Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactoring the util package back to helper

Browse source
This commit is contained in:
pahimar 2013-10-17 20:53:08 -04:00
parent 8896698119
commit 346c4f16d8
35 changed files with 61 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/com/pahimar/ee3/EquivalentExchange3.java
View file

@ -23,9 +23,9 @@ import com.pahimar.ee3.core.handlers.ItemTooltipEventHandler;
import com.pahimar.ee3.core.handlers.PlayerDestroyItemHandler;
import com.pahimar.ee3.core.handlers.VersionCheckTickHandler;
import com.pahimar.ee3.core.handlers.WorldTransmutationHandler;
import com.pahimar.ee3.core.helper.LogHelper;
import com.pahimar.ee3.core.helper.VersionHelper;
import com.pahimar.ee3.core.proxy.CommonProxy;
import com.pahimar.ee3.core.util.LogHelper;
import com.pahimar.ee3.core.util.VersionHelper;
import com.pahimar.ee3.creativetab.CreativeTabEE3;
import com.pahimar.ee3.item.ModItems;
import com.pahimar.ee3.item.crafting.RecipesAlchemicalBagDyes;

2
common/com/pahimar/ee3/client/audio/SoundHandler.java
View file

@ -3,7 +3,7 @@ package com.pahimar.ee3.client.audio;
import net.minecraftforge.client.event.sound.SoundLoadEvent;
import net.minecraftforge.event.ForgeSubscribe;
import com.pahimar.ee3.core.util.LogHelper;
import com.pahimar.ee3.core.helper.LogHelper;
import com.pahimar.ee3.lib.Sounds;
/**

2
common/com/pahimar/ee3/command/CommandVersion.java
View file

@ -4,7 +4,7 @@ import net.minecraft.command.ICommandSender;
import net.minecraft.command.WrongUsageException;
import net.minecraft.util.ChatMessageComponent;
import com.pahimar.ee3.core.util.VersionHelper;
import com.pahimar.ee3.core.helper.VersionHelper;
import com.pahimar.ee3.lib.Commands;
/**

2
common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java
View file

@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.util.TransmutationHelper;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.item.IChargeable;
import com.pahimar.ee3.item.ITransmutationStone;
import com.pahimar.ee3.lib.Textures;

6
common/com/pahimar/ee3/core/handlers/EntityLivingHandler.java
View file

@ -6,7 +6,7 @@ import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import com.pahimar.ee3.core.util.ItemUtil;
import com.pahimar.ee3.core.helper.ItemHelper;
/**
* Equivalent-Exchange-3
@ -28,12 +28,12 @@ public class EntityLivingHandler {
public void onEntityLivingDeath(LivingDeathEvent event) {
if (event.source.getDamageType().equals("player")) {
ItemUtil.dropMiniumShard((EntityPlayer) event.source.getSourceOfDamage(), event.entityLiving);
ItemHelper.dropMiniumShard((EntityPlayer) event.source.getSourceOfDamage(), event.entityLiving);
}
if (event.source.getSourceOfDamage() instanceof EntityArrow) {
if (((EntityArrow) event.source.getSourceOfDamage()).shootingEntity != null) {
if (((EntityArrow) event.source.getSourceOfDamage()).shootingEntity instanceof EntityPlayer) {
ItemUtil.dropMiniumShard((EntityPlayer) ((EntityArrow) event.source.getSourceOfDamage()).shootingEntity, event.entityLiving);
ItemHelper.dropMiniumShard((EntityPlayer) ((EntityArrow) event.source.getSourceOfDamage()).shootingEntity, event.entityLiving);
}
}
}

4
common/com/pahimar/ee3/core/handlers/EquivalencyHandler.java
View file

@ -4,8 +4,8 @@ import java.util.ArrayList;
import net.minecraft.item.ItemStack;
import com.pahimar.ee3.core.util.GeneralHelper;
import com.pahimar.ee3.core.util.LogHelper;
import com.pahimar.ee3.core.helper.GeneralHelper;
import com.pahimar.ee3.core.helper.LogHelper;
/**
* Equivalent-Exchange-3

2
common/com/pahimar/ee3/core/handlers/InterModCommsHandler.java
View file

@ -5,7 +5,7 @@ import java.util.Map;
import net.minecraft.nbt.NBTTagCompound;
import com.pahimar.ee3.core.util.LogHelper;
import com.pahimar.ee3.core.helper.LogHelper;
import com.pahimar.ee3.emc.EmcBlackList;
import com.pahimar.ee3.item.CustomWrappedStack;
import com.pahimar.ee3.item.crafting.RecipesIMC;

6
common/com/pahimar/ee3/core/handlers/KeyBindingHandler.java
View file

@ -6,7 +6,7 @@ import net.minecraft.client.settings.KeyBinding;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import com.pahimar.ee3.core.util.KeyBindingUtil;
import com.pahimar.ee3.core.helper.KeyBindingHelper;
import com.pahimar.ee3.item.IKeyBound;
import com.pahimar.ee3.lib.Reference;
import com.pahimar.ee3.network.PacketTypeHandler;
@ -30,7 +30,7 @@ public class KeyBindingHandler extends KeyBindingRegistry.KeyHandler {
public KeyBindingHandler() {
super(KeyBindingUtil.gatherKeyBindings(), KeyBindingUtil.gatherIsRepeating());
super(KeyBindingHelper.gatherKeyBindings(), KeyBindingHelper.gatherIsRepeating());
}
@Override
@ -52,7 +52,7 @@ public class KeyBindingHandler extends KeyBindingRegistry.KeyHandler {
if (currentItem != null) {
if (currentItem.getItem() instanceof IKeyBound) {
if (!KeyBindingUtil.isClientSided(kb.keyDescription)) {
if (!KeyBindingHelper.isClientSided(kb.keyDescription)) {
PacketDispatcher.sendPacketToServer(PacketTypeHandler.populatePacket(new PacketKeyPressed(kb.keyDescription)));
}
else {

2
common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java
View file

@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL12;
import com.pahimar.ee3.client.renderer.RenderUtils;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.util.TransmutationHelper;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.item.ITransmutationStone;
import com.pahimar.ee3.lib.Reference;

2
common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java
View file

@ -6,7 +6,7 @@ import net.minecraftforge.common.Configuration;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.configuration.GeneralConfiguration;
import com.pahimar.ee3.core.util.VersionHelper;
import com.pahimar.ee3.core.helper.VersionHelper;
import com.pahimar.ee3.lib.Reference;
import com.pahimar.ee3.lib.Strings;

2
common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java
View file

@ -9,7 +9,7 @@ import net.minecraftforge.event.Event.Result;
import net.minecraftforge.event.ForgeSubscribe;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.util.TransmutationHelper;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.event.ActionEvent;
import com.pahimar.ee3.event.ActionEvent.ActionResult;
import com.pahimar.ee3.event.ActionRequestEvent;

2
common/com/pahimar/ee3/core/util/GeneralHelper.java → common/com/pahimar/ee3/core/helper/GeneralHelper.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.core.helper;
import java.util.ArrayList;

28
common/com/pahimar/ee3/core/util/ItemUtil.java → common/com/pahimar/ee3/core/helper/ItemHelper.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.core.helper;
import java.util.Comparator;
@ -11,7 +11,6 @@ import net.minecraftforge.oredict.OreDictionary;
import com.pahimar.ee3.item.ModItems;
import com.pahimar.ee3.lib.Colours;
import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.nbt.NBTHelper;
/**
* Equivalent-Exchange-3
@ -22,33 +21,10 @@ import com.pahimar.ee3.nbt.NBTHelper;
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*
*/
public class ItemUtil {
public class ItemHelper {
private static double rand;
public static String toString(ItemStack itemStack) {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("ItemStack(");
if (itemStack != null) {
stringBuilder.append(String.format("%s", encodeItemStackAsString(itemStack)));
if (itemStack.hasTagCompound()) {
stringBuilder.append(String.format("%s%s", Strings.TOKEN_DELIMITER, NBTHelper.encodeNBTAsString((itemStack.getTagCompound()))));
}
}
else {
stringBuilder.append("null");
}
stringBuilder.append(")");
return stringBuilder.toString();
}
public static String encodeItemStackAsString(ItemStack itemStack) {
StringBuilder stringBuilder = new StringBuilder();

4
common/com/pahimar/ee3/core/util/KeyBindingUtil.java → common/com/pahimar/ee3/core/helper/KeyBindingHelper.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.core.helper;
import java.util.ArrayList;
@ -15,7 +15,7 @@ import com.pahimar.ee3.configuration.ConfigurationSettings;
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*
*/
public class KeyBindingUtil {
public class KeyBindingHelper {
public static ArrayList<KeyBinding> keyBindingsList;
public static ArrayList<Boolean> isRepeatingList;

2
common/com/pahimar/ee3/core/util/LogHelper.java → common/com/pahimar/ee3/core/helper/LogHelper.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.core.helper;
import java.util.logging.Level;
import java.util.logging.Logger;

2
common/com/pahimar/ee3/core/util/QualityHelper.java → common/com/pahimar/ee3/core/helper/QualityHelper.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.core.helper;
import net.minecraft.item.ItemStack;

6
common/com/pahimar/ee3/core/util/RecipeHelper.java → common/com/pahimar/ee3/core/helper/RecipeHelper.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.core.helper;
import java.util.ArrayList;
import java.util.Collections;
@ -12,6 +12,8 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import com.pahimar.ee3.item.CustomWrappedStack;
import com.pahimar.ee3.item.EnergyStack;
import com.pahimar.ee3.item.OreStack;
/**
* Equivalent-Exchange-3
@ -156,7 +158,7 @@ public class RecipeHelper {
for (int i = 0; i < collatedStacks.size(); i++) {
if (collatedStacks.get(i).getWrappedStack() != null) {
if (stack.getWrappedStack() instanceof ItemStack && collatedStacks.get(i).getWrappedStack() instanceof ItemStack) {
if (ItemUtil.compare((ItemStack) stack.getWrappedStack(), (ItemStack) collatedStacks.get(i).getWrappedStack())) {
if (ItemHelper.compare((ItemStack) stack.getWrappedStack(), (ItemStack) collatedStacks.get(i).getWrappedStack())) {
collatedStacks.get(i).setStackSize(collatedStacks.get(i).getStackSize() + stack.getStackSize());
found = true;
}

2
common/com/pahimar/ee3/core/util/ResourceLocationHelper.java → common/com/pahimar/ee3/core/helper/ResourceLocationHelper.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.core.helper;
import net.minecraft.util.ResourceLocation;

2
common/com/pahimar/ee3/core/util/TransmutationHelper.java → common/com/pahimar/ee3/core/helper/TransmutationHelper.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.core.helper;
import java.util.ArrayList;

2
common/com/pahimar/ee3/core/util/VersionHelper.java → common/com/pahimar/ee3/core/helper/VersionHelper.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.core.helper;
import java.io.InputStream;
import java.net.URL;

14
common/com/pahimar/ee3/core/proxy/ClientProxy.java
View file

@ -25,9 +25,9 @@ import com.pahimar.ee3.client.renderer.tileentity.TileEntityRenderingTankRendere
import com.pahimar.ee3.core.handlers.DrawBlockHighlightHandler;
import com.pahimar.ee3.core.handlers.KeyBindingHandler;
import com.pahimar.ee3.core.handlers.TransmutationTargetOverlayHandler;
import com.pahimar.ee3.core.util.ItemUtil;
import com.pahimar.ee3.core.util.KeyBindingUtil;
import com.pahimar.ee3.core.util.TransmutationHelper;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.core.helper.KeyBindingHelper;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.item.IChargeable;
import com.pahimar.ee3.lib.ActionTypes;
import com.pahimar.ee3.lib.BlockIds;
@ -83,8 +83,8 @@ public class ClientProxy extends CommonProxy {
@Override
public void setKeyBinding(String name, int value) {
KeyBindingUtil.addKeyBinding(name, value);
KeyBindingUtil.addIsRepeating(false);
KeyBindingHelper.addKeyBinding(name, value);
KeyBindingHelper.addIsRepeating(false);
}
@Override
@ -157,7 +157,7 @@ public class ClientProxy extends CommonProxy {
ItemStack itemStack = new ItemStack(itemID, stackSize, metaData);
if (color != Integer.parseInt(Colours.PURE_WHITE, 16)) {
ItemUtil.setColor(itemStack, color);
ItemHelper.setColor(itemStack, color);
}
((TileGlassBell) tileEntity).setInventorySlotContents(TileGlassBell.DISPLAY_SLOT_INVENTORY_INDEX, itemStack);
@ -167,7 +167,7 @@ public class ClientProxy extends CommonProxy {
ItemStack itemStack = new ItemStack(itemID, stackSize, metaData);
if (color != Integer.parseInt(Colours.PURE_WHITE, 16)) {
ItemUtil.setColor(itemStack, color);
ItemHelper.setColor(itemStack, color);
}
((TileAludel) tileEntity).setInventorySlotContents(TileAludel.INPUT_INVENTORY_INDEX, itemStack);

2
common/com/pahimar/ee3/emc/EmcDefaultValues.java
View file

@ -6,8 +6,8 @@ import java.util.Map;
import net.minecraft.block.Block;
import com.pahimar.ee3.core.util.EnergyStack;
import com.pahimar.ee3.item.CustomWrappedStack;
import com.pahimar.ee3.item.EnergyStack;
public class EmcDefaultValues {

10
common/com/pahimar/ee3/item/CustomWrappedStack.java
View file

@ -7,9 +7,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import com.pahimar.ee3.core.util.EnergyStack;
import com.pahimar.ee3.core.util.ItemUtil;
import com.pahimar.ee3.core.util.OreStack;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.lib.Reference;
public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
@ -182,7 +180,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
CustomWrappedStack customWrappedStack = (CustomWrappedStack) object;
if ((this.getWrappedStack() instanceof ItemStack) && (customWrappedStack.getWrappedStack() instanceof ItemStack)) {
return (ItemUtil.compare(itemStack, customWrappedStack.itemStack) && (stackSize == customWrappedStack.itemStack.stackSize));
return (ItemHelper.compare(itemStack, customWrappedStack.itemStack) && (stackSize == customWrappedStack.itemStack.stackSize));
}
else if ((this.getWrappedStack() instanceof OreStack) && (customWrappedStack.getWrappedStack() instanceof OreStack)) {
return (oreStack.equals(customWrappedStack.getWrappedStack()) && (stackSize == customWrappedStack.stackSize));
@ -310,10 +308,10 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
else if (customWrappedStack.getWrappedStack() instanceof OreStack)
return 1;
else if (customWrappedStack.getWrappedStack() instanceof ItemStack) {
if (ItemUtil.compare(itemStack, customWrappedStack.itemStack))
if (ItemHelper.compare(itemStack, customWrappedStack.itemStack))
return stackSize - customWrappedStack.stackSize;
else
return ItemUtil.ItemStackComparator.compare(itemStack, customWrappedStack.itemStack);
return ItemHelper.ItemStackComparator.compare(itemStack, customWrappedStack.itemStack);
}
else
return 1;

2
common/com/pahimar/ee3/core/util/EnergyStack.java → common/com/pahimar/ee3/item/EnergyStack.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.item;
public class EnergyStack implements Comparable<EnergyStack> {

8
common/com/pahimar/ee3/item/ItemAlchemicalBag.java
View file

@ -8,7 +8,7 @@ import net.minecraft.util.Icon;
import net.minecraft.world.World;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.core.util.ItemUtil;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.lib.Colours;
import com.pahimar.ee3.lib.GuiIds;
import com.pahimar.ee3.lib.Strings;
@ -113,12 +113,12 @@ public class ItemAlchemicalBag extends ItemEE {
public boolean hasColor(ItemStack itemStack) {
return ItemUtil.hasColor(itemStack);
return ItemHelper.hasColor(itemStack);
}
public int getColor(ItemStack itemStack) {
return ItemUtil.getColor(itemStack);
return ItemHelper.getColor(itemStack);
}
public void setColor(ItemStack itemStack, int color) {
@ -128,7 +128,7 @@ public class ItemAlchemicalBag extends ItemEE {
// TODO Localize
throw new UnsupportedOperationException("Cannot dye non-bags!");
else {
ItemUtil.setColor(itemStack, color);
ItemHelper.setColor(itemStack, color);
}
}
}

2
common/com/pahimar/ee3/item/ItemMiniumStone.java
View file

@ -7,7 +7,7 @@ import net.minecraft.world.World;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.util.TransmutationHelper;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.lib.GuiIds;
import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.nbt.NBTHelper;

2
common/com/pahimar/ee3/item/ItemPhilosophersStone.java
View file

@ -7,7 +7,7 @@ import net.minecraft.world.World;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.util.TransmutationHelper;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.lib.GuiIds;
import com.pahimar.ee3.lib.Sounds;
import com.pahimar.ee3.lib.Strings;

2
common/com/pahimar/ee3/core/util/OreStack.java → common/com/pahimar/ee3/item/OreStack.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.util;
package com.pahimar.ee3.item;
import java.util.ArrayList;

2
common/com/pahimar/ee3/item/crafting/RecipesIMC.java
View file

@ -4,7 +4,7 @@ import java.util.List;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.pahimar.ee3.core.util.RecipeHelper;
import com.pahimar.ee3.core.helper.RecipeHelper;
import com.pahimar.ee3.item.CustomWrappedStack;
/**

2
common/com/pahimar/ee3/item/crafting/RecipesSmelting.java
View file

@ -9,8 +9,8 @@ import net.minecraft.item.crafting.FurnaceRecipes;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.pahimar.ee3.core.util.EnergyStack;
import com.pahimar.ee3.item.CustomWrappedStack;
import com.pahimar.ee3.item.EnergyStack;
public class RecipesSmelting {

2
common/com/pahimar/ee3/item/crafting/RecipesVanilla.java
View file

@ -9,7 +9,7 @@ import net.minecraft.item.crafting.IRecipe;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.pahimar.ee3.core.util.RecipeHelper;
import com.pahimar.ee3.core.helper.RecipeHelper;
import com.pahimar.ee3.item.CustomWrappedStack;
public class RecipesVanilla {

2
common/com/pahimar/ee3/lib/Textures.java
View file

@ -3,7 +3,7 @@ package com.pahimar.ee3.lib;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.ResourceLocation;
import com.pahimar.ee3.core.util.ResourceLocationHelper;
import com.pahimar.ee3.core.helper.ResourceLocationHelper;
/**
* Equivalent-Exchange-3

4
common/com/pahimar/ee3/nbt/NBTHelper.java
View file

@ -21,9 +21,9 @@ import net.minecraft.nbt.NBTTagLong;
import net.minecraft.nbt.NBTTagShort;
import net.minecraft.nbt.NBTTagString;
import com.pahimar.ee3.core.util.EnergyStack;
import com.pahimar.ee3.core.util.OreStack;
import com.pahimar.ee3.item.CustomWrappedStack;
import com.pahimar.ee3.item.EnergyStack;
import com.pahimar.ee3.item.OreStack;
import com.pahimar.ee3.lib.Strings;
/**

4
common/com/pahimar/ee3/tileentity/TileAludel.java
View file

@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.packet.Packet;
import com.pahimar.ee3.core.util.ItemUtil;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.network.PacketTypeHandler;
import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate;
@ -164,7 +164,7 @@ public class TileAludel extends TileEE implements IInventory {
ItemStack itemStack = getStackInSlot(INPUT_INVENTORY_INDEX);
if (itemStack != null && itemStack.stackSize > 0)
return PacketTypeHandler.populatePacket(new PacketTileWithItemUpdate(xCoord, yCoord, zCoord, orientation, state, customName, itemStack.itemID, itemStack.getItemDamage(), itemStack.stackSize, ItemUtil.getColor(itemStack)));
return PacketTypeHandler.populatePacket(new PacketTileWithItemUpdate(xCoord, yCoord, zCoord, orientation, state, customName, itemStack.itemID, itemStack.getItemDamage(), itemStack.stackSize, ItemHelper.getColor(itemStack)));
else
return super.getDescriptionPacket();
}

4
common/com/pahimar/ee3/tileentity/TileGlassBell.java
View file

@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.packet.Packet;
import com.pahimar.ee3.core.util.ItemUtil;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.network.PacketTypeHandler;
import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate;
@ -152,7 +152,7 @@ public class TileGlassBell extends TileEE implements IInventory {
ItemStack itemStack = getStackInSlot(DISPLAY_SLOT_INVENTORY_INDEX);
if (itemStack != null && itemStack.stackSize > 0)
return PacketTypeHandler.populatePacket(new PacketTileWithItemUpdate(xCoord, yCoord, zCoord, orientation, state, customName, itemStack.itemID, itemStack.getItemDamage(), itemStack.stackSize, ItemUtil.getColor(itemStack)));
return PacketTypeHandler.populatePacket(new PacketTileWithItemUpdate(xCoord, yCoord, zCoord, orientation, state, customName, itemStack.itemID, itemStack.getItemDamage(), itemStack.stackSize, ItemHelper.getColor(itemStack)));
else
return super.getDescriptionPacket();
}