Refactoring the util package back to helper
This commit is contained in:
parent
8896698119
commit
346c4f16d8
35 changed files with 61 additions and 85 deletions
|
@ -23,9 +23,9 @@ import com.pahimar.ee3.core.handlers.ItemTooltipEventHandler;
|
||||||
import com.pahimar.ee3.core.handlers.PlayerDestroyItemHandler;
|
import com.pahimar.ee3.core.handlers.PlayerDestroyItemHandler;
|
||||||
import com.pahimar.ee3.core.handlers.VersionCheckTickHandler;
|
import com.pahimar.ee3.core.handlers.VersionCheckTickHandler;
|
||||||
import com.pahimar.ee3.core.handlers.WorldTransmutationHandler;
|
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.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.creativetab.CreativeTabEE3;
|
||||||
import com.pahimar.ee3.item.ModItems;
|
import com.pahimar.ee3.item.ModItems;
|
||||||
import com.pahimar.ee3.item.crafting.RecipesAlchemicalBagDyes;
|
import com.pahimar.ee3.item.crafting.RecipesAlchemicalBagDyes;
|
||||||
|
|
|
@ -3,7 +3,7 @@ package com.pahimar.ee3.client.audio;
|
||||||
import net.minecraftforge.client.event.sound.SoundLoadEvent;
|
import net.minecraftforge.client.event.sound.SoundLoadEvent;
|
||||||
import net.minecraftforge.event.ForgeSubscribe;
|
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;
|
import com.pahimar.ee3.lib.Sounds;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -4,7 +4,7 @@ import net.minecraft.command.ICommandSender;
|
||||||
import net.minecraft.command.WrongUsageException;
|
import net.minecraft.command.WrongUsageException;
|
||||||
import net.minecraft.util.ChatMessageComponent;
|
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;
|
import com.pahimar.ee3.lib.Commands;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11;
|
||||||
import org.lwjgl.opengl.GL12;
|
import org.lwjgl.opengl.GL12;
|
||||||
|
|
||||||
import com.pahimar.ee3.configuration.ConfigurationSettings;
|
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.IChargeable;
|
||||||
import com.pahimar.ee3.item.ITransmutationStone;
|
import com.pahimar.ee3.item.ITransmutationStone;
|
||||||
import com.pahimar.ee3.lib.Textures;
|
import com.pahimar.ee3.lib.Textures;
|
||||||
|
|
|
@ -6,7 +6,7 @@ import net.minecraftforge.event.ForgeSubscribe;
|
||||||
import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
||||||
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
|
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
|
* Equivalent-Exchange-3
|
||||||
|
@ -28,12 +28,12 @@ public class EntityLivingHandler {
|
||||||
public void onEntityLivingDeath(LivingDeathEvent event) {
|
public void onEntityLivingDeath(LivingDeathEvent event) {
|
||||||
|
|
||||||
if (event.source.getDamageType().equals("player")) {
|
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 (event.source.getSourceOfDamage() instanceof EntityArrow) {
|
||||||
if (((EntityArrow) event.source.getSourceOfDamage()).shootingEntity != null) {
|
if (((EntityArrow) event.source.getSourceOfDamage()).shootingEntity != null) {
|
||||||
if (((EntityArrow) event.source.getSourceOfDamage()).shootingEntity instanceof EntityPlayer) {
|
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,8 +4,8 @@ import java.util.ArrayList;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import com.pahimar.ee3.core.util.GeneralHelper;
|
import com.pahimar.ee3.core.helper.GeneralHelper;
|
||||||
import com.pahimar.ee3.core.util.LogHelper;
|
import com.pahimar.ee3.core.helper.LogHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Equivalent-Exchange-3
|
* Equivalent-Exchange-3
|
||||||
|
|
|
@ -5,7 +5,7 @@ import java.util.Map;
|
||||||
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
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.emc.EmcBlackList;
|
||||||
import com.pahimar.ee3.item.CustomWrappedStack;
|
import com.pahimar.ee3.item.CustomWrappedStack;
|
||||||
import com.pahimar.ee3.item.crafting.RecipesIMC;
|
import com.pahimar.ee3.item.crafting.RecipesIMC;
|
||||||
|
|
|
@ -6,7 +6,7 @@ import net.minecraft.client.settings.KeyBinding;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
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.item.IKeyBound;
|
||||||
import com.pahimar.ee3.lib.Reference;
|
import com.pahimar.ee3.lib.Reference;
|
||||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||||
|
@ -30,7 +30,7 @@ public class KeyBindingHandler extends KeyBindingRegistry.KeyHandler {
|
||||||
|
|
||||||
public KeyBindingHandler() {
|
public KeyBindingHandler() {
|
||||||
|
|
||||||
super(KeyBindingUtil.gatherKeyBindings(), KeyBindingUtil.gatherIsRepeating());
|
super(KeyBindingHelper.gatherKeyBindings(), KeyBindingHelper.gatherIsRepeating());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -52,7 +52,7 @@ public class KeyBindingHandler extends KeyBindingRegistry.KeyHandler {
|
||||||
|
|
||||||
if (currentItem != null) {
|
if (currentItem != null) {
|
||||||
if (currentItem.getItem() instanceof IKeyBound) {
|
if (currentItem.getItem() instanceof IKeyBound) {
|
||||||
if (!KeyBindingUtil.isClientSided(kb.keyDescription)) {
|
if (!KeyBindingHelper.isClientSided(kb.keyDescription)) {
|
||||||
PacketDispatcher.sendPacketToServer(PacketTypeHandler.populatePacket(new PacketKeyPressed(kb.keyDescription)));
|
PacketDispatcher.sendPacketToServer(PacketTypeHandler.populatePacket(new PacketKeyPressed(kb.keyDescription)));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL12;
|
||||||
|
|
||||||
import com.pahimar.ee3.client.renderer.RenderUtils;
|
import com.pahimar.ee3.client.renderer.RenderUtils;
|
||||||
import com.pahimar.ee3.configuration.ConfigurationSettings;
|
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.item.ITransmutationStone;
|
||||||
import com.pahimar.ee3.lib.Reference;
|
import com.pahimar.ee3.lib.Reference;
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import net.minecraftforge.common.Configuration;
|
||||||
|
|
||||||
import com.pahimar.ee3.configuration.ConfigurationSettings;
|
import com.pahimar.ee3.configuration.ConfigurationSettings;
|
||||||
import com.pahimar.ee3.configuration.GeneralConfiguration;
|
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.Reference;
|
||||||
import com.pahimar.ee3.lib.Strings;
|
import com.pahimar.ee3.lib.Strings;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ import net.minecraftforge.event.Event.Result;
|
||||||
import net.minecraftforge.event.ForgeSubscribe;
|
import net.minecraftforge.event.ForgeSubscribe;
|
||||||
|
|
||||||
import com.pahimar.ee3.configuration.ConfigurationSettings;
|
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;
|
||||||
import com.pahimar.ee3.event.ActionEvent.ActionResult;
|
import com.pahimar.ee3.event.ActionEvent.ActionResult;
|
||||||
import com.pahimar.ee3.event.ActionRequestEvent;
|
import com.pahimar.ee3.event.ActionRequestEvent;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.core.helper;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.core.helper;
|
||||||
|
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||||
import com.pahimar.ee3.item.ModItems;
|
import com.pahimar.ee3.item.ModItems;
|
||||||
import com.pahimar.ee3.lib.Colours;
|
import com.pahimar.ee3.lib.Colours;
|
||||||
import com.pahimar.ee3.lib.Strings;
|
import com.pahimar.ee3.lib.Strings;
|
||||||
import com.pahimar.ee3.nbt.NBTHelper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Equivalent-Exchange-3
|
* 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)
|
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class ItemUtil {
|
public class ItemHelper {
|
||||||
|
|
||||||
private static double rand;
|
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) {
|
public static String encodeItemStackAsString(ItemStack itemStack) {
|
||||||
|
|
||||||
StringBuilder stringBuilder = new StringBuilder();
|
StringBuilder stringBuilder = new StringBuilder();
|
|
@ -1,4 +1,4 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.core.helper;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
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)
|
* @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<KeyBinding> keyBindingsList;
|
||||||
public static ArrayList<Boolean> isRepeatingList;
|
public static ArrayList<Boolean> isRepeatingList;
|
|
@ -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.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.core.helper;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.core.helper;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
@ -12,6 +12,8 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||||
|
|
||||||
import com.pahimar.ee3.item.CustomWrappedStack;
|
import com.pahimar.ee3.item.CustomWrappedStack;
|
||||||
|
import com.pahimar.ee3.item.EnergyStack;
|
||||||
|
import com.pahimar.ee3.item.OreStack;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Equivalent-Exchange-3
|
* Equivalent-Exchange-3
|
||||||
|
@ -156,7 +158,7 @@ public class RecipeHelper {
|
||||||
for (int i = 0; i < collatedStacks.size(); i++) {
|
for (int i = 0; i < collatedStacks.size(); i++) {
|
||||||
if (collatedStacks.get(i).getWrappedStack() != null) {
|
if (collatedStacks.get(i).getWrappedStack() != null) {
|
||||||
if (stack.getWrappedStack() instanceof ItemStack && collatedStacks.get(i).getWrappedStack() instanceof ItemStack) {
|
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());
|
collatedStacks.get(i).setStackSize(collatedStacks.get(i).getStackSize() + stack.getStackSize());
|
||||||
found = true;
|
found = true;
|
||||||
}
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.core.helper;
|
||||||
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.core.helper;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.core.helper;
|
||||||
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
|
@ -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.DrawBlockHighlightHandler;
|
||||||
import com.pahimar.ee3.core.handlers.KeyBindingHandler;
|
import com.pahimar.ee3.core.handlers.KeyBindingHandler;
|
||||||
import com.pahimar.ee3.core.handlers.TransmutationTargetOverlayHandler;
|
import com.pahimar.ee3.core.handlers.TransmutationTargetOverlayHandler;
|
||||||
import com.pahimar.ee3.core.util.ItemUtil;
|
import com.pahimar.ee3.core.helper.ItemHelper;
|
||||||
import com.pahimar.ee3.core.util.KeyBindingUtil;
|
import com.pahimar.ee3.core.helper.KeyBindingHelper;
|
||||||
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.IChargeable;
|
||||||
import com.pahimar.ee3.lib.ActionTypes;
|
import com.pahimar.ee3.lib.ActionTypes;
|
||||||
import com.pahimar.ee3.lib.BlockIds;
|
import com.pahimar.ee3.lib.BlockIds;
|
||||||
|
@ -83,8 +83,8 @@ public class ClientProxy extends CommonProxy {
|
||||||
@Override
|
@Override
|
||||||
public void setKeyBinding(String name, int value) {
|
public void setKeyBinding(String name, int value) {
|
||||||
|
|
||||||
KeyBindingUtil.addKeyBinding(name, value);
|
KeyBindingHelper.addKeyBinding(name, value);
|
||||||
KeyBindingUtil.addIsRepeating(false);
|
KeyBindingHelper.addIsRepeating(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -157,7 +157,7 @@ public class ClientProxy extends CommonProxy {
|
||||||
|
|
||||||
ItemStack itemStack = new ItemStack(itemID, stackSize, metaData);
|
ItemStack itemStack = new ItemStack(itemID, stackSize, metaData);
|
||||||
if (color != Integer.parseInt(Colours.PURE_WHITE, 16)) {
|
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);
|
((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);
|
ItemStack itemStack = new ItemStack(itemID, stackSize, metaData);
|
||||||
if (color != Integer.parseInt(Colours.PURE_WHITE, 16)) {
|
if (color != Integer.parseInt(Colours.PURE_WHITE, 16)) {
|
||||||
ItemUtil.setColor(itemStack, color);
|
ItemHelper.setColor(itemStack, color);
|
||||||
}
|
}
|
||||||
|
|
||||||
((TileAludel) tileEntity).setInventorySlotContents(TileAludel.INPUT_INVENTORY_INDEX, itemStack);
|
((TileAludel) tileEntity).setInventorySlotContents(TileAludel.INPUT_INVENTORY_INDEX, itemStack);
|
||||||
|
|
|
@ -6,8 +6,8 @@ import java.util.Map;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
|
|
||||||
import com.pahimar.ee3.core.util.EnergyStack;
|
|
||||||
import com.pahimar.ee3.item.CustomWrappedStack;
|
import com.pahimar.ee3.item.CustomWrappedStack;
|
||||||
|
import com.pahimar.ee3.item.EnergyStack;
|
||||||
|
|
||||||
public class EmcDefaultValues {
|
public class EmcDefaultValues {
|
||||||
|
|
||||||
|
|
|
@ -7,9 +7,7 @@ import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
|
|
||||||
import com.pahimar.ee3.core.util.EnergyStack;
|
import com.pahimar.ee3.core.helper.ItemHelper;
|
||||||
import com.pahimar.ee3.core.util.ItemUtil;
|
|
||||||
import com.pahimar.ee3.core.util.OreStack;
|
|
||||||
import com.pahimar.ee3.lib.Reference;
|
import com.pahimar.ee3.lib.Reference;
|
||||||
|
|
||||||
public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
|
public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
|
||||||
|
@ -182,7 +180,7 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
|
||||||
CustomWrappedStack customWrappedStack = (CustomWrappedStack) object;
|
CustomWrappedStack customWrappedStack = (CustomWrappedStack) object;
|
||||||
|
|
||||||
if ((this.getWrappedStack() instanceof ItemStack) && (customWrappedStack.getWrappedStack() instanceof ItemStack)) {
|
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)) {
|
else if ((this.getWrappedStack() instanceof OreStack) && (customWrappedStack.getWrappedStack() instanceof OreStack)) {
|
||||||
return (oreStack.equals(customWrappedStack.getWrappedStack()) && (stackSize == customWrappedStack.stackSize));
|
return (oreStack.equals(customWrappedStack.getWrappedStack()) && (stackSize == customWrappedStack.stackSize));
|
||||||
|
@ -310,10 +308,10 @@ public class CustomWrappedStack implements Comparable<CustomWrappedStack> {
|
||||||
else if (customWrappedStack.getWrappedStack() instanceof OreStack)
|
else if (customWrappedStack.getWrappedStack() instanceof OreStack)
|
||||||
return 1;
|
return 1;
|
||||||
else if (customWrappedStack.getWrappedStack() instanceof ItemStack) {
|
else if (customWrappedStack.getWrappedStack() instanceof ItemStack) {
|
||||||
if (ItemUtil.compare(itemStack, customWrappedStack.itemStack))
|
if (ItemHelper.compare(itemStack, customWrappedStack.itemStack))
|
||||||
return stackSize - customWrappedStack.stackSize;
|
return stackSize - customWrappedStack.stackSize;
|
||||||
else
|
else
|
||||||
return ItemUtil.ItemStackComparator.compare(itemStack, customWrappedStack.itemStack);
|
return ItemHelper.ItemStackComparator.compare(itemStack, customWrappedStack.itemStack);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.item;
|
||||||
|
|
||||||
public class EnergyStack implements Comparable<EnergyStack> {
|
public class EnergyStack implements Comparable<EnergyStack> {
|
||||||
|
|
|
@ -8,7 +8,7 @@ import net.minecraft.util.Icon;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import com.pahimar.ee3.EquivalentExchange3;
|
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.Colours;
|
||||||
import com.pahimar.ee3.lib.GuiIds;
|
import com.pahimar.ee3.lib.GuiIds;
|
||||||
import com.pahimar.ee3.lib.Strings;
|
import com.pahimar.ee3.lib.Strings;
|
||||||
|
@ -113,12 +113,12 @@ public class ItemAlchemicalBag extends ItemEE {
|
||||||
|
|
||||||
public boolean hasColor(ItemStack itemStack) {
|
public boolean hasColor(ItemStack itemStack) {
|
||||||
|
|
||||||
return ItemUtil.hasColor(itemStack);
|
return ItemHelper.hasColor(itemStack);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getColor(ItemStack itemStack) {
|
public int getColor(ItemStack itemStack) {
|
||||||
|
|
||||||
return ItemUtil.getColor(itemStack);
|
return ItemHelper.getColor(itemStack);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setColor(ItemStack itemStack, int color) {
|
public void setColor(ItemStack itemStack, int color) {
|
||||||
|
@ -128,7 +128,7 @@ public class ItemAlchemicalBag extends ItemEE {
|
||||||
// TODO Localize
|
// TODO Localize
|
||||||
throw new UnsupportedOperationException("Cannot dye non-bags!");
|
throw new UnsupportedOperationException("Cannot dye non-bags!");
|
||||||
else {
|
else {
|
||||||
ItemUtil.setColor(itemStack, color);
|
ItemHelper.setColor(itemStack, color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ import net.minecraft.world.World;
|
||||||
|
|
||||||
import com.pahimar.ee3.EquivalentExchange3;
|
import com.pahimar.ee3.EquivalentExchange3;
|
||||||
import com.pahimar.ee3.configuration.ConfigurationSettings;
|
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.GuiIds;
|
||||||
import com.pahimar.ee3.lib.Strings;
|
import com.pahimar.ee3.lib.Strings;
|
||||||
import com.pahimar.ee3.nbt.NBTHelper;
|
import com.pahimar.ee3.nbt.NBTHelper;
|
||||||
|
|
|
@ -7,7 +7,7 @@ import net.minecraft.world.World;
|
||||||
|
|
||||||
import com.pahimar.ee3.EquivalentExchange3;
|
import com.pahimar.ee3.EquivalentExchange3;
|
||||||
import com.pahimar.ee3.configuration.ConfigurationSettings;
|
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.GuiIds;
|
||||||
import com.pahimar.ee3.lib.Sounds;
|
import com.pahimar.ee3.lib.Sounds;
|
||||||
import com.pahimar.ee3.lib.Strings;
|
import com.pahimar.ee3.lib.Strings;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.pahimar.ee3.core.util;
|
package com.pahimar.ee3.item;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
|
@ -4,7 +4,7 @@ import java.util.List;
|
||||||
|
|
||||||
import com.google.common.collect.HashMultimap;
|
import com.google.common.collect.HashMultimap;
|
||||||
import com.google.common.collect.Multimap;
|
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;
|
import com.pahimar.ee3.item.CustomWrappedStack;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -9,8 +9,8 @@ import net.minecraft.item.crafting.FurnaceRecipes;
|
||||||
|
|
||||||
import com.google.common.collect.HashMultimap;
|
import com.google.common.collect.HashMultimap;
|
||||||
import com.google.common.collect.Multimap;
|
import com.google.common.collect.Multimap;
|
||||||
import com.pahimar.ee3.core.util.EnergyStack;
|
|
||||||
import com.pahimar.ee3.item.CustomWrappedStack;
|
import com.pahimar.ee3.item.CustomWrappedStack;
|
||||||
|
import com.pahimar.ee3.item.EnergyStack;
|
||||||
|
|
||||||
public class RecipesSmelting {
|
public class RecipesSmelting {
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ import net.minecraft.item.crafting.IRecipe;
|
||||||
|
|
||||||
import com.google.common.collect.HashMultimap;
|
import com.google.common.collect.HashMultimap;
|
||||||
import com.google.common.collect.Multimap;
|
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;
|
import com.pahimar.ee3.item.CustomWrappedStack;
|
||||||
|
|
||||||
public class RecipesVanilla {
|
public class RecipesVanilla {
|
||||||
|
|
|
@ -3,7 +3,7 @@ package com.pahimar.ee3.lib;
|
||||||
import net.minecraft.client.renderer.texture.TextureMap;
|
import net.minecraft.client.renderer.texture.TextureMap;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
import com.pahimar.ee3.core.util.ResourceLocationHelper;
|
import com.pahimar.ee3.core.helper.ResourceLocationHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Equivalent-Exchange-3
|
* Equivalent-Exchange-3
|
||||||
|
|
|
@ -21,9 +21,9 @@ import net.minecraft.nbt.NBTTagLong;
|
||||||
import net.minecraft.nbt.NBTTagShort;
|
import net.minecraft.nbt.NBTTagShort;
|
||||||
import net.minecraft.nbt.NBTTagString;
|
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.CustomWrappedStack;
|
||||||
|
import com.pahimar.ee3.item.EnergyStack;
|
||||||
|
import com.pahimar.ee3.item.OreStack;
|
||||||
import com.pahimar.ee3.lib.Strings;
|
import com.pahimar.ee3.lib.Strings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.nbt.NBTTagList;
|
import net.minecraft.nbt.NBTTagList;
|
||||||
import net.minecraft.network.packet.Packet;
|
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.lib.Strings;
|
||||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||||
import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate;
|
import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate;
|
||||||
|
@ -164,7 +164,7 @@ public class TileAludel extends TileEE implements IInventory {
|
||||||
ItemStack itemStack = getStackInSlot(INPUT_INVENTORY_INDEX);
|
ItemStack itemStack = getStackInSlot(INPUT_INVENTORY_INDEX);
|
||||||
|
|
||||||
if (itemStack != null && itemStack.stackSize > 0)
|
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
|
else
|
||||||
return super.getDescriptionPacket();
|
return super.getDescriptionPacket();
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.nbt.NBTTagList;
|
import net.minecraft.nbt.NBTTagList;
|
||||||
import net.minecraft.network.packet.Packet;
|
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.lib.Strings;
|
||||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||||
import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate;
|
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);
|
ItemStack itemStack = getStackInSlot(DISPLAY_SLOT_INVENTORY_INDEX);
|
||||||
|
|
||||||
if (itemStack != null && itemStack.stackSize > 0)
|
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
|
else
|
||||||
return super.getDescriptionPacket();
|
return super.getDescriptionPacket();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue