From 59dab7c848b2b8d415a8c7f30096e9bed3876be2 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 31 Jul 2014 15:58:02 +0100 Subject: [PATCH] Move StackUtil to api package for not causing errors. --- src/main/java/mekanism/api/AdvancedInput.java | 2 +- src/main/java/mekanism/api/ChanceOutput.java | 1 - src/main/java/mekanism/api/PressurizedReactants.java | 2 +- src/main/java/mekanism/{common/util => api}/StackUtils.java | 2 +- src/main/java/mekanism/client/ClientTickHandler.java | 2 +- src/main/java/mekanism/common/IFactory.java | 2 +- src/main/java/mekanism/common/integration/OreDictManager.java | 2 +- src/main/java/mekanism/common/recipe/RecipeHandler.java | 2 +- .../mekanism/common/tile/TileEntityAdvancedElectricMachine.java | 2 +- src/main/java/mekanism/common/tile/TileEntityBin.java | 2 +- src/main/java/mekanism/common/tile/TileEntityFactory.java | 2 +- src/main/java/mekanism/common/transporter/Finder.java | 2 +- src/main/java/mekanism/common/util/InventoryUtils.java | 1 + src/main/java/mekanism/tools/item/ItemMekanismArmor.java | 2 +- src/main/java/mekanism/tools/item/ItemMekanismHoe.java | 2 +- src/main/java/mekanism/tools/item/ItemMekanismTool.java | 2 +- 16 files changed, 15 insertions(+), 15 deletions(-) rename src/main/java/mekanism/{common/util => api}/StackUtils.java (98%) diff --git a/src/main/java/mekanism/api/AdvancedInput.java b/src/main/java/mekanism/api/AdvancedInput.java index 8d2859af9..46ede3fe3 100644 --- a/src/main/java/mekanism/api/AdvancedInput.java +++ b/src/main/java/mekanism/api/AdvancedInput.java @@ -1,7 +1,7 @@ package mekanism.api; import mekanism.api.gas.Gas; -import mekanism.common.util.StackUtils; + import net.minecraft.item.ItemStack; public class AdvancedInput diff --git a/src/main/java/mekanism/api/ChanceOutput.java b/src/main/java/mekanism/api/ChanceOutput.java index 97ff0b7de..5b3e512da 100644 --- a/src/main/java/mekanism/api/ChanceOutput.java +++ b/src/main/java/mekanism/api/ChanceOutput.java @@ -2,7 +2,6 @@ package mekanism.api; import java.util.Random; -import mekanism.common.util.StackUtils; import net.minecraft.item.ItemStack; public class ChanceOutput diff --git a/src/main/java/mekanism/api/PressurizedReactants.java b/src/main/java/mekanism/api/PressurizedReactants.java index 07e588235..d0c3ac8de 100644 --- a/src/main/java/mekanism/api/PressurizedReactants.java +++ b/src/main/java/mekanism/api/PressurizedReactants.java @@ -2,7 +2,7 @@ package mekanism.api; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; -import mekanism.common.util.StackUtils; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/common/util/StackUtils.java b/src/main/java/mekanism/api/StackUtils.java similarity index 98% rename from src/main/java/mekanism/common/util/StackUtils.java rename to src/main/java/mekanism/api/StackUtils.java index 9b8e78611..f175879bc 100644 --- a/src/main/java/mekanism/common/util/StackUtils.java +++ b/src/main/java/mekanism/api/StackUtils.java @@ -1,4 +1,4 @@ -package mekanism.common.util; +package mekanism.api; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index ceb7ce012..ba20f0767 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -36,7 +36,7 @@ import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/IFactory.java b/src/main/java/mekanism/common/IFactory.java index 8bc5d479b..d8bc2cccd 100644 --- a/src/main/java/mekanism/common/IFactory.java +++ b/src/main/java/mekanism/common/IFactory.java @@ -10,7 +10,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index d38d930b6..f5a39c7ff 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -16,7 +16,7 @@ import mekanism.common.Mekanism; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/mekanism/common/recipe/RecipeHandler.java b/src/main/java/mekanism/common/recipe/RecipeHandler.java index 9e2d1aa21..859c5b983 100644 --- a/src/main/java/mekanism/common/recipe/RecipeHandler.java +++ b/src/main/java/mekanism/common/recipe/RecipeHandler.java @@ -15,7 +15,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.infuse.InfusionInput; import mekanism.api.infuse.InfusionOutput; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 45c6355bf..3debead7b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -21,7 +21,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index f79f0898a..b8114a473 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -14,7 +14,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.transporter.TransporterManager; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index ee2f59b2e..4e8bbb0c8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -32,7 +32,7 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/transporter/Finder.java b/src/main/java/mekanism/common/transporter/Finder.java index 1113c9511..5cfa3bbb5 100644 --- a/src/main/java/mekanism/common/transporter/Finder.java +++ b/src/main/java/mekanism/common/transporter/Finder.java @@ -3,7 +3,7 @@ package mekanism.common.transporter; import java.util.List; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index ed04e5455..7b6d6edf8 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -1,6 +1,7 @@ package mekanism.common.util; import mekanism.api.EnumColor; +import mekanism.api.StackUtils; import mekanism.common.IInvConfiguration; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityLogisticalSorter; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 1d3a068d9..70ea0beb7 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -5,7 +5,7 @@ import java.util.List; import mekanism.client.render.ModelCustomArmor; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import mekanism.tools.common.MekanismTools; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index bfb8ef3bd..b47ab340d 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -4,7 +4,7 @@ import java.util.List; import mekanism.common.item.ItemMekanism; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index 6843704e7..5e7aa0dbf 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -6,7 +6,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.StackUtils; +import mekanism.api.StackUtils; import mekanism.tools.common.MekanismTools; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister;