From 98188ba87201a025ed2fb81245de66ad0e44c7ad Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 31 Dec 2013 00:25:47 -0500 Subject: [PATCH] Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/506 --- .../handler/DrawBlockHighlightHandler.java | 2 +- .../handler/KeyBindingHandler.java | 9 ++-- .../TransmutationTargetOverlayHandler.java | 4 +- .../{ => client}/helper/KeyBindingHelper.java | 22 +++------- .../{renderer => helper}/RenderUtils.java | 2 +- .../com/pahimar/ee3/helper/ItemHelper.java | 5 --- .../com/pahimar/ee3/helper/QualityHelper.java | 44 ------------------- .../ee3/helper/ResourceLocationHelper.java | 3 -- .../com/pahimar/ee3/proxy/ClientProxy.java | 8 ++-- 9 files changed, 20 insertions(+), 79 deletions(-) rename src/main/java/com/pahimar/ee3/{ => client}/handler/DrawBlockHighlightHandler.java (99%) rename src/main/java/com/pahimar/ee3/{ => client}/handler/KeyBindingHandler.java (90%) rename src/main/java/com/pahimar/ee3/{ => client}/handler/TransmutationTargetOverlayHandler.java (98%) rename src/main/java/com/pahimar/ee3/{ => client}/helper/KeyBindingHelper.java (70%) rename src/main/java/com/pahimar/ee3/client/{renderer => helper}/RenderUtils.java (98%) delete mode 100644 src/main/java/com/pahimar/ee3/helper/QualityHelper.java diff --git a/src/main/java/com/pahimar/ee3/handler/DrawBlockHighlightHandler.java b/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightHandler.java similarity index 99% rename from src/main/java/com/pahimar/ee3/handler/DrawBlockHighlightHandler.java rename to src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightHandler.java index 1ec7be4d..68031bd6 100644 --- a/src/main/java/com/pahimar/ee3/handler/DrawBlockHighlightHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightHandler.java @@ -1,4 +1,4 @@ -package com.pahimar.ee3.handler; +package com.pahimar.ee3.client.handler; import com.pahimar.ee3.configuration.ConfigurationSettings; import com.pahimar.ee3.helper.TransmutationHelper; diff --git a/src/main/java/com/pahimar/ee3/handler/KeyBindingHandler.java b/src/main/java/com/pahimar/ee3/client/handler/KeyBindingHandler.java similarity index 90% rename from src/main/java/com/pahimar/ee3/handler/KeyBindingHandler.java rename to src/main/java/com/pahimar/ee3/client/handler/KeyBindingHandler.java index 78d8a88a..71cdf208 100644 --- a/src/main/java/com/pahimar/ee3/handler/KeyBindingHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/KeyBindingHandler.java @@ -1,6 +1,6 @@ -package com.pahimar.ee3.handler; +package com.pahimar.ee3.client.handler; -import com.pahimar.ee3.helper.KeyBindingHelper; +import com.pahimar.ee3.client.helper.KeyBindingHelper; import com.pahimar.ee3.item.IKeyBound; import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.network.PacketTypeHandler; @@ -9,6 +9,8 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.KeyBindingRegistry; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.network.PacketDispatcher; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -22,6 +24,7 @@ import java.util.EnumSet; * * @author pahimar */ +@SideOnly(Side.CLIENT) public class KeyBindingHandler extends KeyBindingRegistry.KeyHandler { public KeyBindingHandler() @@ -53,7 +56,7 @@ public class KeyBindingHandler extends KeyBindingRegistry.KeyHandler { if (currentItem.getItem() instanceof IKeyBound) { - if (!KeyBindingHelper.isClientSided(kb.keyDescription)) + if (player.worldObj.isRemote) { PacketDispatcher.sendPacketToServer(PacketTypeHandler.populatePacket(new PacketKeyPressed(kb.keyDescription))); } diff --git a/src/main/java/com/pahimar/ee3/handler/TransmutationTargetOverlayHandler.java b/src/main/java/com/pahimar/ee3/client/handler/TransmutationTargetOverlayHandler.java similarity index 98% rename from src/main/java/com/pahimar/ee3/handler/TransmutationTargetOverlayHandler.java rename to src/main/java/com/pahimar/ee3/client/handler/TransmutationTargetOverlayHandler.java index b98d48e7..5217be9e 100644 --- a/src/main/java/com/pahimar/ee3/handler/TransmutationTargetOverlayHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/TransmutationTargetOverlayHandler.java @@ -1,6 +1,6 @@ -package com.pahimar.ee3.handler; +package com.pahimar.ee3.client.handler; -import com.pahimar.ee3.client.renderer.RenderUtils; +import com.pahimar.ee3.client.helper.RenderUtils; import com.pahimar.ee3.configuration.ConfigurationSettings; import com.pahimar.ee3.helper.TransmutationHelper; import com.pahimar.ee3.item.ITransmutationStone; diff --git a/src/main/java/com/pahimar/ee3/helper/KeyBindingHelper.java b/src/main/java/com/pahimar/ee3/client/helper/KeyBindingHelper.java similarity index 70% rename from src/main/java/com/pahimar/ee3/helper/KeyBindingHelper.java rename to src/main/java/com/pahimar/ee3/client/helper/KeyBindingHelper.java index 6926d20e..ffccc50c 100644 --- a/src/main/java/com/pahimar/ee3/helper/KeyBindingHelper.java +++ b/src/main/java/com/pahimar/ee3/client/helper/KeyBindingHelper.java @@ -1,6 +1,7 @@ -package com.pahimar.ee3.helper; +package com.pahimar.ee3.client.helper; -import com.pahimar.ee3.configuration.ConfigurationSettings; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.settings.KeyBinding; import java.util.ArrayList; @@ -12,15 +13,14 @@ import java.util.ArrayList; * * @author pahimar */ +@SideOnly(Side.CLIENT) public class KeyBindingHelper { - - public static ArrayList keyBindingsList; - public static ArrayList isRepeatingList; + private static ArrayList keyBindingsList; + private static ArrayList isRepeatingList; public static void addKeyBinding(String name, int value) { - if (keyBindingsList == null) { keyBindingsList = new ArrayList(); @@ -31,7 +31,6 @@ public class KeyBindingHelper public static void addIsRepeating(boolean value) { - if (isRepeatingList == null) { isRepeatingList = new ArrayList(); @@ -42,13 +41,11 @@ public class KeyBindingHelper public static KeyBinding[] gatherKeyBindings() { - return keyBindingsList.toArray(new KeyBinding[keyBindingsList.size()]); } public static boolean[] gatherIsRepeating() { - boolean[] isRepeating = new boolean[isRepeatingList.size()]; for (int x = 0; x < isRepeating.length; x++) @@ -58,11 +55,4 @@ public class KeyBindingHelper return isRepeating; } - - // TODO Still not ideal, won't work for every case. Specifically, make it context sensitive - public static boolean isClientSided(String keybinding) - { - - return keybinding.equalsIgnoreCase(ConfigurationSettings.KEYBINDING_TOGGLE); - } } diff --git a/src/main/java/com/pahimar/ee3/client/renderer/RenderUtils.java b/src/main/java/com/pahimar/ee3/client/helper/RenderUtils.java similarity index 98% rename from src/main/java/com/pahimar/ee3/client/renderer/RenderUtils.java rename to src/main/java/com/pahimar/ee3/client/helper/RenderUtils.java index 7094d041..5f7349d4 100644 --- a/src/main/java/com/pahimar/ee3/client/renderer/RenderUtils.java +++ b/src/main/java/com/pahimar/ee3/client/helper/RenderUtils.java @@ -1,4 +1,4 @@ -package com.pahimar.ee3.client.renderer; +package com.pahimar.ee3.client.helper; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; diff --git a/src/main/java/com/pahimar/ee3/helper/ItemHelper.java b/src/main/java/com/pahimar/ee3/helper/ItemHelper.java index 81a97988..bf0ed417 100644 --- a/src/main/java/com/pahimar/ee3/helper/ItemHelper.java +++ b/src/main/java/com/pahimar/ee3/helper/ItemHelper.java @@ -19,7 +19,6 @@ import java.util.Comparator; */ public class ItemHelper { - private static double rand; /** @@ -68,7 +67,6 @@ public class ItemHelper } else { - NBTTagCompound displayTagCompound = nbtTagCompound.getCompoundTag(Strings.NBT_ITEM_DISPLAY); return displayTagCompound == null ? Integer.parseInt(Colours.PURE_WHITE, 16) : displayTagCompound.hasKey(Strings.NBT_ITEM_COLOR) ? displayTagCompound.getInteger(Strings.NBT_ITEM_COLOR) : Integer.parseInt(Colours.PURE_WHITE, 16); } @@ -78,12 +76,10 @@ public class ItemHelper { if (itemStack != null) { - NBTTagCompound nbtTagCompound = itemStack.getTagCompound(); if (nbtTagCompound == null) { - nbtTagCompound = new NBTTagCompound(); itemStack.setTagCompound(nbtTagCompound); } @@ -114,7 +110,6 @@ public class ItemHelper public static Comparator comparator = new Comparator() { - public int compare(ItemStack itemStack1, ItemStack itemStack2) { diff --git a/src/main/java/com/pahimar/ee3/helper/QualityHelper.java b/src/main/java/com/pahimar/ee3/helper/QualityHelper.java deleted file mode 100644 index 4436934c..00000000 --- a/src/main/java/com/pahimar/ee3/helper/QualityHelper.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.pahimar.ee3.helper; - -import net.minecraft.item.ItemStack; - -/** - * Equivalent-Exchange-3 - *

- * QualityHelper - * - * @author pahimar - */ -public class QualityHelper -{ - - private static int[][] dustTable = {{0, 0, 0, 1, 1, 1}, {0, 1, 1, 1, 2, 2}, {0, 1, 2, 2, 2, 2}, {1, 1, 2, 3, 3, 3}, {1, 2, 2, 3, 4, 4}, {1, 2, 2, 3, 4, 5},}; - - public static int getItemTierQuality(ItemStack item) - { - - // TODO Return the 'Tier' level of the given ItemStack - return -1; - } - - public static int getFuelTierQuality(ItemStack fuel) - { - - // TODO Return the 'Tier' level of the given ItemStack - return -1; - } - - public static int getDustTierQuality(ItemStack item, ItemStack fuel) - { - - if (getItemTierQuality(item) >= 0 && getItemTierQuality(item) <= 5) - { - if (getFuelTierQuality(fuel) >= 0 && getFuelTierQuality(fuel) <= 5) - { - return dustTable[getItemTierQuality(item)][getFuelTierQuality(fuel)]; - } - } - - return -1; - } -} diff --git a/src/main/java/com/pahimar/ee3/helper/ResourceLocationHelper.java b/src/main/java/com/pahimar/ee3/helper/ResourceLocationHelper.java index cc3e6c27..47676f07 100644 --- a/src/main/java/com/pahimar/ee3/helper/ResourceLocationHelper.java +++ b/src/main/java/com/pahimar/ee3/helper/ResourceLocationHelper.java @@ -5,16 +5,13 @@ import net.minecraft.util.ResourceLocation; public class ResourceLocationHelper { - public static ResourceLocation getResourceLocation(String modId, String path) { - return new ResourceLocation(modId, path); } public static ResourceLocation getResourceLocation(String path) { - return getResourceLocation(Reference.MOD_ID.toLowerCase(), path); } } diff --git a/src/main/java/com/pahimar/ee3/proxy/ClientProxy.java b/src/main/java/com/pahimar/ee3/proxy/ClientProxy.java index 8af7f017..4934d0ff 100644 --- a/src/main/java/com/pahimar/ee3/proxy/ClientProxy.java +++ b/src/main/java/com/pahimar/ee3/proxy/ClientProxy.java @@ -2,7 +2,11 @@ package com.pahimar.ee3.proxy; import com.pahimar.ee3.EquivalentExchange3; import com.pahimar.ee3.client.audio.SoundHandler; +import com.pahimar.ee3.client.handler.DrawBlockHighlightHandler; import com.pahimar.ee3.client.handler.ItemTooltipEventHandler; +import com.pahimar.ee3.client.handler.KeyBindingHandler; +import com.pahimar.ee3.client.handler.TransmutationTargetOverlayHandler; +import com.pahimar.ee3.client.helper.KeyBindingHelper; import com.pahimar.ee3.client.renderer.item.ItemAlchemicalChestRenderer; import com.pahimar.ee3.client.renderer.item.ItemAludelRenderer; import com.pahimar.ee3.client.renderer.item.ItemCalcinatorRenderer; @@ -11,11 +15,7 @@ import com.pahimar.ee3.client.renderer.tileentity.TileEntityAlchemicalChestRende import com.pahimar.ee3.client.renderer.tileentity.TileEntityAludelRenderer; import com.pahimar.ee3.client.renderer.tileentity.TileEntityCalcinatorRenderer; import com.pahimar.ee3.client.renderer.tileentity.TileEntityGlassBellRenderer; -import com.pahimar.ee3.handler.DrawBlockHighlightHandler; -import com.pahimar.ee3.handler.KeyBindingHandler; -import com.pahimar.ee3.handler.TransmutationTargetOverlayHandler; import com.pahimar.ee3.helper.ItemHelper; -import com.pahimar.ee3.helper.KeyBindingHelper; import com.pahimar.ee3.helper.TransmutationHelper; import com.pahimar.ee3.item.IChargeable; import com.pahimar.ee3.lib.ActionTypes;