From a0adaf7ce195b0bb5dd54b0bc61b459985a2f9a8 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 28 Jun 2015 12:42:38 +0200 Subject: [PATCH] -Update 0.0.6.2 --- build.gradle | 2 +- .../java/ellpeck/actuallyadditions/PLANNED.txt | 2 ++ .../ellpeck/actuallyadditions/gen/OreGen.java | 17 ++++++++++++----- .../actuallyadditions/items/ItemDrill.java | 2 +- .../ellpeck/actuallyadditions/util/ModUtil.java | 2 +- update/changelog.txt | 2 +- update/newestVersion.txt | 2 +- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 887dc9aa2..df88062ee 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'maven' -version = "1.7.10-0.0.6.1" +version = "1.7.10-0.0.6.2" group = "ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" diff --git a/src/main/java/ellpeck/actuallyadditions/PLANNED.txt b/src/main/java/ellpeck/actuallyadditions/PLANNED.txt index f8ec91d38..84c7e0f5f 100644 --- a/src/main/java/ellpeck/actuallyadditions/PLANNED.txt +++ b/src/main/java/ellpeck/actuallyadditions/PLANNED.txt @@ -117,3 +117,5 @@ -Inventory Emitter -Emits a Redstone Signal dependant on the Amount of a specified Item in it -Items are configurable in the GUI + +-Enderman Teleport Stopper diff --git a/src/main/java/ellpeck/actuallyadditions/gen/OreGen.java b/src/main/java/ellpeck/actuallyadditions/gen/OreGen.java index 92c700067..513548c1c 100644 --- a/src/main/java/ellpeck/actuallyadditions/gen/OreGen.java +++ b/src/main/java/ellpeck/actuallyadditions/gen/OreGen.java @@ -11,6 +11,7 @@ import ellpeck.actuallyadditions.util.Util; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; import org.apache.logging.log4j.Level; @@ -21,13 +22,17 @@ public class OreGen implements IWorldGenerator{ @Override 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: generateNether(world, random, chunkX*16, chunkZ*16); - case 0: - generateSurface(world, random, chunkX*16, chunkZ*16); + //case 0: + // generateSurface(world, random, chunkX*16, chunkZ*16); case 1: 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){ - 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") @@ -64,6 +71,6 @@ public class OreGen implements IWorldGenerator{ public static void init(){ Util.logInfo("Registering World Generator..."); - GameRegistry.registerWorldGenerator(new OreGen(), 0); + GameRegistry.registerWorldGenerator(new OreGen(), 10); } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java index 98e8171d3..6c99a0359 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java @@ -332,7 +332,7 @@ public class ItemDrill extends ItemEnergyContainer implements INameableItem{ if(!world.isRemote){ if(!living.isSneaking() && this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)){ 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); } diff --git a/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java b/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java index b0cb19646..311925da6 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java @@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger; 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 NAME = "Actually Additions"; diff --git a/update/changelog.txt b/update/changelog.txt index 336016a25..cb483726c 100644 --- a/update/changelog.txt +++ b/update/changelog.txt @@ -1 +1 @@ -Coffee Machine needs Water, ESD Revamp, Plants grow on Farmland \ No newline at end of file +Really Important Fix for the Drill! \ No newline at end of file diff --git a/update/newestVersion.txt b/update/newestVersion.txt index 6bdb112d2..469a92910 100644 --- a/update/newestVersion.txt +++ b/update/newestVersion.txt @@ -1 +1 @@ -1.7.10-0.0.6.1 \ No newline at end of file +1.7.10-0.0.6.2 \ No newline at end of file