diff --git a/build.gradle b/build.gradle index 9be2f8af..810e174a 100644 --- a/build.gradle +++ b/build.gradle @@ -51,9 +51,9 @@ repositories { } dependencies { - compile "codechicken:CodeChickenLib:" + config.mc_version + "-" + config.cclib_version + ":dev" - compile "codechicken:CodeChickenCore:" + config.mc_version + "-" + config.ccc_version + ":dev" - compile "codechicken:NotEnoughItems:" + config.mc_version + "-" + config.nei_version + ":dev" +// compile "codechicken:CodeChickenLib:" + config.mc_version + "-" + config.cclib_version + ":dev" +// compile "codechicken:CodeChickenCore:" + config.mc_version + "-" + config.ccc_version + ":dev" +// compile "codechicken:NotEnoughItems:" + config.mc_version + "-" + config.nei_version + ":dev" // compile name: 'MineTweaker3', version: config.minetweaker_version, ext: 'jar' // compile "codechicken:ForgeMultipart:1.7.10-1.1.0.314:dev" // compile "info.amerifrance.guideapi:Guide-API:" + config.mc_version + "-" + config.guideapi_version + ":deobf" diff --git a/build.properties b/build.properties index a40914e6..8651a7d1 100644 --- a/build.properties +++ b/build.properties @@ -1,8 +1,8 @@ mod_name=BloodMagic forge_version=11.14.3.1499 cclib_version=1.1.2.133 -ccc_version=1.0.5.36 -nei_version=1.0.5.104 +ccc_version=1.0.5.34 +nei_version=1.0.5.82 //=Dependency Information guideapi_version=1.0.1-20 package_group=com.wayoftime.bloodmagic diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index a76b1bad..94d87cf4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -565,9 +565,6 @@ public class AlchemicalWizardry { int craftingConstant = OreDictionary.WILDCARD_VALUE; - ModBlocks.init(); - //blocks - proxy.registerRenderers(); proxy.registerEntities(); proxy.registerEntityTrackers(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/ModBlocks.java b/src/main/java/WayofTime/alchemicalWizardry/ModBlocks.java index a3f6e5c6..551ccf3e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/ModBlocks.java +++ b/src/main/java/WayofTime/alchemicalWizardry/ModBlocks.java @@ -107,13 +107,13 @@ public class ModBlocks public static void init() { -/* blockAltar = (BlockAltar) registerBlock(new BlockAltar(), "altar"); + blockAltar = (BlockAltar) registerBlock(new BlockAltar(), "altar"); bloodRune = (BlockBloodRune) registerBlock(new BlockBloodRune(), ItemBloodRuneBlock.class, "base_rune"); speedRune = (BlockSpeedRune) registerBlock(new BlockSpeedRune(), "speed_rune"); efficiencyRune = (BlockEfficiencyRune) registerBlock(new BlockEfficiencyRune(), "efficiency_rune"); runeOfSacrifice = (BlockRuneOfSacrifice) registerBlock(new BlockRuneOfSacrifice(), "sacrifice_rune"); runeOfSelfSacrifice = (BlockRuneOfSelfSacrifice) registerBlock(new BlockRuneOfSelfSacrifice(), "self_sacrifice_rune"); - */ blockTeleposer = registerBlock(new BlockTeleposer(), "teleposer"); + blockTeleposer = registerBlock(new BlockTeleposer(), "teleposer"); spectralBlock = registerBlock(new BlockSpectral(), "spectral_block"); ritualStone = registerBlock(new BlockRitualStone(), "ritual_stone"); blockMasterStone = registerBlock(new BlockMasterStone(), "master_ritual_stone"); @@ -155,26 +155,25 @@ public class ModBlocks block.setUnlocalizedName(unlocalizedName); // if (!) //creative tab blacklist - { +// { block.setCreativeTab(AlchemicalWizardry.tabBloodMagic); - } +// } -// blocksNotToBeRegistered.clear(); -// for (String unlocName : BloodMagicConfiguration.blocksToBeDisabled) + blocksNotToBeRegistered.clear(); + for (String unlocName : BloodMagicConfiguration.blocksToBeDisabled) { -// if (unlocName.equals(unlocalizedName)) + if (unlocName.equals(unlocalizedName)) { -// blocksNotToBeRegistered.add(unlocName); + blocksNotToBeRegistered.add(unlocName); } } - // if (!blocksNotToBeRegistered.contains(unlocalizedName)) + if (!blocksNotToBeRegistered.contains(unlocalizedName)) { -// GameRegistry.registerBlock(block, unlocalizedName); + GameRegistry.registerBlock(block, unlocalizedName); } // BlockRenderer.registerBlock(block); - GameRegistry.registerBlock(block, unlocalizedName); return block; } @@ -182,14 +181,14 @@ public class ModBlocks { block.setCreativeTab(AlchemicalWizardry.tabBloodMagic); -// for (String unlocName : BloodMagicConfiguration.blocksToBeDisabled) + for (String unlocName : BloodMagicConfiguration.blocksToBeDisabled) { -// if (unlocName.equals(unlocalizedName)) + if (unlocName.equals(unlocalizedName)) { -// blocksNotToBeRegistered.add(unlocName); + blocksNotToBeRegistered.add(unlocName); } } -// if (!blocksNotToBeRegistered.contains(unlocalizedName)) + if (!blocksNotToBeRegistered.contains(unlocalizedName)) { GameRegistry.registerBlock(block, itemBlockClass, unlocalizedName); }