From bd329407360c86ce09974536f31a4beaafcc368b Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Fri, 7 Apr 2023 21:51:23 +0200 Subject: [PATCH] Clean code --- dependencies.gradle | 2 +- .../ab/common/core/proxy/CommonProxy.java | 1 - .../lib/register/AchievementRegister.java | 1 - .../common/lib/register/FlowerRegister.java | 1 - .../ab/common/lib/register/RecipeListAB.java | 21 ++----------------- src/main/java/ab/utils/IModHelper.java | 2 +- 6 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 0ea25cd..3fda894 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api('com.github.GTNewHorizons:Botania:1.9.2-GTNH:dev') api('com.github.GTNewHorizons:Botanic-horizons:1.0.14-GTNH:dev') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.254:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.36:dev') api('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') compileOnly("com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev") compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.1.5:dev") diff --git a/src/main/java/ab/common/core/proxy/CommonProxy.java b/src/main/java/ab/common/core/proxy/CommonProxy.java index 730731e..7991a1c 100644 --- a/src/main/java/ab/common/core/proxy/CommonProxy.java +++ b/src/main/java/ab/common/core/proxy/CommonProxy.java @@ -33,7 +33,6 @@ public class CommonProxy { public void init(FMLInitializationEvent event) { NetworkRegistry.INSTANCE.registerGuiHandler(AdvancedBotany.instance, new GuiHandler()); - // RecipeListAB.init(); NetworkHandler.registerPackets(); ModHelperManager.init(); } diff --git a/src/main/java/ab/common/lib/register/AchievementRegister.java b/src/main/java/ab/common/lib/register/AchievementRegister.java index ce325c7..021ebf2 100644 --- a/src/main/java/ab/common/lib/register/AchievementRegister.java +++ b/src/main/java/ab/common/lib/register/AchievementRegister.java @@ -6,7 +6,6 @@ import net.minecraftforge.common.AchievementPage; import ab.api.AchievementAB; import ab.api.AdvancedBotanyAPI; -// import ab.utils.*; public class AchievementRegister { diff --git a/src/main/java/ab/common/lib/register/FlowerRegister.java b/src/main/java/ab/common/lib/register/FlowerRegister.java index 0cd1b7c..a9ce751 100644 --- a/src/main/java/ab/common/lib/register/FlowerRegister.java +++ b/src/main/java/ab/common/lib/register/FlowerRegister.java @@ -9,7 +9,6 @@ import ab.common.block.subtile.SubTileArdentAzarcissus; import ab.common.block.subtile.SubTileAspecolus; import ab.common.block.subtile.SubTileDictarius; import ab.common.block.subtile.SubTilePureGladiolus; -// import ab.utils.*; public class FlowerRegister { diff --git a/src/main/java/ab/common/lib/register/RecipeListAB.java b/src/main/java/ab/common/lib/register/RecipeListAB.java index 52a25e7..d4c499e 100644 --- a/src/main/java/ab/common/lib/register/RecipeListAB.java +++ b/src/main/java/ab/common/lib/register/RecipeListAB.java @@ -133,6 +133,8 @@ public class RecipeListAB implements IModHelper { public void preInit() {} + public void init() {} + public void postInit() { setupItemAspects(); setupCrafting(); @@ -148,10 +150,7 @@ public class RecipeListAB implements IModHelper { public static void setupCrafting() { - // public static void init() { relicInit(); - // getBlocks(); - // getItems(); BotaniaAPI.addCategory(categoryForgotten = new BLexiconCategory("forgotten", 5)); forgotten = BotaniaAPI.registerKnowledgeType("ab_forgotten", EnumChatFormatting.BLUE, false); @@ -792,22 +791,6 @@ public class RecipeListAB implements IModHelper { OreDictionary.getOres("gemExquisiteManaDiamond").get(0), new ItemStack(BlockListAB.blockABStorage, 1, 0) }); - /* - * ItemStack terraShatter = new ItemStack(ModItems.terraPick, 1, 0); - * terraShatter.stackTagCompound.setInteger("mana", Integer.MAX_VALUE - 1); Destroyer = - * ThaumcraftApi.addInfusionCraftingRecipe( "Destroyer", new ItemStack(ItemListAB.itemMihrillMultiTool), 12, new - * AspectList().add(Aspect.EARTH, 128).add(Aspect.MAGIC, 64).add(Aspect.TOOL, 64).add(Aspect.MINE, 64) - * .add(Aspect.CROP, 32).add(Aspect.HARVEST, 32).add(Aspect.TREE, 32), new ItemStack(ItemListAB.itemABResource, - * 1, 2), new ItemStack[] { new ItemStack(ModItems.terraAxe), new ItemStack(BlockListAB.blockABStorage, 1, 0), - * OreDictionary.getOres("gemExquisiteManaDiamond").get(0), new ItemStack(BlockListAB.blockABStorage, 1, 0), - * terraShatter, new ItemStack(ModBlocks.livingwood, 1, 5), OreDictionary.getOres("gemFlawlessAmber").get(0), - * new ItemStack(BlockListAB.blockLebethron, 1, 4), new ItemStack(ModItems.temperanceStone, 1, 0), new - * ItemStack(BlockListAB.blockLebethron, 1, 4), OreDictionary.getOres("gemFlawlessAmber").get(0), new - * ItemStack(ModBlocks.livingwood, 1, 5), new ItemStack(ItemListAB.itemTerraHoe), new - * ItemStack(BlockListAB.blockABStorage, 1, 0), OreDictionary.getOres("gemExquisiteManaDiamond").get(0), new - * ItemStack(BlockListAB.blockABStorage, 1, 0) }); - */ - } // Aspecolus recipe diff --git a/src/main/java/ab/utils/IModHelper.java b/src/main/java/ab/utils/IModHelper.java index f80abaa..ae366a6 100644 --- a/src/main/java/ab/utils/IModHelper.java +++ b/src/main/java/ab/utils/IModHelper.java @@ -4,7 +4,7 @@ public interface IModHelper { public void preInit(); - // public void init(); + public void init(); public void postInit(); }