crafting recipes and research for jars

6 files changed, 75 insertions, 19 deletions

diff --git a/build.gradle b/build.gradle
index 3ca4335418..b2d30d3dc3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'forge'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-version = "0.2.3"
+version = "0.3"
 group= "kekztech" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "kekztech"
 
diff --git a/config/IC2.ini b/config/IC2.ini
index 2224ac8ef1..73738c3b53 100644
--- a/config/IC2.ini
+++ b/config/IC2.ini
@@ -1,5 +1,5 @@
 ; ic2 general config

-; created Apr 25, 2020 5:28:10 PM

+; created Apr 25, 2020 9:51:28 PM

 ;---

 

 [worldgen]

diff --git a/config/splash.properties b/config/splash.properties
index be3d3ba683..581433d8e2 100644
--- a/config/splash.properties
+++ b/config/splash.properties
@@ -1,5 +1,5 @@
 #Splash screen properties
-#Sat Apr 25 17:27:56 CEST 2020
+#Sat Apr 25 21:51:10 CEST 2020
 logoTexture=textures/gui/title/mojang.png
 background=0xFFFFFF
 font=0x0
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 2ae94913e1..1509be113c 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -1,6 +1,9 @@
 package common;
 
+import java.util.HashMap;
+
 import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -14,10 +17,19 @@ import kekztech.Items;
 import kekztech.KekzCore;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
+import thaumcraft.api.ItemApi;
+import thaumcraft.api.ThaumcraftApi;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.crafting.IArcaneRecipe;
+import thaumcraft.api.crafting.InfusionRecipe;
 import util.Util;
 
 public class Recipes {
 	
+	public static final HashMap<String, IArcaneRecipe> arcaneRecipes = new HashMap<>();
+	public static final HashMap<String, InfusionRecipe> infusionRecipes = new HashMap<>();
+	
 	public static void init() {
 		System.out.println("Registering recipes...");
 		
@@ -25,6 +37,7 @@ public class Recipes {
 		registerRecipes_SOFC();
 		registerRecipes_Nuclear();
 		//registerRecipes_ItemServer();
+		//registerRecipes_Jars();
 		
 		System.out.println("Finished registering recipes");
 	}
@@ -358,4 +371,39 @@ public class Recipes {
 					new ItemStack(Blocks.itemServerDrive, 1), 
 					200, 7680);
 	}
+	
+	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)
+		};
+		final AspectList aspects_jarichor = new AspectList()
+				.add(Aspect.ARMOR, 256)
+				.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), 
+				20, aspects_jarichor, ItemApi.getBlock("blockJar", 0), recipe_jarichor));
+	}
+	
+	
 }
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 8605d4f5b9..cec9300812 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -2,20 +2,6 @@ package kekztech;
 

 import common.Blocks;

 import common.Recipes;

-import common.blocks.Block_ControlRod;

-import common.blocks.Block_GDCUnit;

-import common.blocks.Block_IchorJar;

-import common.blocks.Block_ReactorChamber_OFF;

-import common.blocks.Block_ReactorChamber_ON;

-import common.blocks.Block_TFFTCasing;

-import common.blocks.Block_TFFTMultiHatch;

-import common.blocks.Block_TFFTStorageFieldBlockT1;

-import common.blocks.Block_TFFTStorageFieldBlockT2;

-import common.blocks.Block_TFFTStorageFieldBlockT3;

-import common.blocks.Block_TFFTStorageFieldBlockT4;

-import common.blocks.Block_TFFTStorageFieldBlockT5;

-import common.blocks.Block_ThaumiumReinforcedJar;

-import common.blocks.Block_YSZUnit;

 import common.tileentities.GTMTE_FluidMultiStorage;

 import common.tileentities.GTMTE_ItemServer;

 import common.tileentities.GTMTE_ModularNuclearReactor;

@@ -34,6 +20,10 @@ import items.ErrorItem;
 import items.Item_ThaumiumReinforcedJarFilled;

 import items.MetaItem_CraftingComponent;

 import items.MetaItem_ReactorComponent;

+import net.minecraft.item.ItemStack;

+import thaumcraft.api.aspects.AspectList;

+import thaumcraft.api.research.ResearchItem;

+import thaumcraft.api.research.ResearchPage;

 

 /**

  * My GT-Meta-IDs are: 13101 - 13500

@@ -51,7 +41,7 @@ public class KekzCore {
 	

 	public static final String NAME = "KekzTech";

 	public static final String MODID = "kekztech";

-	public static final String VERSION = "0.2.3";

+	public static final String VERSION = "0.3";

 	

 	@Mod.Instance("kekztech")

 	public static KekzCore instance;

@@ -105,6 +95,22 @@ public class KekzCore {
 	@Mod.EventHandler

 	public void postInit(FMLPostInitializationEvent event) {

 		Recipes.init();

+		

+		// Thaumcraft research

+		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"))

+		});

+		jar_thaumiumreinforced.setParents(new String[] {"JARLABEL"});

+		jar_thaumiumreinforced.registerResearchItem();

+		

+		final ResearchItem jar_ichor = new ResearchItem("ICHORJAR", "ALCHEMY", new AspectList(), 2, -5, 3, new ItemStack(Blocks.jarIchor, 1));

+		jar_ichor.setPages(new ResearchPage[] {

+			new ResearchPage("kekztech.research_page.ICHORJAR"),

+			new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR"))

+		});

+		jar_ichor.setParents(new String[] {"THAUMIUMREINFORCEDJAR"});

+		jar_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 5d3da5190c..cb37880cd0 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -106,3 +106,5 @@ 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