From 0a8eec22dba6dc4246c0cd7d41072ba509377973 Mon Sep 17 00:00:00 2001 From: Azanor Date: Tue, 12 Aug 2014 09:41:09 +0200 Subject: [PATCH] closes #57 Fix for ring position in NEI --- build.gradle | 2 +- .../java/baubles/client/gui/GuiEvents.java | 18 ++++++++++++++++-- src/main/java/baubles/common/Baubles.java | 4 +++- src/main/java/baubles/common/Config.java | 2 -- .../textures/gui/expanded_inventory.png | Bin 3215 -> 2898 bytes src/main/resources/changelog.txt | 3 +++ 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index d7e0dda..0754179 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.0.1.3" +version = "1.7.10-1.0.1.4" group= "com.azanor.baubles" archivesBaseName = "Baubles" diff --git a/src/main/java/baubles/client/gui/GuiEvents.java b/src/main/java/baubles/client/gui/GuiEvents.java index 3a82e0e..e1042d3 100644 --- a/src/main/java/baubles/client/gui/GuiEvents.java +++ b/src/main/java/baubles/client/gui/GuiEvents.java @@ -1,5 +1,7 @@ package baubles.client.gui; +import java.lang.reflect.Method; + import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.resources.I18n; import net.minecraftforge.client.event.GuiScreenEvent; @@ -24,7 +26,7 @@ public class GuiEvents { int guiLeft = (event.gui.width - xSize) / 2; int guiTop = (event.gui.height - ySize) / 2; - if (!event.gui.mc.thePlayer.getActivePotionEffects().isEmpty()) { + if (!event.gui.mc.thePlayer.getActivePotionEffects().isEmpty() && shiftNei()) { guiLeft = 160 + (event.gui.width - xSize - 200) / 2; } @@ -33,7 +35,6 @@ public class GuiEvents { } } - @SideOnly(value = Side.CLIENT) @SubscribeEvent @@ -52,4 +53,17 @@ public class GuiEvents { } } } + + static Method isNEIHidden; + boolean shiftNei() { + boolean hidden=false; + try { + if (isNEIHidden==null) { + Class fake = Class.forName("codechicken.nei.NEIClientConfig"); + isNEIHidden = fake.getMethod("isHidden"); + } + hidden = (Boolean) isNEIHidden.invoke(null); + } catch(Exception ex) { } + return hidden; + } } diff --git a/src/main/java/baubles/common/Baubles.java b/src/main/java/baubles/common/Baubles.java index ad964a9..c79abbe 100644 --- a/src/main/java/baubles/common/Baubles.java +++ b/src/main/java/baubles/common/Baubles.java @@ -24,7 +24,7 @@ public class Baubles { public static final String MODID = "Baubles"; public static final String MODNAME = "Baubles"; - public static final String VERSION = "1.0.1.3"; + public static final String VERSION = "1.0.1.4"; @SidedProxy(clientSide = "baubles.client.ClientProxy", serverSide = "baubles.common.CommonProxy") public static CommonProxy proxy; @@ -61,6 +61,7 @@ public class Baubles { ///////////////////// Config.save(); + } @EventHandler @@ -72,6 +73,7 @@ public class Baubles { @EventHandler public void postInit(FMLPostInitializationEvent evt) { Config.initRecipe(); + } } diff --git a/src/main/java/baubles/common/Config.java b/src/main/java/baubles/common/Config.java index e87a315..04ed07b 100644 --- a/src/main/java/baubles/common/Config.java +++ b/src/main/java/baubles/common/Config.java @@ -2,9 +2,7 @@ package baubles.common; import java.io.File; -import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import baubles.common.items.ItemRing; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/resources/assets/baubles/textures/gui/expanded_inventory.png b/src/main/resources/assets/baubles/textures/gui/expanded_inventory.png index 98a63f79954faecd117cfc4ccdf1a94085a0b8b7..3f242119e7e4c656183b77edb21ce9658e1f1fd7 100644 GIT binary patch literal 2898 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 PKLeOvvNSIL#WnUHo?mQ! literal 3215 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 F`%j@Iu+#tm diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt index d894356..d8527eb 100644 --- a/src/main/resources/changelog.txt +++ b/src/main/resources/changelog.txt @@ -1,3 +1,6 @@ +1.0.1.4 +- detect NEI so baubles "ring" button is placed correctly (most of the time). + 1.0.1.3 - created workaround for unnecessary calls to onEquipped and onUneEquipped - fixed a bug where onUneEquipped wasn't being called if you pick an item up from a slot