From 086faefd234fa06894c07eb6d60291e229df5888 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Tue, 3 May 2016 18:28:49 +0200 Subject: [PATCH] general code cleanup --- build.gradle | 1 + src/main/java/blocks/BlockAardiumOre.java | 2 +- src/main/java/blocks/BlockAdamantiteOre.java | 2 +- src/main/java/blocks/BlockArcaniteOre.java | 2 +- src/main/java/blocks/BlockAxiidianOre.java | 2 +- src/main/java/blocks/BlockBasalt.java | 2 +- src/main/java/blocks/BlockBismuthOre.java | 2 +- src/main/java/blocks/BlockEterniteOre.java | 2 +- src/main/java/blocks/BlockIgnititeOre.java | 2 +- src/main/java/blocks/BlockKarmesineOre.java | 2 +- src/main/java/blocks/BlockLigniteOre.java | 11 ++++---- src/main/java/blocks/BlockMeteoriteOre.java | 2 +- src/main/java/blocks/BlockMindoriteOre.java | 2 +- src/main/java/blocks/BlockMythrilOre.java | 2 +- src/main/java/blocks/BlockPalladiumOre.java | 2 +- src/main/java/blocks/BlockRottenGround.java | 2 +- src/main/java/blocks/BlockSlaggoldOre.java | 2 +- src/main/java/blocks/BlockSlagironOre.java | 2 +- src/main/java/blocks/BlockTiberiumOre.java | 2 +- src/main/java/blocks/BlockVibraniumOre.java | 2 +- src/main/java/blocks/BlockYrdeanOre.java | 2 +- .../blocks/category/BasicBlockGround.java | 2 +- src/main/java/items/ItemIronNugget.java | 4 +-- src/main/java/items/ItemKarmesineIngot.java | 4 +-- src/main/java/items/ItemMeteoriteIngot.java | 4 +-- src/main/java/items/ItemMindoriteIngot.java | 4 +-- src/main/java/items/ItemMythrilIngot.java | 4 +-- src/main/java/items/ItemPalladiumIngot.java | 4 +-- src/main/java/items/ItemPrometheumIngot.java | 4 +-- src/main/java/items/ItemTiberiumIngot.java | 4 +-- src/main/java/items/ItemVibraniumIngot.java | 4 +-- src/main/java/items/ItemYrdeanIngot.java | 4 +-- src/main/java/main/ZCompression.java | 1 - src/main/java/main/util/FuelHandler.java | 8 +++--- src/main/java/main/util/Generator.java | 2 +- src/main/java/main/util/StateMatcher.java | 8 +++--- src/main/java/main/world/ZWorldGen.java | 28 +++++++++---------- src/main/java/proxy/ClientProxy.java | 18 ++++++------ 38 files changed, 76 insertions(+), 81 deletions(-) diff --git a/build.gradle b/build.gradle index 3a62b97..2b21f1f 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ repositories { name = "chickenbones" url = "http://chickenbones.net/maven/" } + maven { name 'DVS1 Maven FS' url 'http://dvs1.progwml6.com/files/maven' diff --git a/src/main/java/blocks/BlockAardiumOre.java b/src/main/java/blocks/BlockAardiumOre.java index 13c1b0e..9dcfe20 100644 --- a/src/main/java/blocks/BlockAardiumOre.java +++ b/src/main/java/blocks/BlockAardiumOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockAardiumOre extends BasicBlockOre { public BlockAardiumOre() { - super("aardium_ore", Material.ROCK, 55.0f, 400.0f, 3 ); + super("aardium_ore", Material.ROCK, 55.0f, 400.0f, 3); } } diff --git a/src/main/java/blocks/BlockAdamantiteOre.java b/src/main/java/blocks/BlockAdamantiteOre.java index 17cdc6e..730dd73 100644 --- a/src/main/java/blocks/BlockAdamantiteOre.java +++ b/src/main/java/blocks/BlockAdamantiteOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockAdamantiteOre extends BasicBlockOre { public BlockAdamantiteOre() { - super("adamantite_ore", Material.ROCK, 80.0f, 1000.0f,4); + super("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, 4); } } diff --git a/src/main/java/blocks/BlockArcaniteOre.java b/src/main/java/blocks/BlockArcaniteOre.java index bcf2f87..e073886 100644 --- a/src/main/java/blocks/BlockArcaniteOre.java +++ b/src/main/java/blocks/BlockArcaniteOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockArcaniteOre extends BasicBlockOre { public BlockArcaniteOre() { - super("arcanite_ore", Material.ROCK, 23.0f, 25.0f,2); + super("arcanite_ore", Material.ROCK, 23.0f, 25.0f, 2); } } diff --git a/src/main/java/blocks/BlockAxiidianOre.java b/src/main/java/blocks/BlockAxiidianOre.java index 912f9bf..d7ef4d8 100644 --- a/src/main/java/blocks/BlockAxiidianOre.java +++ b/src/main/java/blocks/BlockAxiidianOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockAxiidianOre extends BasicBlockOre { public BlockAxiidianOre() { - super("axiidian_ore", Material.ROCK, 13.0f, 13.0f,3); + super("axiidian_ore", Material.ROCK, 13.0f, 13.0f, 3); } } diff --git a/src/main/java/blocks/BlockBasalt.java b/src/main/java/blocks/BlockBasalt.java index cc85c93..1c22f22 100644 --- a/src/main/java/blocks/BlockBasalt.java +++ b/src/main/java/blocks/BlockBasalt.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockBasalt extends BasicBlockOre { public BlockBasalt() { - super("basalt", Material.ROCK, 35.0f, 35.0f,3); + super("basalt", Material.ROCK, 35.0f, 35.0f, 3); } } diff --git a/src/main/java/blocks/BlockBismuthOre.java b/src/main/java/blocks/BlockBismuthOre.java index bc720f7..8cdeb2e 100644 --- a/src/main/java/blocks/BlockBismuthOre.java +++ b/src/main/java/blocks/BlockBismuthOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockBismuthOre extends BasicBlockOre { public BlockBismuthOre() { - super("bismuth_ore", Material.ROCK, 8.0f, 8.0f,1); + super("bismuth_ore", Material.ROCK, 8.0f, 8.0f, 1); } } diff --git a/src/main/java/blocks/BlockEterniteOre.java b/src/main/java/blocks/BlockEterniteOre.java index e56e95c..3c75a50 100644 --- a/src/main/java/blocks/BlockEterniteOre.java +++ b/src/main/java/blocks/BlockEterniteOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockEterniteOre extends BasicBlockOre { public BlockEterniteOre() { - super("eternite_ore", Material.ROCK, 24.0f, 25.0f,3); + super("eternite_ore", Material.ROCK, 24.0f, 25.0f, 3); } } diff --git a/src/main/java/blocks/BlockIgnititeOre.java b/src/main/java/blocks/BlockIgnititeOre.java index b57224e..91bb96a 100644 --- a/src/main/java/blocks/BlockIgnititeOre.java +++ b/src/main/java/blocks/BlockIgnititeOre.java @@ -6,7 +6,7 @@ import net.minecraft.block.material.Material; public class BlockIgnititeOre extends BasicBlockOre { public BlockIgnititeOre() { - super("ignitite_ore", Material.ROCK, 23.0f, 25.0f,3); + super("ignitite_ore", Material.ROCK, 23.0f, 25.0f, 3); } } diff --git a/src/main/java/blocks/BlockKarmesineOre.java b/src/main/java/blocks/BlockKarmesineOre.java index d8b7a59..536172b 100644 --- a/src/main/java/blocks/BlockKarmesineOre.java +++ b/src/main/java/blocks/BlockKarmesineOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockKarmesineOre extends BasicBlockOre { public BlockKarmesineOre() { - super("karmesine_ore", Material.ROCK, 13.0f, 15.0f,1); + super("karmesine_ore", Material.ROCK, 13.0f, 15.0f, 1); } } diff --git a/src/main/java/blocks/BlockLigniteOre.java b/src/main/java/blocks/BlockLigniteOre.java index 3782c20..c3f4ff6 100644 --- a/src/main/java/blocks/BlockLigniteOre.java +++ b/src/main/java/blocks/BlockLigniteOre.java @@ -15,22 +15,21 @@ import java.util.Random; public class BlockLigniteOre extends BasicBlockOre { public BlockLigniteOre() { - super("lignite_ore", Material.ROCK, 4.0f, 5.0f,1); + super("lignite_ore", Material.ROCK, 4.0f, 5.0f, 1); } @Override public int getExpDrop(IBlockState state, IBlockAccess world, BlockPos pos, int fortune) { - Random rand = world instanceof World ? ((World) world).rand : new Random(); + Random rand = world instanceof World ? ((World) world).rand : new Random(); int r = RANDOM.nextInt(11); - if(r > 7) { + if (r > 7) { return MathHelper.getRandomIntegerInRange(rand, 0, 10) + fortune; - } - else return 0; + } else return 0; } @Override public int quantityDropped(IBlockState state, int fortune, Random random) { - return MathHelper.getRandomIntegerInRange(random, 1, 3 + fortune); + return MathHelper.getRandomIntegerInRange(random, 1, 3 + fortune); } @Override diff --git a/src/main/java/blocks/BlockMeteoriteOre.java b/src/main/java/blocks/BlockMeteoriteOre.java index b5fa01a..cab7308 100644 --- a/src/main/java/blocks/BlockMeteoriteOre.java +++ b/src/main/java/blocks/BlockMeteoriteOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockMeteoriteOre extends BasicBlockOre { public BlockMeteoriteOre() { - super("meteorite_ore", Material.ROCK, 60.0f,500.0f,4); + super("meteorite_ore", Material.ROCK, 60.0f, 500.0f, 4); } } diff --git a/src/main/java/blocks/BlockMindoriteOre.java b/src/main/java/blocks/BlockMindoriteOre.java index 63c5f35..a7aa6df 100644 --- a/src/main/java/blocks/BlockMindoriteOre.java +++ b/src/main/java/blocks/BlockMindoriteOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockMindoriteOre extends BasicBlockOre { public BlockMindoriteOre() { - super("mindorite_ore", Material.ROCK, 12.0f, 12.0f,2); + super("mindorite_ore", Material.ROCK, 12.0f, 12.0f, 2); } } diff --git a/src/main/java/blocks/BlockMythrilOre.java b/src/main/java/blocks/BlockMythrilOre.java index 6db186f..810d868 100644 --- a/src/main/java/blocks/BlockMythrilOre.java +++ b/src/main/java/blocks/BlockMythrilOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockMythrilOre extends BasicBlockOre { public BlockMythrilOre() { - super("mythril_ore", Material.ROCK, 25.0f, 25.0f,4); + super("mythril_ore", Material.ROCK, 25.0f, 25.0f, 4); } } diff --git a/src/main/java/blocks/BlockPalladiumOre.java b/src/main/java/blocks/BlockPalladiumOre.java index 5dc2d94..73d4619 100644 --- a/src/main/java/blocks/BlockPalladiumOre.java +++ b/src/main/java/blocks/BlockPalladiumOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockPalladiumOre extends BasicBlockOre { public BlockPalladiumOre() { - super("palladium_ore", Material.ROCK, 25.0f, 25.0f,3); + super("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3); } } diff --git a/src/main/java/blocks/BlockRottenGround.java b/src/main/java/blocks/BlockRottenGround.java index 4b1a57a..d590204 100644 --- a/src/main/java/blocks/BlockRottenGround.java +++ b/src/main/java/blocks/BlockRottenGround.java @@ -7,7 +7,7 @@ import net.minecraft.block.material.Material; public class BlockRottenGround extends BasicBlockGround { public BlockRottenGround() { - super("rotten_ground", Material.GROUND, 2.0f, 2.0f,0); + super("rotten_ground", Material.GROUND, 2.0f, 2.0f, 0); this.setSoundType(SoundType.GROUND); } } diff --git a/src/main/java/blocks/BlockSlaggoldOre.java b/src/main/java/blocks/BlockSlaggoldOre.java index bcf7b17..559a135 100644 --- a/src/main/java/blocks/BlockSlaggoldOre.java +++ b/src/main/java/blocks/BlockSlaggoldOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockSlaggoldOre extends BasicBlockOre { public BlockSlaggoldOre() { - super("slaggold_ore", Material.ROCK, 3.0f, 5.0f,1); + super("slaggold_ore", Material.ROCK, 3.0f, 5.0f, 1); } } diff --git a/src/main/java/blocks/BlockSlagironOre.java b/src/main/java/blocks/BlockSlagironOre.java index fcf60a8..f4bc78c 100644 --- a/src/main/java/blocks/BlockSlagironOre.java +++ b/src/main/java/blocks/BlockSlagironOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockSlagironOre extends BasicBlockOre { public BlockSlagironOre() { - super("slagiron_ore", Material.ROCK, 3.0f, 5.0f,1); + super("slagiron_ore", Material.ROCK, 3.0f, 5.0f, 1); } } diff --git a/src/main/java/blocks/BlockTiberiumOre.java b/src/main/java/blocks/BlockTiberiumOre.java index c493742..076b519 100644 --- a/src/main/java/blocks/BlockTiberiumOre.java +++ b/src/main/java/blocks/BlockTiberiumOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockTiberiumOre extends BasicBlockOreGlow { public BlockTiberiumOre() { - super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3,0.66f); + super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3, 0.66f); } } diff --git a/src/main/java/blocks/BlockVibraniumOre.java b/src/main/java/blocks/BlockVibraniumOre.java index c535480..5ac0307 100644 --- a/src/main/java/blocks/BlockVibraniumOre.java +++ b/src/main/java/blocks/BlockVibraniumOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockVibraniumOre extends BasicBlockOre { public BlockVibraniumOre() { - super("vibranium_ore", Material.ROCK, 70.0f, 800.0f,4); + super("vibranium_ore", Material.ROCK, 70.0f, 800.0f, 4); } } \ No newline at end of file diff --git a/src/main/java/blocks/BlockYrdeanOre.java b/src/main/java/blocks/BlockYrdeanOre.java index e403e4b..9435abf 100644 --- a/src/main/java/blocks/BlockYrdeanOre.java +++ b/src/main/java/blocks/BlockYrdeanOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockYrdeanOre extends BasicBlockOre { public BlockYrdeanOre() { - super("yrdean_ore", Material.ROCK, 13.0f, 15.0f,3); + super("yrdean_ore", Material.ROCK, 13.0f, 15.0f, 3); } } diff --git a/src/main/java/blocks/category/BasicBlockGround.java b/src/main/java/blocks/category/BasicBlockGround.java index 516abbe..6326276 100644 --- a/src/main/java/blocks/category/BasicBlockGround.java +++ b/src/main/java/blocks/category/BasicBlockGround.java @@ -11,6 +11,6 @@ public class BasicBlockGround extends Block { setRegistryName(name); setHardness(hardness); setResistance(resistance); - setHarvestLevel("shovel",harvest); + setHarvestLevel("shovel", harvest); } } diff --git a/src/main/java/items/ItemIronNugget.java b/src/main/java/items/ItemIronNugget.java index c5e8572..9bafe38 100644 --- a/src/main/java/items/ItemIronNugget.java +++ b/src/main/java/items/ItemIronNugget.java @@ -1,8 +1,8 @@ package items; -public class ItemIronNugget extends BasicItem{ +public class ItemIronNugget extends BasicItem { - public ItemIronNugget(){ + public ItemIronNugget() { super("iron_nugget"); } } diff --git a/src/main/java/items/ItemKarmesineIngot.java b/src/main/java/items/ItemKarmesineIngot.java index 761977b..56ae5da 100644 --- a/src/main/java/items/ItemKarmesineIngot.java +++ b/src/main/java/items/ItemKarmesineIngot.java @@ -1,8 +1,8 @@ package items; -public class ItemKarmesineIngot extends BasicItem{ +public class ItemKarmesineIngot extends BasicItem { - public ItemKarmesineIngot(){ + public ItemKarmesineIngot() { super("karmesine_ingot"); } } diff --git a/src/main/java/items/ItemMeteoriteIngot.java b/src/main/java/items/ItemMeteoriteIngot.java index 7296282..91e6507 100644 --- a/src/main/java/items/ItemMeteoriteIngot.java +++ b/src/main/java/items/ItemMeteoriteIngot.java @@ -1,8 +1,8 @@ package items; -public class ItemMeteoriteIngot extends BasicItem{ +public class ItemMeteoriteIngot extends BasicItem { - public ItemMeteoriteIngot(){ + public ItemMeteoriteIngot() { super("meteorite_ingot"); } } diff --git a/src/main/java/items/ItemMindoriteIngot.java b/src/main/java/items/ItemMindoriteIngot.java index a098b16..57f0a01 100644 --- a/src/main/java/items/ItemMindoriteIngot.java +++ b/src/main/java/items/ItemMindoriteIngot.java @@ -1,8 +1,8 @@ package items; -public class ItemMindoriteIngot extends BasicItem{ +public class ItemMindoriteIngot extends BasicItem { - public ItemMindoriteIngot(){ + public ItemMindoriteIngot() { super("mindorite_ingot"); } } diff --git a/src/main/java/items/ItemMythrilIngot.java b/src/main/java/items/ItemMythrilIngot.java index 1d5066b..3441294 100644 --- a/src/main/java/items/ItemMythrilIngot.java +++ b/src/main/java/items/ItemMythrilIngot.java @@ -1,8 +1,8 @@ package items; -public class ItemMythrilIngot extends BasicItem{ +public class ItemMythrilIngot extends BasicItem { - public ItemMythrilIngot(){ + public ItemMythrilIngot() { super("mythril_ingot"); } } diff --git a/src/main/java/items/ItemPalladiumIngot.java b/src/main/java/items/ItemPalladiumIngot.java index 4dd8911..d795dbc 100644 --- a/src/main/java/items/ItemPalladiumIngot.java +++ b/src/main/java/items/ItemPalladiumIngot.java @@ -1,8 +1,8 @@ package items; -public class ItemPalladiumIngot extends BasicItem{ +public class ItemPalladiumIngot extends BasicItem { - public ItemPalladiumIngot(){ + public ItemPalladiumIngot() { super("palladium_ingot"); } } diff --git a/src/main/java/items/ItemPrometheumIngot.java b/src/main/java/items/ItemPrometheumIngot.java index 853309c..a41d546 100644 --- a/src/main/java/items/ItemPrometheumIngot.java +++ b/src/main/java/items/ItemPrometheumIngot.java @@ -1,8 +1,8 @@ package items; -public class ItemPrometheumIngot extends BasicItem{ +public class ItemPrometheumIngot extends BasicItem { - public ItemPrometheumIngot(){ + public ItemPrometheumIngot() { super("prometheum_ingot"); } } diff --git a/src/main/java/items/ItemTiberiumIngot.java b/src/main/java/items/ItemTiberiumIngot.java index 9cf8da8..d5f5348 100644 --- a/src/main/java/items/ItemTiberiumIngot.java +++ b/src/main/java/items/ItemTiberiumIngot.java @@ -1,8 +1,8 @@ package items; -public class ItemTiberiumIngot extends BasicItem{ +public class ItemTiberiumIngot extends BasicItem { - public ItemTiberiumIngot(){ + public ItemTiberiumIngot() { super("tiberium_ingot"); } } diff --git a/src/main/java/items/ItemVibraniumIngot.java b/src/main/java/items/ItemVibraniumIngot.java index 88ab2f3..ef1128f 100644 --- a/src/main/java/items/ItemVibraniumIngot.java +++ b/src/main/java/items/ItemVibraniumIngot.java @@ -1,8 +1,8 @@ package items; -public class ItemVibraniumIngot extends BasicItem{ +public class ItemVibraniumIngot extends BasicItem { - public ItemVibraniumIngot(){ + public ItemVibraniumIngot() { super("vibranium_ingot"); } } diff --git a/src/main/java/items/ItemYrdeanIngot.java b/src/main/java/items/ItemYrdeanIngot.java index 5b4f99c..221c36a 100644 --- a/src/main/java/items/ItemYrdeanIngot.java +++ b/src/main/java/items/ItemYrdeanIngot.java @@ -1,8 +1,8 @@ package items; -public class ItemYrdeanIngot extends BasicItem{ +public class ItemYrdeanIngot extends BasicItem { - public ItemYrdeanIngot(){ + public ItemYrdeanIngot() { super("yrdean_ingot"); } } diff --git a/src/main/java/main/ZCompression.java b/src/main/java/main/ZCompression.java index e5aa87b..676d003 100644 --- a/src/main/java/main/ZCompression.java +++ b/src/main/java/main/ZCompression.java @@ -134,7 +134,6 @@ public class ZCompression { GameRegistry.registerFuelHandler(new FuelHandler()); new Smelting(); new Crafting(); - } @EventHandler diff --git a/src/main/java/main/util/FuelHandler.java b/src/main/java/main/util/FuelHandler.java index 5a3dd31..d83c222 100644 --- a/src/main/java/main/util/FuelHandler.java +++ b/src/main/java/main/util/FuelHandler.java @@ -8,11 +8,11 @@ import org.apache.commons.lang3.RandomUtils; public class FuelHandler implements IFuelHandler { @Override - public int getBurnTime(ItemStack fuel){ - if(fuel.getItem().equals(ZCompression.lignite)) { - return 200*2; + public int getBurnTime(ItemStack fuel) { + if (fuel.getItem().equals(ZCompression.lignite)) { + return 200 * 2; } - if(fuel.getItem().equals(ZCompression.fuel_brick)) { + if (fuel.getItem().equals(ZCompression.fuel_brick)) { return RandomUtils.nextInt(1, 64) * 200; } return 0; diff --git a/src/main/java/main/util/Generator.java b/src/main/java/main/util/Generator.java index 99545ce..410b124 100644 --- a/src/main/java/main/util/Generator.java +++ b/src/main/java/main/util/Generator.java @@ -17,7 +17,7 @@ public class Generator { 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(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize); } - + public static void generateEndOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) { generateOre(state, Blocks.END_STONE.getDefaultState(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize); } diff --git a/src/main/java/main/util/StateMatcher.java b/src/main/java/main/util/StateMatcher.java index b7c5a6b..933cce0 100644 --- a/src/main/java/main/util/StateMatcher.java +++ b/src/main/java/main/util/StateMatcher.java @@ -13,10 +13,10 @@ public class StateMatcher implements Predicate { private final Comparable value; private StateMatcher(IBlockState state, IProperty property, Comparable value) { - this.state = state; - this.property = property; - this.value = value; - } + this.state = state; + this.property = property; + this.value = value; + } public static StateMatcher forState(IBlockState state, IProperty property, Comparable value) { return new StateMatcher(state, property, value); diff --git a/src/main/java/main/world/ZWorldGen.java b/src/main/java/main/world/ZWorldGen.java index 04a36da..69f81f0 100644 --- a/src/main/java/main/world/ZWorldGen.java +++ b/src/main/java/main/world/ZWorldGen.java @@ -24,27 +24,25 @@ public class ZWorldGen implements IWorldGenerator { Generator.generateOre(ZCompression.slaggoldOre.getDefaultState(), random, x, z, world, 20, 8, 48, 5, 9); Generator.generateOre(ZCompression.ligniteOre.getDefaultState(), random, x, z, world, 40, 8, 96, 5, 15); Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), random, x, z, world, 40, 8, 96, 2, 14); - Generator.generateOre(ZCompression.basalt.getDefaultState(), Blocks.LAVA.getDefaultState(), random, x, z, world, 100, 8, 24, 2, 5); Generator.generateOre(ZCompression.rottenGround.getDefaultState(), Blocks.DIRT.getDefaultState(), random, x, z, world, 25, 50, 70, 2, 15); - - Generator.generateOre(ZCompression.vibraniumOre.getDefaultState(), random, x, z, world, 18, 48, 64, 2, 4); - Generator.generateOre(ZCompression.karmesineOre.getDefaultState(), random, x, z, world, 30, 16, 48, 2, 5); - Generator.generateOre(ZCompression.bismuthOre.getDefaultState(), random, x, z, world, 50, 50, 130, 2, 4); - Generator.generateOre(ZCompression.mythrilOre.getDefaultState(), random, x, z, world, 18, 16, 32, 2, 4); - Generator.generateOre(ZCompression.meteoriteOre.getDefaultState(), random, x, z, world, 12, 0, 32, 2, 10); - Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 200, 16, 96, 2, 4); - Generator.generateOre(ZCompression.arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 200, 16, 96, 2, 4); - Generator.generateOre(ZCompression.eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 200, 16, 96, 2, 4); + Generator.generateOre(ZCompression.vibraniumOre.getDefaultState(), random, x, z, world, 18, 48, 64, 2, 4); + Generator.generateOre(ZCompression.karmesineOre.getDefaultState(), random, x, z, world, 30, 16, 48, 2, 5); + Generator.generateOre(ZCompression.bismuthOre.getDefaultState(), random, x, z, world, 50, 50, 130, 2, 4); + Generator.generateOre(ZCompression.mythrilOre.getDefaultState(), random, x, z, world, 18, 16, 32, 2, 4); + Generator.generateOre(ZCompression.meteoriteOre.getDefaultState(), random, x, z, world, 12, 0, 32, 2, 10); + Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 200, 16, 96, 2, 4); + Generator.generateOre(ZCompression.arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 200, 16, 96, 2, 4); + Generator.generateOre(ZCompression.eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 200, 16, 96, 2, 4); } private void end(Random random, int x, int z, World world) { - - Generator.generateEndOre(ZCompression.yrdeanOre.getDefaultState(), random, x, z, world, 16, 10, 35, 2, 6); - Generator.generateEndOre(ZCompression.ignititeOre.getDefaultState(), random, x, z, world, 16, 20, 45, 2, 6); - Generator.generateEndOre(ZCompression.axiidianOre.getDefaultState(), random, x, z, world, 16, 30, 55, 2, 6); - Generator.generateEndOre(ZCompression.aardiumOre.getDefaultState(), random, x, z, world, 16, 40, 65, 2, 6); + + Generator.generateEndOre(ZCompression.yrdeanOre.getDefaultState(), random, x, z, world, 16, 10, 35, 2, 6); + Generator.generateEndOre(ZCompression.ignititeOre.getDefaultState(), random, x, z, world, 16, 20, 45, 2, 6); + Generator.generateEndOre(ZCompression.axiidianOre.getDefaultState(), random, x, z, world, 16, 30, 55, 2, 6); + Generator.generateEndOre(ZCompression.aardiumOre.getDefaultState(), random, x, z, world, 16, 40, 65, 2, 6); } diff --git a/src/main/java/proxy/ClientProxy.java b/src/main/java/proxy/ClientProxy.java index 8705f7c..f9804bc 100644 --- a/src/main/java/proxy/ClientProxy.java +++ b/src/main/java/proxy/ClientProxy.java @@ -8,6 +8,14 @@ import net.minecraft.item.Item; public class ClientProxy extends ServerProxy { + private static void registerBlockModel(Block block) { + registerItemModel(Item.getItemFromBlock(block)); + } + + private static void registerItemModel(Item item) { + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); + } + @Override public void registerClientStuff() { // Items @@ -56,15 +64,5 @@ public class ClientProxy extends ServerProxy { registerBlockModel(ZCompression.tiberiumOre); registerBlockModel(ZCompression.vibraniumOre); registerBlockModel(ZCompression.yrdeanOre); - - - } - - private static void registerBlockModel(Block block) { - registerItemModel(Item.getItemFromBlock(block)); - } - - private static void registerItemModel(Item item) { - Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); } }