aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/kubatech/CommonProxy.java2
-rw-r--r--src/main/java/kubatech/loaders/TCLoader.java14
-rw-r--r--src/main/resources/assets/kubatech/lang/en_US.lang2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/kubatech/CommonProxy.java b/src/main/java/kubatech/CommonProxy.java
index 5abf29962a..71c575ecc4 100644
--- a/src/main/java/kubatech/CommonProxy.java
+++ b/src/main/java/kubatech/CommonProxy.java
@@ -53,11 +53,11 @@ public class CommonProxy {
public void init(FMLInitializationEvent event) {
if (LoaderReference.MineTweaker) MTLoader.init();
- if (LoaderReference.Thaumcraft) TCLoader.init();
}
public void postInit(FMLPostInitializationEvent event) {
RecipeLoader.addRecipes();
+ if (LoaderReference.Thaumcraft) TCLoader.init();
}
public void serverAboutToStart(FMLServerAboutToStartEvent event) {}
diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java
index 64db101514..8f2b48ceaa 100644
--- a/src/main/java/kubatech/loaders/TCLoader.java
+++ b/src/main/java/kubatech/loaders/TCLoader.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.stream.Collectors;
-import kubatech.Tags;
import kubatech.api.LoaderReference;
import kubatech.api.enums.ItemList;
import kubatech.api.utils.ItemID;
@@ -33,7 +32,6 @@ import kubatech.loaders.item.items.TeaUltimate;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import thaumcraft.api.ThaumcraftApi;
@@ -51,10 +49,12 @@ public class TCLoader {
public static final String TCCategoryKey = "KUBATECH";
public static void init() {
- ResearchCategories.registerCategory(
- TCCategoryKey,
- new ResourceLocation(Tags.MODID, "textures/gui/green_tea.png"),
- new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"));
+ /*
+ * ResearchCategories.registerCategory(
+ * TCCategoryKey,
+ * new ResourceLocation(Tags.MODID, "textures/gui/green_tea.png"),
+ * new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"));
+ */
if (!LoaderReference.GTNHCoreMod || !LoaderReference.DraconicEvolution) return;
registerRecipe();
registerResearch();
@@ -120,7 +120,7 @@ public class TCLoader {
if (ultimateTeaResearch == null) {
ultimateTeaResearch = new ResearchItem(
"KT_UltimateTea",
- TCCategoryKey,
+ "NEWHORIZONS" /* TCCategoryKey */,
new AspectList().add(Aspect.MAGIC, 1)
.add(Aspect.HEAL, 1)
.add(Aspect.PLANT, 1)
diff --git a/src/main/resources/assets/kubatech/lang/en_US.lang b/src/main/resources/assets/kubatech/lang/en_US.lang
index 43e35261be..b830d3611e 100644
--- a/src/main/resources/assets/kubatech/lang/en_US.lang
+++ b/src/main/resources/assets/kubatech/lang/en_US.lang
@@ -119,7 +119,7 @@ achievement.teacollection.yellow_tea.desc=§6Green Tea with more grassy flavour
achievement.teacollection.ultimate_tea.desc=§4§lOne Tea to drink them all
#Thaumcraft
-tc.research_category.KUBATECH=§4§lTEA
+tc.research_category.KUBATECH=§lCamellia sinensis
tc.research_name.KT_UltimateTea=%s §6§lTea
tc.research_text.KT_UltimateTea=§4§lPure power
KT.research.ultimatetea=You have found a way to convert all this Tea into pure power creating the %s §6§lTea