mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-10-26 14:33:50 +00:00
fix crash because some mods shade the TabRegistry class... (#204)
This commit is contained in:
1 parent
4534b674ae
commit
4813c5b9cc
2 files changed
+3
-16
No files matched your search
@@ -60,7 +60,7 @@ public class ArmorProxyClient extends ArmorProxyCommon {
|
||||
@Override
|
||||
public void preInit() {
|
||||
controlInstance = new ArmorControls();
|
||||
new TabRegistry().registerEvent();
|
||||
MinecraftForge.EVENT_BUS.register(new TabRegistry());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -7,7 +7,6 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.inventory.GuiInventory;
|
||||
import net.minecraft.network.play.client.C0DPacketCloseWindow;
|
||||
import net.minecraftforge.client.event.GuiScreenEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import codechicken.nei.NEIClientConfig;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
@@ -18,10 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class TabRegistry {
|
||||
|
||||
public void registerEvent() {
|
||||
MinecraftForge.EVENT_BUS.register(new EventHandler());
|
||||
}
|
||||
|
||||
private static final ArrayList<AbstractTab> tabList = new ArrayList<>();
|
||||
|
||||
public static void registerTab(AbstractTab tab) {
|
||||
@@ -32,7 +27,8 @@ public class TabRegistry {
|
||||
return tabList;
|
||||
}
|
||||
|
||||
// Client method
|
||||
@SideOnly(Side.CLIENT)
|
||||
@SubscribeEvent
|
||||
public void guiPostInit(GuiScreenEvent.InitGuiEvent.Post event) {
|
||||
if ((event.gui instanceof GuiInventory)) {
|
||||
int xSize = 176;
|
||||
@@ -93,13 +89,4 @@ public class TabRegistry {
|
||||
// No potions, no offset needed
|
||||
return 0;
|
||||
}
|
||||
|
||||
public class EventHandler {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@SubscribeEvent
|
||||
public void guiPostInitWrapper(GuiScreenEvent.InitGuiEvent.Post event) {
|
||||
TabRegistry.this.guiPostInit(event);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user