From 3578a431e81672f02492fd4b614753b4049fbd31 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Wed, 29 Jul 2015 09:20:39 -0400 Subject: [PATCH] Added CB Files --- build.gradle | 6 ++--- build.properties | 9 ++++---- .../AlchemicalWizardry.java | 22 ++++++++----------- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index dca746fd..9be2f8af 100644 --- a/build.gradle +++ b/build.gradle @@ -51,9 +51,9 @@ repositories { } dependencies { -// compile "codechicken:CodeChickenLib:1.7.10-1.1.1.99: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 5c65da81..a40914e6 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,8 @@ -# -#Mon Jul 20 20:59:46 EDT 2015 mod_name=BloodMagic -forge_version=11.14.1.1334 -ccc_version=1.0.4.29 -nei_version=1.0.3.64 +forge_version=11.14.3.1499 +cclib_version=1.1.2.133 +ccc_version=1.0.5.36 +nei_version=1.0.5.104 //=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 48574a7f..05150a8f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -50,10 +50,10 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import thaumcraft.api.ItemApi; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; +//import thaumcraft.api.ItemApi; +//import thaumcraft.api.ThaumcraftApi; +//import thaumcraft.api.aspects.Aspect; +//import thaumcraft.api.aspects.AspectList; import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; @@ -848,7 +848,6 @@ public class AlchemicalWizardry ItemStack strengthenedCatalystStackCrafted = new ItemStack(ModItems.baseAlchemyItems, 2, 3); ItemStack fracturedBoneStackCrafted = new ItemStack(ModItems.baseAlchemyItems, 4, 5); - //TODO NEW RECIPES! AlchemyRecipeRegistry.registerRecipe(new ItemStack(ModItems.weakBindingAgent), 10, new ItemStack[]{simpleCatalystStack, simpleCatalystStack, new ItemStack(Items.clay_ball)}, 2); AlchemyRecipeRegistry.registerRecipe(new ItemStack(ModItems.standardBindingAgent), 15, new ItemStack[]{new ItemStack(ModItems.weakBindingAgent), sanctusStack, new ItemStack(ModItems.crystallos)}, 3); @@ -887,7 +886,6 @@ public class AlchemicalWizardry AlchemyRecipeRegistry.registerRecipe(reductusStack, 20, new ItemStack[]{redstoneStack, goldIngotStack, strengthenedCatalystStack, new ItemStack(Blocks.soul_sand), new ItemStack(Items.carrot)}, 3); AlchemyRecipeRegistry.registerRecipe(potentiaStack, 20, new ItemStack[]{glowstoneDustStack, strengthenedCatalystStack, lapisStack, lapisStack, new ItemStack(Items.quartz)}, 3); - HomSpellRegistry.registerBasicSpell(new ItemStack(Items.flint_and_steel), new SpellFireBurst()); HomSpellRegistry.registerBasicSpell(new ItemStack(Blocks.ice), new SpellFrozenWater()); HomSpellRegistry.registerBasicSpell(new ItemStack(Blocks.tnt), new SpellExplosions()); @@ -939,8 +937,6 @@ public class AlchemicalWizardry EntityRegistry.registerModEntity(EntityMinorDemonGruntGuardianIce.class, "MinorDemonGruntGuardianIce", 42, this, 80, 3, true); EntityRegistry.registerModEntity(EntityMinorDemonGruntGuardianEarth.class, "MinorDemonGruntGuardianEarth", 43, this, 80, 3, true); - - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ModItems.standardBindingAgent), 1, 3, this.standardBindingAgentDungeonChance / 5)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ModItems.mundanePowerCatalyst), 1, 1, this.mundanePowerCatalystDungeonChance / 5)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ModItems.mundaneLengtheningCatalyst), 1, 1, this.mundaneLengtheningCatalystDungeonChance / 5)); @@ -1133,7 +1129,7 @@ public class AlchemicalWizardry { proxy.registerPostSideObjects(); //TODO Thaumcraft Integration - if (Loader.isModLoaded("Thaumcraft")) +/* if (Loader.isModLoaded("Thaumcraft")) { isThaumcraftLoaded = true; @@ -1162,7 +1158,6 @@ public class AlchemicalWizardry ThaumcraftApi.registerObjectTag(new ItemStack(ModItems.sanguinePants), aspectList); ThaumcraftApi.registerObjectTag(new ItemStack(ModItems.sanguineBoots), aspectList); - if (itemGoggles != null) { BindingRegistry.registerRecipe(new ItemStack(ModItems.sanguineHelmet), itemGoggles); @@ -1242,7 +1237,8 @@ public class AlchemicalWizardry // HarvestRegistry.registerHarvestHandler(new AgriCraftCropHarvestHandler()); // AlchemicalWizardry.logger.info("Loaded AgriCraft Handlers!"); // } - +*/ + isThaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); //this is temp. isBotaniaLoaded = Loader.isModLoaded("Botania"); isPneumaticCraftLoaded = Loader.isModLoaded("PneumaticCraft"); isFMPLoaded = Loader.isModLoaded("ForgeMultipart"); @@ -1261,12 +1257,12 @@ public class AlchemicalWizardry // this.createItemTextureFiles(); } - @Optional.Method(modid = "guideapi") +/* @Optional.Method(modid = "guideapi") public static void registerBMBook() { BloodMagicGuide.registerGuide(); } - +*/ public static void blacklistAccelerators() { if (Loader.isModLoaded("Torcherino"))