Moved TC research registration into it's own place. Improved names for init() methods

5 files changed, 66 insertions, 49 deletions

diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
index cfa4b87b7a..f6939ffd90 100644
--- a/src/main/java/common/Blocks.java
+++ b/src/main/java/common/Blocks.java
@@ -54,7 +54,7 @@ public class Blocks {
 	
 	public static Block lscLapotronicEnergyUnit;
 	
-	public static void init() {
+	public static void preInit() {
 		KekzCore.LOGGER.info("Registering blocks...");
 		
 		registerBlocks_SOFC();
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 57cc14ab92..174e2b9104 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -34,7 +34,7 @@ public class Recipes {
 
 	public static final HashMap<String, InfusionRecipe> infusionRecipes = new HashMap<>();
 	
-	public static void init() {
+	public static void postInit() {
 		KekzCore.LOGGER.info("Registering recipes...");
 		
 		registerRecipes_TFFT();
diff --git a/src/main/java/common/Researches.java b/src/main/java/common/Researches.java
new file mode 100644
index 0000000000..b901a1588f
--- /dev/null
+++ b/src/main/java/common/Researches.java
@@ -0,0 +1,58 @@
+package common;
+
+import kekztech.KekzCore;
+import net.minecraft.item.ItemStack;
+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("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"))
+                )
+                .setConcealed()
+                .setParents("THAUMIUMREINFORCEDJAR")
+                .setParentsHidden("ICHOR")
+                .registerResearchItem();
+    }
+}
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index ea98bdc2f9..7fcafe1d77 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -2,6 +2,7 @@ package kekztech;
 

 import common.Blocks;

 import common.Recipes;

+import common.Researches;

 import common.tileentities.*;

 import cpw.mods.fml.common.Mod;

 import cpw.mods.fml.common.event.FMLInitializationEvent;

@@ -10,17 +11,10 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;

 import cpw.mods.fml.common.registry.GameRegistry;

 import items.ErrorItem;

-import items.Item_ThaumiumReinforcedJarFilled;

 import items.MetaItem_CraftingComponent;

 import items.MetaItem_ReactorComponent;

-import net.minecraft.item.ItemStack;

 import org.apache.logging.log4j.LogManager;

 import org.apache.logging.log4j.Logger;

-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;

 

 /**

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

@@ -67,7 +61,7 @@ public class KekzCore {
 		

 		//Item_ThaumiumReinforcedJarFilled.getInstance().registerItem();

 		

-		Blocks.init();

+		Blocks.preInit();

 		

 		// Register TileEntities

 		GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");

@@ -82,11 +76,7 @@ public class KekzCore {
 		// Register guis

 		NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler());

 

-		// Blacklist this research from being a requirement to unlock kami

-		KekzCore.LOGGER.info("Blacklisting research THAUMIUMREINFORCEDJAR from /iskamiunlocked");

-		KamiResearchItem.Blacklist.add("THAUMIUMREINFORCEDJAR");

-		KekzCore.LOGGER.info("Blacklisting research ICHORJAR from /iskamiunlocked");

-		KamiResearchItem.Blacklist.add("ICHORJAR");

+		Researches.preInit();

 	}

 	

 	@Mod.EventHandler

@@ -104,38 +94,7 @@ public class KekzCore {
 	

 	@Mod.EventHandler

 	public void postInit(FMLPostInitializationEvent event) {

-		Recipes.init();

-		

-		// Thaumcraft research

-		final AspectList aspects_jarthaumiumreinforced = new AspectList()

-				.add(Aspect.ARMOR, 3)

-				.add(Aspect.WATER, 3)

-				.add(Aspect.GREED, 3)

-				.add(Aspect.VOID, 3);

-		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("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);

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

-			)

-			.setConcealed()

-			.setParents("THAUMIUMREINFORCEDJAR")

-			.setParentsHidden("ICHOR")

-			.registerResearchItem();

+		Recipes.postInit();

+		Researches.postInit();

 	}

 }

diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang
index 7caff3ced0..9ad7406180 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -133,7 +133,7 @@ item.kekztech_thaumiumreinforcedjarfilled_item.void.name=Thaumium Reinforced Voi
 # -------- Thaumium Reinforced Jar: Research

 # This is the name of the research

 tc.research_name.THAUMIUMREINFORCEDJAR=Thaumium Reinforced Jars

-# This is the subtext for the research note

+# This is the subtext for the research note (I think)

 kekztech.research_page.THAUMIUMREINFORCEDJAR=Slightly better jars

 # Lore text for the research pages

 kekztech.research_page.THAUMIUMREINFORCEDJAR.0=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.