mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Fix JABBA-related issues with crafting station slots (#54)
* Fix shift-merging tools voiding items fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11392> * Change 0-sized ItemStacks into null stacks in crafting station attached slots Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10425> * Update buildscript * spotlessApply
This commit is contained in:
1 parent
18bfeaff32
commit
39be06c23b
571 files changed
+25959
-28223
No files matched your search
@@ -1,44 +1,37 @@
|
||||
package tconstruct.client.tabs;
|
||||
|
||||
import java.lang.reflect.*;
|
||||
import java.util.*;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.client.gui.inventory.GuiInventory;
|
||||
import net.minecraft.network.play.client.C0DPacketCloseWindow;
|
||||
import net.minecraftforge.client.event.GuiScreenEvent;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.lang.reflect.*;
|
||||
import java.util.*;
|
||||
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;
|
||||
|
||||
public class TabRegistry
|
||||
{
|
||||
public class TabRegistry {
|
||||
private static ArrayList<AbstractTab> tabList = new ArrayList<AbstractTab>();
|
||||
|
||||
public static void registerTab (AbstractTab tab)
|
||||
{
|
||||
public static void registerTab(AbstractTab tab) {
|
||||
tabList.add(tab);
|
||||
}
|
||||
|
||||
public static ArrayList<AbstractTab> getTabList ()
|
||||
{
|
||||
public static ArrayList<AbstractTab> getTabList() {
|
||||
return tabList;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@SubscribeEvent
|
||||
public void guiPostInit (GuiScreenEvent.InitGuiEvent.Post event)
|
||||
{
|
||||
if ((event.gui instanceof GuiInventory))
|
||||
{
|
||||
public void guiPostInit(GuiScreenEvent.InitGuiEvent.Post event) {
|
||||
if ((event.gui instanceof GuiInventory)) {
|
||||
int xSize = 176;
|
||||
int ySize = 166;
|
||||
int guiLeft = (event.gui.width - xSize) / 2;
|
||||
int guiTop = (event.gui.height - ySize) / 2;
|
||||
guiLeft += getPotionOffset();
|
||||
guiLeft += getPotionOffset();
|
||||
|
||||
updateTabValues(guiLeft, guiTop, InventoryTabVanilla.class);
|
||||
addTabsToList(event.gui.buttonList);
|
||||
@@ -47,22 +40,18 @@ public class TabRegistry
|
||||
|
||||
private static Minecraft mc = FMLClientHandler.instance().getClient();
|
||||
|
||||
public static void openInventoryGui ()
|
||||
{
|
||||
public static void openInventoryGui() {
|
||||
mc.thePlayer.sendQueue.addToSendQueue(new C0DPacketCloseWindow(mc.thePlayer.openContainer.windowId));
|
||||
GuiInventory inventory = new GuiInventory(mc.thePlayer);
|
||||
mc.displayGuiScreen(inventory);
|
||||
}
|
||||
|
||||
public static void updateTabValues (int cornerX, int cornerY, Class<?> selectedButton)
|
||||
{
|
||||
public static void updateTabValues(int cornerX, int cornerY, Class<?> selectedButton) {
|
||||
int count = 2;
|
||||
for (int i = 0; i < tabList.size(); i++)
|
||||
{
|
||||
for (int i = 0; i < tabList.size(); i++) {
|
||||
AbstractTab t = tabList.get(i);
|
||||
|
||||
if (t.shouldAddToList())
|
||||
{
|
||||
if (t.shouldAddToList()) {
|
||||
t.id = count;
|
||||
t.xPosition = cornerX + (count - 2) * 28;
|
||||
t.yPosition = cornerY - 28;
|
||||
@@ -72,51 +61,38 @@ public class TabRegistry
|
||||
}
|
||||
}
|
||||
|
||||
public static void addTabsToList (List buttonList)
|
||||
{
|
||||
for (AbstractTab tab : tabList)
|
||||
{
|
||||
if (tab.shouldAddToList())
|
||||
{
|
||||
public static void addTabsToList(List buttonList) {
|
||||
for (AbstractTab tab : tabList) {
|
||||
if (tab.shouldAddToList()) {
|
||||
buttonList.add(tab);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static int getPotionOffset()
|
||||
{
|
||||
// If at least one potion is active...
|
||||
if (!mc.thePlayer.getActivePotionEffects().isEmpty())
|
||||
{
|
||||
if (Loader.isModLoaded("NotEnoughItems"))
|
||||
{
|
||||
try
|
||||
{
|
||||
// Check whether NEI is hidden and enabled
|
||||
Class<?> c = Class.forName("codechicken.nei.NEIClientConfig");
|
||||
Object hidden = c.getMethod("isHidden").invoke(null);
|
||||
Object enabled = c.getMethod("isEnabled").invoke(null);
|
||||
if (hidden != null && hidden instanceof Boolean && enabled != null && enabled instanceof Boolean)
|
||||
{
|
||||
if ((Boolean)hidden || !((Boolean)enabled))
|
||||
{
|
||||
// If NEI is disabled or hidden, offset the tabs by 60
|
||||
return 60;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// If NEI is not installed, offset the tabs
|
||||
return 60;
|
||||
}
|
||||
}
|
||||
|
||||
// No potions, no offset needed
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static int getPotionOffset() {
|
||||
// If at least one potion is active...
|
||||
if (!mc.thePlayer.getActivePotionEffects().isEmpty()) {
|
||||
if (Loader.isModLoaded("NotEnoughItems")) {
|
||||
try {
|
||||
// Check whether NEI is hidden and enabled
|
||||
Class<?> c = Class.forName("codechicken.nei.NEIClientConfig");
|
||||
Object hidden = c.getMethod("isHidden").invoke(null);
|
||||
Object enabled = c.getMethod("isEnabled").invoke(null);
|
||||
if (hidden != null && hidden instanceof Boolean && enabled != null && enabled instanceof Boolean) {
|
||||
if ((Boolean) hidden || !((Boolean) enabled)) {
|
||||
// If NEI is disabled or hidden, offset the tabs by 60
|
||||
return 60;
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
} else {
|
||||
// If NEI is not installed, offset the tabs
|
||||
return 60;
|
||||
}
|
||||
}
|
||||
|
||||
// No potions, no offset needed
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user