aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/common/Recipes.java56
-rw-r--r--src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java11
-rw-r--r--src/main/java/kekztech/KekzCore.java4
-rw-r--r--src/main/resources/assets/kekztech/lang/en_US.lang7
4 files changed, 48 insertions, 30 deletions
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 1509be113c..15516ecc88 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -37,7 +37,7 @@ public class Recipes {
registerRecipes_SOFC();
registerRecipes_Nuclear();
//registerRecipes_ItemServer();
- //registerRecipes_Jars();
+ registerRecipes_Jars();
System.out.println("Finished registering recipes");
}
@@ -373,28 +373,22 @@ public class Recipes {
}
private static void registerRecipes_Jars() {
- final Object[] recipe_jarthaumiumreinforced = {
- "PJP", "JCJ", "PJP",
- 'P', OrePrefixes.plateDense.get(Materials.Thaumium),
- 'J', ItemApi.getBlock("blockJar", 0),
- 'C', GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 1, null)
- };
- final AspectList aspects_jarthaumiumreinforced = new AspectList()
- .add(Aspect.ORDER, 80)
- .add(Aspect.WATER, 80)
- .add(Aspect.AIR, 10);
- arcaneRecipes.put("THAUMIUMREINFORCEDJAR",
- ThaumcraftApi.addArcaneCraftingRecipe("THAUMIUMREINFORCEDJAR", new ItemStack(Blocks.jarThaumiumReinforced, 1),
- aspects_jarthaumiumreinforced, recipe_jarthaumiumreinforced));
final ItemStack[] recipe_jarichor = {
- GameRegistry.makeItemStack("ThaumicTinkerer:KamiResource", 0, 1, null),
- GameRegistry.makeItemStack("ThaumicTinkerer:KamiResource", 6, 1, null),
- GameRegistry.makeItemStack("Thaumcraft:EldritchObject", 3, 0, null),
- GameRegistry.makeItemStack("ThaumicTinkerer:KamiResource", 7, 1, null)
+ GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 1, 0),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
+ new ItemStack(net.minecraft.init.Blocks.glass_pane),
+ 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.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)
@@ -402,8 +396,30 @@ public class Recipes {
.add(Aspect.AIR, 32);
infusionRecipes.put("ICHORJAR",
ThaumcraftApi.addInfusionCraftingRecipe("ICHORJAR", new ItemStack(Blocks.jarIchor, 1),
- 20, aspects_jarichor, ItemApi.getBlock("blockJar", 0), recipe_jarichor));
+ 15, aspects_jarichor, ItemApi.getBlock("blockJar", 0), recipe_jarichor));
+
+ final ItemStack[] recipe_jarthaumiumreinforced = {
+ GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 0, 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),
+ GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 0, 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),
+ };
+ 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),
+ 5, aspects_jarthaumiumreinforced, ItemApi.getBlock("blockJar", 0), recipe_jarthaumiumreinforced));
}
-
}
diff --git a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
index 98e0fabe80..b794306b6e 100644
--- a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
+++ b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java
@@ -31,9 +31,8 @@ import java.util.ArrayList;
import java.util.HashSet;
public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
-
- private final static String glassNameAE2 = "tile.appliedenergistics2.BlockQuartzGlass";
- private final static String glassNameStained = "tile.stainedGlass";
+
+ private final static String glassNameIC2Reinforced = "blockAlloyGlass";
private final static Block CASING = Blocks.tfftCasing;
private final static Block_TFFTStorageFieldBlockT1 STORAGE_FIELD1 = (Block_TFFTStorageFieldBlockT1) Blocks.tfftStorageField1;
private final static Block_TFFTStorageFieldBlockT2 STORAGE_FIELD2 = (Block_TFFTStorageFieldBlockT2) Blocks.tfftStorageField2;
@@ -355,8 +354,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
// Corner allows only glass or casings
if (X == -2 && Y == -2 || X == 2 && Y == 2 || X == -2 && Y == 2 || X == 2 && Y == -2) {
- if (!(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameAE2)
- || thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameStained)
+ if (!(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameIC2Reinforced)
|| thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING)) {
formationChecklist = false; // do nothing yet
}
@@ -378,8 +376,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase {
thisController.getYCoord() + offset.y(),
thisController.getZCoord() + offset.z());
multiHatches.add(mh);
- } else if (!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameAE2)
- && !thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameStained)) {
+ } else if (!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameIC2Reinforced)) {
formationChecklist = false;
}
}
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index cec9300812..ff677a3296 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -35,6 +35,8 @@ import thaumcraft.api.research.ResearchPage;
dependencies =
"required-after:IC2; "
+ "required-after:gregtech;"
+ + "required-after:Thaumcraft;"
+ + "required-after:ThaumicTinkerer;"
+ "after:bartworks"
)
public class KekzCore {
@@ -100,7 +102,7 @@ public class KekzCore {
final ResearchItem jar_thaumiumreinforced = new ResearchItem("THAUMIUMREINFORCEDJAR", "ALCHEMY", new AspectList(), 3, -4, 2, new ItemStack(Blocks.jarThaumiumReinforced, 1));
jar_thaumiumreinforced.setPages(new ResearchPage[] {
new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR"),
- new ResearchPage(Recipes.arcaneRecipes.get("THAUMIUMREINFORCEDJAR"))
+ new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR"))
});
jar_thaumiumreinforced.setParents(new String[] {"JARLABEL"});
jar_thaumiumreinforced.registerResearchItem();
diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang
index cb37880cd0..69ed77ae42 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -106,5 +106,8 @@ tile.kekztech_ichorjar_block.name=Ichor Jar
item.kekztech_ichorjarfilled_item.name=Ichor Jar with Essentia
item.kekztech_ichorjarfilled_item.void.name=Ichor Void Jar with Essentia
-research_page.THAUMIUMREINFORCEDJAR=Lorem ipsum
-research_page.ICHORJAR=Lorem ipsum \ No newline at end of file
+tc.research_name.THAUMIUMREINFORCEDJAR=Thaumium Reinforced Jars
+kekztech.research_page.THAUMIUMREINFORCEDJAR=You have heard your fellow Thaumaturges talk about the benefits of digitized Essentia Storage.<BR><BR> Storing enough Essentia for your advanced infusions has indeed been an issue for you too, however those jars are simply too pleasing to look at to even consider the idea of replacing them with some compact technological construct.<BR><BR>Thanks to this new discovery, you have managed to quadruple the capacity of your jars by improving them with a thick Thaumium lining. This should buy you some more time to come up with a better solution. You imagine that you could get even more out of your jars if only you had some kind of material harder then even diamond or any of the other magical metal you have seen so far.
+tc.research_name.ICHORJAR=Ichor Jars
+kekztech.research_page.ICHORJAR=This is it!<BR><BR>By infusing a jar with just a single piece of Ichor you have created something to rival digitized Essentia storage without sacrificing any of the beauty that your array of warded jars offer.<BR><BR>Ichor Jars can hold an astounding 4096 Essentia and fit nicely into your recently aquired set of Ichor based achievements.
+
generated by cgit (git 2.46.0) at 2025-03-10 00:41:53 +0000