fixes

Author: brachy84

src/main/java/com/cleanroommc/modularui/factory/SidedTileEntityGuiFactory.java

@@ -23,7 +23,8 @@ public class SidedTileEntityGuiFactory extends AbstractUIFactory<SidedPosGuiData
     public <T extends TileEntity & IGuiHolder<SidedPosGuiData>> void open(EntityPlayer player, T tile, EnumFacing facing) {
         Objects.requireNonNull(player);
         Objects.requireNonNull(facing);
-        BlockPos pos = TileEntityGuiFactory.getPosFromTile(tile);
+        TileEntityGuiFactory.verifyTile(player, tile);
+        BlockPos pos = tile.getPos();
         SidedPosGuiData data = new SidedPosGuiData(player, pos.getX(), pos.getY(), pos.getZ(), facing);
         GuiManager.open(this, data, (EntityPlayerMP) player);
     }
@@ -39,7 +40,8 @@ public void open(EntityPlayer player, BlockPos pos, EnumFacing facing) {
     @SideOnly(Side.CLIENT)
     public <T extends TileEntity & IGuiHolder<SidedPosGuiData>> void openClient(T tile, EnumFacing facing) {
         Objects.requireNonNull(facing);
-        BlockPos pos = TileEntityGuiFactory.getPosFromTile(tile);
+        TileEntityGuiFactory.verifyTile(Platform.getClientPlayer(), tile);
+        BlockPos pos = tile.getPos();
         SidedPosGuiData data = new SidedPosGuiData(Platform.getClientPlayer(), pos.getX(), pos.getY(), pos.getZ(), facing);
         GuiManager.openFromClient(this, data);
     }

src/main/java/com/cleanroommc/modularui/factory/TileEntityGuiFactory.java

@@ -26,7 +26,8 @@ private TileEntityGuiFactory() {
 
     public <T extends TileEntity & IGuiHolder<PosGuiData>> void open(EntityPlayer player, T tile) {
         Objects.requireNonNull(player);
-        BlockPos pos = getPosFromTile(tile);
+        verifyTile(player, tile);
+        BlockPos pos = tile.getPos();
         PosGuiData data = new PosGuiData(player, pos.getX(), pos.getY(), pos.getZ());
         GuiManager.open(this, data, (EntityPlayerMP) player);
     }
@@ -40,7 +41,8 @@ public void open(EntityPlayer player, BlockPos pos) {
 
     @SideOnly(Side.CLIENT)
     public <T extends TileEntity & IGuiHolder<PosGuiData>> void openClient(T tile) {
-        BlockPos pos = getPosFromTile(tile);
+        verifyTile(Platform.getClientPlayer(), tile);
+        BlockPos pos = tile.getPos();
         GuiManager.openFromClient(this, new PosGuiData(MCHelper.getPlayer(), pos.getX(), pos.getY(), pos.getZ()));
     }
 
@@ -72,14 +74,13 @@ public void writeGuiData(PosGuiData guiData, PacketBuffer buffer) {
         return new PosGuiData(player, buffer.readVarInt(), buffer.readVarInt(), buffer.readVarInt());
     }
 
-    public static BlockPos getPosFromTile(TileEntity tile) {
+    public static void verifyTile(EntityPlayer player, TileEntity tile) {
         Objects.requireNonNull(tile);
         if (tile.isInvalid()) {
             throw new IllegalArgumentException("Can't open invalid TileEntity GUI!");
         }
         if (Platform.getClientPlayer().world != tile.getWorld()) {
             throw new IllegalArgumentException("TileEntity must be in same dimension as the player!");
         }
-        return tile.getPos();
     }
 }

src/main/java/com/cleanroommc/modularui/factory/inventory/InventoryTypes.java

@@ -8,7 +8,7 @@
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 import baubles.api.BaublesApi;
-import org.apache.commons.lang3.tuple.Pair;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 
@@ -41,10 +41,10 @@ public static Collection<InventoryType> getAll() {
         return InventoryType.getAll();
     }
 
-    public static Pair<InventoryType, Integer> findFirstStackable(EntityPlayer player, ItemStack stack) {
+    public static @Nullable SlotFindResult findFirstStackable(EntityPlayer player, ItemStack stack) {
         for (InventoryType type : getAll()) {
             int i = type.findFirstStackable(player, stack);
-            if (i >= 0) return Pair.of(type, i);
+            if (i >= 0) return new SlotFindResult(type, i);
         }
         return null;
     }
@@ -64,4 +64,14 @@ public static void visitAll(EntityPlayer player, InventoryVisitor visitor) {
             }
         }
     }
+
+    public static class SlotFindResult {
+        public final InventoryType type;
+        public final int slot;
+
+        public SlotFindResult(InventoryType type, int slot) {
+            this.type = type;
+            this.slot = slot;
+        }
+    }
 }

src/main/java/com/cleanroommc/modularui/network/packets/OpenGuiPacket.java

@@ -23,8 +23,7 @@ public class OpenGuiPacket<T extends GuiData> implements IPacket {
     private UIFactory<T> factory;
     private PacketBuffer data;
 
-    public OpenGuiPacket() {
-    }
+    public OpenGuiPacket() {}
 
     public OpenGuiPacket(int windowId, UIFactory<T> factory, PacketBuffer data) {
         this.windowId = windowId;

src/main/java/com/cleanroommc/modularui/test/TestItem.java

@@ -9,6 +9,7 @@
 import com.cleanroommc.modularui.utils.Alignment;
 import com.cleanroommc.modularui.utils.ItemCapabilityProvider;
 import com.cleanroommc.modularui.utils.ItemStackItemHandler;
+import com.cleanroommc.modularui.utils.Platform;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.value.sync.SyncHandlers;
 import com.cleanroommc.modularui.widget.ParentWidget;
@@ -91,7 +92,7 @@ public ICapabilityProvider initCapabilities(@NotNull ItemStack stack, @Nullable
     public void addInformation(@NotNull ItemStack stack, @Nullable World worldIn, @NotNull List<String> tooltip, @NotNull ITooltipFlag flagIn) {
         super.addInformation(stack, worldIn, tooltip, flagIn);
         tooltip.add("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.");
-        tooltip.add(TextFormatting.GREEN + "Press " + ClientProxy.testKey.getDisplayName() + " to open GUI from Baubles");
+        tooltip.add(TextFormatting.GREEN + "Press " + Platform.getKeyDisplay(ClientProxy.testKey) + " to open GUI from Baubles");
     }
 
     @Override

src/main/java/com/cleanroommc/modularui/utils/Platform.java

@@ -7,6 +7,7 @@
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
@@ -30,6 +31,11 @@ public class Platform {
         return Minecraft.getMinecraft().player;
     }
 
+    @SideOnly(Side.CLIENT)
+    public static String getKeyDisplay(KeyBinding keyBinding) {
+        return keyBinding.getKeyDescription();
+    }
+
     public static boolean isStackEmpty(ItemStack stack) {
         return stack == null || stack.isEmpty();
     }