fix crash when fairy is disabled

RCXcrafter · Jan 26, 2021 · 694d114 · 694d114
1 parent 2d3722f
commit 694d114
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/com/rcx/materialis/Materialis.java b/src/main/java/com/rcx/materialis/Materialis.java
@@ -19,7 +19,6 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import slimeknights.mantle.client.CreativeTab;
-import slimeknights.tconstruct.shared.TinkerCommons;
 
 @Mod(modid = Materialis.ID, name = Materialis.NAME, version = Materialis.VERSION, dependencies = "required-after:tconstruct;after:conarm;after:aquaculture")
 public class Materialis {
@@ -30,7 +29,7 @@ public class Materialis {
 	public static final String NAME = "Materialis";
 	public static final String VERSION = "1.2.5";
 
-	public static ItemStack tabItem = TinkerCommons.ingotKnightSlime;
+	public static ItemStack tabItem = null;
 	public static CreativeTab MatTab = new CreativeTab(ID + ".creativeTab", ItemStack.EMPTY) {
 		@SideOnly(Side.CLIENT)
 		public ItemStack getIconItemStack() {

diff --git a/src/main/java/com/rcx/materialis/proxy/CommonProxy.java b/src/main/java/com/rcx/materialis/proxy/CommonProxy.java
@@ -19,6 +19,7 @@
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import slimeknights.tconstruct.shared.TinkerCommons;
 
 public class CommonProxy {
 
@@ -61,6 +62,8 @@ public void postInit(FMLPostInitializationEvent postEvent) {
 			if (module.shouldLoad())
 				module.postInit(postEvent);
 		}
+		if (Materialis.tabItem == null)
+			Materialis.tabItem = TinkerCommons.ingotKnightSlime;
 	}
 
 	public void ConfigChanged(OnConfigChangedEvent event) {