tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge branch 'development' into 1.8

Browse source
This commit is contained in:
Ben Spiers 2014-07-31 15:59:30 +01:00
commit 4faa733106
16 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/api/AdvancedInput.java
View file

@ -1,7 +1,7 @@
package mekanism.api; package mekanism.api;
import mekanism.api.gas.Gas; import mekanism.api.gas.Gas;
import mekanism.common.util.StackUtils;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public class AdvancedInput public class AdvancedInput

1
src/main/java/mekanism/api/ChanceOutput.java
View file

@ -2,7 +2,6 @@ package mekanism.api;
import java.util.Random; import java.util.Random;
import mekanism.common.util.StackUtils;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public class ChanceOutput public class ChanceOutput

2
src/main/java/mekanism/api/PressurizedReactants.java
View file

@ -2,7 +2,7 @@ package mekanism.api;
import mekanism.api.gas.GasStack; import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTank; import mekanism.api.gas.GasTank;
import mekanism.common.util.StackUtils;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTank;

2
src/main/java/mekanism/common/util/StackUtils.java → src/main/java/mekanism/api/StackUtils.java
View file

@ -1,4 +1,4 @@
package mekanism.common.util; package mekanism.api;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
src/main/java/mekanism/client/ClientTickHandler.java
View file

@ -39,7 +39,7 @@ import mekanism.common.network.PacketScubaTankData.ScubaTankPacket;
import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage;
import mekanism.common.util.LangUtils; import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

2
src/main/java/mekanism/common/IFactory.java
View file

@ -10,7 +10,7 @@ import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.FurnaceRecipes;

2
src/main/java/mekanism/common/integration/OreDictManager.java
View file

@ -16,7 +16,7 @@ import mekanism.common.Mekanism;
import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;

2
src/main/java/mekanism/common/recipe/RecipeHandler.java
View file

@ -15,7 +15,7 @@ import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTank; import mekanism.api.gas.GasTank;
import mekanism.api.infuse.InfusionInput; import mekanism.api.infuse.InfusionInput;
import mekanism.api.infuse.InfusionOutput; import mekanism.api.infuse.InfusionOutput;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;

2
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
View file

@ -21,7 +21,7 @@ import mekanism.common.util.ChargeUtils;
import mekanism.common.util.InventoryUtils; import mekanism.common.util.InventoryUtils;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;

2
src/main/java/mekanism/common/tile/TileEntityBin.java
View file

@ -14,7 +14,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.transporter.TransporterManager; import mekanism.common.transporter.TransporterManager;
import mekanism.common.util.InventoryUtils; import mekanism.common.util.InventoryUtils;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import mekanism.common.util.TransporterUtils; import mekanism.common.util.TransporterUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;

2
src/main/java/mekanism/common/tile/TileEntityFactory.java
View file

@ -31,7 +31,7 @@ import mekanism.common.tile.component.TileComponentUpgrade;
import mekanism.common.util.ChargeUtils; import mekanism.common.util.ChargeUtils;
import mekanism.common.util.InventoryUtils; import mekanism.common.util.InventoryUtils;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;

2
src/main/java/mekanism/common/transporter/Finder.java
View file

@ -3,7 +3,7 @@ package mekanism.common.transporter;
import java.util.List; import java.util.List;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;

1
src/main/java/mekanism/common/util/InventoryUtils.java
View file

@ -1,6 +1,7 @@
package mekanism.common.util; package mekanism.common.util;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.api.StackUtils;
import mekanism.common.IInvConfiguration; import mekanism.common.IInvConfiguration;
import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityBin;
import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter;

2
src/main/java/mekanism/tools/item/ItemMekanismArmor.java
View file

@ -5,7 +5,7 @@ import java.util.List;
import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import mekanism.tools.common.MekanismTools; import mekanism.tools.common.MekanismTools;
import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;

2
src/main/java/mekanism/tools/item/ItemMekanismHoe.java
View file

@ -4,7 +4,7 @@ import java.util.List;
import mekanism.common.item.ItemMekanism; import mekanism.common.item.ItemMekanism;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

2
src/main/java/mekanism/tools/item/ItemMekanismTool.java
View file

@ -6,7 +6,7 @@ import java.util.List;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.StackUtils; import mekanism.api.StackUtils;
import mekanism.tools.common.MekanismTools; import mekanism.tools.common.MekanismTools;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;