From 15465862a83515e734c415b62e00df7f830ce8e5 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Fri, 29 Apr 2016 20:41:11 +0200 Subject: [PATCH] fixed Generator --- src/main/java/items/BasicItem.java | 9 +++++++++ src/main/java/main/util/Generator.java | 9 +++++---- src/main/java/main/world/ZWorldGen.java | 4 +++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/items/BasicItem.java b/src/main/java/items/BasicItem.java index 628bc37..03ceb7b 100644 --- a/src/main/java/items/BasicItem.java +++ b/src/main/java/items/BasicItem.java @@ -1,6 +1,14 @@ package items; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class BasicItem extends Item { @@ -8,4 +16,5 @@ public class BasicItem extends Item { setUnlocalizedName(name); setRegistryName(name); } + } diff --git a/src/main/java/main/util/Generator.java b/src/main/java/main/util/Generator.java index 16f26a4..6f8fac9 100644 --- a/src/main/java/main/util/Generator.java +++ b/src/main/java/main/util/Generator.java @@ -1,5 +1,6 @@ package main.util; +import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; @@ -11,15 +12,15 @@ import java.util.Random; public class Generator { public static void generateOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) { - generateOre(state, Blocks.STONE.getDefaultState(), random, x, z, world, chance, minY, maxY, minSize, maxSize); + generateOre(state, Blocks.STONE.getDefaultState(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize); } public static void generateNetherOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) { - generateOre(state, Blocks.NETHERRACK.getDefaultState(), random, x, z, world, chance, minY, maxY, minSize, maxSize); + generateOre(state, Blocks.NETHERRACK.getDefaultState(),null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize); } - public static void generateOre(IBlockState state, IBlockState replace, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize) { + public static void generateOre(IBlockState state, IBlockState replace, IProperty property, Comparable comparable, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize) { int size = minSize + random.nextInt(maxSize - minSize); int height = maxY - minY; @@ -27,7 +28,7 @@ public class Generator { int posX = chunkX + random.nextInt(16); int posY = random.nextInt(height) + minY; int posZ = chunkZ + random.nextInt(16); - new WorldGenMinable(state, size, StateMatcher.forState(replace)).generate(world, random, new BlockPos(posX, posY, posZ)); + new WorldGenMinable(state, size, StateMatcher.forState(replace, property, comparable)).generate(world, random, new BlockPos(posX, posY, posZ)); } } } diff --git a/src/main/java/main/world/ZWorldGen.java b/src/main/java/main/world/ZWorldGen.java index f8b0db7..22b7d79 100644 --- a/src/main/java/main/world/ZWorldGen.java +++ b/src/main/java/main/world/ZWorldGen.java @@ -2,6 +2,8 @@ package main.world; import main.ZCompression; import main.util.Generator; +import net.minecraft.block.BlockStone; +import net.minecraft.block.properties.PropertyEnum; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkGenerator; @@ -28,7 +30,7 @@ public class ZWorldGen implements IWorldGenerator { Generator.generateOre(ZCompression.vibraniumOre.getDefaultState(), random, x, z, world, 16, 48, 64, 2, 4); Generator.generateOre(ZCompression.mythrilOre.getDefaultState(), random, x, z, world, 16, 16, 32, 2, 4); Generator.generateOre(ZCompression.meteoriteOre.getDefaultState(), random, x, z, world, 25, 0, 32, 3, 6); - Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 450, 32, 96, 3, 6); + Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 2450, 32, 96, 3, 6); } private void end(Random random, int x, int z, World world) {