From 6b7ede874a680606762cb367220a1413cdda4c69 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Wed, 22 May 2024 00:34:38 -0400 Subject: [PATCH] deprecating the thaumcraft jars --- src/main/java/common/CommonProxy.java | 4 - src/main/java/common/Recipes.java | 87 ------------------- src/main/java/common/Researches.java | 62 ------------- .../resources/assets/kekztech/lang/en_US.lang | 8 +- .../resources/assets/kekztech/lang/zh_CN.lang | 8 +- 5 files changed, 8 insertions(+), 161 deletions(-) delete mode 100644 src/main/java/common/Researches.java diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java index 540e6ce..1f43270 100644 --- a/src/main/java/common/CommonProxy.java +++ b/src/main/java/common/CommonProxy.java @@ -20,8 +20,6 @@ public void preInit(final FMLPreInitializationEvent e) { Blocks.preInit(); // TileEntities TileEntities.preInit(); - // TC Research - Researches.preInit(); } public void init(final FMLInitializationEvent e) { @@ -32,8 +30,6 @@ public void init(final FMLInitializationEvent e) { public void postInit(final FMLPostInitializationEvent e) { // Recipes Recipes.postInit(); - // Research - Researches.postInit(); GTMTE_TFFTHatch.registerAEIntegration(); } diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 5efcae6..1fc9dec 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -22,16 +22,9 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import kekztech.KekzCore; -import thaumcraft.api.ItemApi; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.InfusionRecipe; public class Recipes { - public static final HashMap infusionRecipes = new HashMap<>(); - public static void postInit() { KekzCore.LOGGER.info("Registering recipes..."); @@ -45,87 +38,7 @@ public static void postInit() { new ResearchableAssemblyLine().run(); new Unpackager().run(); - registerRecipes_Jars(); - KekzCore.LOGGER.info("Finished registering recipes"); } - private static void registerRecipes_Jars() { - - // Thaumium Reinforced Jar - final ItemStack[] recipe_jarthaumiumreinforced = { - GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 1, null), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), }; - final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 64).add(Aspect.ORDER, 32) - .add(Aspect.WATER, 32).add(Aspect.GREED, 16).add(Aspect.VOID, 16).add(Aspect.AIR, 8); - infusionRecipes.put( - "THAUMIUMREINFORCEDJAR", - ThaumcraftApi.addInfusionCraftingRecipe( - "THAUMIUMREINFORCEDJAR", - new ItemStack(Blocks.jarThaumiumReinforced, 1, 0), - 5, - aspects_jarthaumiumreinforced, - ItemApi.getBlock("blockJar", 0), - recipe_jarthaumiumreinforced)); - // Thaumium Reinforced Void Jar - final ItemStack[] recipe_voidjarupgrade = { - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1), ItemApi.getItem("itemNugget", 5) }; - final AspectList aspects_voidjarupgrade = new AspectList().add(Aspect.VOID, 14).add(Aspect.MAGIC, 14) - .add(Aspect.ENTROPY, 14).add(Aspect.WATER, 14); - infusionRecipes.put( - "THAUMIUMREINFORCEDVOIDJAR", - ThaumcraftApi.addInfusionCraftingRecipe( - "THAUMIUMREINFORCEDJAR", - new ItemStack(Blocks.jarThaumiumReinforced, 1, 3), - 2, - aspects_voidjarupgrade, - new ItemStack(Blocks.jarThaumiumReinforced, 1, 0), - recipe_voidjarupgrade)); - - final ItemStack[] recipe_jarichor = { GT_ModHandler.getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 0), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), }; - final AspectList aspects_jarichor = new AspectList().add(Aspect.ARMOR, 256).add(Aspect.ELDRITCH, 128) - .add(Aspect.ORDER, 128).add(Aspect.WATER, 128).add(Aspect.GREED, 64).add(Aspect.VOID, 64) - .add(Aspect.AIR, 32); - infusionRecipes.put( - "ICHORJAR", - ThaumcraftApi.addInfusionCraftingRecipe( - "ICHORJAR", - new ItemStack(Blocks.jarIchor, 1, 0), - 15, - aspects_jarichor, - ItemApi.getBlock("blockJar", 0), - recipe_jarichor)); - // Ichor Void Jar - infusionRecipes.put( - "ICHORVOIDJAR", - ThaumcraftApi.addInfusionCraftingRecipe( - "ICHORJAR", - new ItemStack(Blocks.jarIchor, 1, 3), - 5, - aspects_voidjarupgrade, - new ItemStack(Blocks.jarIchor, 1, 0), - recipe_voidjarupgrade)); - } - } diff --git a/src/main/java/common/Researches.java b/src/main/java/common/Researches.java deleted file mode 100644 index 853b9db..0000000 --- a/src/main/java/common/Researches.java +++ /dev/null @@ -1,62 +0,0 @@ -package common; - -import net.minecraft.item.ItemStack; - -import kekztech.KekzCore; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchItem; -import thaumcraft.api.research.ResearchPage; -import thaumic.tinkerer.common.research.KamiResearchItem; - -public class Researches { - - public static final String THAUMIUMREINFORCEDJAR = "THAUMIUMREINFORCEDJAR"; - public static final String ICHORJAR = "ICHORJAR"; - - public static void preInit() { - // Blacklist these researches from being a requirement to unlock TTKami - KekzCore.LOGGER.info("Blacklisting research " + THAUMIUMREINFORCEDJAR + " from /iskamiunlocked"); - KamiResearchItem.Blacklist.add(ICHORJAR); - KekzCore.LOGGER.info("Blacklisting research" + ICHORJAR + "from /iskamiunlocked"); - KamiResearchItem.Blacklist.add(ICHORJAR); - } - - public static void postInit() { - final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 3).add(Aspect.WATER, 3) - .add(Aspect.GREED, 3).add(Aspect.VOID, 3); - @SuppressWarnings("unused") - final ResearchItem jar_thaumiumreinforced = new ResearchItem( - "THAUMIUMREINFORCEDJAR", - "ALCHEMY", - aspects_jarthaumiumreinforced, - 3, - -4, - 2, - new ItemStack(Blocks.jarThaumiumReinforced, 1)) - .setPages( - new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"), - new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR")), - new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDVOIDJAR")), - new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.1")) - .setConcealed().setParents("JARLABEL").registerResearchItem(); - - final AspectList aspects_jarichor = new AspectList().add(Aspect.ARMOR, 3).add(Aspect.ELDRITCH, 3) - .add(Aspect.WATER, 3).add(Aspect.GREED, 5).add(Aspect.VOID, 5); - @SuppressWarnings("unused") - final ResearchItem jar_ichor = new ResearchItem( - "ICHORJAR", - "ALCHEMY", - aspects_jarichor, - 2, - -5, - 3, - new ItemStack(Blocks.jarIchor, 1)) - .setPages( - new ResearchPage("kekztech.research_page.ICHORJAR.0"), - new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR")), - new ResearchPage(Recipes.infusionRecipes.get("ICHORVOIDJAR"))) - .setConcealed().setParents("THAUMIUMREINFORCEDJAR").setParentsHidden("ICHOR") - .registerResearchItem(); - } -} diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang index a77f21b..dcae9d2 100644 --- a/src/main/resources/assets/kekztech/lang/en_US.lang +++ b/src/main/resources/assets/kekztech/lang/en_US.lang @@ -64,8 +64,8 @@ tile.kekztech_lapotronicenergyunit_block.10.name=Mega Ultimate Capacitor (UMV) tile.kekztech_lapotronicenergyunit_block.desc=Part of the Lapotronic Super Capacitor # -------- Thaumium Reinforced Jar: Block -tile.kekztech_thaumiumreinforcedjar_block.0.name=Thaumium Reinforced Jar -tile.kekztech_thaumiumreinforcedjar_block.3.name=Thaumium Reinforced Void Jar +tile.kekztech_thaumiumreinforcedjar_block.0.name=Thaumium Reinforced Jar - Deprecated, migrate to Thaumic Insurgence +tile.kekztech_thaumiumreinforcedjar_block.3.name=Thaumium Reinforced Void Jar - Deprecated, migrate to Thaumic Insurgence # -------- Thaumium Reinforced Jar: Research # This is the name of the research @@ -77,8 +77,8 @@ kekztech.research_page.THAUMIUMREINFORCEDJAR.0=You have heard your fellow Thauma kekztech.research_page.THAUMIUMREINFORCEDJAR.1=Compressing this much Essentia in such a tiny space causes some volatility. Picking up reinforced jars is probably a bad idea...

You imagine that you could get even more out of your jars if only you had some kind of material harder than even diamond or any of the other magical metal you have seen so far. # -------- Ichor Jar: Block -tile.kekztech_ichorjar_block.0.name=Ichor Jar -tile.kekztech_ichorjar_block.3.name=Ichor Void Jar +tile.kekztech_ichorjar_block.0.name=Ichor Jar - Deprecated, migrate to Thaumic Insurgence +tile.kekztech_ichorjar_block.3.name=Ichor Void Jar - Deprecated, migrate to Thaumic Insurgence # -------- Ichor Jar: Research tc.research_name.ICHORJAR=Ichor Jars diff --git a/src/main/resources/assets/kekztech/lang/zh_CN.lang b/src/main/resources/assets/kekztech/lang/zh_CN.lang index 360e4d5..4f86ab5 100644 --- a/src/main/resources/assets/kekztech/lang/zh_CN.lang +++ b/src/main/resources/assets/kekztech/lang/zh_CN.lang @@ -57,8 +57,8 @@ tile.kekztech_lapotronicenergyunit_block.7.name=兰波顿电容(EV) tile.kekztech_lapotronicenergyunit_block.desc=兰波顿超级电容库的组成部分 # -------- Thaumium Reinforced Jar: Block -tile.kekztech_thaumiumreinforcedjar_block.0.name=神秘源质罐子 -tile.kekztech_thaumiumreinforcedjar_block.3.name=神秘虚空罐子 +tile.kekztech_thaumiumreinforcedjar_block.0.name=神秘源质罐子 - Deprecated, migrate to Thaumic Insurgence +tile.kekztech_thaumiumreinforcedjar_block.3.name=神秘虚空罐子 - Deprecated, migrate to Thaumic Insurgence # -------- Thaumium Reinforced Jar: Research # This is the name of the research @@ -70,8 +70,8 @@ kekztech.research_page.THAUMIUMREINFORCEDJAR.0=你曾听你的神秘使伙伴谈 kekztech.research_page.THAUMIUMREINFORCEDJAR.1=在如此狭小的空间中压缩这么多的源质会导致一些不稳定性.所以捡起这种加强罐子可能是个糟糕的主意...

可以想象,如果有某种材料比钻石,或比目前为止你所见过的任何其他神秘金属更坚硬的话,以此制成的源质罐子一定能给你惊喜. # -------- Ichor Jar: Block -tile.kekztech_ichorjar_block.0.name=灵液源质罐子 -tile.kekztech_ichorjar_block.3.name=灵液虚空罐子 +tile.kekztech_ichorjar_block.0.name=灵液源质罐子 - Deprecated, migrate to Thaumic Insurgence +tile.kekztech_ichorjar_block.3.name=灵液虚空罐子 - Deprecated, migrate to Thaumic Insurgence # -------- Ichor Jar: Research tc.research_name.ICHORJAR=灵液源质罐子