Skip to content
This repository has been archived by the owner on May 25, 2024. It is now read-only.

Commit

Permalink
deprecating the thaumcraft jars
Browse files Browse the repository at this point in the history
  • Loading branch information
@Alastors
Alastors committed May 22, 2024
1 parent 2cac4ba commit 6b7ede8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 161 deletions.
4 changes: 0 additions & 4 deletions src/main/java/common/CommonProxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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();
}
Expand Down
87 changes: 0 additions & 87 deletions src/main/java/common/Recipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, InfusionRecipe> infusionRecipes = new HashMap<>();

public static void postInit() {
KekzCore.LOGGER.info("Registering recipes...");

Expand All @@ -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));
}

}
62 changes: 0 additions & 62 deletions src/main/java/common/Researches.java
View file

This file was deleted.

8 changes: 4 additions & 4 deletions src/main/resources/assets/kekztech/lang/en_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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...<BR><BR>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
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/assets/kekztech/lang/zh_CN.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -70,8 +70,8 @@ kekztech.research_page.THAUMIUMREINFORCEDJAR.0=你曾听你的神秘使伙伴谈
kekztech.research_page.THAUMIUMREINFORCEDJAR.1=在如此狭小的空间中压缩这么多的源质会导致一些不稳定性.所以捡起这种加强罐子可能是个糟糕的主意...<BR><BR>可以想象,如果有某种材料比钻石,或比目前为止你所见过的任何其他神秘金属更坚硬的话,以此制成的源质罐子一定能给你惊喜.

# -------- 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=灵液源质罐子
Expand Down

0 comments on commit 6b7ede8

Please sign in to comment.