Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

-Update 0.0.6.2

Browse source
This commit is contained in:
Ellpeck 2015-06-28 12:42:38 +02:00
parent 9607128e15
commit a0adaf7ce1
7 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -18,7 +18,7 @@ buildscript {
apply plugin: 'forge' apply plugin: 'forge'
apply plugin: 'maven' apply plugin: 'maven'
version = "1.7.10-0.0.6.1" version = "1.7.10-0.0.6.2"
group = "ellpeck.actuallyadditions" group = "ellpeck.actuallyadditions"
archivesBaseName = "ActuallyAdditions" archivesBaseName = "ActuallyAdditions"

2
src/main/java/ellpeck/actuallyadditions/PLANNED.txt
View file

@ -117,3 +117,5 @@
-Inventory Emitter -Inventory Emitter
-Emits a Redstone Signal dependant on the Amount of a specified Item in it -Emits a Redstone Signal dependant on the Amount of a specified Item in it
-Items are configurable in the GUI -Items are configurable in the GUI
-Enderman Teleport Stopper

17
src/main/java/ellpeck/actuallyadditions/gen/OreGen.java
View file

@ -11,6 +11,7 @@ import ellpeck.actuallyadditions.util.Util;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraft.world.gen.feature.WorldGenMinable;
import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Level;
@ -21,13 +22,17 @@ public class OreGen implements IWorldGenerator{
@Override @Override
public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider){ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider){
switch (world.provider.dimensionId){ if(world.provider.terrainType == WorldType.FLAT) return;
switch(world.provider.dimensionId){
case -1: case -1:
generateNether(world, random, chunkX*16, chunkZ*16); generateNether(world, random, chunkX*16, chunkZ*16);
case 0: //case 0:
generateSurface(world, random, chunkX*16, chunkZ*16); // generateSurface(world, random, chunkX*16, chunkZ*16);
case 1: case 1:
generateEnd(world, random, chunkX*16, chunkZ*16); generateEnd(world, random, chunkX*16, chunkZ*16);
default:
generateSurface(world, random, chunkX*16, chunkZ*16);
} }
} }
@ -37,7 +42,9 @@ public class OreGen implements IWorldGenerator{
} }
private void generateSurface(World world, Random random, int x, int z){ private void generateSurface(World world, Random random, int x, int z){
if(ConfigBoolValues.GENERATE_QUARTZ.isEnabled()) this.addOreSpawn(InitBlocks.blockMisc, TheMiscBlocks.ORE_QUARTZ.ordinal(), Blocks.stone, world, random, x, z, this.getRandom(ConfigIntValues.BLACK_QUARTZ_BASE_AMOUNT.getValue(), ConfigIntValues.BLACK_QUARTZ_ADD_CHANCE.getValue(), random), ConfigIntValues.BLACK_QUARTZ_CHANCE.getValue(), ConfigIntValues.BLACK_QUARTZ_MIN_HEIGHT.getValue(), ConfigIntValues.BLACK_QUARTZ_MAX_HEIGHT.getValue()); if(ConfigBoolValues.GENERATE_QUARTZ.isEnabled()){
this.addOreSpawn(InitBlocks.blockMisc, TheMiscBlocks.ORE_QUARTZ.ordinal(), Blocks.stone, world, random, x, z, this.getRandom(ConfigIntValues.BLACK_QUARTZ_BASE_AMOUNT.getValue(), ConfigIntValues.BLACK_QUARTZ_ADD_CHANCE.getValue(), random), ConfigIntValues.BLACK_QUARTZ_CHANCE.getValue(), ConfigIntValues.BLACK_QUARTZ_MIN_HEIGHT.getValue(), ConfigIntValues.BLACK_QUARTZ_MAX_HEIGHT.getValue());
}
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ -64,6 +71,6 @@ public class OreGen implements IWorldGenerator{
public static void init(){ public static void init(){
Util.logInfo("Registering World Generator..."); Util.logInfo("Registering World Generator...");
GameRegistry.registerWorldGenerator(new OreGen(), 0); GameRegistry.registerWorldGenerator(new OreGen(), 10);
} }
} }

2
src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java
View file

@ -332,7 +332,7 @@ public class ItemDrill extends ItemEnergyContainer implements INameableItem{
if(!world.isRemote){ if(!world.isRemote){
if(!living.isSneaking() && this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)){ if(!living.isSneaking() && this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)){
if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)){ if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)){
this.breakBlocks(stack, 30, world, x, y, z, player); this.breakBlocks(stack, 2, world, x, y, z, player);
} }
else this.breakBlocks(stack, 1, world, x, y, z, player); else this.breakBlocks(stack, 1, world, x, y, z, player);
} }

2
src/main/java/ellpeck/actuallyadditions/util/ModUtil.java
View file

@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger;
public class ModUtil{ public class ModUtil{
public static final String VERSION = "1.7.10-0.0.6.1"; public static final String VERSION = "1.7.10-0.0.6.2";
public static final String MOD_ID = "ActuallyAdditions"; public static final String MOD_ID = "ActuallyAdditions";
public static final String NAME = "Actually Additions"; public static final String NAME = "Actually Additions";

2
update/changelog.txt
View file

@ -1 +1 @@
Coffee Machine needs Water, ESD Revamp, Plants grow on Farmland Really Important Fix for the Drill!

2
update/newestVersion.txt
View file

@ -1 +1 @@
1.7.10-0.0.6.1 1.7.10-0.0.6.2