diff --git a/resources/assets/enderio/textures/gui/inhibitorObelisk.xcf b/resources/assets/enderio/textures/gui/inhibitorObelisk.xcf new file mode 100644 index 00000000..cc677d38 Binary files /dev/null and b/resources/assets/enderio/textures/gui/inhibitorObelisk.xcf differ diff --git a/src/main/java/crazypants/enderio/BlockEio.java b/src/main/java/crazypants/enderio/BlockEio.java index d84ab326..4947f348 100644 --- a/src/main/java/crazypants/enderio/BlockEio.java +++ b/src/main/java/crazypants/enderio/BlockEio.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import javax.annotation.Nullable; -import com.google.common.collect.Lists; - import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -15,14 +13,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.ITankAccess; +import com.google.common.collect.Lists; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.tool.ToolUtil; -import crazypants.util.FluidUtil; -import crazypants.util.ITankAccess; public abstract class BlockEio extends Block { diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 6f592a9e..f41ce7eb 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -89,14 +89,10 @@ import crazypants.enderio.machine.light.ElectricLightRenderer; import crazypants.enderio.machine.obelisk.BlockObeliskAbstract; import crazypants.enderio.machine.obelisk.ObeliskRenderer; import crazypants.enderio.machine.obelisk.ObeliskSpecialRenderer; -import crazypants.enderio.machine.obelisk.attractor.BlockAttractor; import crazypants.enderio.machine.obelisk.attractor.TileAttractor; import crazypants.enderio.machine.obelisk.aversion.AversionObeliskRenderer; -import crazypants.enderio.machine.obelisk.aversion.BlockAversionObelisk; import crazypants.enderio.machine.obelisk.aversion.TileAversionObelisk; -import crazypants.enderio.machine.obelisk.weather.BlockWeatherObelisk; import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk; -import crazypants.enderio.machine.obelisk.xp.BlockExperienceObelisk; import crazypants.enderio.machine.obelisk.xp.TileExperienceOblisk; import crazypants.enderio.machine.painter.BlockPaintedFenceGate; import crazypants.enderio.machine.painter.BlockPaintedFenceGateRenderer; diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 8dee23f2..8bfb13c0 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -15,6 +15,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import com.enderio.core.common.util.EntityUtil; import com.google.common.collect.ImmutableList; import cpw.mods.fml.common.Loader; @@ -156,7 +157,7 @@ import crazypants.enderio.teleport.anchor.BlockTravelAnchor; import crazypants.enderio.teleport.telepad.BlockTelePad; import crazypants.enderio.teleport.telepad.ItemCoordSelector; import crazypants.enderio.thaumcraft.ThaumcraftCompat; -import crazypants.util.EntityUtil; + import static crazypants.enderio.EnderIO.*; @Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") diff --git a/src/main/java/crazypants/enderio/EnderIOTab.java b/src/main/java/crazypants/enderio/EnderIOTab.java index 0918e159..f659c2a8 100644 --- a/src/main/java/crazypants/enderio/EnderIOTab.java +++ b/src/main/java/crazypants/enderio/EnderIOTab.java @@ -1,11 +1,12 @@ package crazypants.enderio; -import static crazypants.enderio.EnderIO.MODID; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import static crazypants.enderio.EnderIO.MODID; + public class EnderIOTab extends CreativeTabs { public static final CreativeTabs tabEnderIO = new EnderIOTab(); diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index f7ecd52d..0a7b1829 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -5,12 +5,14 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; + +import com.enderio.core.common.util.IProgressTile; +import com.enderio.core.common.util.Util; + import crazypants.enderio.config.Config; import crazypants.enderio.machine.PacketProgress; import crazypants.enderio.network.PacketHandler; -import crazypants.util.BlockCoord; -import crazypants.util.IProgressTile; -import crazypants.util.Util; +import com.enderio.core.common.util.BlockCoord; public abstract class TileEntityEio extends TileEntity { diff --git a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java index dfd492e1..36af0fe1 100644 --- a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java +++ b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java @@ -3,7 +3,7 @@ package crazypants.enderio.api.teleport; import javax.annotation.Nullable; import net.minecraft.entity.Entity; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public interface ITelePad extends ITravelAccessable { diff --git a/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java b/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java index c0100473..a53f2a17 100644 --- a/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java +++ b/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java @@ -4,7 +4,7 @@ import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public interface ITravelAccessable { diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java index 504c660f..f078c4ab 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java @@ -34,7 +34,7 @@ import crazypants.enderio.machine.painter.IPaintedBlock; import crazypants.enderio.machine.painter.PaintSourceValidator; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.machine.painter.TileEntityPaintedBlock; -import crazypants.util.Util; +import com.enderio.core.common.util.Util; public class BlockDarkSteelPressurePlate extends BlockPressurePlate implements IResourceTooltipProvider, ITileEntityProvider, IPaintedBlock { diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index 7afff2a9..02b5140c 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -17,12 +17,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.geom.CollidableCache; import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; -import crazypants.util.BlockCoord; public abstract class AbstractConduit implements IConduit { diff --git a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java index 58e4cfc0..8b1b1d40 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java @@ -13,14 +13,16 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.Util; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.util.BlockCoord; -import crazypants.util.Util; +import com.enderio.core.common.util.BlockCoord; public abstract class AbstractItemConduit extends Item implements IConduitItem { diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index f603a5da..f861c787 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -26,6 +26,9 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed; import powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode; import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType; + +import com.enderio.core.common.util.Util; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -64,7 +67,6 @@ import crazypants.enderio.tool.ToolUtil; import crazypants.render.BoundingBox; import crazypants.render.RenderUtil; import crazypants.util.IFacade; -import crazypants.util.Util; @Optional.Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode", modid = "MineFactoryReloaded") public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade, IRotatableFacade, IRedNetOmniNode { diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index c1fcd73e..d7361877 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -19,7 +19,8 @@ import crazypants.enderio.material.Alloy; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.Material; -import static crazypants.enderio.ModObject.*; + +import static crazypants.enderio.ModObject.blockPainter; public class ConduitRecipes { diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index 7a9dc356..3fb5e05d 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -18,13 +18,15 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + +import com.enderio.core.common.util.DyeColor; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.Log; -import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.api.tool.IHideFacades; import crazypants.enderio.conduit.IConduitBundle.FacadeRenderState; import crazypants.enderio.conduit.gas.GasConduitNetwork; @@ -47,8 +49,7 @@ import crazypants.enderio.conduit.redstone.RedstoneConduitNetwork; import crazypants.enderio.conduit.redstone.Signal; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.tool.ToolUtil; -import crazypants.util.BlockCoord; -import crazypants.util.DyeColor; +import com.enderio.core.common.util.BlockCoord; public class ConduitUtil { diff --git a/src/main/java/crazypants/enderio/conduit/ConnectionMode.java b/src/main/java/crazypants/enderio/conduit/ConnectionMode.java index 85d2362e..d7b71c8a 100644 --- a/src/main/java/crazypants/enderio/conduit/ConnectionMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConnectionMode.java @@ -1,6 +1,7 @@ package crazypants.enderio.conduit; -import crazypants.util.Lang; +import com.enderio.core.common.util.Lang; + public enum ConnectionMode { diff --git a/src/main/java/crazypants/enderio/conduit/IConduit.java b/src/main/java/crazypants/enderio/conduit/IConduit.java index f201de9a..6ea91637 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduit.java +++ b/src/main/java/crazypants/enderio/conduit/IConduit.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public interface IConduit { diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index b9cd6ced..d4d2c51e 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -21,7 +21,7 @@ import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.power.IInternalPowerHandler; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; @InterfaceList({ @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2"), diff --git a/src/main/java/crazypants/enderio/conduit/IConduitItem.java b/src/main/java/crazypants/enderio/conduit/IConduitItem.java index b55d50ad..83384254 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitItem.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitItem.java @@ -1,7 +1,7 @@ package crazypants.enderio.conduit; -import net.minecraft.item.ItemStack; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import crazypants.enderio.api.tool.IHideFacades; public interface IConduitItem extends IHideFacades { diff --git a/src/main/java/crazypants/enderio/conduit/IExtractor.java b/src/main/java/crazypants/enderio/conduit/IExtractor.java index f6234b6f..7cca6a84 100644 --- a/src/main/java/crazypants/enderio/conduit/IExtractor.java +++ b/src/main/java/crazypants/enderio/conduit/IExtractor.java @@ -1,8 +1,10 @@ package crazypants.enderio.conduit; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.util.DyeColor; public interface IExtractor extends IConduit { diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index 2f8dffad..d40ded82 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -12,6 +12,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.Util; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,8 +31,6 @@ import crazypants.enderio.machine.painter.BasicPainterTemplate; import crazypants.enderio.machine.painter.IPaintedBlock; import crazypants.enderio.machine.painter.PaintSourceValidator; import crazypants.enderio.machine.painter.PainterUtil; -import crazypants.util.Lang; -import crazypants.util.Util; public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java index 95795d41..3b67c676 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java @@ -10,6 +10,9 @@ import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; @@ -17,8 +20,7 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.reservoir.TileReservoir; -import crazypants.util.BlockCoord; -import crazypants.util.DyeColor; +import com.enderio.core.common.util.BlockCoord; public abstract class AbstractGasConduit extends AbstractConduit implements IGasConduit { diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java index 3f89863e..6e12c2f1 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java @@ -12,7 +12,7 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.tool.ToolUtil; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public abstract class AbstractGasTankConduit extends AbstractGasConduit { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java index c807fa6c..3c01968e 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java @@ -19,7 +19,7 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.config.Config; import crazypants.render.IconUtil; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class GasConduit extends AbstractGasTankConduit { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java index 3505bf88..f7cb524d 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java @@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.IConduit; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class GasConduitNetwork extends AbstractGasTankConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java index 69b2b7df..109bee41 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java @@ -1,7 +1,5 @@ package crazypants.enderio.conduit.gas; -import static crazypants.render.CubeRenderer.addVecWithUV; - import java.util.List; import mekanism.api.gas.GasStack; @@ -9,6 +7,10 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vertex; + import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; @@ -20,8 +22,8 @@ import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.render.BoundingBox; import crazypants.render.RenderUtil; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vertex; + +import static crazypants.render.CubeRenderer.addVecWithUV; public class GasConduitRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java b/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java index c2ca8b06..70a4f6af 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java @@ -1,7 +1,7 @@ package crazypants.enderio.conduit.gas; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class GasOutput { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java index 4ca78213..56476711 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java @@ -8,7 +8,7 @@ import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.config.Config; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public final class GasUtil { diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index 5a160933..21db567b 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -4,6 +4,9 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ModObject; @@ -13,7 +16,6 @@ import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; -import crazypants.util.Lang; public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java b/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java index c6314815..74d336fa 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java @@ -5,11 +5,13 @@ import java.util.HashMap; import java.util.Map; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector3d; + import crazypants.enderio.conduit.IConduit; import crazypants.render.BoundingBox; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.VecmathUtil; -import crazypants.vecmath.Vector3d; public class ConduitGeometryUtil { diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java b/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java index 2ede91f9..0b46462b 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java @@ -1,7 +1,5 @@ package crazypants.enderio.conduit.geom; -import static crazypants.util.ForgeDirectionOffsets.*; - import java.util.ArrayList; import java.util.EnumMap; import java.util.List; @@ -9,14 +7,18 @@ import java.util.List; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vertex; + import crazypants.render.BoundingBox; import crazypants.render.RenderUtil; import crazypants.render.VertexRotation; import crazypants.render.VertexTransform; import crazypants.render.VertexTransformComposite; import crazypants.render.VertexTranslation; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vertex; + +import static com.enderio.core.common.util.ForgeDirectionOffsets.offsetScaled; public class ConnectionModeGeometry { @@ -98,7 +100,7 @@ public class ConnectionModeGeometry { public static void renderModeConnector(ForgeDirection dir, Offset offset, IIcon tex, boolean tintSides) { List verts = VERTS.get(dir); - if(verts == null) { + if (verts == null) { return; } @@ -111,19 +113,19 @@ public class ConnectionModeGeometry { Tessellator tes = Tessellator.instance; for (Vertex v : verts) { - if(tintSides) { + if (tintSides) { float cm = 1; - if(v.ny() > 0.1) { + if (v.ny() > 0.1) { cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.UP); - } else if(v.ny() < -0.1) { + } else if (v.ny() < -0.1) { cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.DOWN); - } else if(v.nx() > 0.1) { + } else if (v.nx() > 0.1) { cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.EAST); - } else if(v.nx() < -0.1) { + } else if (v.nx() < -0.1) { cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.WEST); - } else if(v.nz() > 0.1) { + } else if (v.nz() > 0.1) { cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.SOUTH); - } else if(v.nz() < -0.1) { + } else if (v.nz() < -0.1) { cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.NORTH); } tes.setColorOpaque_F(cm, cm, cm); diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index bd9295e4..7b67a2da 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -8,6 +8,8 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketConnectionMode; @@ -16,7 +18,6 @@ import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; -import crazypants.util.Lang; public class BaseSettingsPanel implements ITabPanel { diff --git a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java index dadb4db0..036b47e9 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java @@ -5,6 +5,10 @@ import java.awt.Color; import mekanism.api.gas.Gas; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.IIcon; + +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.gas.IGasConduit; @@ -17,8 +21,6 @@ import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.DyeColor; -import crazypants.util.Lang; public class GasSettings extends BaseSettingsPanel { diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index c1236fba..82534063 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -15,6 +15,7 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.common.Optional; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.gas.IGasConduit; @@ -28,8 +29,6 @@ import crazypants.enderio.gui.IconEIO; import crazypants.gui.GuiContainerBase; import crazypants.render.RenderUtil; -import cpw.mods.fml.common.Optional; - public class GuiExternalConnection extends GuiContainerBase { private static final int TAB_HEIGHT = 24; diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java index bba70c54..14472a59 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java @@ -18,7 +18,7 @@ import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class GuiExternalConnectionSelector extends GuiScreen { diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index e92bcacd..e7e2b863 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -14,6 +14,9 @@ import net.minecraftforge.fluids.Fluid; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.liquid.EnderLiquidConduit; @@ -31,8 +34,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.DyeColor; -import crazypants.util.Lang; public class LiquidSettings extends BaseSettingsPanel { diff --git a/src/main/java/crazypants/enderio/conduit/gui/MESettings.java b/src/main/java/crazypants/enderio/conduit/gui/MESettings.java index a2ab2ff6..c7298c27 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/MESettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/MESettings.java @@ -1,8 +1,9 @@ package crazypants.enderio.conduit.gui; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.IConduit; import crazypants.enderio.gui.IconEIO; -import crazypants.util.Lang; public class MESettings extends BaseSettingsPanel { diff --git a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java index 57bbd48d..f03c1859 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java @@ -1,6 +1,10 @@ package crazypants.enderio.conduit.gui; import net.minecraft.client.gui.GuiButton; + +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.conduit.power.IPowerConduit; @@ -10,8 +14,6 @@ import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; -import crazypants.util.DyeColor; -import crazypants.util.Lang; public class PowerSettings extends BaseSettingsPanel { diff --git a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java index e40122c3..e7202305 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java @@ -3,6 +3,10 @@ package crazypants.enderio.conduit.gui; import java.awt.Color; import net.minecraft.client.gui.GuiButton; + +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength; import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; @@ -12,8 +16,6 @@ import crazypants.enderio.gui.ColorButton; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; -import crazypants.util.DyeColor; -import crazypants.util.Lang; public class RedstoneSettings extends BaseSettingsPanel { diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java index 7daa8bcc..cace4994 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java @@ -4,6 +4,8 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.gui.IconButtonEIO; @@ -11,7 +13,6 @@ import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.gui.GuiContainerBase; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class BasicItemFilterGui implements IItemFilterGui { diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index 278ad914..9ac03640 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -1,20 +1,19 @@ package crazypants.enderio.conduit.gui.item; -import java.awt.Color; import java.awt.Rectangle; import java.util.List; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; + +import org.lwjgl.opengl.GL11; + +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.vecmath.Vector4f; + import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.ExistingItemFilter; @@ -24,10 +23,7 @@ import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.network.PacketHandler; import crazypants.gui.IGuiScreen; -import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; -import crazypants.vecmath.Vector4f; public class ExistingItemFilterGui implements IItemFilterGui { diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index e56d347f..3931bbf8 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -2,12 +2,16 @@ package crazypants.enderio.conduit.gui.item; import java.awt.Color; import java.awt.Rectangle; +import java.util.ArrayList; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.gui.BaseSettingsPanel; @@ -34,9 +38,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.DyeColor; -import crazypants.util.Lang; -import java.util.ArrayList; public class ItemSettings extends BaseSettingsPanel { diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java index d21e5c7f..23638fa2 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java @@ -3,12 +3,13 @@ package crazypants.enderio.conduit.gui.item; import java.awt.Color; import java.awt.Rectangle; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; + +import org.lwjgl.opengl.GL11; + import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.ModItemFilter; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PacketModItemFilter.java b/src/main/java/crazypants/enderio/conduit/gui/item/PacketModItemFilter.java index eaf9fa29..d9029326 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PacketModItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PacketModItemFilter.java @@ -1,19 +1,12 @@ package crazypants.enderio.conduit.gui.item; import io.netty.buffer.ByteBuf; - -import java.util.List; - -import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.item.IItemConduit; -import crazypants.enderio.conduit.item.ItemConduitNetwork; -import crazypants.enderio.conduit.item.NetworkedInventory; -import crazypants.enderio.conduit.item.filter.ExistingItemFilter; import crazypants.enderio.conduit.item.filter.ModItemFilter; import crazypants.enderio.conduit.packet.AbstractConduitPacket; import crazypants.enderio.conduit.packet.ConTypeEnum; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java index 9515d769..53d8f3b4 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java @@ -1,6 +1,9 @@ package crazypants.enderio.conduit.gui.item; import net.minecraft.client.gui.GuiButton; + +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.PowerItemFilter; @@ -8,7 +11,6 @@ import crazypants.enderio.conduit.packet.PacketItemConduitFilter; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.network.PacketHandler; -import crazypants.util.Lang; public class PowerItemFilterGui implements IItemFilterGui { diff --git a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java index 1f0712e1..21c04049 100644 --- a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java @@ -5,10 +5,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.transport.IItemDuct; + +import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IExtractor; import crazypants.enderio.conduit.item.filter.IItemFilter; -import crazypants.util.DyeColor; public interface IItemConduit extends IConduit, IItemDuct, IExtractor { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index d0a76e47..ddf2dd0a 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import cofh.api.inventory.IInventoryConnection; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -18,6 +17,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.inventory.IInventoryConnection; + +import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.AbstractConduitNetwork; @@ -33,8 +36,7 @@ import crazypants.enderio.item.PacketConduitProbe; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.tool.ToolUtil; import crazypants.render.IconUtil; -import crazypants.util.BlockCoord; -import crazypants.util.DyeColor; +import com.enderio.core.common.util.BlockCoord; public class ItemConduit extends AbstractConduit implements IItemConduit { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index 46489985..fef45f6d 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -9,12 +9,14 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.item.NetworkedInventory.Target; import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; +import com.enderio.core.common.util.BlockCoord; public class ItemConduitNetwork extends AbstractConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java index f31d35f3..073cb30b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java @@ -4,6 +4,9 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; @@ -11,7 +14,6 @@ import crazypants.enderio.conduit.geom.ConnectionModeGeometry; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; -import crazypants.util.DyeColor; public class ItemConduitRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java index 7d5ff4ae..b1614d92 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java @@ -1,18 +1,19 @@ package crazypants.enderio.conduit.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.gui.IResourceTooltipProvider; public class ItemFunctionUpgrade extends Item implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 24d94321..aa288408 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -13,14 +13,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.InventoryWrapper; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.RoundRobinIterator; + import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.config.Config; import crazypants.enderio.machine.invpanel.TileInventoryPanel; -import crazypants.util.BlockCoord; -import crazypants.util.InventoryWrapper; -import crazypants.util.ItemUtil; -import crazypants.util.RoundRobinIterator; +import com.enderio.core.common.util.BlockCoord; public class NetworkedInventory { @@ -369,7 +371,7 @@ public class NetworkedInventory { } private int distanceTo(NetworkedInventory other) { - return con.getLocation().distanceSquared(other.con.getLocation()); + return con.getLocation().getDistSq(other.con.getLocation()); } public ISidedInventory getInventory() { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java b/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java index f715f731..b32e7747 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java @@ -8,9 +8,11 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.conduit.item.FilterRegister; -import crazypants.util.Lang; public class ClearFilterRecipe implements IRecipe{ diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java index d0585164..dc525bb4 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.List; +import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -13,7 +14,6 @@ import net.minecraftforge.oredict.OreDictionary; import crazypants.enderio.conduit.item.NetworkedInventory; import crazypants.enderio.network.NetworkUtil; import crazypants.gui.GhostSlot; -import net.minecraft.inventory.IInventory; public class ExistingItemFilter implements IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBasicItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBasicItemFilter.java index 99081d70..01ebc68b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBasicItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBasicItemFilter.java @@ -10,6 +10,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +20,6 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.gui.TooltipAddera; -import crazypants.util.Lang; public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java index 3d100ae5..bc75f13b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java @@ -11,6 +11,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; + +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -19,8 +23,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java index 4a53db3a..d5e6316c 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java @@ -7,6 +7,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -15,7 +18,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; -import crazypants.util.Lang; public class ItemModItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java index d2930696..28aea462 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java @@ -2,14 +2,11 @@ package crazypants.enderio.conduit.item.filter; import io.netty.buffer.ByteBuf; -import java.util.Collections; import java.util.List; -import cofh.api.energy.IEnergyContainerItem; - -import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cofh.api.energy.IEnergyContainerItem; import crazypants.enderio.conduit.item.NetworkedInventory; import crazypants.enderio.network.NetworkUtil; import crazypants.gui.GhostSlot; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index d2c7c563..59280942 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -10,6 +10,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.util.FluidUtil; + import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; @@ -17,9 +22,6 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.reservoir.TileReservoir; -import crazypants.util.BlockCoord; -import crazypants.util.DyeColor; -import crazypants.util.FluidUtil; public abstract class AbstractLiquidConduit extends AbstractConduit implements ILiquidConduit { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java index 4eefc32c..4b867476 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java @@ -12,13 +12,15 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.tool.ToolUtil; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; +import com.enderio.core.common.util.BlockCoord; public abstract class AbstractTankConduit extends AbstractLiquidConduit { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java index 86f0bd7b..7bda153e 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java @@ -22,7 +22,7 @@ import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.config.Config; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.render.IconUtil; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class AdvancedLiquidConduit extends AbstractTankConduit { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java index 590071f5..076dc96c 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java @@ -9,9 +9,11 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.FluidUtil; + import crazypants.enderio.conduit.IConduit; -import crazypants.util.BlockCoord; -import crazypants.util.FluidUtil; +import com.enderio.core.common.util.BlockCoord; public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java index 2c1fa201..fea8dad2 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java @@ -7,6 +7,10 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; + +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vertex; + import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; @@ -18,10 +22,8 @@ import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.render.BoundingBox; import crazypants.render.RenderUtil; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vertex; -import static crazypants.render.CubeRenderer.*; +import static crazypants.render.CubeRenderer.addVecWithUV; public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java index 5cc3ab51..7a9df8dd 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java @@ -28,7 +28,7 @@ import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.tool.ToolUtil; import crazypants.render.IconUtil; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class EnderLiquidConduit extends AbstractLiquidConduit { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java index 22d10c94..886c83cf 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java @@ -9,12 +9,14 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.RoundRobinIterator; + import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.config.Config; -import crazypants.util.BlockCoord; -import crazypants.util.FluidUtil; -import crazypants.util.RoundRobinIterator; +import com.enderio.core.common.util.BlockCoord; public class EnderLiquidConduitNetwork extends AbstractConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java b/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java index 7f206cd8..c7d6fbee 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java @@ -6,7 +6,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import crazypants.util.FluidUtil; + +import com.enderio.core.common.util.FluidUtil; public class FluidFilter { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java index 7260c6df..8d8a6fcb 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java @@ -4,6 +4,9 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ModObject; @@ -13,7 +16,6 @@ import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; -import crazypants.util.Lang; public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java index 701f8f7d..26d0854e 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -28,7 +28,7 @@ import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.config.Config; import crazypants.enderio.network.PacketHandler; import crazypants.render.IconUtil; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class LiquidConduit extends AbstractTankConduit { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java index fa55976b..0917acf8 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java @@ -9,7 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import crazypants.enderio.conduit.ConduitUtil; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class LiquidConduitNetwork extends AbstractTankConduitNetwork { @@ -175,7 +175,7 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork 0) { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java index 81386107..1d3c9a5e 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java @@ -1,7 +1,5 @@ package crazypants.enderio.conduit.liquid; -import static crazypants.render.CubeRenderer.*; - import java.util.Collection; import java.util.List; @@ -10,6 +8,13 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; + +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector2f; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vertex; + import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; @@ -19,11 +24,8 @@ import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.render.BoundingBox; import crazypants.render.RenderUtil; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector2f; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vertex; + +import static crazypants.render.CubeRenderer.*; public class LiquidConduitRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java index cffe7b15..50556db7 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java @@ -1,7 +1,7 @@ package crazypants.enderio.conduit.liquid; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class LiquidOutput { diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index f8d07cfa..22abfacc 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -30,7 +30,7 @@ import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.tool.ToolUtil; import crazypants.render.IconUtil; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class MEConduit extends AbstractConduit implements IMEConduit { diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java b/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java index d0d85e5b..05597d1a 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java @@ -2,12 +2,14 @@ package crazypants.enderio.conduit.packet; import io.netty.buffer.ByteBuf; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.IExtractor; import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.util.DyeColor; public class PacketExtractMode extends AbstractConduitPacket implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java index c19bdbeb..970cf655 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java @@ -2,13 +2,15 @@ package crazypants.enderio.conduit.packet; import io.netty.buffer.ByteBuf; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.IItemFilter; -import crazypants.util.DyeColor; public class PacketItemConduitFilter extends AbstractConduitPacket implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java b/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java index d6560652..b3bb4bc8 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java @@ -2,11 +2,13 @@ package crazypants.enderio.conduit.packet; import io.netty.buffer.ByteBuf; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; -import crazypants.util.DyeColor; public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java index ec4768f8..136212db 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -4,6 +4,9 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ModObject; @@ -12,7 +15,6 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.ICapacitor; -import crazypants.util.Lang; public class ItemPowerConduit extends AbstractItemConduit { diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 0982827f..5e8754e9 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -18,6 +18,10 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.vecmath.Vector3d; + import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.AbstractConduitNetwork; @@ -39,8 +43,6 @@ import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.tool.ToolUtil; import crazypants.render.BoundingBox; import crazypants.render.IconUtil; -import crazypants.util.DyeColor; -import crazypants.vecmath.Vector3d; public class PowerConduit extends AbstractConduit implements IPowerConduit { diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java index a43f6f77..9b592007 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java @@ -10,10 +10,12 @@ import java.util.Set; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.power.IPowerInterface; -import crazypants.util.BlockCoord; public class PowerConduitNetwork extends AbstractConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java index 351159d8..51e3f937 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java @@ -4,6 +4,10 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector3d; + import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; @@ -15,8 +19,6 @@ import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector3d; public class PowerConduitRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/ConduitBundledRedstoneProvider.java b/src/main/java/crazypants/enderio/conduit/redstone/ConduitBundledRedstoneProvider.java index 5fc1446d..68533745 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/ConduitBundledRedstoneProvider.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/ConduitBundledRedstoneProvider.java @@ -1,13 +1,13 @@ package crazypants.enderio.conduit.redstone; -import crazypants.enderio.conduit.IConduitBundle; -import dan200.computercraft.api.ComputerCraftAPI; -import dan200.computercraft.api.redstone.IBundledRedstoneProvider; +import java.util.Set; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.Set; +import crazypants.enderio.conduit.IConduitBundle; +import dan200.computercraft.api.ComputerCraftAPI; +import dan200.computercraft.api.redstone.IBundledRedstoneProvider; public class ConduitBundledRedstoneProvider implements IBundledRedstoneProvider { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java index 055fa031..eb9cf66e 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java @@ -1,8 +1,10 @@ package crazypants.enderio.conduit.redstone; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.conduit.ConnectionMode; -import crazypants.util.DyeColor; public interface IInsulatedRedstoneConduit extends IRedstoneConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java index fbf8cbba..769b986f 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java @@ -4,8 +4,10 @@ import java.util.Set; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.conduit.IConduit; -import crazypants.util.DyeColor; public interface IRedstoneConduit extends IConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index 1ee4b876..887058b2 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -21,6 +21,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.tileentity.IRedstoneControl; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.DyeColor; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -36,8 +40,6 @@ import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.tool.ToolUtil; import crazypants.render.BoundingBox; import crazypants.render.IconUtil; -import crazypants.util.BlockCoord; -import crazypants.util.DyeColor; public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsulatedRedstoneConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java index 61822775..54109a8d 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java @@ -17,6 +17,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import powercrystals.minefactoryreloaded.api.rednet.IRedNetOutputNode; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.DyeColor; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; @@ -28,8 +32,6 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.render.IconUtil; -import crazypants.util.BlockCoord; -import crazypants.util.DyeColor; import dan200.computercraft.api.ComputerCraftAPI; public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java index 6d9c66e5..54bc3e8c 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java @@ -10,6 +10,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -19,9 +24,6 @@ import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.conduit.geom.Offset; import crazypants.render.BoundingBox; import crazypants.render.IconUtil; -import crazypants.util.BlockCoord; -import crazypants.util.DyeColor; -import crazypants.vecmath.Vector3d; public class RedstoneSwitch extends RedstoneConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java index fb1c9297..72809ae5 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java @@ -1,10 +1,11 @@ package crazypants.enderio.conduit.redstone; +import com.enderio.core.common.vecmath.Vector3d; + import crazypants.enderio.config.Config; import crazypants.render.BoundingBox; import crazypants.render.VertexRotation; import crazypants.render.VertexTransform; -import crazypants.vecmath.Vector3d; public class RedstoneSwitchBounds { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java index ae737713..13d5dd1d 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java @@ -4,6 +4,9 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.vecmath.Vector3d; + import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; @@ -15,7 +18,6 @@ import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.VertexTransform; -import crazypants.vecmath.Vector3d; public class RedstoneSwitchRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/Signal.java b/src/main/java/crazypants/enderio/conduit/redstone/Signal.java index bf8508ff..62d06199 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/Signal.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/Signal.java @@ -1,7 +1,8 @@ package crazypants.enderio.conduit.redstone; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.util.DyeColor; + +import com.enderio.core.common.util.DyeColor; public class Signal { diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index 0497a2a0..67ceb2bb 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -22,6 +22,8 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.IBlockAccessWrapper; import com.google.common.collect.Lists; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; @@ -46,8 +48,6 @@ import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.IconUtil; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.IBlockAccessWrapper; @SideOnly(Side.CLIENT) public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java index 587ab042..850bfe96 100644 --- a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java @@ -7,6 +7,9 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.vecmath.Vertex; + import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; @@ -14,7 +17,6 @@ import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.render.BoundingBox; import crazypants.render.RenderUtil; -import crazypants.vecmath.Vertex; import static crazypants.render.CubeRenderer.*; import static net.minecraftforge.common.util.ForgeDirection.*; diff --git a/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java b/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java index 8510f8e1..fe1bdf85 100644 --- a/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java @@ -1,21 +1,23 @@ package crazypants.enderio.conduit.render; -import static crazypants.util.ForgeDirectionOffsets.*; -import static net.minecraftforge.common.util.ForgeDirection.*; - import java.util.List; import net.minecraft.client.renderer.Tessellator; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.vecmath.Matrix4d; +import com.enderio.core.common.vecmath.Vector2f; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vertex; + import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.conduit.geom.Offsets; import crazypants.enderio.conduit.geom.Offsets.Axis; import crazypants.render.BoundingBox; -import crazypants.vecmath.Matrix4d; -import crazypants.vecmath.Vector2f; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vertex; + +import static com.enderio.core.common.util.ForgeDirectionOffsets.offsetScaled; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; public class RoundedSegmentRenderer { diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 19e721a8..75ccf0bc 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -6,7 +6,10 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; -import tterrag.core.common.event.ConfigFileChangedEvent; + +import com.enderio.core.common.event.ConfigFileChangedEvent; +import com.enderio.core.common.vecmath.VecmathUtil; + import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional.Method; @@ -16,7 +19,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.Log; import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask; -import crazypants.vecmath.VecmathUtil; public final class Config { diff --git a/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java b/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java index d34c4fa8..e7114a36 100644 --- a/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java +++ b/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java @@ -1,18 +1,20 @@ package crazypants.enderio.config; -import static crazypants.enderio.config.Config.*; - import java.util.ArrayList; import java.util.List; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.IConfigElement; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config.Section; -import crazypants.util.Lang; + +import static crazypants.enderio.config.Config.config; @SuppressWarnings({ "rawtypes" }) public class GuiConfigFactoryEIO extends GuiConfig { diff --git a/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java b/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java index 57529715..89f139e3 100644 --- a/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java +++ b/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java @@ -3,7 +3,6 @@ package crazypants.enderio.enchantment; import java.util.ListIterator; import java.util.Map; -import tterrag.core.api.common.enchant.IAdvancedEnchant; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnumEnchantmentType; @@ -17,12 +16,15 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; + +import com.enderio.core.api.common.enchant.IAdvancedEnchant; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.config.Config; import crazypants.util.BaublesUtil; -import crazypants.util.Lang; @Interface(iface = "tterrag.core.api.common.enchant.IAdvancedEnchant", modid = "ttCore") public class EnchantmentSoulBound extends Enchantment implements IAdvancedEnchant { diff --git a/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java b/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java index 1bb17732..bc914526 100644 --- a/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java +++ b/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java @@ -19,9 +19,9 @@ import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; -import crazypants.vecmath.Matrix4d; -import crazypants.vecmath.VecmathUtil; -import crazypants.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Matrix4d; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector3d; @SideOnly(Side.CLIENT) public class EnderIoRenderer extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java index 1fcc3e7e..d22dff7d 100644 --- a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java +++ b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java @@ -33,11 +33,11 @@ import crazypants.enderio.config.Config; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.TravelController; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.vecmath.Camera; -import crazypants.vecmath.Matrix4d; -import crazypants.vecmath.VecmathUtil; -import crazypants.vecmath.Vector3d; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Camera; +import com.enderio.core.common.vecmath.Matrix4d; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector3d; public class GuiEnderface extends GuiScreen { diff --git a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java index 097a8fe0..20f8e26f 100644 --- a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java +++ b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java @@ -15,8 +15,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; + +import com.enderio.core.common.util.EntityUtil; + import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.util.EntityUtil; public class EntityWitherSkeleton extends EntitySkeleton { public EntityWitherSkeleton(World world) { diff --git a/src/main/java/crazypants/enderio/fluid/Fluids.java b/src/main/java/crazypants/enderio/fluid/Fluids.java index 69968d4d..0c3f0447 100644 --- a/src/main/java/crazypants/enderio/fluid/Fluids.java +++ b/src/main/java/crazypants/enderio/fluid/Fluids.java @@ -1,7 +1,7 @@ package crazypants.enderio.fluid; import net.minecraftforge.fluids.IFluidTank; -import crazypants.util.Lang; +import com.enderio.core.common.util.Lang; public class Fluids { diff --git a/src/main/java/crazypants/enderio/gui/ColorButton.java b/src/main/java/crazypants/enderio/gui/ColorButton.java index b15c98ac..450eba12 100644 --- a/src/main/java/crazypants/enderio/gui/ColorButton.java +++ b/src/main/java/crazypants/enderio/gui/ColorButton.java @@ -7,8 +7,9 @@ import net.minecraft.util.MathHelper; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.DyeColor; + import crazypants.gui.IGuiScreen; -import crazypants.util.DyeColor; public class ColorButton extends IconButtonEIO { diff --git a/src/main/java/crazypants/enderio/gui/IGuiOverlay.java b/src/main/java/crazypants/enderio/gui/IGuiOverlay.java index 5ac43385..2f6ccb38 100644 --- a/src/main/java/crazypants/enderio/gui/IGuiOverlay.java +++ b/src/main/java/crazypants/enderio/gui/IGuiOverlay.java @@ -2,7 +2,6 @@ package crazypants.enderio.gui; import java.awt.Rectangle; -import net.minecraft.util.IIcon; import crazypants.gui.IGuiScreen; public interface IGuiOverlay { diff --git a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java index 3e946620..e6fd4693 100644 --- a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java +++ b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java @@ -29,6 +29,15 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL14; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.IBlockAccessWrapper; +import com.enderio.core.common.vecmath.Camera; +import com.enderio.core.common.vecmath.Matrix4d; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector4f; +import com.enderio.core.common.vecmath.Vertex; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -40,14 +49,6 @@ import crazypants.enderio.teleport.TravelController; import crazypants.render.BoundingBox; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.IBlockAccessWrapper; -import crazypants.vecmath.Camera; -import crazypants.vecmath.Matrix4d; -import crazypants.vecmath.VecmathUtil; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector4f; -import crazypants.vecmath.Vertex; public class IoConfigRenderer { diff --git a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java index 65f4ef95..943d42ad 100644 --- a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java +++ b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java @@ -1,13 +1,15 @@ package crazypants.enderio.gui; import net.minecraft.client.Minecraft; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.PacketRedstoneMode; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; import crazypants.gui.IGuiScreen; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; public class RedstoneModeButton extends IconButtonEIO { diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 1e83d649..21eccf3a 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -24,6 +24,9 @@ import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.input.Keyboard; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; @@ -39,8 +42,6 @@ import crazypants.enderio.machine.crusher.IGrindingMultiplier; import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer; import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; public class TooltipAddera { diff --git a/src/main/java/crazypants/enderio/gui/VScrollbarEIO.java b/src/main/java/crazypants/enderio/gui/VScrollbarEIO.java index 6b9cd05d..4af77799 100644 --- a/src/main/java/crazypants/enderio/gui/VScrollbarEIO.java +++ b/src/main/java/crazypants/enderio/gui/VScrollbarEIO.java @@ -1,11 +1,14 @@ package crazypants.enderio.gui; +import java.awt.Rectangle; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; + +import org.lwjgl.opengl.GL11; + import crazypants.gui.IGuiScreen; import crazypants.render.RenderUtil; -import java.awt.Rectangle; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import org.lwjgl.opengl.GL11; public class VScrollbarEIO { diff --git a/src/main/java/crazypants/enderio/item/ItemMagnet.java b/src/main/java/crazypants/enderio/item/ItemMagnet.java index f6f0dead..782e0e19 100644 --- a/src/main/java/crazypants/enderio/item/ItemMagnet.java +++ b/src/main/java/crazypants/enderio/item/ItemMagnet.java @@ -14,6 +14,9 @@ import net.minecraft.world.World; import baubles.api.BaubleType; import baubles.api.IBauble; import cofh.api.energy.ItemEnergyContainer; + +import com.enderio.core.common.util.ItemUtil; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.Optional.Method; @@ -27,7 +30,6 @@ import crazypants.enderio.config.Config; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.util.BaublesUtil; -import crazypants.util.ItemUtil; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles|API") public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipProvider, IBauble { diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 21f961fc..49c14619 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -26,6 +26,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; + +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.util.EntityUtil; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -34,9 +39,6 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IResourceTooltipProvider; -import crazypants.util.DyeColor; -import crazypants.util.EntityUtil; -import crazypants.util.Lang; public class ItemSoulVessel extends Item implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index b6b034dd..fe6f6130 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -10,7 +10,8 @@ import net.minecraft.util.ChatComponentTranslation; import org.lwjgl.input.Keyboard; -import static crazypants.enderio.EnderIO.itemMagnet; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -29,7 +30,8 @@ import crazypants.enderio.item.darksteel.SpeedUpgrade; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade; import crazypants.util.BaublesUtil; -import crazypants.util.Lang; + +import static crazypants.enderio.EnderIO.itemMagnet; public class KeyTracker { diff --git a/src/main/java/crazypants/enderio/item/MagnetController.java b/src/main/java/crazypants/enderio/item/MagnetController.java index 1a98ce8a..8fe36eb5 100644 --- a/src/main/java/crazypants/enderio/item/MagnetController.java +++ b/src/main/java/crazypants/enderio/item/MagnetController.java @@ -21,6 +21,7 @@ import crazypants.enderio.config.Config; import crazypants.enderio.item.PacketMagnetState.SlotType; import crazypants.enderio.network.PacketHandler; import crazypants.util.BaublesUtil; + import static crazypants.enderio.EnderIO.itemMagnet; public class MagnetController implements IEntitySelector { diff --git a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java index f3888fc2..b0d0e06b 100644 --- a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java @@ -11,6 +11,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -27,7 +30,6 @@ import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.EnergyHandlerPI; import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.IInternalPoweredTile; -import crazypants.util.Lang; public class PacketConduitProbe implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/item/PacketConduitProbeMode.java b/src/main/java/crazypants/enderio/item/PacketConduitProbeMode.java index 77ec490a..e386aecf 100644 --- a/src/main/java/crazypants/enderio/item/PacketConduitProbeMode.java +++ b/src/main/java/crazypants/enderio/item/PacketConduitProbeMode.java @@ -1,12 +1,11 @@ package crazypants.enderio.item; -import net.minecraft.item.ItemStack; import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.ConduitDisplayMode; public class PacketConduitProbeMode implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/item/PacketMagnetState.java b/src/main/java/crazypants/enderio/item/PacketMagnetState.java index b1d954cc..7aa6814a 100644 --- a/src/main/java/crazypants/enderio/item/PacketMagnetState.java +++ b/src/main/java/crazypants/enderio/item/PacketMagnetState.java @@ -1,7 +1,7 @@ package crazypants.enderio.item; -import net.minecraft.entity.player.EntityPlayerMP; import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java index 55e6c2ed..751a38a5 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java @@ -6,11 +6,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; + +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.gui.TooltipAddera; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; public abstract class AbstractUpgrade implements IDarkSteelUpgrade { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ApiaristArmorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/ApiaristArmorUpgrade.java index d5165d0d..18c4951b 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ApiaristArmorUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ApiaristArmorUpgrade.java @@ -1,11 +1,10 @@ package crazypants.enderio.item.darksteel; -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.config.Config; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.config.Config; public class ApiaristArmorUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index e45ad0b8..ab6a6719 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -16,6 +16,12 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.util.MovementInput; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector4d; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; @@ -25,10 +31,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.machine.solar.TileEntitySolarPanel; import crazypants.enderio.network.PacketHandler; -import crazypants.util.Util; -import crazypants.vecmath.VecmathUtil; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector4d; public class DarkSteelController { diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index 1f4ebe7f..f5ee7911 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -13,15 +13,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.event.AnvilUpdateEvent; +import com.enderio.core.common.util.Lang; import com.google.common.collect.ImmutableList; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.EnderIO; import crazypants.enderio.material.Alloy; -import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade; import crazypants.enderio.thaumcraft.ThaumcraftCompat; -import crazypants.util.Lang; public class DarkSteelRecipeManager { diff --git a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java index 42d973f7..00fa2845 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java @@ -8,6 +8,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -15,7 +18,6 @@ import crazypants.enderio.config.Config; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Material; -import crazypants.util.Lang; public class EnergyUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java index 83382a67..ed8f9bda 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java @@ -2,7 +2,6 @@ package crazypants.enderio.item.darksteel; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; public class GliderUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 125ec1ad..25ca3acd 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -20,6 +20,10 @@ import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.nodes.IRevealer; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; @@ -31,8 +35,6 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; import forestry.api.apiculture.IArmorApiarist; import forestry.api.core.IArmorNaturalist; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 591dfe51..49f77d0e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -19,9 +19,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.oredict.OreDictionary; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -31,9 +35,6 @@ import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.farm.farmers.HarvestResult; import crazypants.enderio.machine.farm.farmers.TreeHarvestUtil; -import crazypants.util.BlockCoord; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { @@ -284,8 +285,8 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I @Override public int compare(BlockCoord arg0, BlockCoord arg1) { - int d1 = refPoint.distanceSquared(arg0); - int d2 = refPoint.distanceSquared(arg1); + int d1 = refPoint.getDistSq(arg0); + int d2 = refPoint.getDistSq(arg1); return compare(d1, d1); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 889f877a..e95241b9 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -19,6 +19,8 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; import com.google.common.collect.Sets; import cpw.mods.fml.common.registry.GameRegistry; @@ -32,8 +34,6 @@ import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.teleport.TravelController; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java index 8b44c941..7633e56e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java @@ -20,6 +20,11 @@ import net.minecraftforge.common.IShearable; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerEvent; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -28,9 +33,6 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.farm.farmers.HarvestResult; -import crazypants.util.BlockCoord; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; public class ItemDarkSteelShears extends ItemShears implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { @@ -274,8 +276,8 @@ public class ItemDarkSteelShears extends ItemShears implements IEnergyContainerI @Override public int compare(BlockCoord arg0, BlockCoord arg1) { - int d1 = refPoint.distanceSquared(arg0); - int d2 = refPoint.distanceSquared(arg1); + int d1 = refPoint.getDistSq(arg0); + int d2 = refPoint.getDistSq(arg1); return compare(d1, d1); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index fdabc9b5..78318658 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -24,6 +24,11 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.Util; + import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; @@ -36,9 +41,6 @@ import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.teleport.TravelController; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; -import crazypants.util.Util; public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { diff --git a/src/main/java/crazypants/enderio/item/darksteel/JumpUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/JumpUpgrade.java index ca59c00c..a7d94cd4 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/JumpUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/JumpUpgrade.java @@ -4,8 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; public class JumpUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java index ae37ba90..7f063bb0 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java @@ -1,12 +1,11 @@ package crazypants.enderio.item.darksteel; -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.config.Config; -import static crazypants.enderio.item.darksteel.AbstractUpgrade.KEY_UPGRADE_PREFIX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.config.Config; public class NaturalistEyeUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/item/darksteel/NightVisionUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/NightVisionUpgrade.java index 650927f3..06f2c58c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/NightVisionUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/NightVisionUpgrade.java @@ -1,11 +1,9 @@ package crazypants.enderio.item.darksteel; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionHelper; -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; public class NightVisionUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java b/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java index 7498c84f..13ee5a52 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java @@ -1,7 +1,7 @@ package crazypants.enderio.item.darksteel; -import net.minecraft.entity.player.EntityPlayerMP; import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java index 43f255e5..e0a0b45d 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java @@ -11,9 +11,11 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.common.vecmath.Vector4f; + import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.vecmath.Vector4f; public class PoweredItemRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java b/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java index 6922ea57..c19cc163 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java @@ -9,13 +9,15 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.client.event.sound.PlaySoundSourceEvent; import net.minecraftforge.event.entity.PlaySoundAtEntityEvent; + +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.config.Config; -import crazypants.util.Util; -import crazypants.vecmath.Vector3d; public class SoundDetector { diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundDetectorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SoundDetectorUpgrade.java index 64b6d8cf..88cabb9b 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundDetectorUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundDetectorUpgrade.java @@ -3,7 +3,6 @@ package crazypants.enderio.item.darksteel; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; public class SoundDetectorUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java b/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java index 0cf3ec73..98c8ed1f 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java @@ -1,12 +1,14 @@ package crazypants.enderio.item.darksteel; -import crazypants.enderio.config.Config; -import crazypants.vecmath.Vector3d; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import com.enderio.core.common.vecmath.Vector3d; + +import crazypants.enderio.config.Config; + public class SoundEntity extends Entity { int lifeSpan = Config.darkSteelSoundLocatorLifespan; diff --git a/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java index 687cc614..b8f0b167 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java @@ -4,12 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionHelper; -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; -import crazypants.enderio.material.Material; -import crazypants.util.Util; public class SpeedUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/item/darksteel/SpoonUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SpoonUpgrade.java index faede685..14b49b84 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SpoonUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SpoonUpgrade.java @@ -3,9 +3,7 @@ package crazypants.enderio.item.darksteel; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; -import crazypants.enderio.material.Material; public class SpoonUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java index ed7c1f7b..ba5c7071 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java @@ -3,7 +3,6 @@ package crazypants.enderio.item.darksteel; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; public class SwimUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java b/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java index 614acea8..de3da076 100644 --- a/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java +++ b/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java @@ -11,7 +11,7 @@ import crazypants.render.CubeRenderer; import crazypants.render.IconUtil; import crazypants.render.RenderUtil; import crazypants.render.VertexRotation; -import crazypants.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3d; import net.minecraft.block.Block; import net.minecraft.client.model.ModelEnderman; import net.minecraft.client.model.ModelSkeletonHead; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 4c7b6cbe..ed0d0740 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -16,6 +16,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.InventoryWrapper; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,10 +29,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.redstone.IRedstoneConnectable; import crazypants.enderio.config.Config; -import crazypants.util.BlockCoord; -import crazypants.util.InventoryWrapper; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; public abstract class AbstractMachineEntity extends TileEntityEio implements ISidedInventory, IMachine, IRedstoneModeControlable, IRedstoneConnectable, IIoConfigurable { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java index 6eb7b6d2..b4f16c7b 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java @@ -11,6 +11,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.vecmath.Vertex; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.machine.painter.IPaintableTileEntity; import crazypants.enderio.machine.painter.PaintedBlockRenderer; @@ -21,7 +24,6 @@ import crazypants.render.CustomCubeRenderer; import crazypants.render.CustomRenderBlocks; import crazypants.render.IconUtil; import crazypants.render.RenderUtil; -import crazypants.vecmath.Vertex; public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index 828cd871..5a7dd8d3 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -4,13 +4,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.vecmath.VecmathUtil; + import crazypants.enderio.EnderIO; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.vecmath.VecmathUtil; public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile { diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 1c995edb..cc674db3 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -8,9 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.IProgressTile; + import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.power.IInternalPowerReceiver; -import crazypants.util.IProgressTile; public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEntity implements IInternalPowerReceiver, IProgressTile { diff --git a/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java b/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java index 4c890081..64e8b1f2 100644 --- a/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java +++ b/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java @@ -10,8 +10,10 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import crazypants.util.Lang; public class ClearConfigRecipe implements IRecipe { diff --git a/src/main/java/crazypants/enderio/machine/ContinuousTask.java b/src/main/java/crazypants/enderio/machine/ContinuousTask.java index 7e3a03dd..ad45ebc9 100644 --- a/src/main/java/crazypants/enderio/machine/ContinuousTask.java +++ b/src/main/java/crazypants/enderio/machine/ContinuousTask.java @@ -1,8 +1,8 @@ package crazypants.enderio.machine; +import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.machine.recipe.RecipeBonusType; -import net.minecraft.nbt.NBTTagCompound; public class ContinuousTask implements IPoweredTask { diff --git a/src/main/java/crazypants/enderio/machine/IIoConfigurable.java b/src/main/java/crazypants/enderio/machine/IIoConfigurable.java index f18e8ad9..0e612414 100644 --- a/src/main/java/crazypants/enderio/machine/IIoConfigurable.java +++ b/src/main/java/crazypants/enderio/machine/IIoConfigurable.java @@ -1,7 +1,8 @@ package crazypants.enderio.machine; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.util.BlockCoord; + +import com.enderio.core.common.util.BlockCoord; public interface IIoConfigurable { diff --git a/src/main/java/crazypants/enderio/machine/IItemBuffer.java b/src/main/java/crazypants/enderio/machine/IItemBuffer.java index 25cd6af6..df2fc79d 100644 --- a/src/main/java/crazypants/enderio/machine/IItemBuffer.java +++ b/src/main/java/crazypants/enderio/machine/IItemBuffer.java @@ -1,6 +1,6 @@ package crazypants.enderio.machine; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public interface IItemBuffer { diff --git a/src/main/java/crazypants/enderio/machine/IMachineRecipe.java b/src/main/java/crazypants/enderio/machine/IMachineRecipe.java index af1b347d..e687c8c4 100644 --- a/src/main/java/crazypants/enderio/machine/IMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/IMachineRecipe.java @@ -4,7 +4,6 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; - import crazypants.enderio.machine.recipe.RecipeBonusType; /** diff --git a/src/main/java/crazypants/enderio/machine/IoMode.java b/src/main/java/crazypants/enderio/machine/IoMode.java index 1053a4cb..38231985 100644 --- a/src/main/java/crazypants/enderio/machine/IoMode.java +++ b/src/main/java/crazypants/enderio/machine/IoMode.java @@ -1,8 +1,10 @@ package crazypants.enderio.machine; import net.minecraft.util.EnumChatFormatting; + +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.ConnectionMode; -import crazypants.util.Lang; public enum IoMode { diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java b/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java index 397c2097..793111b8 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java @@ -6,9 +6,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; - public class MachineRecipeRegistry { public static final MachineRecipeRegistry instance = new MachineRecipeRegistry(); diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 1631dcfd..62d1d118 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine; -import static crazypants.enderio.EnderIO.itemBasicCapacitor; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -23,6 +22,8 @@ import crazypants.enderio.material.MachinePart; import crazypants.enderio.material.Material; import crazypants.enderio.power.Capacitors; +import static crazypants.enderio.EnderIO.itemBasicCapacitor; + public class MachineRecipes { public static void addRecipes() { diff --git a/src/main/java/crazypants/enderio/machine/OverlayRenderer.java b/src/main/java/crazypants/enderio/machine/OverlayRenderer.java index 0bb322da..f48cdfc6 100644 --- a/src/main/java/crazypants/enderio/machine/OverlayRenderer.java +++ b/src/main/java/crazypants/enderio/machine/OverlayRenderer.java @@ -7,14 +7,16 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vertex; + import crazypants.render.CustomCubeRenderer; import crazypants.render.CustomRenderBlocks; import crazypants.render.IRenderFace; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vertex; public class OverlayRenderer implements IRenderFace { diff --git a/src/main/java/crazypants/enderio/machine/PacketIoMode.java b/src/main/java/crazypants/enderio/machine/PacketIoMode.java index 57cb0c2c..46670aa7 100644 --- a/src/main/java/crazypants/enderio/machine/PacketIoMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketIoMode.java @@ -4,10 +4,12 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.util.BlockCoord; public class PacketIoMode implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/PacketItemBuffer.java b/src/main/java/crazypants/enderio/machine/PacketItemBuffer.java index 70b82a72..6d59d512 100644 --- a/src/main/java/crazypants/enderio/machine/PacketItemBuffer.java +++ b/src/main/java/crazypants/enderio/machine/PacketItemBuffer.java @@ -3,10 +3,12 @@ package crazypants.enderio.machine; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.util.BlockCoord; public class PacketItemBuffer implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java b/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java index de46abf1..b5fba683 100644 --- a/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java +++ b/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java @@ -3,12 +3,14 @@ package crazypants.enderio.machine; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.power.IPowerContainer; -import crazypants.util.BlockCoord; public class PacketPowerStorage implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/PacketProgress.java b/src/main/java/crazypants/enderio/machine/PacketProgress.java index 8a9225b5..0df18e9f 100644 --- a/src/main/java/crazypants/enderio/machine/PacketProgress.java +++ b/src/main/java/crazypants/enderio/machine/PacketProgress.java @@ -1,13 +1,15 @@ package crazypants.enderio.machine; -import net.minecraft.tileentity.TileEntity; import io.netty.buffer.ByteBuf; +import net.minecraft.tileentity.TileEntity; + +import com.enderio.core.common.util.IProgressTile; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.network.MessageTileEntity; -import crazypants.util.IProgressTile; public class PacketProgress extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java index 633cf6dc..9d8259ef 100644 --- a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java +++ b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java @@ -1,7 +1,8 @@ package crazypants.enderio.machine; import net.minecraft.tileentity.TileEntity; -import crazypants.util.Lang; + +import com.enderio.core.common.util.Lang; public enum RedstoneControlMode { diff --git a/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java b/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java index f863c013..205ee984 100644 --- a/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java +++ b/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java @@ -2,11 +2,10 @@ package crazypants.enderio.machine; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; - -import crazypants.enderio.power.PowerHandlerUtil; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.ShapedOreRecipe; +import crazypants.enderio.power.PowerHandlerUtil; public class UpgradeCapBankRecipe extends ShapedOreRecipe { diff --git a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java index 106f47b4..9d88f601 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java @@ -8,7 +8,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.stats.AchievementList; import crazypants.enderio.machine.gui.AbstractMachineContainer; -import crazypants.util.Util; +import com.enderio.core.common.util.Util; public class ContainerAlloySmelter extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java index 0f8e9fe0..76a453bc 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java @@ -16,8 +16,8 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.gui.IconButton; import crazypants.render.RenderUtil; -import crazypants.util.Lang; -import crazypants.vecmath.Vector4f; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.vecmath.Vector4f; public class GuiAlloySmelter extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java index f54e3490..b6423d42 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java @@ -13,7 +13,7 @@ import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.render.RenderUtil; -import crazypants.util.Lang; +import com.enderio.core.common.util.Lang; public class GuiBuffer extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java index 8b227988..f20602f3 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java @@ -13,7 +13,7 @@ import crazypants.enderio.machine.painter.IPaintableTileEntity; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.power.IInternalPowerHandler; import crazypants.enderio.power.PowerDistributor; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintableTileEntity, IInternalPowerHandler { diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 63893465..0bd4d15b 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -22,6 +22,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -50,9 +55,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.tool.ToolUtil; import crazypants.enderio.waila.IWailaInfoProvider; -import crazypants.util.Lang; -import crazypants.util.Util; -import crazypants.vecmath.Vector3d; public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider, IRedstoneConnectable { diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 6a8446a1..b3953028 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -13,6 +13,10 @@ import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.vecmath.VecmathUtil; + import crazypants.enderio.EnderIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.gui.TextFieldEIO; @@ -30,9 +34,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; -import crazypants.vecmath.VecmathUtil; public class GuiCapBank extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 8b823f84..4d522ea9 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -18,6 +18,12 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.EntityUtil; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -38,10 +44,6 @@ import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.IPowerStorage; import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.util.BlockCoord; -import crazypants.util.EntityUtil; -import crazypants.util.Util; -import crazypants.vecmath.Vector3d; public class TileCapBank extends TileEntityEio implements IInternalPowerReceiver, IInventory, IIoConfigurable, IPowerStorage { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index a87ded96..a3e5a183 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -1,11 +1,16 @@ package crazypants.enderio.machine.capbank.network; import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.EnderIO; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.CapBankType; @@ -15,9 +20,6 @@ import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IPowerStorage; -import crazypants.util.BlockCoord; -import java.util.HashMap; -import java.util.Map; public class CapBankClientNetwork implements ICapBankNetwork { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index 2c67d92c..9b64606e 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -11,6 +11,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.RoundRobinIterator; + import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import crazypants.enderio.conduit.ConduitNetworkTickHandler; import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener; @@ -26,8 +30,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.IPowerStorage; import crazypants.enderio.power.PerTickIntAverageCalculator; -import crazypants.util.BlockCoord; -import crazypants.util.RoundRobinIterator; public class CapBankNetwork implements ICapBankNetwork { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java b/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java index 0b69fd6a..c8df1203 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java @@ -1,12 +1,14 @@ package crazypants.enderio.machine.capbank.network; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.power.IPowerInterface; -import crazypants.util.BlockCoord; public class EnergyReceptor { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java index ef8d36fe..9f136a66 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java @@ -1,9 +1,11 @@ package crazypants.enderio.machine.capbank.network; import io.netty.buffer.ByteBuf; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.util.BlockCoord; public class NetworkState { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java index 53f24dfe..3cf70997 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java @@ -3,14 +3,15 @@ package crazypants.enderio.machine.capbank.network; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.util.BlockCoord; public class NetworkUtil { diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java index 12e19c03..0f749290 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java @@ -12,6 +12,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector4f; +import com.enderio.core.common.vecmath.Vertex; + import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.InfoDisplayType; @@ -19,11 +26,6 @@ import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.render.BoundingBox; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector4f; -import crazypants.vecmath.Vertex; public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener { diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java index ffbec7bf..3ddacd99 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java @@ -11,13 +11,14 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class IoDisplay implements IInfoRenderer { diff --git a/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java index 1d4e6406..f52b65b9 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java @@ -1,9 +1,9 @@ package crazypants.enderio.machine.crafter; -import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; diff --git a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java index 7267c7ad..5e8d7d1c 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java @@ -2,11 +2,15 @@ package crazypants.enderio.machine.crafter; import java.util.List; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; @@ -16,9 +20,6 @@ import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GhostSlot; import crazypants.render.RenderUtil; -import crazypants.util.Lang; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; public class GuiCrafter extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java index 3abf08f3..db242667 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java @@ -1,12 +1,12 @@ package crazypants.enderio.machine.crafter; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.network.MessageTileEntity; -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; public class PacketCrafter extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java index 2e96cb3c..2ee424d3 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java @@ -10,6 +10,9 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; + +import com.enderio.core.common.util.ItemUtil; + import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPowerConsumerEntity; @@ -18,7 +21,6 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; -import crazypants.util.ItemUtil; public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuffer { diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index 72e8b2be..efdfd47c 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -20,7 +20,7 @@ import crazypants.enderio.machine.recipe.RecipeConfigParser; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; import crazypants.enderio.machine.recipe.RecipeBonusType; -import crazypants.util.Util; +import com.enderio.core.common.util.Util; public class CrusherRecipeManager { diff --git a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java index 0afe6dd3..7a5e428f 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java @@ -19,7 +19,7 @@ import crazypants.enderio.api.tool.ITool; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.tool.ToolUtil; -import crazypants.util.Util; +import com.enderio.core.common.util.Util; public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java b/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java index b3dcd95a..483c158a 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java @@ -1,13 +1,25 @@ package crazypants.enderio.machine.farm; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.farm.farmers.*; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.farm.farmers.CocoaFarmer; +import crazypants.enderio.machine.farm.farmers.CustomSeedFarmer; +import crazypants.enderio.machine.farm.farmers.FarmersCommune; +import crazypants.enderio.machine.farm.farmers.FlowerPicker; +import crazypants.enderio.machine.farm.farmers.ManaBeanFarmer; +import crazypants.enderio.machine.farm.farmers.MelonFarmer; +import crazypants.enderio.machine.farm.farmers.NaturaBerryFarmer; +import crazypants.enderio.machine.farm.farmers.NetherWartFarmer; +import crazypants.enderio.machine.farm.farmers.PickableFarmer; +import crazypants.enderio.machine.farm.farmers.PlantableFarmer; +import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2; +import crazypants.enderio.machine.farm.farmers.StemFarmer; +import crazypants.enderio.machine.farm.farmers.TreeFarmer; public final class FarmersRegistry { diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java b/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java index e6a68882..eb068db2 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java @@ -1,15 +1,16 @@ package crazypants.enderio.machine.farm; -import static org.lwjgl.opengl.GL11.GL_LIGHTING; -import static org.lwjgl.opengl.GL11.glDisable; -import static org.lwjgl.opengl.GL11.glEnable; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; + +import com.enderio.core.common.vecmath.Vector3f; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.config.Config; import crazypants.render.RenderUtil; -import crazypants.vecmath.Vector3f; + +import static org.lwjgl.opengl.GL11.*; @SideOnly(Side.CLIENT) public class FarmingStationSpecialRenderer extends TileEntitySpecialRenderer{ diff --git a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java index 78d2ef7b..ac09a789 100644 --- a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java +++ b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java @@ -2,8 +2,6 @@ package crazypants.enderio.machine.farm; import java.util.List; -import com.google.common.collect.Lists; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -13,8 +11,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; + +import com.enderio.core.common.util.BlockCoord; +import com.google.common.collect.Lists; + import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.util.BlockCoord; public enum Fertilizer { diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index dce74f51..6b3ac771 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -8,14 +8,15 @@ import net.minecraft.inventory.Slot; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.vecmath.Vector4f; + import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; -import crazypants.vecmath.Vector4f; public class GuiFarmStation extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java index 4f4e9d11..991af4db 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java @@ -6,10 +6,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.util.BlockCoord; import crazypants.util.ClientUtil; public class PacketFarmAction implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 0e01ea16..3754ebe8 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -15,6 +15,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.world.EnumSkyBlock; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; @@ -30,8 +34,6 @@ import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.tool.ArrayMappingTool; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; public class TileFarmStation extends AbstractPoweredTaskEntity { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java index 4c519d94..b8be2ec9 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java @@ -8,9 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.config.Config; import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public class CocoaFarmer extends CustomSeedFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java index f1308e50..636bad52 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java @@ -10,8 +10,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public class CustomSeedFarmer implements IFarmerJoe { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java b/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java index dcb19be5..18d84a97 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java @@ -1,17 +1,14 @@ package crazypants.enderio.machine.farm.farmers; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import net.minecraft.block.Block; -import net.minecraft.item.ItemAxe; -import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; public class FarmersCommune implements IFarmerJoe { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java b/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java index b506bd3e..0f039b59 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java @@ -5,11 +5,12 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public class FlowerPicker implements IFarmerJoe { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java b/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java index bc3f9c2d..d5a7c912 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java @@ -4,7 +4,8 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.entity.item.EntityItem; -import crazypants.util.BlockCoord; + +import com.enderio.core.common.util.BlockCoord; public class HarvestResult implements IHarvestResult { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java b/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java index 2ea8d93e..98cdf71e 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java @@ -3,8 +3,10 @@ package crazypants.enderio.machine.farm.farmers; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public interface IFarmerJoe { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/IHarvestResult.java b/src/main/java/crazypants/enderio/machine/farm/farmers/IHarvestResult.java index e8ff8877..72f3af56 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/IHarvestResult.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/IHarvestResult.java @@ -3,7 +3,8 @@ package crazypants.enderio.machine.farm.farmers; import java.util.List; import net.minecraft.entity.item.EntityItem; -import crazypants.util.BlockCoord; + +import com.enderio.core.common.util.BlockCoord; public interface IHarvestResult { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/ManaBeanFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/ManaBeanFarmer.java index ed49875e..4a43e1bc 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/ManaBeanFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/ManaBeanFarmer.java @@ -1,10 +1,11 @@ package crazypants.enderio.machine.farm.farmers; -import crazypants.util.BlockCoord; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import com.enderio.core.common.util.BlockCoord; + public class ManaBeanFarmer extends CustomSeedFarmer { public ManaBeanFarmer(Block block, ItemStack stack) diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java index e1205abf..4a69137c 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java @@ -1,10 +1,11 @@ package crazypants.enderio.machine.farm.farmers; -import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; + +import com.enderio.core.common.util.BlockCoord; + +import crazypants.enderio.machine.farm.TileFarmStation; public class MelonFarmer extends CustomSeedFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java index 6a38243a..4f42b720 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java @@ -6,9 +6,11 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.config.Config; import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public class NaturaBerryFarmer extends PickableFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java index 232cff78..4585eeb1 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java @@ -6,8 +6,10 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public class NetherWartFarmer extends CustomSeedFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java index 21ea65ba..ed59b850 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java @@ -8,8 +8,10 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public class PickableFarmer extends CustomSeedFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java index e3b94346..e69e93d6 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java @@ -1,12 +1,5 @@ package crazypants.enderio.machine.farm.farmers; -import static net.minecraftforge.common.EnumPlantType.Cave; -import static net.minecraftforge.common.EnumPlantType.Crop; -import static net.minecraftforge.common.EnumPlantType.Desert; -import static net.minecraftforge.common.EnumPlantType.Nether; -import static net.minecraftforge.common.EnumPlantType.Plains; -import static net.minecraftforge.common.EnumPlantType.Water; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -18,13 +11,14 @@ import net.minecraft.block.IGrowable; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public class PlantableFarmer implements IFarmerJoe { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java b/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java index 0a00a20e..f5d55ff1 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java @@ -1,18 +1,16 @@ package crazypants.enderio.machine.farm.farmers; -import java.util.ArrayList; -import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import com.enderio.core.common.util.BlockCoord; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.machine.farm.TileFarmStation; import crazypants.enderio.machine.farm.TileFarmStation.ToolType; -import crazypants.util.BlockCoord; -import net.minecraft.block.Block; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class RubberTreeFarmerIC2 extends TreeFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java index a4a75a02..447a7a0e 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java @@ -10,8 +10,10 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public class StemFarmer extends CustomSeedFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java index f832760d..db5c6482 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java @@ -14,9 +14,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IShearable; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.config.Config; import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public class TreeFarmer implements IFarmerJoe { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java index cb86311f..1104c81b 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java @@ -1,10 +1,15 @@ package crazypants.enderio.machine.farm.farmers; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLeaves; +import net.minecraft.block.BlockNewLeaf; +import net.minecraft.block.BlockOldLeaf; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.util.BlockCoord; public class TreeHarvestUtil { diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java index e97f9e3d..b5ace06b 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java @@ -4,7 +4,6 @@ import java.util.Random; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java index fecb14b4..db3fe85b 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java @@ -8,6 +8,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; @@ -15,7 +17,6 @@ import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class GuiCombustionGenerator extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java index 134cbfee..70cef437 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -10,6 +10,11 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.ITankAccess; + import crazypants.enderio.ModObject; import crazypants.enderio.fluid.FluidFuelRegister; import crazypants.enderio.fluid.IFluidCoolant; @@ -19,9 +24,6 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.AbstractGeneratorEntity; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerDistributor; -import crazypants.util.BlockCoord; -import crazypants.util.FluidUtil; -import crazypants.util.ITankAccess; public class TileCombustionGenerator extends AbstractGeneratorEntity implements IFluidHandler, ITankAccess { diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java index df586253..86782504 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java @@ -7,15 +7,17 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector4f; +import com.enderio.core.common.vecmath.Vertex; + import crazypants.render.BoundingBox; import crazypants.render.CustomCubeRenderer; import crazypants.render.CustomRenderBlocks; import crazypants.render.IRenderFace; import crazypants.render.RenderUtil; import crazypants.render.VertexTransform; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector4f; -import crazypants.vecmath.Vertex; public class TranslatedCubeRenderer { diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java index bd21ace5..593c7282 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java @@ -11,6 +11,8 @@ import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; @@ -19,7 +21,6 @@ import crazypants.enderio.power.Capacitors; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; @SideOnly(Side.CLIENT) public class GuiStirlingGenerator extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java index b1c2b45d..8a4798eb 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -7,6 +7,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.IProgressTile; + import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.SlotDefinition; @@ -14,8 +18,6 @@ import crazypants.enderio.machine.generator.AbstractGeneratorEntity; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.PowerDistributor; -import crazypants.util.BlockCoord; -import crazypants.util.IProgressTile; public class TileEntityStirlingGenerator extends AbstractGeneratorEntity implements ISidedInventory, IProgressTile { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java index c0bf7237..793eca43 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -11,6 +11,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -18,7 +21,6 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.util.Lang; public class BlockZombieGenerator extends AbstractMachineBlock { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java index 32987f1a..75eb3dca 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java @@ -8,6 +8,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; @@ -15,7 +17,6 @@ import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class GuiZombieGenerator extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java index a4fa4c93..157b2a90 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java @@ -2,12 +2,12 @@ package crazypants.enderio.machine.generator.zombie; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.network.MessageTileEntity; -import net.minecraft.tileentity.TileEntity; public class PacketNutrientTank extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index 5788eaf1..bcc7791f 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -10,6 +10,11 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.ITankAccess; + import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; @@ -18,9 +23,6 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.AbstractGeneratorEntity; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerDistributor; -import crazypants.util.BlockCoord; -import crazypants.util.FluidUtil; -import crazypants.util.ITankAccess; public class TileZombieGenerator extends AbstractGeneratorEntity implements IFluidHandler, ITankAccess, IHasNutrientTank { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java index aea64a51..48cfaa37 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java @@ -14,13 +14,14 @@ import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector3d; @SideOnly(Side.CLIENT) public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index 5c38259f..c93f8e5c 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -12,10 +12,12 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.IProgressTile; +import com.enderio.core.common.util.Util; + import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; -import crazypants.util.IProgressTile; -import crazypants.util.Util; public abstract class AbstractMachineContainer extends Container { diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java index 2c2d1242..46c21ecb 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java @@ -1,5 +1,11 @@ package crazypants.enderio.machine.gui; +import java.util.ArrayList; + +import org.lwjgl.input.Keyboard; + +import com.enderio.core.common.util.Lang; + import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.gui.TooltipAddera; @@ -7,9 +13,6 @@ import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.PacketIoMode; import crazypants.enderio.network.PacketHandler; import crazypants.gui.IGuiScreen; -import crazypants.util.Lang; -import java.util.ArrayList; -import org.lwjgl.input.Keyboard; public class GuiButtonIoConfig extends ToggleButtonEIO { diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index 620480d5..fb3ad635 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -11,6 +11,12 @@ import net.minecraft.inventory.Slot; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.IProgressTile; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector4f; + import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; @@ -22,11 +28,6 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.IProgressTile; -import crazypants.util.Lang; -import crazypants.util.Util; -import crazypants.vecmath.Vector4f; public abstract class GuiMachineBase extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java index a53c8e2e..e04597d1 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java @@ -8,6 +8,9 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.IoConfigRenderer; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; @@ -17,7 +20,6 @@ import crazypants.enderio.machine.IoMode; import crazypants.gui.IGuiScreen; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; public class GuiOverlayIoConfig implements IGuiOverlay { diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java index 2e8a52db..80f5367a 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java @@ -2,9 +2,9 @@ package crazypants.enderio.machine.gui; import java.awt.Rectangle; import java.util.List; -import net.minecraft.util.StatCollector; import net.minecraft.inventory.Container; +import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index f61111be..b0acaee5 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine.hypercube; import java.text.NumberFormat; -import java.util.ArrayList; import java.util.Random; import java.util.UUID; @@ -19,6 +18,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.PlayerUtil; +import com.enderio.core.common.util.Util; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; @@ -32,8 +35,6 @@ import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.util.PlayerUtil; -import crazypants.util.Util; public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java index 67c6011a..56f82bbb 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java @@ -8,8 +8,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.InventoryWrapper; + import crazypants.enderio.ModObject; -import crazypants.util.InventoryWrapper; public class CompositeInventory implements ISidedInventory { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index e4f060bb..52a583cc 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -10,6 +10,10 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.PlayerUtil; + import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; @@ -26,9 +30,6 @@ import crazypants.gui.GuiToolTip; import crazypants.gui.ListSelectionListener; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; -import crazypants.util.PlayerUtil; public class GuiHyperCube extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java index 3336da87..d800a99d 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java @@ -14,9 +14,10 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.UUID; -import crazypants.util.PlayerUtil; import org.apache.commons.io.IOUtils; +import com.enderio.core.common.util.PlayerUtil; + import crazypants.enderio.Log; public class HyperCubeConfig { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java index ab1ded63..64995a76 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java @@ -1,9 +1,9 @@ package crazypants.enderio.machine.hypercube; -import java.util.UUID; - -import crazypants.util.PlayerUtil; import io.netty.buffer.ByteBuf; + +import com.enderio.core.common.util.PlayerUtil; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java index eb3af7b7..d126be8f 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.hypercube; -import crazypants.util.PlayerUtil; import io.netty.buffer.ByteBuf; import java.util.ArrayList; @@ -8,6 +7,9 @@ import java.util.List; import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; + +import com.enderio.core.common.util.PlayerUtil; + import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java index 0f505433..e1993171 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java @@ -1,14 +1,15 @@ package crazypants.enderio.machine.hypercube; -import crazypants.util.PlayerUtil; import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.List; -import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; + +import com.enderio.core.common.util.PlayerUtil; + import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index e059a38e..dce10ec8 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -1,23 +1,31 @@ package crazypants.enderio.machine.hypercube; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumMap; +import java.util.List; +import java.util.ListIterator; +import java.util.UUID; -import com.mojang.authlib.GameProfile; -import crazypants.util.PlayerUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; -import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.PlayerUtil; +import com.enderio.core.common.vecmath.VecmathUtil; + import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; @@ -28,10 +36,6 @@ import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.IInternalPowerHandler; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.util.BlockCoord; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; -import crazypants.vecmath.VecmathUtil; public class TileHyperCube extends TileEntityEio implements IInternalPowerHandler, IFluidHandler, ISidedInventory, IRedstoneModeControlable { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index bebf46fe..2d46b96e 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -15,6 +15,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.fluid.Fluids; @@ -35,8 +38,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GhostSlot; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; -import crazypants.util.ItemUtil; -import crazypants.util.Lang; @SideOnly(Side.CLIENT) public class GuiInventoryPanel extends GuiMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java index f7b73584..ae6e0f9a 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java @@ -22,13 +22,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; + +import com.enderio.core.common.util.ItemUtil; + import cpw.mods.fml.common.FMLCommonHandler; import crazypants.enderio.machine.gui.AbstractMachineContainer; import crazypants.enderio.machine.invpanel.server.ChangeLog; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import crazypants.enderio.machine.invpanel.server.ItemEntry; import crazypants.enderio.network.PacketHandler; -import crazypants.util.ItemUtil; public class InventoryPanelContainer extends AbstractMachineContainer implements ChangeLog { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java index 688820f5..ab1d74bf 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java @@ -10,6 +10,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.ITankAccess; + import crazypants.enderio.ModObject; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.item.FilterRegister; @@ -26,7 +29,6 @@ import crazypants.enderio.machine.invpanel.client.ClientDatabaseManager; import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import crazypants.enderio.network.PacketHandler; -import crazypants.util.ITankAccess; public class TileInventoryPanel extends AbstractMachineEntity implements IFluidHandler, ITankAccess, IHasNutrientTank { diff --git a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java index 2880ceba..9cba5682 100644 --- a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java @@ -7,6 +7,9 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.SoundUtil; + import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; @@ -17,8 +20,6 @@ import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketGivePlayerXP; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; -import crazypants.util.Lang; -import crazypants.util.SoundUtil; public class GuiKillerJoe extends GuiMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java b/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java index 886b6f1c..c8208e2b 100644 --- a/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java @@ -17,14 +17,15 @@ import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.generator.zombie.ModelZombieJar; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector3d; @SideOnly(Side.CLIENT) public class KillerJoeRenderer extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java b/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java index 6303ceb3..095880e5 100644 --- a/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java +++ b/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java @@ -1,14 +1,11 @@ package crazypants.enderio.machine.killera; -import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.network.MessageTileEntity; -import crazypants.enderio.network.NetworkUtil; public class PacketSwing extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 3fbab123..34231921 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -26,6 +26,11 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.util.ITankAccess; +import com.enderio.core.common.vecmath.Vector3d; import com.mojang.authlib.GameProfile; import crazypants.enderio.EnderIO; @@ -43,11 +48,6 @@ import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; import crazypants.enderio.xp.XpUtil; import crazypants.render.BoundingBox; -import crazypants.util.BlockCoord; -import crazypants.util.FluidUtil; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.util.ITankAccess; -import crazypants.vecmath.Vector3d; public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandler, IEntitySelector, IHaveExperience, ITankAccess, IHasNutrientTank { diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index 44bdad0a..b32bf9b6 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -10,6 +10,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.vecmath.Vector3f; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +20,6 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.redstone.IRedstoneConnectable; -import crazypants.vecmath.Vector3f; public class BlockElectricLight extends BlockEio implements IRedstoneConnectable { diff --git a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java index 6f6f118f..96422de2 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java @@ -11,15 +11,17 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.EnumSkyBlock; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector3d; + import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.machine.wireless.WirelessChargedLocation; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.util.BlockCoord; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector3d; public class TileElectricLight extends TileEntityEio implements IInternalPowerReceiver { diff --git a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java index 39711caa..51d1f6c7 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java @@ -5,12 +5,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; -import crazypants.util.DyeColor; public class BlockPowerMonitor extends AbstractMachineBlock { diff --git a/src/main/java/crazypants/enderio/machine/monitor/ContainerPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/ContainerPowerMonitor.java index 77cc77a6..f404d2cc 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/ContainerPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/ContainerPowerMonitor.java @@ -2,7 +2,6 @@ package crazypants.enderio.machine.monitor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.tileentity.TileEntity; public class ContainerPowerMonitor extends Container { diff --git a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index e7ccaa52..6fbd2bcc 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -1,7 +1,5 @@ package crazypants.enderio.machine.monitor; -import static crazypants.enderio.machine.power.PowerDisplayUtil.*; - import java.awt.Color; import java.awt.Rectangle; import java.text.NumberFormat; @@ -12,6 +10,8 @@ import net.minecraft.client.gui.GuiTextField; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.gui.CheckBoxEIO; import crazypants.enderio.gui.TextFieldEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; @@ -20,7 +20,8 @@ import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; + +import static crazypants.enderio.machine.power.PowerDisplayUtil.*; public class GuiPowerMonitor extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java index a2ca8d97..5c043bcf 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java @@ -3,6 +3,9 @@ package crazypants.enderio.machine.monitor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractConduitNetwork; @@ -17,7 +20,6 @@ import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IInternalPoweredTile; -import crazypants.util.DyeColor; public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IInternalPoweredTile { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java index 795c3ecf..9b413309 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java @@ -8,14 +8,15 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vertex; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.VertexTransform; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vertex; public class ObeliskRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java index f78f84c6..abf61893 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java @@ -16,7 +16,7 @@ import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; +import com.enderio.core.common.util.Lang; public class GuiAttractor extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java index d7a4bcd1..96dbf078 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java @@ -40,8 +40,8 @@ import crazypants.enderio.machine.ranged.IRanged; import crazypants.enderio.machine.ranged.RangeEntity; import crazypants.enderio.power.BasicCapacitor; import crazypants.render.BoundingBox; -import crazypants.util.BlockCoord; -import crazypants.vecmath.Vector3d; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Vector3d; public class TileAttractor extends AbstractPowerConsumerEntity implements IRanged { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java index 176b2820..0f2bed87 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java @@ -11,7 +11,7 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.config.Config; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class AversionObeliskController { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java index 5a48e0b5..5ebc2253 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java @@ -16,7 +16,7 @@ import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; +import com.enderio.core.common.util.Lang; public class GuiAversionObelisk extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java index 7c1f9e18..9f245e90 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java @@ -8,6 +8,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import com.enderio.core.common.util.BlockCoord; import com.google.common.collect.Maps; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -16,7 +17,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.TeleportEntityEvent; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.obelisk.BlockObeliskAbstract; -import crazypants.util.BlockCoord; public class BlockInhibitorObelisk extends BlockObeliskAbstract { @@ -60,7 +60,7 @@ public class BlockInhibitorObelisk extends BlockObeliskAbstract e : activeInhibitors.entrySet()) { BlockCoord bc = e.getKey(); - int dist = bc.distance(new BlockCoord(event.targetX, event.targetY, event.targetZ)); + int dist = bc.getDist(new BlockCoord(event.targetX, event.targetY, event.targetZ)); if(dist < e.getValue()) { TileEntity te = bc.getTileEntity(event.entity.worldObj); if(te instanceof TileInhibitorObelisk && ((TileInhibitorObelisk) te).isActive()) { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/GuiInhibitorObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/GuiInhibitorObelisk.java index 6f8e80e6..3c44c880 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/GuiInhibitorObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/GuiInhibitorObelisk.java @@ -2,13 +2,15 @@ package crazypants.enderio.machine.obelisk.inhibitor; import java.awt.Color; +import net.minecraft.inventory.Container; + import org.lwjgl.opengl.GL11; -import net.minecraft.inventory.Container; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class GuiInhibitorObelisk extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java index 0de13e9e..5592e6ac 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java @@ -12,12 +12,13 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask; import crazypants.enderio.network.PacketHandler; -import crazypants.util.Lang; public class GuiWeatherObelisk extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java index 86d1bcd6..c49a0dd8 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java @@ -7,6 +7,9 @@ import net.minecraft.client.particle.EntitySmokeFX; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.storage.WorldInfo; + +import com.enderio.core.common.util.IProgressTile; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ModObject; @@ -17,7 +20,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; -import crazypants.util.IProgressTile; public class TileWeatherObelisk extends AbstractPowerConsumerEntity implements IProgressTile { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java index 5f8bae7b..3f83a849 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java @@ -7,6 +7,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiMachineBase; @@ -15,7 +17,6 @@ import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketDrainPlayerXP; import crazypants.enderio.xp.PacketGivePlayerXP; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class GuiExperienceObelisk extends GuiMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java index 6bf17707..4c1f1c32 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java @@ -10,6 +10,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -18,11 +22,8 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.gui.IResourceTooltipProvider; -import crazypants.enderio.item.PacketConduitProbe; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.XpUtil; -import crazypants.util.Util; -import crazypants.vecmath.Vector3d; public class ItemXpTransfer extends Item implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/PacketXpTransferEffects.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/PacketXpTransferEffects.java index 467d2a22..6882d7c9 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/PacketXpTransferEffects.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/PacketXpTransferEffects.java @@ -8,8 +8,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.util.Util; -import crazypants.vecmath.Vector3d; public class PacketXpTransferEffects implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java index 9b3ac36f..9f6444f7 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceOblisk.java @@ -8,6 +8,10 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.ITankAccess; + import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; @@ -17,8 +21,6 @@ import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; import crazypants.enderio.xp.XpUtil; -import crazypants.util.FluidUtil; -import crazypants.util.ITankAccess; public class TileExperienceOblisk extends AbstractMachineEntity implements IFluidHandler, IHaveExperience, ITankAccess { diff --git a/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java b/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java index db9f1923..a482b492 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java +++ b/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java @@ -1,19 +1,21 @@ package crazypants.enderio.machine.painter; -import static crazypants.enderio.machine.MachineRecipeInput.getInputForSlot; - import java.util.Collections; import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.Util; + import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.recipe.RecipeBonusType; -import crazypants.util.Util; + +import static crazypants.enderio.machine.MachineRecipeInput.getInputForSlot; public abstract class BasicPainterTemplate implements IMachineRecipe { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedGlowstone.java index c8defe5e..5e223b0c 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedGlowstone.java @@ -6,11 +6,11 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public class BlockItemPaintedGlowstone extends ItemBlock { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index a4d5dc25..b8d93930 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -22,6 +22,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.ItemTooltipEvent; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -34,7 +37,6 @@ import crazypants.enderio.item.IRotatableFacade; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.util.IFacade; -import crazypants.util.Lang; public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvider, IPaintedBlock, IFacade, IRotatableFacade { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstoneRenderer.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstoneRenderer.java index 6fff17a2..e9063e85 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstoneRenderer.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstoneRenderer.java @@ -6,7 +6,6 @@ import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.EnderIO; public class BlockPaintedGlowstoneRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java index 367512bb..4fc253c6 100644 --- a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java @@ -4,11 +4,12 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.vecmath.Vector4f; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.render.RenderUtil; -import crazypants.vecmath.Vector4f; @SideOnly(Side.CLIENT) public class GuiPainter extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java b/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java index f489ec0b..eae0fcaa 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java @@ -7,10 +7,12 @@ import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Util; + import crazypants.enderio.config.Config; import crazypants.enderio.machine.recipe.RecipeInput; -import crazypants.util.ItemUtil; -import crazypants.util.Util; public class PaintSourceValidator { diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockAccessWrapper.java b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockAccessWrapper.java index 8443476b..58ff1c3e 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockAccessWrapper.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockAccessWrapper.java @@ -3,9 +3,11 @@ package crazypants.enderio.machine.painter; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; + +import com.enderio.core.common.util.IBlockAccessWrapper; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.util.IBlockAccessWrapper; public class PaintedBlockAccessWrapper extends IBlockAccessWrapper { diff --git a/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java b/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java index ea52cd0f..31a1988a 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java +++ b/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java @@ -1,16 +1,16 @@ package crazypants.enderio.machine.painter; -import com.google.common.base.Strings; - import net.minecraft.block.Block; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import crazypants.util.Lang; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.common.util.Lang; +import com.google.common.base.Strings; + public final class PainterUtil { private PainterUtil() { diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 62ac1d46..5897b853 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.power; -import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -20,6 +19,12 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -35,10 +40,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.tool.ToolUtil; import crazypants.enderio.waila.IWailaInfoProvider; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; -import crazypants.util.Util; -import crazypants.vecmath.Vector3d; public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider { diff --git a/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java b/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java index 3c784e91..6cea2a56 100644 --- a/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java +++ b/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java @@ -10,6 +10,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector2f; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector4d; +import com.enderio.core.common.vecmath.Vector4f; +import com.enderio.core.common.vecmath.Vertex; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.power.GaugeBounds.VPos; @@ -19,13 +28,6 @@ import crazypants.render.CustomRenderBlocks; import crazypants.render.IRenderFace; import crazypants.render.IconUtil; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector2f; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector4d; -import crazypants.vecmath.Vector4f; -import crazypants.vecmath.Vertex; public class CapBankRenderer2 implements ISimpleBlockRenderingHandler { @@ -204,7 +206,7 @@ public class CapBankRenderer2 implements ISimpleBlockRenderingHandler { Tessellator tes = Tessellator.instance; Vector2f u = gb.getMinMaxU(icon); - List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), maxV); + List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), maxV); for (Vertex coord : corners) { coord.xyz.add(ForgeDirectionOffsets.offsetScaled(gb.face, 0.002f)); diff --git a/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java b/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java index f9d1bbab..c722a894 100644 --- a/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java +++ b/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java @@ -15,6 +15,11 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Vector2f; +import com.enderio.core.common.vecmath.Vector4d; +import com.enderio.core.common.vecmath.Vertex; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -23,10 +28,6 @@ import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.IconUtil; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.vecmath.Vector2f; -import crazypants.vecmath.Vector4d; -import crazypants.vecmath.Vertex; @SideOnly(Side.CLIENT) public class CapacitorBankRenderer extends TileEntitySpecialRenderer implements IItemRenderer { @@ -207,7 +208,7 @@ public class CapacitorBankRenderer extends TileEntitySpecialRenderer implements Tessellator tes = Tessellator.instance; tes.setNormal(gb.face.offsetX, gb.face.offsetY, gb.face.offsetZ); Vector2f u = gb.getMinMaxU(icon); - List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), maxV); + List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), maxV); for (Vertex coord : corners) { if(coord.uv != null) { tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), coord.u(), coord.v()); diff --git a/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java b/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java index 65b30ca5..978f9149 100644 --- a/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java +++ b/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java @@ -5,11 +5,13 @@ import java.util.List; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Vector2f; +import com.enderio.core.common.vecmath.Vector4d; + import crazypants.render.BoundingBox; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.vecmath.Vector2f; -import crazypants.vecmath.Vector4d; class GaugeBounds { diff --git a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java index 111f3e52..8f73bc7b 100644 --- a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java @@ -14,20 +14,21 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.gui.GuiOverlayIoConfig; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; public class GuiCapacitorBank extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java b/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java index 1eaee92b..eb9abb29 100644 --- a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java +++ b/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java @@ -7,11 +7,13 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.util.BlockCoord; public class PacketPowerStorage implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java index 8c60760b..3d2d5b69 100644 --- a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java +++ b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java @@ -7,9 +7,11 @@ import java.text.NumberFormat; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.util.Lang; public class PowerDisplayUtil { diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index d29d2567..0e48c67e 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -17,6 +17,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.VecmathUtil; + import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.conduit.ConnectionMode; @@ -33,9 +38,6 @@ import crazypants.enderio.power.IInternalPoweredTile; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.IPowerStorage; import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.util.BlockCoord; -import crazypants.util.Util; -import crazypants.vecmath.VecmathUtil; public class TileCapacitorBank extends TileEntityEio implements IInternalPowerHandler, IInventory, IIoConfigurable, IPowerStorage { diff --git a/src/main/java/crazypants/enderio/machine/ranged/IRanged.java b/src/main/java/crazypants/enderio/machine/ranged/IRanged.java index f80ee210..23b98764 100644 --- a/src/main/java/crazypants/enderio/machine/ranged/IRanged.java +++ b/src/main/java/crazypants/enderio/machine/ranged/IRanged.java @@ -1,7 +1,8 @@ package crazypants.enderio.machine.ranged; import net.minecraft.world.World; -import crazypants.util.BlockCoord; + +import com.enderio.core.common.util.BlockCoord; public interface IRanged { diff --git a/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java b/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java index 3726f914..a34b11a0 100644 --- a/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java +++ b/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java @@ -3,9 +3,11 @@ package crazypants.enderio.machine.ranged; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.util.BlockCoord; public class RangeEntity extends Entity { diff --git a/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java index 9edda6c8..8f1d62db 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java @@ -6,7 +6,6 @@ import java.util.List; import net.minecraft.item.ItemStack; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.recipe.RecipeBonusType; public abstract class AbstractMachineRecipe implements IMachineRecipe { diff --git a/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java index b9d9f9c8..4788bd22 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java @@ -7,9 +7,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.recipe.RecipeBonusType; public class BasicManyToOneRecipe implements IManyToOneRecipe { diff --git a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneMachineRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneMachineRecipe.java index 3b34c516..7df50f75 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneMachineRecipe.java @@ -1,9 +1,7 @@ package crazypants.enderio.machine.recipe; import net.minecraft.item.ItemStack; -import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.alloy.AlloyRecipeManager; public class ManyToOneMachineRecipe extends AbstractMachineRecipe { diff --git a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java index 9429e03a..fc92da7d 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java @@ -5,10 +5,12 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.Util; + import crazypants.enderio.Log; import crazypants.enderio.config.Config; import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.util.Util; public class ManyToOneRecipeManager { diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java index b9c1c7b2..9527b6d7 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java @@ -4,7 +4,6 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.StringReader; - import java.util.Locale; import javax.xml.parsers.SAXParser; @@ -27,13 +26,14 @@ import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; +import com.enderio.core.common.util.OreDictionaryHelper; + import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Log; import crazypants.enderio.machine.crusher.CrusherRecipeManager; import crazypants.enderio.machine.recipe.RecipeConfig.RecipeElement; import crazypants.enderio.machine.recipe.RecipeConfig.RecipeGroup; import crazypants.enderio.material.OreDictionaryPreferences; -import crazypants.util.OreDictionaryHelper; public class RecipeConfigParser extends DefaultHandler { diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index b4d3913b..5b153af7 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -11,6 +11,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; @@ -18,8 +22,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.reservoir.TileReservoir.Pos; import crazypants.enderio.tool.ToolUtil; -import crazypants.util.BlockCoord; -import crazypants.vecmath.Vector3d; public class BlockReservoir extends BlockEio implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java index e8a5dbcd..6f1a5468 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java @@ -13,13 +13,14 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; @SideOnly(Side.CLIENT) public class ReservoirRenderer extends TileEntitySpecialRenderer implements IResourceManagerReloadListener { diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index 3e2b791d..d52aabcd 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -1,7 +1,5 @@ package crazypants.enderio.machine.reservoir; -import static net.minecraftforge.fluids.FluidContainerRegistry.*; - import java.util.ArrayList; import net.minecraft.block.Block; @@ -14,12 +12,16 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ITankAccess; +import com.enderio.core.common.vecmath.Vector3f; + import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.render.BoundingBox; -import crazypants.util.BlockCoord; -import crazypants.util.ITankAccess; -import crazypants.vecmath.Vector3f; + +import static net.minecraftforge.fluids.FluidContainerRegistry.BUCKET_VOLUME; public class TileReservoir extends TileEntityEio implements IFluidHandler, ITankAccess { diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java index a43eedc2..81646d4f 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java @@ -14,7 +14,6 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.AbstractPoweredMachineEntity; public class BlockSliceAndSplice extends AbstractMachineBlock { diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java index 6ab29bdc..19d03826 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java @@ -18,7 +18,6 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.recipe.ManyToOneMachineRecipe; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; -import crazypants.enderio.power.ICapacitor; public class TileSliceAndSplice extends AbstractPoweredTaskEntity { diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java index 72fce79f..462b03c5 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java @@ -8,6 +8,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -17,7 +20,6 @@ import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.util.Lang; public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvancedTooltipProvider, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index 18d14f3c..cc7ce5fd 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -14,6 +14,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,7 +25,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.waila.IWailaInfoProvider; -import crazypants.util.Lang; public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvider, IWailaInfoProvider { diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index 9e253e70..d96952f1 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; -import cofh.api.energy.EnergyStorage; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; @@ -14,13 +13,16 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.energy.EnergyStorage; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.TileEntityEio; import crazypants.enderio.config.Config; import crazypants.enderio.power.IInternalPowerProvider; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.waila.IWailaNBTProvider; -import crazypants.util.BlockCoord; public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowerProvider, IWailaNBTProvider { diff --git a/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java b/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java index 426a4e54..3fb39c99 100644 --- a/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java @@ -1,20 +1,15 @@ package crazypants.enderio.machine.soul; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import net.minecraft.entity.EntityList; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.machine.recipe.RecipeBonusType; -import crazypants.enderio.material.FrankenSkull; public abstract class AbstractSoulBinderRecipe implements IMachineRecipe, ISoulBinderRecipe { diff --git a/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java b/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java index 21b66edc..e2803ee6 100644 --- a/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java @@ -1,9 +1,6 @@ package crazypants.enderio.machine.soul; import net.minecraft.item.ItemStack; -import crazypants.enderio.EnderIO; -import crazypants.enderio.config.Config; -import crazypants.enderio.material.Material; public class BasicSoulBinderRecipe extends AbstractSoulBinderRecipe { diff --git a/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java index 959ed776..dd21276e 100644 --- a/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java @@ -2,8 +2,6 @@ package crazypants.enderio.machine.soul; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,6 +9,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; diff --git a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java index 0dfcdc54..b47118e1 100644 --- a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java @@ -6,6 +6,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.SoundUtil; + import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; @@ -14,7 +16,6 @@ import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketDrainPlayerXP; import crazypants.enderio.xp.XpUtil; import crazypants.render.RenderUtil; -import crazypants.util.SoundUtil; public class GuiSoulBinder extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java index 102d9524..9f73198c 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java @@ -1,11 +1,8 @@ package crazypants.enderio.machine.soul; -import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; -import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.Material; public class SoulBinderEnderCystalRecipe extends AbstractSoulBinderRecipe { diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java index c6cd49a0..349cb1b9 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java @@ -1,17 +1,8 @@ package crazypants.enderio.machine.soul; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.minecraft.entity.EntityList; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.machine.IMachineRecipe; -import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.material.FrankenSkull; public class SoulBinderReanimationRecipe extends AbstractSoulBinderRecipe { diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java index 96c85e23..730959ef 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java @@ -10,13 +10,14 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.ForgeDirectionOffsets; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.ClientProxy; import crazypants.enderio.EnderIO; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.IconUtil; -import crazypants.util.ForgeDirectionOffsets; public class SoulBinderRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java index f13703ee..18208de8 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java @@ -4,14 +4,16 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.EntityUtil; + import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.spawner.PoweredSpawnerConfig; import crazypants.enderio.machine.recipe.RecipeBonusType; -import crazypants.util.EntityUtil; +import crazypants.enderio.machine.spawner.PoweredSpawnerConfig; public class SoulBinderSpawnerRecipe implements IMachineRecipe, ISoulBinderRecipe { diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index 9141ed7f..76042011 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -10,6 +10,10 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.ITankAccess; + import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -20,13 +24,10 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; -import crazypants.enderio.power.ICapacitor; import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; import crazypants.enderio.xp.XpUtil; -import crazypants.util.FluidUtil; -import crazypants.util.ITankAccess; public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveExperience, IFluidHandler, ITankAccess { diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index 8d53384f..f0ee8c35 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -24,6 +24,11 @@ import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.BlockEvent.BreakEvent; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.Util; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; @@ -43,9 +48,6 @@ import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.waila.IWailaInfoProvider; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; -import crazypants.util.Util; public class BlockPoweredSpawner extends AbstractMachineBlock implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java index dabf0ae1..a1c8b8b8 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java @@ -1,11 +1,12 @@ package crazypants.enderio.machine.spawner; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + import crazypants.enderio.EnderIO; public class BrokenSpawnerRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java index 1db1cede..3ba5aec6 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java @@ -8,12 +8,13 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class GuiPoweredSpawner extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index b736d2c7..b20fa0a3 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -16,6 +16,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -29,7 +32,6 @@ import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; -import crazypants.util.Lang; public class BlockTank extends AbstractMachineBlock implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java index e585ee55..04e584a8 100644 --- a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java @@ -6,11 +6,12 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.gui.GuiMachineBase; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class GuiTank extends GuiMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index c89f6cfb..bb1c028c 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -8,21 +8,22 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.FluidUtil.FluidAndStackResult; +import com.enderio.core.common.util.ITankAccess; +import com.enderio.core.common.util.ItemUtil; + import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; -import crazypants.util.BlockCoord; -import crazypants.util.FluidUtil; -import crazypants.util.ITankAccess; -import crazypants.util.ItemUtil; -import crazypants.util.FluidUtil.FluidAndStackResult; public class TileTank extends AbstractMachineEntity implements IFluidHandler, ITankAccess { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index 103b1ec5..46f4e236 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -9,6 +9,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; + +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.Util; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -19,8 +23,6 @@ import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.transceiver.gui.ContainerTransceiver; import crazypants.enderio.machine.transceiver.gui.GuiTransceiver; import crazypants.enderio.network.PacketHandler; -import crazypants.util.Lang; -import crazypants.util.Util; public class BlockTransceiver extends AbstractMachineBlock { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/Channel.java b/src/main/java/crazypants/enderio/machine/transceiver/Channel.java index 3578303b..e4ac2a57 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/Channel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/Channel.java @@ -1,11 +1,11 @@ package crazypants.enderio.machine.transceiver; -import crazypants.util.PlayerUtil; -import net.minecraft.nbt.NBTTagCompound; -import org.apache.commons.lang3.builder.ToStringBuilder; - import java.util.UUID; +import net.minecraft.nbt.NBTTagCompound; + +import com.enderio.core.common.util.PlayerUtil; + public class Channel { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java index 7a91f809..92b09e99 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java @@ -1,7 +1,8 @@ package crazypants.enderio.machine.transceiver; +import com.enderio.core.common.util.PlayerUtil; + import crazypants.enderio.EnderIO; -import crazypants.util.PlayerUtil; public class ClientChannelRegister extends ChannelRegister { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java b/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java index ca5a8512..cdcae697 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java @@ -1,9 +1,6 @@ package crazypants.enderio.machine.transceiver; import net.minecraft.entity.player.EntityPlayerMP; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.event.FMLServerStartedEvent; -import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java index 8a570f39..e393ef26 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java @@ -1,12 +1,11 @@ package crazypants.enderio.machine.transceiver; -import net.minecraft.nbt.NBTTagCompound; import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; -import crazypants.enderio.machine.hypercube.PacketChannelList; import crazypants.enderio.network.NetworkUtil; import crazypants.enderio.network.PacketHandler; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java index 0bb09568..a35c16db 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java @@ -1,12 +1,12 @@ package crazypants.enderio.machine.transceiver; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java index 99725034..e647adc9 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java @@ -1,10 +1,11 @@ package crazypants.enderio.machine.transceiver; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.EnumMap; import java.util.List; -import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java index af80c48c..8e966521 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java @@ -15,7 +15,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import crazypants.util.PlayerUtil; import net.minecraft.item.ItemStack; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.util.ForgeDirection; @@ -25,14 +24,15 @@ import net.minecraftforge.fluids.FluidTankInfo; import org.apache.commons.io.FileUtils; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.PlayerUtil; +import com.enderio.core.common.util.RoundRobinIterator; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import crazypants.enderio.Log; import crazypants.enderio.config.Config; import crazypants.enderio.machine.SlotDefinition; -import crazypants.util.ItemUtil; -import crazypants.util.RoundRobinIterator; public class ServerChannelRegister extends ChannelRegister { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index 28cf4bcd..f8184743 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -15,6 +15,10 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.ItemUtil; + import crazypants.enderio.ModObject; import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.conduit.item.filter.ItemFilter; @@ -30,8 +34,6 @@ import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IInternalPowerHandler; import crazypants.enderio.power.PowerDistributor; import crazypants.enderio.rail.EnderRailController; -import crazypants.util.FluidUtil; -import crazypants.util.ItemUtil; public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluidHandler, IItemBuffer, IInternalPowerHandler { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java index 11d0347a..80a3e13c 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java @@ -2,10 +2,13 @@ package crazypants.enderio.machine.transceiver.gui; import java.awt.Color; -import crazypants.util.PlayerUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; + +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.PlayerUtil; + import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; @@ -20,7 +23,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiScrollableList; import crazypants.gui.ListSelectionListener; import crazypants.render.ColorUtil; -import crazypants.util.Lang; public class ChannelTab implements ITabPanel { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java index 29a433dc..e3a63757 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java @@ -19,7 +19,7 @@ import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; +import com.enderio.core.common.util.Lang; public class FilterTab implements ITabPanel { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java index 33fe9e2b..6299d554 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -20,7 +20,7 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; +import com.enderio.core.common.util.Lang; public class GeneralTab implements ITabPanel { diff --git a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java index 35b73110..d193e2d3 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java @@ -1,7 +1,19 @@ package crazypants.enderio.machine.vacuum; +import java.awt.Color; +import java.awt.Rectangle; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.MultiIconButtonEIO; @@ -13,15 +25,6 @@ import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; -import java.awt.Color; -import java.awt.Rectangle; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; public class GuiVacuumChest extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java index c18057af..6f0fe12e 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java @@ -1,12 +1,12 @@ package crazypants.enderio.machine.vacuum; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.network.MessageTileEntity; -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; public class PacketVaccumChest extends MessageTileEntity implements IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index 11efbcf4..2afab5d8 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.vacuum; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; @@ -12,6 +13,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; + +import com.enderio.core.common.util.ItemUtil; + import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; @@ -22,8 +26,6 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.render.BoundingBox; -import crazypants.util.ItemUtil; -import net.minecraft.block.Block; public class TileVacuumChest extends TileEntityEio implements IEntitySelector, IInventory, IRedstoneModeControlable { diff --git a/src/main/java/crazypants/enderio/machine/vat/BlockVat.java b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java index 00d8188a..66a35ba5 100644 --- a/src/main/java/crazypants/enderio/machine/vat/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java @@ -4,12 +4,14 @@ import java.util.Random; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; @@ -19,7 +21,6 @@ import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.network.PacketHandler; import crazypants.render.VertexRotation; -import crazypants.vecmath.Vector3d; public class BlockVat extends AbstractMachineBlock { diff --git a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java index 443d40ac..4b0c15a9 100644 --- a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java @@ -11,6 +11,8 @@ import net.minecraftforge.fluids.Fluid; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; @@ -20,7 +22,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class GuiVat extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/vat/TileVat.java b/src/main/java/crazypants/enderio/machine/vat/TileVat.java index 81cb4b5a..e2c0fa63 100644 --- a/src/main/java/crazypants/enderio/machine/vat/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/TileVat.java @@ -9,6 +9,11 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.ITankAccess; + import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -17,9 +22,6 @@ import crazypants.enderio.machine.IPoweredTask; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; -import crazypants.util.BlockCoord; -import crazypants.util.FluidUtil; -import crazypants.util.ITankAccess; public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler, ITankAccess { diff --git a/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java b/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java index 951c0eb9..0e1ea1ea 100644 --- a/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java @@ -8,9 +8,9 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.recipe.IRecipe; +import crazypants.enderio.machine.recipe.RecipeBonusType; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; -import crazypants.enderio.machine.recipe.RecipeBonusType; public class VatRecipe implements IRecipe { diff --git a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java index 1b62e106..375a11fe 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java @@ -2,7 +2,8 @@ package crazypants.enderio.machine.wireless; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import crazypants.util.BlockCoord; + +import com.enderio.core.common.util.BlockCoord; public interface IWirelessCharger { diff --git a/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java b/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java index 1b81d05b..167c18ec 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java +++ b/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java @@ -7,9 +7,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.power.PacketPowerStorage; -import crazypants.enderio.machine.power.TileCapacitorBank; -import crazypants.util.BlockCoord; public class PacketStoredEnergy implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java index dadc8b7a..7b40a87a 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java @@ -1,14 +1,14 @@ package crazypants.enderio.machine.wireless; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import crazypants.util.BlockCoord; -import java.util.Collections; -import java.util.Comparator; +import com.enderio.core.common.util.BlockCoord; public class WirelessChargedLocation { @@ -35,8 +35,8 @@ public class WirelessChargedLocation { Collections.sort(chargers, new Comparator() { @Override public int compare(IWirelessCharger o1, IWirelessCharger o2) { - int dist1 = o1.getLocation().distanceSquared(bc); - int dist2 = o2.getLocation().distanceSquared(bc); + int dist1 = o1.getLocation().getDistSq(bc); + int dist2 = o2.getLocation().getDistSq(bc); return dist1 - dist2; } }); diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java index a9f9744e..21c36053 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java @@ -9,13 +9,15 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.config.Config; import crazypants.util.BaublesUtil; -import crazypants.util.BlockCoord; public class WirelessChargerController { @@ -68,7 +70,7 @@ public class WirelessChargerController { public void getChargers(World world, BlockCoord bc, Collection res) { Map chargers = getChargersForWorld(world); for (IWirelessCharger wc : chargers.values()) { - if(wc.getLocation().distanceSquared(bc) <= RANGE_SQ) { + if(wc.getLocation().getDistSq(bc) <= RANGE_SQ) { res.add(wc); } } @@ -81,7 +83,7 @@ public class WirelessChargerController { } BlockCoord bc = new BlockCoord(player); for (IWirelessCharger capBank : chargers.values()) { - if(capBank.isActive() && capBank.getLocation().distanceSquared(bc) <= RANGE_SQ) { + if(capBank.isActive() && capBank.getLocation().getDistSq(bc) <= RANGE_SQ) { boolean done = chargeFromCapBank(player, capBank); if(done) { return; diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java index 6c62fe55..708dae4e 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java @@ -1,24 +1,21 @@ package crazypants.enderio.machine.wireless; -import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; -import crazypants.render.IconUtil; import crazypants.render.VertexRotation; import crazypants.render.VertexTransform; import crazypants.render.VertexTransformComposite; import crazypants.render.VertexTranslation; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vertex; public class WirelessChargerRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index 309e7933..d7e86fc2 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -15,6 +15,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,7 +27,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.machine.painter.TileEntityPaintedBlock; -import crazypants.util.BlockCoord; public class BlockFusedQuartz extends BlockEio { diff --git a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java index ede7ad1c..fb26ed1d 100644 --- a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java +++ b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java @@ -11,13 +11,15 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.util.Lang; public class BlockIngotStorage extends BlockEio implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java index 9551dc79..99d59770 100644 --- a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java +++ b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java @@ -6,9 +6,11 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.util.Lang; public class BlockItemDarkIronBars extends ItemBlock { diff --git a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java index 5f2098db..492ae4f3 100644 --- a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java +++ b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java @@ -7,15 +7,14 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.render.ConduitBundleRenderer.FacadeAccessWrapper; import crazypants.enderio.config.Config; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.machine.painter.TileEntityPaintedBlock; -import crazypants.enderio.conduit.render.ConduitBundleRenderer.FacadeAccessWrapper; import crazypants.render.ConnectedTextureRenderer; import crazypants.render.ConnectedTextureRenderer.DefaultTextureCallback; import crazypants.render.CustomCubeRenderer; diff --git a/src/main/java/crazypants/enderio/material/ItemCapacitor.java b/src/main/java/crazypants/enderio/material/ItemCapacitor.java index 84cc8e92..0325eb85 100644 --- a/src/main/java/crazypants/enderio/material/ItemCapacitor.java +++ b/src/main/java/crazypants/enderio/material/ItemCapacitor.java @@ -9,6 +9,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -19,7 +22,6 @@ import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.ICapacitorItem; -import crazypants.util.Lang; public class ItemCapacitor extends Item implements ICapacitorItem { diff --git a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java index 79ccb4b5..5fc44224 100644 --- a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java @@ -9,10 +9,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; -import crazypants.util.Lang; public class ItemFusedQuartz extends ItemBlockWithMetadata { diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index aa104f50..66592298 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -1,11 +1,5 @@ package crazypants.enderio.material; -import static crazypants.enderio.EnderIO.itemBasicCapacitor; -import static crazypants.util.OreDictionaryHelper.INGOT_TIN; -import static crazypants.util.OreDictionaryHelper.hasCopper; -import static crazypants.util.OreDictionaryHelper.hasEnderPearlDust; -import static crazypants.util.OreDictionaryHelper.hasTin; - import java.util.ArrayList; import net.minecraft.init.Blocks; @@ -15,11 +9,15 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; + +import com.enderio.core.common.util.OreDictionaryHelper; + import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask; -import crazypants.util.OreDictionaryHelper; + +import static crazypants.enderio.EnderIO.itemBasicCapacitor; public class MaterialRecipes { diff --git a/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java b/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java index 2072986f..5c2533fe 100644 --- a/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java +++ b/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java @@ -7,7 +7,8 @@ import java.util.Map; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import crazypants.util.OreDictionaryHelper; + +import com.enderio.core.common.util.OreDictionaryHelper; public final class OreDictionaryPreferences { diff --git a/src/main/java/crazypants/enderio/material/PowderIngot.java b/src/main/java/crazypants/enderio/material/PowderIngot.java index 6649103b..668f6fbb 100644 --- a/src/main/java/crazypants/enderio/material/PowderIngot.java +++ b/src/main/java/crazypants/enderio/material/PowderIngot.java @@ -1,10 +1,5 @@ package crazypants.enderio.material; -import static crazypants.util.OreDictionaryHelper.DUST_ENDERPEARL; -import static crazypants.util.OreDictionaryHelper.INGOT_COPPER; -import static crazypants.util.OreDictionaryHelper.INGOT_ENDERIUM; -import static crazypants.util.OreDictionaryHelper.INGOT_TIN; -import static crazypants.util.OreDictionaryHelper.isRegistered; public enum PowderIngot { diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java index c61e859d..865880bd 100644 --- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java @@ -19,6 +19,9 @@ import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; + +import com.enderio.core.common.util.FluidUtil; + import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.recipe.IRecipe; @@ -26,7 +29,6 @@ import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.vat.GuiVat; import crazypants.enderio.machine.vat.VatRecipeManager; import crazypants.render.RenderUtil; -import crazypants.util.FluidUtil; public class VatRecipeHandler extends TemplateRecipeHandler { diff --git a/src/main/java/crazypants/enderio/power/IPowerContainer.java b/src/main/java/crazypants/enderio/power/IPowerContainer.java index 734883b8..5b9f751c 100644 --- a/src/main/java/crazypants/enderio/power/IPowerContainer.java +++ b/src/main/java/crazypants/enderio/power/IPowerContainer.java @@ -1,6 +1,6 @@ package crazypants.enderio.power; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public interface IPowerContainer { diff --git a/src/main/java/crazypants/enderio/power/PowerDistributor.java b/src/main/java/crazypants/enderio/power/PowerDistributor.java index 59f2ca6c..fb960d4c 100644 --- a/src/main/java/crazypants/enderio/power/PowerDistributor.java +++ b/src/main/java/crazypants/enderio/power/PowerDistributor.java @@ -8,7 +8,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.util.BlockCoord; +import com.enderio.core.common.util.BlockCoord; public class PowerDistributor { diff --git a/src/main/java/crazypants/enderio/rail/BlockEnderRail.java b/src/main/java/crazypants/enderio/rail/BlockEnderRail.java index 7413ee80..9f703c22 100644 --- a/src/main/java/crazypants/enderio/rail/BlockEnderRail.java +++ b/src/main/java/crazypants/enderio/rail/BlockEnderRail.java @@ -16,6 +16,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.MetadataUtil; +import com.enderio.core.common.util.RoundRobinIterator; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -31,8 +35,6 @@ import crazypants.enderio.machine.transceiver.ServerChannelRegister; import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; -import crazypants.util.MetadataUtil; -import crazypants.util.RoundRobinIterator; public class BlockEnderRail extends BlockRail implements IResourceTooltipProvider { @@ -260,7 +262,7 @@ public class BlockEnderRail extends BlockRail implements IResourceTooltipProvide if(sender.getWorldObj().provider.dimensionId != reciever.getWorldObj().provider.dimensionId) { powerRequired = Config.enderRailPowerRequireCrossDimensions; } else { - powerRequired += sender.getLocation().distance(reciever.getLocation()) * Config.enderRailPowerRequiredPerBlock; + powerRequired += sender.getLocation().getDist(reciever.getLocation()) * Config.enderRailPowerRequiredPerBlock; if(Config.enderRailCapSameDimensionPowerAtCrossDimensionCost) { powerRequired = Math.min(powerRequired, Config.enderRailPowerRequireCrossDimensions); } diff --git a/src/main/java/crazypants/enderio/rail/EnderRailController.java b/src/main/java/crazypants/enderio/rail/EnderRailController.java index a6fcffcf..f02ee802 100644 --- a/src/main/java/crazypants/enderio/rail/EnderRailController.java +++ b/src/main/java/crazypants/enderio/rail/EnderRailController.java @@ -23,12 +23,14 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.EntityUtil; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector3d; + import crazypants.enderio.config.Config; import crazypants.enderio.machine.transceiver.TileTransceiver; -import crazypants.util.BlockCoord; -import crazypants.util.EntityUtil; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector3d; public class EnderRailController { diff --git a/src/main/java/crazypants/enderio/rail/PacketTeleportEffects.java b/src/main/java/crazypants/enderio/rail/PacketTeleportEffects.java index 41f7dbcd..05cabc32 100644 --- a/src/main/java/crazypants/enderio/rail/PacketTeleportEffects.java +++ b/src/main/java/crazypants/enderio/rail/PacketTeleportEffects.java @@ -1,19 +1,17 @@ package crazypants.enderio.rail; +import io.netty.buffer.ByteBuf; + import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.teleport.packet.PacketDrainStaff; -import crazypants.util.BlockCoord; -import crazypants.util.ClientUtil; public class PacketTeleportEffects implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java b/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java index 90cc18fd..5b06425d 100644 --- a/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java +++ b/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java @@ -7,12 +7,14 @@ import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.EntityUtil; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.transceiver.TileTransceiver; -import crazypants.util.BlockCoord; -import crazypants.util.EntityUtil; public class PlayerTeleportHandler { diff --git a/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java b/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java index 466defe5..4179ebe3 100644 --- a/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java +++ b/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java @@ -13,7 +13,8 @@ import net.minecraft.entity.item.EntityMinecart; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.vecmath.Vector3d; + +import com.enderio.core.common.vecmath.Vector3d; public class RailcraftLinkUtil implements ICartLinkUtil { diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java index 4488dd9a..b1ee3015 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java @@ -10,6 +10,9 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.api.teleport.ITravelAccessable.AccessMode; import crazypants.enderio.gui.CheckBoxEIO; @@ -20,8 +23,6 @@ import crazypants.enderio.teleport.packet.PacketLabel; import crazypants.gui.GuiContainerBase; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; public class GuiTravelAccessable extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java index a3f0aeae..058a51e0 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java @@ -10,13 +10,14 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.Lang; + import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.network.MessageTileNBT; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; public class GuiTravelAuth extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index 98207d1f..1c074938 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -22,6 +22,15 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Camera; +import com.enderio.core.common.vecmath.Matrix4d; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector2d; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; @@ -41,13 +50,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.packet.PacketDrainStaff; import crazypants.enderio.teleport.packet.PacketOpenAuthGui; import crazypants.enderio.teleport.packet.PacketTravelEvent; -import crazypants.util.BlockCoord; -import crazypants.util.Util; -import crazypants.vecmath.Camera; -import crazypants.vecmath.Matrix4d; -import crazypants.vecmath.VecmathUtil; -import crazypants.vecmath.Vector2d; -import crazypants.vecmath.Vector3d; public class TravelController { diff --git a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java index 834f9e0e..b2efbc52 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java @@ -16,6 +16,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.UsernameCache; + +import com.enderio.core.common.util.Lang; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; @@ -45,7 +48,6 @@ import crazypants.enderio.teleport.packet.PacketLabel; import crazypants.enderio.teleport.packet.PacketOpenAuthGui; import crazypants.enderio.teleport.packet.PacketTravelEvent; import crazypants.util.IFacade; -import crazypants.util.Lang; public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEntityProvider, IResourceTooltipProvider, IFacade { diff --git a/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java index 882e7ea3..6e416b4b 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java @@ -11,13 +11,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; + +import com.enderio.core.common.util.PlayerUtil; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.machine.painter.IPaintableTileEntity; -import crazypants.util.PlayerUtil; public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable, IPaintableTileEntity { diff --git a/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java index 5af9e834..eb655895 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java @@ -16,6 +16,12 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL14; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vector4f; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -25,11 +31,6 @@ import crazypants.enderio.teleport.TravelController; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.Util; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vector4f; @SideOnly(Side.CLIENT) public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer { diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java index 1fa5758b..9f319926 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java @@ -13,8 +13,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.api.teleport.IItemOfTravel; import crazypants.enderio.api.teleport.TeleportEntityEvent; import crazypants.enderio.api.teleport.TravelSource; -import crazypants.util.Util; -import crazypants.vecmath.Vector3d; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; public class PacketTravelEvent implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java index 0c9a2420..9d2e425c 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java @@ -2,13 +2,15 @@ package crazypants.enderio.teleport.telepad; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; + +import com.enderio.core.common.util.Lang; + import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.ContainerTravelAccessable; import crazypants.enderio.teleport.GuiTravelAccessable; -import crazypants.util.Lang; public class GuiAugmentedTravelAccessible extends GuiTravelAccessable implements IToggleableGui { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index 3c15371f..268cd8ee 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -13,6 +13,9 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.Util; import com.google.common.collect.Lists; import crazypants.enderio.EnderIO; @@ -25,9 +28,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; -import crazypants.util.Util; public class GuiTelePad extends GuiContainerBase implements IToggleableGui { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java index d3975c0a..40f02c98 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java @@ -16,6 +16,12 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Lang; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; + import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIOTab; @@ -23,10 +29,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.ITelePad; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.teleport.anchor.BlockTravelAnchor; -import crazypants.util.BlockCoord; -import crazypants.util.Lang; -import crazypants.util.Util; -import crazypants.vecmath.Vector3d; public class ItemCoordSelector extends Item implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java index 8e9e976a..f22a8778 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java @@ -1,12 +1,14 @@ package crazypants.enderio.teleport.telepad; import io.netty.buffer.ByteBuf; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.network.MessageTileEntity; -import crazypants.util.BlockCoord; public class PacketUpdateCoords extends MessageTileEntity implements IMessageHandler{ diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java b/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java index cb79f9a7..07f32e7b 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java @@ -10,6 +10,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.render.RenderUtil; + import static org.lwjgl.opengl.GL11.*; public class TeleportEntityRenderHandler { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index ec731ca5..b0f17d1d 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -22,6 +22,9 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.EnergyStorage; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.IProgressTile; +import com.enderio.core.common.util.Util; import com.google.common.collect.Lists; import com.google.common.collect.Queues; @@ -41,9 +44,6 @@ import crazypants.enderio.teleport.TravelController; import crazypants.enderio.teleport.anchor.TileTravelAnchor; import crazypants.enderio.teleport.packet.PacketTravelEvent; import crazypants.enderio.teleport.telepad.PacketTeleport.Type; -import crazypants.util.BlockCoord; -import crazypants.util.IProgressTile; -import crazypants.util.Util; public class TileTelePad extends TileTravelAnchor implements IInternalPowerReceiver, ITelePad, IProgressTile { diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index e4d8b25f..5b999f10 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -43,7 +43,7 @@ import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.IFacade; -import crazypants.util.Lang; +import com.enderio.core.common.util.Lang; import static crazypants.enderio.waila.IWailaInfoProvider.*; public class WailaCompat implements IWailaDataProvider { diff --git a/src/main/java/crazypants/render/BoundingBox.java b/src/main/java/crazypants/render/BoundingBox.java index 3a32a9a8..e6c3312d 100644 --- a/src/main/java/crazypants/render/BoundingBox.java +++ b/src/main/java/crazypants/render/BoundingBox.java @@ -6,11 +6,11 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.util.BlockCoord; -import crazypants.vecmath.Vector2f; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vertex; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Vector2f; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vertex; public final class BoundingBox { diff --git a/src/main/java/crazypants/render/ColorUtil.java b/src/main/java/crazypants/render/ColorUtil.java index 6a134ef9..d0d6831e 100644 --- a/src/main/java/crazypants/render/ColorUtil.java +++ b/src/main/java/crazypants/render/ColorUtil.java @@ -2,8 +2,8 @@ package crazypants.render; import java.awt.Color; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vector4f; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vector4f; public final class ColorUtil { diff --git a/src/main/java/crazypants/render/ConnectedTextureRenderer.java b/src/main/java/crazypants/render/ConnectedTextureRenderer.java index d89bf294..5939b7d5 100644 --- a/src/main/java/crazypants/render/ConnectedTextureRenderer.java +++ b/src/main/java/crazypants/render/ConnectedTextureRenderer.java @@ -9,12 +9,14 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.util.BlockCoord; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector2f; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector4f; -import crazypants.vecmath.Vertex; + +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector2f; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector4f; +import com.enderio.core.common.vecmath.Vertex; + +import com.enderio.core.common.util.BlockCoord; public class ConnectedTextureRenderer implements IRenderFace, IConnectedTextureRenderer { diff --git a/src/main/java/crazypants/render/CubeRenderer.java b/src/main/java/crazypants/render/CubeRenderer.java index 48c4f571..3df3ce73 100644 --- a/src/main/java/crazypants/render/CubeRenderer.java +++ b/src/main/java/crazypants/render/CubeRenderer.java @@ -4,7 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.vecmath.Vector3d; + +import com.enderio.core.common.vecmath.Vector3d; public final class CubeRenderer { diff --git a/src/main/java/crazypants/render/CustomRenderBlocks.java b/src/main/java/crazypants/render/CustomRenderBlocks.java index 86b85cfc..0723f17e 100644 --- a/src/main/java/crazypants/render/CustomRenderBlocks.java +++ b/src/main/java/crazypants/render/CustomRenderBlocks.java @@ -11,7 +11,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.vecmath.Vertex; +import com.enderio.core.common.vecmath.Vertex; public class CustomRenderBlocks extends RenderBlocks { diff --git a/src/main/java/crazypants/render/IRenderFace.java b/src/main/java/crazypants/render/IRenderFace.java index 18bd4d9e..54e43ea7 100644 --- a/src/main/java/crazypants/render/IRenderFace.java +++ b/src/main/java/crazypants/render/IRenderFace.java @@ -5,7 +5,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.vecmath.Vertex; +import com.enderio.core.common.vecmath.Vertex; public interface IRenderFace { diff --git a/src/main/java/crazypants/render/RenderUtil.java b/src/main/java/crazypants/render/RenderUtil.java index 374fdd34..62744cb8 100644 --- a/src/main/java/crazypants/render/RenderUtil.java +++ b/src/main/java/crazypants/render/RenderUtil.java @@ -36,15 +36,15 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.ReflectionHelper; import crazypants.enderio.Log; -import crazypants.util.BlockCoord; -import crazypants.vecmath.Matrix4d; -import crazypants.vecmath.VecmathUtil; -import crazypants.vecmath.Vector2f; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vector4d; -import crazypants.vecmath.Vector4f; -import crazypants.vecmath.Vertex; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Matrix4d; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector2f; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vector4d; +import com.enderio.core.common.vecmath.Vector4f; +import com.enderio.core.common.vecmath.Vertex; import static net.minecraftforge.common.util.ForgeDirection.*; import static org.lwjgl.opengl.GL11.*; diff --git a/src/main/java/crazypants/render/TechneUtil.java b/src/main/java/crazypants/render/TechneUtil.java index 5faf8e5b..d5617dbe 100644 --- a/src/main/java/crazypants/render/TechneUtil.java +++ b/src/main/java/crazypants/render/TechneUtil.java @@ -67,7 +67,7 @@ import com.google.common.collect.Maps; import cpw.mods.fml.common.ObfuscationReflectionHelper; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3d; /** * Slightly modified to fit the EnderIO source. diff --git a/src/main/java/crazypants/render/VertexRotation.java b/src/main/java/crazypants/render/VertexRotation.java index 6cf4241e..88f08f2d 100644 --- a/src/main/java/crazypants/render/VertexRotation.java +++ b/src/main/java/crazypants/render/VertexRotation.java @@ -1,9 +1,9 @@ package crazypants.render; -import crazypants.vecmath.Quat4d; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vertex; +import com.enderio.core.common.vecmath.Quat4d; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vertex; public class VertexRotation implements VertexTransform { diff --git a/src/main/java/crazypants/render/VertexRotationFacing.java b/src/main/java/crazypants/render/VertexRotationFacing.java index a0ddcf1b..ce1c15c3 100644 --- a/src/main/java/crazypants/render/VertexRotationFacing.java +++ b/src/main/java/crazypants/render/VertexRotationFacing.java @@ -1,7 +1,7 @@ package crazypants.render; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3d; public class VertexRotationFacing extends VertexRotation { diff --git a/src/main/java/crazypants/render/VertexTransform.java b/src/main/java/crazypants/render/VertexTransform.java index bb1a6ee0..c4c12c02 100644 --- a/src/main/java/crazypants/render/VertexTransform.java +++ b/src/main/java/crazypants/render/VertexTransform.java @@ -1,8 +1,8 @@ package crazypants.render; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vertex; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vertex; public interface VertexTransform { diff --git a/src/main/java/crazypants/render/VertexTransformComposite.java b/src/main/java/crazypants/render/VertexTransformComposite.java index ea50f119..bee2bdd4 100644 --- a/src/main/java/crazypants/render/VertexTransformComposite.java +++ b/src/main/java/crazypants/render/VertexTransformComposite.java @@ -2,9 +2,9 @@ package crazypants.render; import java.util.Collection; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vertex; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vertex; public class VertexTransformComposite implements VertexTransform { diff --git a/src/main/java/crazypants/render/VertexTranslation.java b/src/main/java/crazypants/render/VertexTranslation.java index 9a0cff90..61da9558 100644 --- a/src/main/java/crazypants/render/VertexTranslation.java +++ b/src/main/java/crazypants/render/VertexTranslation.java @@ -1,8 +1,8 @@ package crazypants.render; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vertex; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vertex; public class VertexTranslation implements VertexTransform { diff --git a/src/main/java/crazypants/util/ArrayInventory.java b/src/main/java/crazypants/util/ArrayInventory.java index 92f29799..2237953b 100644 --- a/src/main/java/crazypants/util/ArrayInventory.java +++ b/src/main/java/crazypants/util/ArrayInventory.java @@ -4,6 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import com.enderio.core.common.util.Util; + public class ArrayInventory implements IInventory { protected ItemStack[] items; diff --git a/src/main/java/crazypants/util/BlockCoord.java b/src/main/java/crazypants/util/BlockCoord.java deleted file mode 100644 index 9c871ea1..00000000 --- a/src/main/java/crazypants/util/BlockCoord.java +++ /dev/null @@ -1,158 +0,0 @@ -package crazypants.util; - -import com.google.common.base.Strings; - -import io.netty.buffer.ByteBuf; -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -public final class BlockCoord { - - public final int x; - public final int y; - public final int z; - - public BlockCoord(int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; - } - - public BlockCoord() { - this(0, 0, 0); - } - - public BlockCoord(double x, double y, double z) { - this(MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z)); - } - - public BlockCoord(TileEntity tile) { - this(tile.xCoord, tile.yCoord, tile.zCoord); - } - - public BlockCoord(Entity e) { - this(e.posX, e.posY, e.posZ); - } - - public BlockCoord(BlockCoord bc) { - this(bc.x, bc.y, bc.z); - } - - public BlockCoord getLocation(ForgeDirection dir) { - return new BlockCoord(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ); - } - - public BlockCoord(String x, String y, String z) { - this(Strings.isNullOrEmpty(x) ? 0 : Integer.parseInt(x), - Strings.isNullOrEmpty(y) ? 0 : Integer.parseInt(y), - Strings.isNullOrEmpty(z) ? 0 : Integer.parseInt(z)); - } - - public BlockCoord(MovingObjectPosition mop) { - this(mop.blockX, mop.blockY, mop.blockZ); - } - - public int distanceSquared(BlockCoord other) { - int dx, dy, dz; - dx = x - other.x; - dy = y - other.y; - dz = z - other.z; - return (dx * dx + dy * dy + dz * dz); - } - - public int distance(BlockCoord other) { - double dsq = distanceSquared(other); - return (int)Math.ceil(Math.sqrt(dsq)); - } - - public Block getBlock(World world) { - return world.getBlock(x, y, z); - } - - public TileEntity getTileEntity(World world) { - return world.getTileEntity(x, y, z); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + x; - result = prime * result + y; - result = prime * result + z; - return result; - } - - @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; - } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - BlockCoord other = (BlockCoord) obj; - if(x != other.x) { - return false; - } - if(y != other.y) { - return false; - } - if(z != other.z) { - return false; - } - return true; - } - - @Override - public String toString() { - return "BlockCoord [x=" + x + ", y=" + y + ", z=" + z + "]"; - } - - public String chatString() { - return chatString(EnumChatFormatting.WHITE); - } - - public String chatString(EnumChatFormatting defaultColor) { - return String.format( - "x%s%d%s y%s%d%s z%s%d", - EnumChatFormatting.GREEN, x, defaultColor, - EnumChatFormatting.GREEN, y, defaultColor, - EnumChatFormatting.GREEN, z - ); - } - - public boolean equals(int xCoord, int yCoord, int zCoord) { - return x == xCoord && y == yCoord && z == zCoord; - } - - public void writeToBuf(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } - - public static BlockCoord readFromBuf(ByteBuf buf) { - return new BlockCoord(buf.readInt(), buf.readInt(), buf.readInt()); - } - - public void writeToNBT(NBTTagCompound tag) { - tag.setInteger("bc:x", x); - tag.setInteger("bc:y", y); - tag.setInteger("bc:z", z); - } - - public static BlockCoord readFromNBT(NBTTagCompound tag) { - return new BlockCoord(tag.getInteger("bc:x"), tag.getInteger("bc:y"), tag.getInteger("bc:z")); - } -} diff --git a/src/main/java/crazypants/util/BuildcraftUtil.java b/src/main/java/crazypants/util/BuildcraftUtil.java index 2fa77e8e..53115c9a 100644 --- a/src/main/java/crazypants/util/BuildcraftUtil.java +++ b/src/main/java/crazypants/util/BuildcraftUtil.java @@ -6,6 +6,11 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.IFluidReceptor; +import com.enderio.core.common.util.IItemReceptor; +import com.enderio.core.common.util.ItemUtil; + public class BuildcraftUtil implements IItemReceptor, IFluidReceptor { static { diff --git a/src/main/java/crazypants/util/ClientUtil.java b/src/main/java/crazypants/util/ClientUtil.java index ea47bea7..ed1e4e42 100644 --- a/src/main/java/crazypants/util/ClientUtil.java +++ b/src/main/java/crazypants/util/ClientUtil.java @@ -5,6 +5,9 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.gas.IGasConduit; diff --git a/src/main/java/crazypants/util/DyeColor.java b/src/main/java/crazypants/util/DyeColor.java deleted file mode 100644 index 4f295387..00000000 --- a/src/main/java/crazypants/util/DyeColor.java +++ /dev/null @@ -1,115 +0,0 @@ -package crazypants.util; - -import net.minecraft.item.ItemDye; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public enum DyeColor { - - BLACK, - RED, - GREEN, - BROWN, - BLUE, - PURPLE, - CYAN, - SILVER, - GRAY, - PINK, - LIME, - YELLOW, - LIGHT_BLUE, - MAGENTA, - ORANGE, - WHITE; - - public static final String[] DYE_ORE_NAMES = { - "dyeBlack", - "dyeRed", - "dyeGreen", - "dyeBrown", - "dyeBlue", - "dyePurple", - "dyeCyan", - "dyeLightGray", - "dyeGray", - "dyePink", - "dyeLime", - "dyeYellow", - "dyeLightBlue", - "dyeMagenta", - "dyeOrange", - "dyeWhite" - }; - - public static final String[] DYE_ORE_UNLOCAL_NAMES = { - - "item.fireworksCharge.black", - "item.fireworksCharge.red", - "item.fireworksCharge.green", - "item.fireworksCharge.brown", - "item.fireworksCharge.blue", - "item.fireworksCharge.purple", - "item.fireworksCharge.cyan", - "item.fireworksCharge.silver", - "item.fireworksCharge.gray", - "item.fireworksCharge.pink", - "item.fireworksCharge.lime", - "item.fireworksCharge.yellow", - "item.fireworksCharge.lightBlue", - "item.fireworksCharge.magenta", - "item.fireworksCharge.orange", - "item.fireworksCharge.white" - - }; - - public static DyeColor getNext(DyeColor col) { - int ord = col.ordinal() + 1; - if(ord >= DyeColor.values().length) { - ord = 0; - } - return DyeColor.values()[ord]; - } - - public static DyeColor getColorFromDye(ItemStack dye) { - if(dye == null) { - return null; - } - int oreId = OreDictionary.getOreID(dye); - if(oreId < 0) { - return null; - } - for (int i = 0; i < DYE_ORE_NAMES.length; i++) { - String dyeName = DYE_ORE_NAMES[i]; - if(OreDictionary.getOreID(dyeName) == oreId) { - return DyeColor.values()[i]; - } - } - return null; - } - - public static DyeColor fromIndex(int index) { - return DyeColor.values()[index]; - } - - private DyeColor() { - } - - public int getColor() { - return ItemDye.field_150922_c[ordinal()]; - } - - public String getName() { - return ItemDye.field_150921_b[ordinal()]; - } - - public String getLocalisedName() { - return Lang.localize(DYE_ORE_UNLOCAL_NAMES[ordinal()], false); - } - - @Override - public String toString() { - return getName(); - } - -} \ No newline at end of file diff --git a/src/main/java/crazypants/util/EntityUtil.java b/src/main/java/crazypants/util/EntityUtil.java deleted file mode 100644 index 2a214658..00000000 --- a/src/main/java/crazypants/util/EntityUtil.java +++ /dev/null @@ -1,94 +0,0 @@ -package crazypants.util; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.boss.IBossDisplayData; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import crazypants.vecmath.Vector3d; - -public class EntityUtil { - - public static String getDisplayNameForEntity(String mobName) { - return StatCollector.translateToLocal("entity." + mobName + ".name"); - } - - public static List getAllRegisteredMobNames(boolean excludeBosses) { - List result = new ArrayList(); - Set> entries = EntityList.classToStringMapping.entrySet(); - for(Map.Entry entry : entries) { - if(EntityLiving.class.isAssignableFrom(entry.getKey()) ) { - if(!excludeBosses || !IBossDisplayData.class.isAssignableFrom(entry.getKey())) { - result.add(entry.getValue()); - } - } - } - return result; - } - - private EntityUtil() { - } - - public static Vector3d getEntityPosition(Entity ent) { - return new Vector3d(ent.posX, ent.posY, ent.posZ); - } - - public static List getCollidingBlockGeometry(World world, Entity entity) { - AxisAlignedBB entityBounds = entity.boundingBox; - ArrayList collidingBoundingBoxes = new ArrayList(); - int minX = MathHelper.floor_double(entityBounds.minX); - int minY = MathHelper.floor_double(entityBounds.minY); - int minZ = MathHelper.floor_double(entityBounds.minZ); - int maxX = MathHelper.floor_double(entityBounds.maxX + 1.0D); - int maxY = MathHelper.floor_double(entityBounds.maxY + 1.0D); - int maxZ = MathHelper.floor_double(entityBounds.maxZ + 1.0D); - for (int x = minX; x < maxX; x++) { - for (int z = minZ; z < maxZ; z++) { - for (int y = minY; y < maxY; y++) { - Block block = world.getBlock(x, y, z); - if(block != null) { - block.addCollisionBoxesToList(world, x, y, z, entityBounds, collidingBoundingBoxes, entity); - } - } - } - } - return collidingBoundingBoxes; - } - - public static void spawnItemInWorldWithRandomMotion(World world, ItemStack item, int x, int y, int z) { - if(item != null) { - spawnItemInWorldWithRandomMotion(world, item, x + 0.5, y + 0.5, z + 0.5); - } - } - - public static void spawnItemInWorldWithRandomMotion(World world, ItemStack item, double x, double y, double z) { - if(item != null) { - spawnItemInWorldWithRandomMotion(new EntityItem(world, x, y, z, item)); - } - } - - public static void spawnItemInWorldWithRandomMotion(EntityItem entity) { - entity.delayBeforeCanPickup = 10; - - float f = (entity.worldObj.rand.nextFloat() * 0.1f) - 0.05f; - float f1 = (entity.worldObj.rand.nextFloat() * 0.1f) - 0.05f; - float f2 = (entity.worldObj.rand.nextFloat() * 0.1f) - 0.05f; - - entity.motionX += f; - entity.motionY += f1; - entity.motionZ += f2; - - entity.worldObj.spawnEntityInWorld(entity); - } -} diff --git a/src/main/java/crazypants/util/FluidUtil.java b/src/main/java/crazypants/util/FluidUtil.java deleted file mode 100644 index e7ff8df1..00000000 --- a/src/main/java/crazypants/util/FluidUtil.java +++ /dev/null @@ -1,462 +0,0 @@ -package crazypants.util; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemPotion; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fluids.IFluidContainerItem; -import net.minecraftforge.fluids.IFluidHandler; -import net.minecraftforge.fluids.IFluidTank; -import cpw.mods.fml.common.Loader; -import crazypants.enderio.Log; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.config.Config; - -public class FluidUtil { - - public static final List fluidReceptors = new ArrayList(); - - static { - try { - Class.forName("crazypants.util.BuildcraftUtil"); - } catch (Exception e) { - if(Loader.isModLoaded("BuildCraft|Transport")) { - Log.warn("ItemUtil: Could not register Build Craft pipe handler. Fluid conduits will show connections to all Build Craft pipes."); - } //Don't log if BC isn't installed, but we still check in case another mod is using their API - } - } - - public static Map getNeighbouringFluidHandlers(IBlockAccess world, BlockCoord bc) { - Map res = new HashMap(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - IFluidHandler fh = getFluidHandler(world, bc.getLocation(dir)); - if(fh != null) { - res.put(dir, fh); - } - } - return res; - } - - public static IFluidHandler getExternalFluidHandler(IBlockAccess world, BlockCoord bc) { - IFluidHandler con = getFluidHandler(world, bc); - return (con != null && !(con instanceof IConduitBundle)) ? con : null; - } - - public static IFluidHandler getFluidHandler(IBlockAccess world, BlockCoord bc) { - return getFluidHandler(world, bc.x, bc.y, bc.z); - } - - public static IFluidHandler getFluidHandler(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - return getFluidHandler(te); - } - - public static IFluidHandler getFluidHandler(TileEntity te) { - if(te instanceof IFluidHandler) { - IFluidHandler res = (IFluidHandler) te; - for (IFluidReceptor rec : fluidReceptors) { - if(!rec.isValidReceptor(res)) { - return null; - } - } - return res; - } - return null; - } - - public static FluidStack getFluidFromItem(ItemStack stack) { - if(stack != null) { - FluidStack fluidStack = null; - if(stack.getItem() instanceof IFluidContainerItem) { - fluidStack = ((IFluidContainerItem) stack.getItem()).getFluid(stack); - } - if(fluidStack == null) { - fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack); - } - if(fluidStack == null && Block.getBlockFromItem(stack.getItem()) instanceof IFluidBlock) { - Fluid fluid = ((IFluidBlock) Block.getBlockFromItem(stack.getItem())).getFluid(); - if(fluid != null) { - return new FluidStack(fluid, 1000); - } - } - return fluidStack; - } - return null; - } - - public static boolean doPull(IFluidHandler into, ForgeDirection fromDir, int maxVolume) { - TileEntity te = (TileEntity) into; - BlockCoord loc = new BlockCoord(te).getLocation(fromDir); - IFluidHandler target = FluidUtil.getFluidHandler(te.getWorldObj(), loc); - if(target != null) { - FluidTankInfo[] infos = target.getTankInfo(fromDir.getOpposite()); - if(infos != null) { - for (FluidTankInfo info : infos) { - if(info.fluid != null && info.fluid.amount > 0) { - if(into.canFill(fromDir, info.fluid.getFluid())) { - FluidStack canPull = info.fluid.copy(); - canPull.amount = Math.min(maxVolume, canPull.amount); - FluidStack drained = target.drain(fromDir.getOpposite(), canPull, false); - if(drained != null && drained.amount > 0) { - int filled = into.fill(fromDir, drained, false); - if(filled > 0) { - drained = target.drain(fromDir.getOpposite(), filled, true); - into.fill(fromDir, drained, true); - return true; - } - } - } - } - } - } - } - return false; - } - - public static boolean doPush(IFluidHandler from, ForgeDirection fromDir, int maxVolume) { - - TileEntity te = (TileEntity) from; - BlockCoord loc = new BlockCoord(te).getLocation(fromDir); - IFluidHandler target = getFluidHandler(te.getWorldObj(), loc); - if(target == null) { - return false; - } - FluidTankInfo[] infos = from.getTankInfo(fromDir); - boolean res = false; - if(infos != null) { - for (FluidTankInfo info : infos) { - if(info.fluid != null && info.fluid.amount > 0 && from.canDrain(fromDir, info.fluid.getFluid())) { - FluidStack maxDrain = new FluidStack(info.fluid.getFluid(), maxVolume); - FluidStack canDrain = from.drain(fromDir, maxDrain, false); - if(canDrain != null && canDrain.amount > 0) { - int filled = target.fill(fromDir.getOpposite(), canDrain, true); - from.drain(fromDir, new FluidStack(info.fluid.getFluid(), filled), true); - res |= true; - } - } - } - } - return res; - } - - public static FluidAndStackResult tryFillContainer(ItemStack target, FluidStack source) { - if (target != null && target.getItem() != null && source != null && source.getFluid() != null && source.amount > 0) { - - if (target.getItem() instanceof IFluidContainerItem) { - ItemStack resultStack = target.copy(); - resultStack.stackSize = 1; - int amount = ((IFluidContainerItem) target.getItem()).fill(resultStack, source, true); - if (amount <= 0) { - return new FluidAndStackResult(null, null, target, source); - } - FluidStack resultFluid = source.copy(); - resultFluid.amount = amount; - ItemStack remainderStack = target.copy(); - remainderStack.stackSize--; - if (remainderStack.stackSize <= 0) { - remainderStack = null; - } - FluidStack remainderFluid = source.copy(); - remainderFluid.amount -= amount; - if (remainderFluid.amount <= 0) { - remainderFluid = null; - } - return new FluidAndStackResult(resultStack, resultFluid, remainderStack, remainderFluid); - } - - ItemStack resultStack = FluidContainerRegistry.fillFluidContainer(source.copy(), target); - if (resultStack != null) { - FluidStack resultFluid = FluidContainerRegistry.getFluidForFilledItem(resultStack); - if (resultFluid != null) { - ItemStack remainderStack = target.copy(); - remainderStack.stackSize--; - if (remainderStack.stackSize <= 0) { - remainderStack = null; - } - FluidStack remainderFluid = source.copy(); - remainderFluid.amount -= resultFluid.amount; - if (remainderFluid.amount <= 0) { - remainderFluid = null; - } - return new FluidAndStackResult(resultStack, resultFluid, remainderStack, remainderFluid); - } - } - - } - return new FluidAndStackResult(null, null, target, source); - } - - public static FluidAndStackResult tryDrainContainer(ItemStack source, FluidStack target, int capacity) { - if (source != null && source.getItem() != null) { - - int maxDrain = capacity - (target != null ? target.amount : 0); - if (source.getItem() instanceof IFluidContainerItem) { - ItemStack resultStack = source.copy(); - resultStack.stackSize = 1; - FluidStack resultFluid = ((IFluidContainerItem) source.getItem()).drain(resultStack, maxDrain, true); - if (resultFluid == null || resultFluid.amount <= 0 || (target != null && resultFluid.getFluid() != target.getFluid())) { - return new FluidAndStackResult(null, null, source, target); - } - ItemStack remainderStack = source.copy(); - remainderStack.stackSize--; - if (remainderStack.stackSize <= 0) { - remainderStack = null; - } - FluidStack remainderFluid = target != null ? target.copy() : new FluidStack(resultFluid.getFluid(), 0); - remainderFluid.amount += resultFluid.amount; - return new FluidAndStackResult(resultStack, resultFluid, remainderStack, remainderFluid); - } - - FluidStack resultFluid = FluidContainerRegistry.getFluidForFilledItem(source); - if (resultFluid != null && resultFluid.amount > 0 && resultFluid.amount <= maxDrain - && (target == null || resultFluid.getFluid() == target.getFluid())) { - ItemStack resultStack = source.getItem().getContainerItem(source); - if (resultStack == null && Config.enableWaterFromBottles && source.getItem() instanceof ItemPotion - && source.stackTagCompound == null) { - resultStack = new ItemStack(Items.glass_bottle); - } - ItemStack remainderStack = source.copy(); - remainderStack.stackSize--; - if (remainderStack.stackSize <= 0) { - remainderStack = null; - } - FluidStack remainderFluid = target != null ? target.copy() : new FluidStack(resultFluid.getFluid(), 0); - remainderFluid.amount += resultFluid.amount; - return new FluidAndStackResult(resultStack, resultFluid, remainderStack, remainderFluid); - } - - - } - return new FluidAndStackResult(null, null, source, target); - } - - public static FluidAndStackResult tryDrainContainer(ItemStack source, ITankAccess tank) { - if (source != null && source.getItem() != null) { - - if (source.getItem() instanceof IFluidContainerItem) { - IFluidTank targetTank = tank.getInputTank(((IFluidContainerItem) source.getItem()).getFluid(source)); - if (targetTank != null) { - FluidStack target = targetTank.getFluid(); - int maxDrain = targetTank.getCapacity() - (target != null ? target.amount : 0); - ItemStack resultStack = source.copy(); - resultStack.stackSize = 1; - FluidStack resultFluid = ((IFluidContainerItem) source.getItem()).drain(resultStack, maxDrain, true); - if (resultFluid == null || resultFluid.amount <= 0 || (target != null && resultFluid.getFluid() != target.getFluid())) { - return new FluidAndStackResult(null, null, source, target); - } - ItemStack remainderStack = source.copy(); - remainderStack.stackSize--; - if (remainderStack.stackSize <= 0) { - remainderStack = null; - } - FluidStack remainderFluid = target != null ? target.copy() : new FluidStack(resultFluid.getFluid(), 0); - remainderFluid.amount += resultFluid.amount; - return new FluidAndStackResult(resultStack, resultFluid, remainderStack, remainderFluid); - } - } - - FluidStack resultFluid = FluidContainerRegistry.getFluidForFilledItem(source); - if (resultFluid != null && resultFluid.amount > 0) { - IFluidTank targetTank = tank.getInputTank(resultFluid); - if (targetTank != null) { - FluidStack target = targetTank.getFluid(); - int maxDrain = targetTank.getCapacity() - (target != null ? target.amount : 0); - if (resultFluid.amount <= maxDrain && (target == null || resultFluid.getFluid() == target.getFluid())) { - ItemStack resultStack = source.getItem().getContainerItem(source); - if (resultStack == null && Config.enableWaterFromBottles && source.getItem() instanceof ItemPotion - && source.stackTagCompound == null) { - resultStack = new ItemStack(Items.glass_bottle); - } - ItemStack remainderStack = source.copy(); - remainderStack.stackSize--; - if (remainderStack.stackSize <= 0) { - remainderStack = null; - } - FluidStack remainderFluid = target != null ? target.copy() : new FluidStack(resultFluid.getFluid(), 0); - remainderFluid.amount += resultFluid.amount; - return new FluidAndStackResult(resultStack, resultFluid, remainderStack, remainderFluid); - } - } - } - - } - return new FluidAndStackResult(null, null, source, null); - } - - /** - * If the currently held item of the given player can be filled with the - * liquid in the given tank's output tank, do so and put the resultant filled - * container item where it can go. This will also drain the tank and set it to - * dirty. - * - *

- * Cases handled for the the filled container: - * - *

    - *
  • If the stacksize of the held item is one, then it will be replaced by - * the filled container unless the player in in creative. - *
  • If the filled container is stackable and the player already has a - * non-maxed stack in the inventory, it is put there. - *
  • If the player has space in his inventory, it is put there. - *
  • Otherwise it will be dropped on the ground between the position given - * as parameter and the player's position. - *
- * - * @param world - * @param x - * @param y - * @param z - * @param entityPlayer - * @param tank - * @return true if a container was filled, false otherwise - */ - public static boolean fillPlayerHandItemFromInternalTank(World world, int x, int y, int z, EntityPlayer entityPlayer, - ITankAccess tank) { - - for (FluidTank subTank : tank.getOutputTanks()) { - FluidAndStackResult fill = tryFillContainer(entityPlayer.inventory.getCurrentItem(), subTank.getFluid()); - if(fill.result.fluidStack != null) { - - subTank.setFluid(fill.remainder.fluidStack); - tank.setTanksDirty(); - if(!entityPlayer.capabilities.isCreativeMode) { - if(fill.remainder.itemStack == null) { - entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, fill.result.itemStack); - return true; - } else { - entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, fill.remainder.itemStack); - } - - if(fill.result.itemStack.isStackable()) { - for (int i = 0; i < entityPlayer.inventory.mainInventory.length; i++) { - ItemStack inventoryItem = entityPlayer.inventory.mainInventory[i]; - if(ItemUtil.areStackMergable(inventoryItem, fill.result.itemStack) && inventoryItem.stackSize < inventoryItem.getMaxStackSize()) { - fill.result.itemStack.stackSize += inventoryItem.stackSize; - entityPlayer.inventory.setInventorySlotContents(i, fill.result.itemStack); - return true; - } - } - } - - for (int i = 0; i < entityPlayer.inventory.mainInventory.length; i++) { - if(entityPlayer.inventory.mainInventory[i] == null) { - entityPlayer.inventory.setInventorySlotContents(i, fill.result.itemStack); - return true; - } - } - - if(!world.isRemote) { - double x0 = (x + entityPlayer.posX) / 2.0D; - double y0 = (y + entityPlayer.posY) / 2.0D + 0.5D; - double z0 = (z + entityPlayer.posZ) / 2.0D; - Util.dropItems(world, fill.result.itemStack, x0, y0, z0, true); - } - } - - return true; - } - } - return false; - } - - public static boolean fillInternalTankFromPlayerHandItem(World world, int x, int y, int z, EntityPlayer entityPlayer, - ITankAccess tank) { - FluidAndStackResult fill = tryDrainContainer(entityPlayer.inventory.getCurrentItem(), tank); - if(fill.result.fluidStack == null) { - return false; - } - - tank.getInputTank(fill.result.fluidStack).setFluid(fill.remainder.fluidStack); - tank.setTanksDirty(); - - if(!entityPlayer.capabilities.isCreativeMode) { - if(fill.remainder.itemStack == null) { - entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, fill.result.itemStack); - return true; - } else { - entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, fill.remainder.itemStack); - } - - if(fill.result.itemStack.isStackable()) { - for (int i = 0; i < entityPlayer.inventory.mainInventory.length; i++) { - ItemStack inventoryItem = entityPlayer.inventory.mainInventory[i]; - if(ItemUtil.areStackMergable(inventoryItem, fill.result.itemStack) && inventoryItem.stackSize < inventoryItem.getMaxStackSize()) { - fill.result.itemStack.stackSize += inventoryItem.stackSize; - entityPlayer.inventory.setInventorySlotContents(i, fill.result.itemStack); - return true; - } - } - } - - for (int i = 0; i < entityPlayer.inventory.mainInventory.length; i++) { - if(entityPlayer.inventory.mainInventory[i] == null) { - entityPlayer.inventory.setInventorySlotContents(i, fill.result.itemStack); - return true; - } - } - - if(!world.isRemote) { - double x0 = (x + entityPlayer.posX) / 2.0D; - double y0 = (y + entityPlayer.posY) / 2.0D + 0.5D; - double z0 = (z + entityPlayer.posZ) / 2.0D; - Util.dropItems(world, fill.result.itemStack, x0, y0, z0, true); - } - } - - return true; - } - - public static class FluidAndStack { - public final FluidStack fluidStack; - public final ItemStack itemStack; - - public FluidAndStack(FluidStack fluidStack, ItemStack itemStack) { - this.fluidStack = fluidStack; - this.itemStack = itemStack; - } - - public FluidAndStack(ItemStack itemStack, FluidStack fluidStack) { - this.fluidStack = fluidStack; - this.itemStack = itemStack; - } - } - - public static class FluidAndStackResult { - public final FluidAndStack result; - public final FluidAndStack remainder; - - public FluidAndStackResult(FluidAndStack result, FluidAndStack remainder) { - this.result = result; - this.remainder = remainder; - } - - public FluidAndStackResult(FluidStack fluidStackResult, ItemStack itemStackResult, FluidStack fluidStackRemainder, - ItemStack itemStackRemainder) { - this.result = new FluidAndStack(fluidStackResult, itemStackResult); - this.remainder = new FluidAndStack(fluidStackRemainder, itemStackRemainder); - } - - public FluidAndStackResult(ItemStack itemStackResult, FluidStack fluidStackResult, ItemStack itemStackRemainder, - FluidStack fluidStackRemainder) { - this.result = new FluidAndStack(fluidStackResult, itemStackResult); - this.remainder = new FluidAndStack(fluidStackRemainder, itemStackRemainder); - } - } - -} diff --git a/src/main/java/crazypants/util/ForgeDirectionOffsets.java b/src/main/java/crazypants/util/ForgeDirectionOffsets.java deleted file mode 100644 index d515900e..00000000 --- a/src/main/java/crazypants/util/ForgeDirectionOffsets.java +++ /dev/null @@ -1,59 +0,0 @@ -package crazypants.util; - -import net.minecraftforge.common.util.ForgeDirection; -import crazypants.vecmath.Vector3d; - -public final class ForgeDirectionOffsets { - - public static final Vector3d[] OFFSETS = new Vector3d[ForgeDirection.values().length]; - - static { - for (ForgeDirection dir : ForgeDirection.values()) { - OFFSETS[dir.ordinal()] = new Vector3d(dir.offsetX, dir.offsetY, dir.offsetZ); - } - } - - public static Vector3d forDir(ForgeDirection dir) { - return OFFSETS[dir.ordinal()]; - } - - public static Vector3d forDirCopy(ForgeDirection dir) { - return new Vector3d(OFFSETS[dir.ordinal()]); - } - - public static Vector3d offsetScaled(ForgeDirection dir, double scale) { - Vector3d res = forDirCopy(dir); - res.scale(scale); - return res; - } - - public static Vector3d absolueOffset(ForgeDirection dir) { - Vector3d res = forDirCopy(dir); - res.x = Math.abs(res.x); - res.y = Math.abs(res.y); - res.z = Math.abs(res.z); - return res; - } - - public ForgeDirection closest(float x, float y, float z) { - float ax = Math.abs(x); - float ay = Math.abs(y); - float az = Math.abs(z); - - if(ax >= ay && ax >= az) { - return x > 0 ? ForgeDirection.EAST : ForgeDirection.WEST; - } - if(ay >= ax && ay >= az) { - return y > 0 ? ForgeDirection.UP : ForgeDirection.DOWN; - } - return z > 0 ? ForgeDirection.SOUTH : ForgeDirection.NORTH; - } - - private ForgeDirectionOffsets() { - } - - public static boolean isPositiveOffset(ForgeDirection dir) { - return dir == ForgeDirection.SOUTH || dir == ForgeDirection.EAST || dir == ForgeDirection.UP; - } - -} diff --git a/src/main/java/crazypants/util/IBlockAccessWrapper.java b/src/main/java/crazypants/util/IBlockAccessWrapper.java deleted file mode 100644 index 5506bfb1..00000000 --- a/src/main/java/crazypants/util/IBlockAccessWrapper.java +++ /dev/null @@ -1,78 +0,0 @@ -package crazypants.util; - -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class IBlockAccessWrapper implements IBlockAccess { - - protected IBlockAccess wrapped; - - public IBlockAccessWrapper(IBlockAccess ba) { - wrapped = ba; - } - - @Override - public boolean isSideSolid(int x, int y, int z, ForgeDirection side, boolean _default) { - return wrapped.isSideSolid(x, y, z, side, _default); - } - - @Override - public int isBlockProvidingPowerTo(int var1, int var2, int var3, int var4) { - return wrapped.isBlockProvidingPowerTo(var1, var2, var3, var4); - } - - @Override - public boolean isAirBlock(int var1, int var2, int var3) { - return wrapped.isAirBlock(var1, var2, var3); - } - - @Override - public TileEntity getTileEntity(int var1, int var2, int var3) { - if (var2 >= 0 && var2 < 256) { - return wrapped.getTileEntity(var1, var2, var3); - } else { - return null; - } - } - - @Override - @SideOnly(Side.CLIENT) - public int getLightBrightnessForSkyBlocks(int var1, int var2, int var3, int var4) { - return 15 << 20 | 15 << 4; - } - - @Override - @SideOnly(Side.CLIENT) - public int getHeight() { - return wrapped.getHeight(); - } - - @Override - public int getBlockMetadata(int var1, int var2, int var3) { - return wrapped.getBlockMetadata(var1, var2, var3); - } - - @Override - public Block getBlock(int var1, int var2, int var3) { - return wrapped.getBlock(var1, var2, var3); - } - - @Override - @SideOnly(Side.CLIENT) - public BiomeGenBase getBiomeGenForCoords(int var1, int var2) { - - return wrapped.getBiomeGenForCoords(var1, var2); - } - - @Override - @SideOnly(Side.CLIENT) - public boolean extendedLevelsInChunkCache() { - return wrapped.extendedLevelsInChunkCache(); - } - -} diff --git a/src/main/java/crazypants/util/IFluidReceptor.java b/src/main/java/crazypants/util/IFluidReceptor.java deleted file mode 100644 index cab0a0ee..00000000 --- a/src/main/java/crazypants/util/IFluidReceptor.java +++ /dev/null @@ -1,9 +0,0 @@ -package crazypants.util; - -import net.minecraftforge.fluids.IFluidHandler; - -public interface IFluidReceptor { - - boolean isValidReceptor(IFluidHandler handler); - -} diff --git a/src/main/java/crazypants/util/IItemReceptor.java b/src/main/java/crazypants/util/IItemReceptor.java deleted file mode 100644 index d2a0b099..00000000 --- a/src/main/java/crazypants/util/IItemReceptor.java +++ /dev/null @@ -1,12 +0,0 @@ -package crazypants.util; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -public interface IItemReceptor { - - boolean canInsertIntoObject(Object into, ForgeDirection side); - - int doInsertItem(Object into, ItemStack item, ForgeDirection side); - -} diff --git a/src/main/java/crazypants/util/IProgressTile.java b/src/main/java/crazypants/util/IProgressTile.java deleted file mode 100644 index 2a63ae05..00000000 --- a/src/main/java/crazypants/util/IProgressTile.java +++ /dev/null @@ -1,22 +0,0 @@ -package crazypants.util; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.tileentity.TileEntity; - -public interface IProgressTile { - - float getProgress(); - - /** - * Client-only. Called to set clientside progress for syncing/rendering - * purposes. - * - * @param progress - * The % progress. - */ - @SideOnly(Side.CLIENT) - void setProgress(float progress); - - TileEntity getTileEntity(); -} diff --git a/src/main/java/crazypants/util/ITankAccess.java b/src/main/java/crazypants/util/ITankAccess.java deleted file mode 100644 index 2525a0bd..00000000 --- a/src/main/java/crazypants/util/ITankAccess.java +++ /dev/null @@ -1,33 +0,0 @@ -package crazypants.util; - -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; - -public interface ITankAccess { - - /** - * Find tank to insert fluid. - * - * @param forFluidType - * The type of fluid that should be inserted. May be null. - * @return An internal tank that can take the given type of fluid. If multiple - * tanks can take the fluid, the first one that is not full will be - * returned. If no tank can take the fluid, returns null. - */ - FluidTank getInputTank(FluidStack forFluidType); - - /** - * Get tank(s) to remove liquid from. - * - * @return Tank that can be drained. Tanks are returned in order or priority. - * If there's no tank, an empty array is returned. - */ - FluidTank[] getOutputTanks(); - - /** - * Will be called after a tank that was returned by one of the other methods - * was manipulated. - */ - void setTanksDirty(); - -} diff --git a/src/main/java/crazypants/util/InventoryWrapper.java b/src/main/java/crazypants/util/InventoryWrapper.java deleted file mode 100644 index f7f04934..00000000 --- a/src/main/java/crazypants/util/InventoryWrapper.java +++ /dev/null @@ -1,118 +0,0 @@ -package crazypants.util; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; - -public class InventoryWrapper implements ISidedInventory { - - public static ISidedInventory asSidedInventory(IInventory inv) { - if(inv == null) { - return null; - } - if(inv instanceof ISidedInventory) { - return (ISidedInventory) inv; - } - return new InventoryWrapper(inv); - } - - private IInventory inv; - - public InventoryWrapper(IInventory inventory) { - this.inv = ItemUtil.getInventory(inventory); - } - - public IInventory getWrappedInv() { - return inv; - } - - @Override - public int getSizeInventory() { - return inv.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) { - if(slot < 0 || slot >= inv.getSizeInventory()) { - return null; - } - return inv.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int amount) { - return inv.decrStackSize(slot, amount); - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inv.getStackInSlotOnClosing(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack itemStack) { - if(slot >= 0 && slot < inv.getSizeInventory()) { - inv.setInventorySlotContents(slot, itemStack); - } - } - - @Override - public String getInventoryName() { - return inv.getInventoryName(); - } - - @Override - public int getInventoryStackLimit() { - return inv.getInventoryStackLimit(); - } - - @Override - public void markDirty() { - inv.markDirty(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return inv.isUseableByPlayer(entityplayer); - } - - @Override - public void openInventory() { - inv.openInventory(); - } - - @Override - public void closeInventory() { - inv.closeInventory(); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack itemStack) { - return slot >= 0 && slot < getSizeInventory() && inv.isItemValidForSlot(slot, itemStack); - } - - @Override - public int[] getAccessibleSlotsFromSide(int var1) { - int[] slots = new int[inv.getSizeInventory()]; - for (int i = 0; i < slots.length; i++) { - slots[i] = i; - } - return slots; - } - - @Override - public boolean canInsertItem(int slot, ItemStack itemStack, int side) { - return isItemValidForSlot(slot, itemStack); - } - - @Override - public boolean canExtractItem(int slot, ItemStack itemStack, int side) { - return slot >= 0 && slot < getSizeInventory(); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } -} \ No newline at end of file diff --git a/src/main/java/crazypants/util/ItemUtil.java b/src/main/java/crazypants/util/ItemUtil.java deleted file mode 100644 index 6ecefb08..00000000 --- a/src/main/java/crazypants/util/ItemUtil.java +++ /dev/null @@ -1,257 +0,0 @@ -package crazypants.util; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.inventory.InventoryLargeChest; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.transport.IItemDuct; -import cpw.mods.fml.common.Loader; -import crazypants.enderio.Log; - -public class ItemUtil { - - public static final List receptors = new ArrayList(); - - static { - try { - Class.forName("crazypants.util.BuildcraftUtil"); - } catch (Exception e) { - if(Loader.isModLoaded("BuildCraft|Transport")) { - Log.warn("ItemUtil: Could not register Build Craft pipe handler. Machines will not be able to output to BC pipes."); - } //Don't log if BC isn't installed, but we still check in case another mod is using their API - } - } - - public static String getDurabilityString(ItemStack item) { - if(item == null) { - return null; - } - return Lang.localize("item.darkSteel.tooltip.durability") + " " + (item.getMaxDamage() - item.getItemDamage()) + "/" + item.getMaxDamage(); - } - - public static NBTTagCompound getOrCreateNBT(ItemStack stack) { - if(stack.stackTagCompound == null) { - stack.stackTagCompound = new NBTTagCompound(); - } - return stack.stackTagCompound; - } - - public static int doInsertItem(Object into, ItemStack item, ForgeDirection side) { - if(into == null || item == null) { - return 0; - } - if(into instanceof ISidedInventory) { - return ItemUtil.doInsertItemInv((ISidedInventory) into, item, side); - } else if(into instanceof IInventory) { - return ItemUtil.doInsertItemInv(getInventory((IInventory) into), item, side); - } else if(into instanceof IItemDuct) { - return ItemUtil.doInsertItem((IItemDuct) into, item, side); - } - - for (IItemReceptor rec : receptors) { - if(rec.canInsertIntoObject(into, side)) { - return rec.doInsertItem(into, item, side); - } - } - - return 0; - } - - public static int doInsertItem(IItemDuct con, ItemStack item, ForgeDirection inventorySide) { - int startedWith = item.stackSize; - ItemStack remaining = con.insertItem(inventorySide, item); - if(remaining == null) { - return startedWith; - } - return startedWith - remaining.stackSize; - } - - public static int doInsertItem(IInventory inv, int startSlot, int endSlot, ItemStack item) { - return doInsertItemInv(inv, null, invSlotter.getInstance(startSlot, endSlot), item, ForgeDirection.UNKNOWN); - } - - /* - * Insert items into an IInventory or an ISidedInventory. - */ - private static int doInsertItemInv(IInventory inv, ItemStack item, ForgeDirection inventorySide) { - final ISidedInventory sidedInv = inv instanceof ISidedInventory ? (ISidedInventory) inv : null; - ISlotIterator slots; - - if (sidedInv != null) { - if(inventorySide == null) { - inventorySide = ForgeDirection.UNKNOWN; - } - // Note: This is not thread-safe. Change to getInstance() to constructor when needed (1.8++?). - slots = sidedSlotter.getInstance(sidedInv.getAccessibleSlotsFromSide(inventorySide.ordinal())); - } else { - slots = invSlotter.getInstance(0, inv.getSizeInventory()); - } - - return doInsertItemInv(inv, sidedInv, slots, item, inventorySide); - } - - private static int doInsertItemInv(IInventory inv, ISidedInventory sidedInv, ISlotIterator slots, ItemStack item, ForgeDirection inventorySide) { - int numInserted = 0; - int numToInsert = item.stackSize; - int firstFreeSlot = -1; - - // PASS1: Try to add to an existing stack - while (numToInsert > 0 && slots.hasNext()) { - final int slot = slots.nextSlot(); - if(sidedInv == null || sidedInv.canInsertItem(slot, item, inventorySide.ordinal())) { - final ItemStack contents = inv.getStackInSlot(slot); - if(contents != null) { - if (areStackMergable(contents, item)) { - final int freeSpace = Math.min(inv.getInventoryStackLimit(), contents.getMaxStackSize()) - contents.stackSize; // some inventories like using itemstacks with invalid stack sizes - if (freeSpace > 0) { - final int noToInsert = Math.min(numToInsert, freeSpace); - final ItemStack toInsert = item.copy(); - toInsert.stackSize = contents.stackSize + noToInsert; - // isItemValidForSlot() may check the stacksize, so give it the number the stack would have in the end. - // If it does something funny, like "only even numbers", we are screwed. - if(sidedInv != null || inv.isItemValidForSlot(slot, toInsert)) { - numInserted += noToInsert; - numToInsert -= noToInsert; - inv.setInventorySlotContents(slot, toInsert); - } - } - } - } else if (firstFreeSlot == -1) { - firstFreeSlot = slot; - } - } - } - - // PASS2: Try to insert into an empty slot - if (numToInsert > 0 && firstFreeSlot != -1) { - final ItemStack toInsert = item.copy(); - toInsert.stackSize = min(numToInsert, inv.getInventoryStackLimit(), toInsert.getMaxStackSize()); // some inventories like using itemstacks with invalid stack sizes - if(sidedInv != null || inv.isItemValidForSlot(firstFreeSlot, toInsert)) { - numInserted += toInsert.stackSize; - numToInsert -= toInsert.stackSize; - inv.setInventorySlotContents(firstFreeSlot, toInsert); - } - } - - if(numInserted > 0) { - inv.markDirty(); - } - return numInserted; - } - - private final static int min(int i1, int i2, int i3) { - return i1 < i2 ? (i1 < i3 ? i1 : i3) : (i2 < i3 ? i2 : i3); - } - - public static boolean isStackFull(ItemStack contents) { - if(contents == null) { - return false; - } - return contents.stackSize >= contents.getMaxStackSize(); - } - - public static IInventory getInventory(IInventory inv) { - if(inv instanceof TileEntityChest) { - TileEntityChest chest = (TileEntityChest) inv; - TileEntityChest neighbour = null; - if(chest.adjacentChestXNeg != null) { - neighbour = chest.adjacentChestXNeg; - } else if(chest.adjacentChestXPos != null) { - neighbour = chest.adjacentChestXPos; - } else if(chest.adjacentChestZNeg != null) { - neighbour = chest.adjacentChestZNeg; - } else if(chest.adjacentChestZPos != null) { - neighbour = chest.adjacentChestZPos; - } - if(neighbour != null) { - return new InventoryLargeChest("", inv, neighbour); - } - return inv; - } - return inv; - } - - /** - * Checks if items, damage and NBT are equal and the items are stackable. - * - * @param s1 - * @param s2 - * @return - */ - public static boolean areStackMergable(ItemStack s1, ItemStack s2) { - if(s1 == null || s2 == null || !s1.isStackable() || !s2.isStackable()) { - return false; - } - if(!s1.isItemEqual(s2)) { - return false; - } - return ItemStack.areItemStackTagsEqual(s1, s2); - } - - /** - * Checks if items, damage and NBT are equal. - * - * @param s1 - * @param s2 - * @return - */ - public static boolean areStacksEqual(ItemStack s1, ItemStack s2) { - if(s1 == null || s2 == null) { - return false; - } - if(!s1.isItemEqual(s2)) { - return false; - } - return ItemStack.areItemStackTagsEqual(s1, s2); - } - - private interface ISlotIterator { - int nextSlot(); - boolean hasNext(); - } - - private final static class invSlotter implements ISlotIterator { - private static final invSlotter me = new invSlotter(); - private int end; - private int current; - public final static invSlotter getInstance(int start, int end) { - me.end = end; - me.current = start; - return me; - } - @Override - public final int nextSlot() { - return current++; - } - @Override - public final boolean hasNext() { - return current < end; - } - } - - private final static class sidedSlotter implements ISlotIterator { - private static final sidedSlotter me = new sidedSlotter(); - private int[] slots; - private int current; - public final static sidedSlotter getInstance(int[] slots) { - me.slots = slots; - me.current = 0; - return me; - } - @Override - public final int nextSlot() { - return slots[current++]; - } - @Override - public final boolean hasNext() { - return slots != null && current < slots.length; - } - } - -} diff --git a/src/main/java/crazypants/util/Lang.java b/src/main/java/crazypants/util/Lang.java deleted file mode 100644 index 892f44d1..00000000 --- a/src/main/java/crazypants/util/Lang.java +++ /dev/null @@ -1,31 +0,0 @@ -package crazypants.util; - -import java.util.IllegalFormatException; - -import net.minecraft.util.StatCollector; - -public class Lang { - - public static final String prefix = "enderio."; - - public static String localize(String s, String... args) { - return localize(s, true, args); - } - - public static String localize(String s, boolean appendEIO, String... args) { - if(appendEIO) { - s = prefix + s; - } - String ret = StatCollector.translateToLocal(s); - try { - return String.format(ret, (Object[]) args); - } catch (IllegalFormatException e) { - return ret; - } - } - - public static String[] localizeList(String string) { - String s = localize(string); - return s.split("\\|"); - } -} diff --git a/src/main/java/crazypants/util/MetadataUtil.java b/src/main/java/crazypants/util/MetadataUtil.java deleted file mode 100644 index 708c95c1..00000000 --- a/src/main/java/crazypants/util/MetadataUtil.java +++ /dev/null @@ -1,43 +0,0 @@ -package crazypants.util; - -public class MetadataUtil { - - public static void printBits(int meta) { - for (int k = 0; k < 4; k++) { - if(((meta >> k) & 1) == 1) { - System.out.print(1); - } else { - System.out.print(0); - } - } - System.out.println(); - } - - public static String toBitString(int meta) { - StringBuilder sb = new StringBuilder(); - for (int k = 0; k < 4; k++) { - if(((meta >> k) & 1) == 1) { - sb.append(1); - } else { - sb.append(0); - } - } - return sb.toString(); - } - - public static boolean isBitSet(int position, int meta) { - return ((meta >> position) & 1) == 1; - } - - public static int setBit(int position, boolean value, int meta) { - if(value) { - return meta | (1 << position); - } - return meta & ~(1 << position); - } - - public static int toggleBit(int position, int meta) { - return setBit(position, !isBitSet(position, meta), meta); - } - -} diff --git a/src/main/java/crazypants/util/OreDictionaryHelper.java b/src/main/java/crazypants/util/OreDictionaryHelper.java deleted file mode 100644 index c140345b..00000000 --- a/src/main/java/crazypants/util/OreDictionaryHelper.java +++ /dev/null @@ -1,45 +0,0 @@ -package crazypants.util; - -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public final class OreDictionaryHelper { - - public static final String INGOT_COPPER = "ingotCopper"; - public static final String INGOT_TIN = "ingotTin"; - public static final String DUST_ENDERPEARL = "dustEnderPearl"; - public static final String INGOT_ENDERIUM = "ingotEnderium"; - - public static boolean isRegistered(String name) { - if(!getOres(name).isEmpty()) { - return true; - } - return false; - } - - public static List getOres(String name) { - return OreDictionary.getOres(name); - } - - public static boolean hasCopper() { - return isRegistered(INGOT_COPPER); - } - - public static boolean hasTin() { - return isRegistered(INGOT_TIN); - } - - public static boolean hasEnderPearlDust() { - return isRegistered(DUST_ENDERPEARL); - } - - private OreDictionaryHelper() { - } - - public static boolean hasEnderium() { - return isRegistered(INGOT_ENDERIUM); - } - -} diff --git a/src/main/java/crazypants/util/PlayerUtil.java b/src/main/java/crazypants/util/PlayerUtil.java deleted file mode 100644 index 0b74519d..00000000 --- a/src/main/java/crazypants/util/PlayerUtil.java +++ /dev/null @@ -1,31 +0,0 @@ -package crazypants.util; - -import net.minecraftforge.common.UsernameCache; - -import java.util.Map; -import java.util.UUID; - -public class PlayerUtil { - - public static UUID getPlayerUUID(String username) { - for (Map.Entry entry : UsernameCache.getMap().entrySet()) { - - if(entry.getValue().equalsIgnoreCase(username)) { - return entry.getKey(); - } - } - return null; - } - - public static UUID getPlayerUIDUnstable(String possibleUUID) { - if(possibleUUID == null || possibleUUID.isEmpty()) - return null; - UUID uuid = null; - try { - uuid = UUID.fromString(possibleUUID); - } catch (IllegalArgumentException e) { - uuid = getPlayerUUID(possibleUUID); - } - return uuid; - } -} diff --git a/src/main/java/crazypants/util/RoundRobinIterator.java b/src/main/java/crazypants/util/RoundRobinIterator.java deleted file mode 100644 index 83e148d7..00000000 --- a/src/main/java/crazypants/util/RoundRobinIterator.java +++ /dev/null @@ -1,44 +0,0 @@ -package crazypants.util; - -import java.util.Iterator; -import java.util.List; - -public class RoundRobinIterator implements Iterable, Iterator { - - private int index = -1; - private int currentCount = 0; - private final List itOver; - - public RoundRobinIterator(List itOver) { - this.itOver = itOver; - } - - @Override - public Iterator iterator() { - currentCount = 0; - return this; - } - - @Override - public boolean hasNext() { - return !itOver.isEmpty() && currentCount < itOver.size(); - } - - @Override - public T next() { - if(itOver.isEmpty()) { - return null; - } - currentCount++; - index++; - if(index >= itOver.size()) { - index = 0; - } - return itOver.get(index); - } - - @Override - public void remove() { - } - -} diff --git a/src/main/java/crazypants/util/SoundUtil.java b/src/main/java/crazypants/util/SoundUtil.java deleted file mode 100644 index d625b852..00000000 --- a/src/main/java/crazypants/util/SoundUtil.java +++ /dev/null @@ -1,17 +0,0 @@ -package crazypants.util; - -import net.minecraft.client.Minecraft; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class SoundUtil { - - @SideOnly(Side.CLIENT) - public static void playClientSoundFX(String name, TileEntity te) { - World world = Minecraft.getMinecraft().thePlayer.worldObj; - Minecraft.getMinecraft().theWorld.playSound(te.xCoord + 0.5, te.yCoord + 0.5, te.zCoord + 0.5, name, 0.1F, 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F),true); - } - -} diff --git a/src/main/java/crazypants/util/Util.java b/src/main/java/crazypants/util/Util.java deleted file mode 100644 index 15bb6d3a..00000000 --- a/src/main/java/crazypants/util/Util.java +++ /dev/null @@ -1,530 +0,0 @@ -package crazypants.util; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityXPOrb; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemPotion; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.oredict.OreDictionary; - -import com.google.common.base.Charsets; -import com.google.common.base.Joiner; -import com.google.common.io.Files; - -import crazypants.enderio.Log; -import crazypants.vecmath.Vector3d; - -public class Util { - - public static Block getBlockFromItemId(ItemStack itemId) { - Item item = itemId.getItem(); - if(item instanceof ItemBlock) { - return ((ItemBlock) item).field_150939_a; - } - return null; - } - - public static ItemStack consumeItem(ItemStack stack) { - if(stack.getItem() instanceof ItemPotion) { - if(stack.stackSize == 1) { - return new ItemStack(Items.glass_bottle); - } else { - stack.splitStack(1); - return stack; - } - } - if(stack.stackSize == 1) { - if(stack.getItem().hasContainerItem(stack)) { - return stack.getItem().getContainerItem(stack); - } else { - return null; - } - } else { - stack.splitStack(1); - return stack; - } - } - - public static void giveExperience(EntityPlayer thePlayer, float experience) { - if(experience < 1.0F) { - int rndRound = MathHelper.floor_float(experience); - if(rndRound < MathHelper.ceiling_float_int(experience) && (float) Math.random() < experience) { - ++rndRound; - } - experience = rndRound; - } - int intExp = Math.round(experience); - while (intExp > 0) { - int j = EntityXPOrb.getXPSplit(intExp); - intExp -= j; - thePlayer.worldObj.spawnEntityInWorld(new EntityXPOrb(thePlayer.worldObj, thePlayer.posX, thePlayer.posY + 0.5D, thePlayer.posZ + 0.5D, j)); - } - } - - // derived from ItemBlock.onItemUse - public static BlockCoord canPlaceItem(ItemStack itemUsed, Block blockIdToBePlaced, EntityPlayer player, World world, int x, int y, int z, int side) { - - if(blockIdToBePlaced == null) { - return null; - } - - Block block = world.getBlock(x, y, z); - - if(block == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) { - side = 1; - } else if(block != Blocks.vine && block != Blocks.tallgrass && block != Blocks.deadbush - && (block == null || !block.isReplaceable(world, x, y, z))) { - - if(side == 0) { - --y; - } else if(side == 1) { - ++y; - } else if(side == 2) { - --z; - } else if(side == 3) { - ++z; - } else if(side == 4) { - --x; - } else if(side == 5) { - ++x; - } - } - - if(itemUsed.stackSize == 0) { - return null; - } else if(!player.canPlayerEdit(x, y, z, side, itemUsed)) { - return null; - } else if(y == 255 && blockIdToBePlaced.getMaterial().isSolid()) { - return null; - } else if(world.canPlaceEntityOnSide(blockIdToBePlaced, x, y, z, false, side, player, itemUsed)) { - return new BlockCoord(x, y, z); - } - return null; - - } - - public static EntityItem createDrop(World world, ItemStack stack, double x, double y, double z, boolean doRandomSpread) { - if(stack == null || stack.stackSize <= 0) { - return null; - } - if(doRandomSpread) { - float f1 = 0.7F; - double d = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; - double d1 = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; - double d2 = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d, y + d1, z + d2, stack); - entityitem.delayBeforeCanPickup = 10; - return entityitem; - } else { - EntityItem entityitem = new EntityItem(world, x, y, z, stack); - entityitem.motionX = 0; - entityitem.motionY = 0; - entityitem.motionZ = 0; - entityitem.delayBeforeCanPickup = 0; - return entityitem; - } - } - - public static void dropItems(World world, ItemStack stack, double x, double y, double z, boolean doRandomSpread) { - if(stack == null || stack.stackSize <= 0) { - return; - } - - EntityItem entityitem = createEntityItem(world, stack, x, y, z, doRandomSpread); - world.spawnEntityInWorld(entityitem); - - } - - public static EntityItem createEntityItem(World world, ItemStack stack, double x, double y, double z) { - return createEntityItem(world, stack, x, y, z, true); - } - - public static EntityItem createEntityItem(World world, ItemStack stack, double x, double y, double z, boolean doRandomSpread) { - EntityItem entityitem; - if(doRandomSpread) { - float f1 = 0.7F; - double d = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; - double d1 = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; - double d2 = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; - entityitem = new EntityItem(world, x + d, y + d1, z + d2, stack); - entityitem.delayBeforeCanPickup = 10; - } else { - entityitem = new EntityItem(world, x, y, z, stack); - entityitem.motionX = 0; - entityitem.motionY = 0; - entityitem.motionZ = 0; - entityitem.delayBeforeCanPickup = 0; - } - return entityitem; - } - - public static void dropItems(World world, ItemStack stack, int x, int y, int z, boolean doRandomSpread) { - if(stack == null || stack.stackSize <= 0) { - return; - } - - if(doRandomSpread) { - float f1 = 0.7F; - double d = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; - double d1 = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; - double d2 = (world.rand.nextFloat() * f1) + (1.0F - f1) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d, y + d1, z + d2, stack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - } else { - EntityItem entityitem = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, stack); - entityitem.motionX = 0; - entityitem.motionY = 0; - entityitem.motionZ = 0; - entityitem.delayBeforeCanPickup = 0; - world.spawnEntityInWorld(entityitem); - } - - } - - public static void dropItems(World world, ItemStack[] inventory, int x, int y, int z, boolean doRandomSpread) { - if(inventory == null) { - return; - } - for (ItemStack stack : inventory) { - if(stack != null && stack.stackSize > 0) { - dropItems(world, stack.copy(), x, y, z, doRandomSpread); - } - } - } - - public static void dropItems(World world, IInventory inventory, int x, int y, int z, boolean doRandomSpread) { - for (int l = 0; l < inventory.getSizeInventory(); ++l) { - ItemStack items = inventory.getStackInSlot(l); - - if(items != null && items.stackSize > 0) { - dropItems(world, inventory.getStackInSlot(l).copy(), x, y, z, doRandomSpread); - } - } - } - - public static boolean dumpModObjects(File file) { - - StringBuilder sb = new StringBuilder(); - for (Object key : Block.blockRegistry.getKeys()) { - if(key != null) { - sb.append(key.toString()); - sb.append("\n"); - } - } - for (Object key : Item.itemRegistry.getKeys()) { - if(key != null) { - sb.append(key.toString()); - sb.append("\n"); - } - } - - try { - Files.write(sb, file, Charsets.UTF_8); - return true; - } catch (IOException e) { - Log.warn("Error dumping ore dictionary entries: " + e.getMessage()); - e.printStackTrace(); - return false; - } - } - - public static boolean dumpOreNames(File file) { - - try { - String[] oreNames = OreDictionary.getOreNames(); - Files.write(Joiner.on("\n").join(oreNames), file, Charsets.UTF_8); - return true; - } catch (IOException e) { - Log.warn("Error dumping ore dictionary entries: " + e.getMessage()); - e.printStackTrace(); - return false; - } - } - - public static ItemStack decrStackSize(IInventory inventory, int slot, int size) { - ItemStack item = inventory.getStackInSlot(slot); - if(item != null) { - if(item.stackSize <= size) { - ItemStack result = item; - inventory.setInventorySlotContents(slot, null); - inventory.markDirty(); - return result; - } - ItemStack split = item.splitStack(size); - if(item.stackSize == 0) { - inventory.setInventorySlotContents(slot, null); - } - inventory.markDirty(); - return split; - } - return null; - } - - public static Vec3 getEyePosition(EntityPlayer player) { - Vec3 v = Vec3.createVectorHelper(player.posX, player.posY, player.posZ); - if(player.worldObj.isRemote) { - //take into account any eye changes done by mods. - v.yCoord += player.getEyeHeight() - player.getDefaultEyeHeight(); - } else { - v.yCoord += player.getEyeHeight(); - if(player instanceof EntityPlayerMP && player.isSneaking()) { - v.yCoord -= 0.08; - } - } - return v; - } - - public static Vector3d getEyePositionEio(EntityPlayer player) { - Vector3d res = new Vector3d(player.posX, player.posY, player.posZ); - if(player.worldObj.isRemote) { - //take into account any eye changes done by mods. - res.y += player.getEyeHeight() - player.getDefaultEyeHeight(); - } else { - res.y += player.getEyeHeight(); - if(player instanceof EntityPlayerMP && player.isSneaking()) { - res.y -= 0.08; - } - } - return res; - } - - public static Vector3d getLookVecEio(EntityPlayer player) { - Vec3 lv = player.getLookVec(); - return new Vector3d(lv.xCoord, lv.yCoord, lv.zCoord); - } - - public static boolean isEquipped(EntityPlayer player, Class class1) { - if(player == null || player.inventory == null || player.inventory.getCurrentItem() == null) { - return false; - } - //player.inventory.getCurrentItem().getClass().getItem().isAssignableFrom(class1) - return class1.isAssignableFrom(player.inventory.getCurrentItem().getItem().getClass()); - } - - public static boolean isType(ItemStack stack, Class class1) { - if(stack == null || class1 == null) { - return false; - } - return class1.isAssignableFrom(stack.getItem().getClass()); - } - - //Code adapted from World.func_147447_a (rayTraceBlocks) to return all collided blocks - public static List raytraceAll(World world, Vec3 startVec, Vec3 endVec, boolean includeLiquids) { - - List result = new ArrayList(); - boolean p_147447_4_ = false; - boolean p_147447_5_ = false; - - if(!Double.isNaN(startVec.xCoord) && !Double.isNaN(startVec.yCoord) && !Double.isNaN(startVec.zCoord)) { - if(!Double.isNaN(endVec.xCoord) && !Double.isNaN(endVec.yCoord) && !Double.isNaN(endVec.zCoord)) { - - int i = MathHelper.floor_double(endVec.xCoord); - int j = MathHelper.floor_double(endVec.yCoord); - int k = MathHelper.floor_double(endVec.zCoord); - int l = MathHelper.floor_double(startVec.xCoord); - int i1 = MathHelper.floor_double(startVec.yCoord); - int j1 = MathHelper.floor_double(startVec.zCoord); - Block block = world.getBlock(l, i1, j1); - int k1 = world.getBlockMetadata(l, i1, j1); - - if((!p_147447_4_ || block.getCollisionBoundingBoxFromPool(world, l, i1, j1) != null) && block.canCollideCheck(k1, includeLiquids)) { - MovingObjectPosition movingobjectposition = block.collisionRayTrace(world, l, i1, j1, startVec, endVec); - if(movingobjectposition != null) { - result.add(movingobjectposition); - } - } - - MovingObjectPosition movingobjectposition2 = null; - k1 = 200; - - while (k1-- >= 0) { - if(Double.isNaN(startVec.xCoord) || Double.isNaN(startVec.yCoord) || Double.isNaN(startVec.zCoord)) { - return null; - } - - if(l == i && i1 == j && j1 == k) { - if(p_147447_5_) { - result.add(movingobjectposition2); - } else { - return result; - } - } - - boolean flag6 = true; - boolean flag3 = true; - boolean flag4 = true; - double d0 = 999.0D; - double d1 = 999.0D; - double d2 = 999.0D; - - if(i > l) { - d0 = l + 1.0D; - } else if(i < l) { - d0 = l + 0.0D; - } else { - flag6 = false; - } - - if(j > i1) { - d1 = i1 + 1.0D; - } else if(j < i1) { - d1 = i1 + 0.0D; - } else { - flag3 = false; - } - - if(k > j1) { - d2 = j1 + 1.0D; - } else if(k < j1) { - d2 = j1 + 0.0D; - } else { - flag4 = false; - } - - double d3 = 999.0D; - double d4 = 999.0D; - double d5 = 999.0D; - double d6 = endVec.xCoord - startVec.xCoord; - double d7 = endVec.yCoord - startVec.yCoord; - double d8 = endVec.zCoord - startVec.zCoord; - - if(flag6) { - d3 = (d0 - startVec.xCoord) / d6; - } - if(flag3) { - d4 = (d1 - startVec.yCoord) / d7; - } - if(flag4) { - d5 = (d2 - startVec.zCoord) / d8; - } - - boolean flag5 = false; - byte b0; - - if(d3 < d4 && d3 < d5) { - if(i > l) { - b0 = 4; - } else { - b0 = 5; - } - - startVec.xCoord = d0; - startVec.yCoord += d7 * d3; - startVec.zCoord += d8 * d3; - } else if(d4 < d5) { - if(j > i1) { - b0 = 0; - } else { - b0 = 1; - } - - startVec.xCoord += d6 * d4; - startVec.yCoord = d1; - startVec.zCoord += d8 * d4; - } else { - if(k > j1) { - b0 = 2; - } else { - b0 = 3; - } - - startVec.xCoord += d6 * d5; - startVec.yCoord += d7 * d5; - startVec.zCoord = d2; - } - - Vec3 vec32 = Vec3.createVectorHelper(startVec.xCoord, startVec.yCoord, startVec.zCoord); - l = (int) (vec32.xCoord = MathHelper.floor_double(startVec.xCoord)); - if(b0 == 5) { - --l; - ++vec32.xCoord; - } - - i1 = (int) (vec32.yCoord = MathHelper.floor_double(startVec.yCoord)); - - if(b0 == 1) { - --i1; - ++vec32.yCoord; - } - - j1 = (int) (vec32.zCoord = MathHelper.floor_double(startVec.zCoord)); - - if(b0 == 3) { - --j1; - ++vec32.zCoord; - } - - Block block1 = world.getBlock(l, i1, j1); - int l1 = world.getBlockMetadata(l, i1, j1); - - if(!p_147447_4_ || block1.getCollisionBoundingBoxFromPool(world, l, i1, j1) != null) { - if(block1.canCollideCheck(l1, includeLiquids)) { - MovingObjectPosition movingobjectposition1 = block1.collisionRayTrace(world, l, i1, j1, startVec, endVec); - if(movingobjectposition1 != null) { - result.add(movingobjectposition1); - } - } else { - movingobjectposition2 = new MovingObjectPosition(l, i1, j1, b0, startVec, false); - } - } - } - if(p_147447_5_ ) { - result.add(movingobjectposition2); - } else { - return result; - } - } else { - return result; - } - } else { - return result; - } - return result; - } - - public static ForgeDirection getDirFromOffset(int xOff, int yOff, int zOff) { - if(xOff != 0 && yOff == 0 && zOff == 0) { - return xOff < 0 ? ForgeDirection.WEST : ForgeDirection.EAST; - } - if(zOff != 0 && yOff == 0 && xOff == 0) { - return zOff < 0 ? ForgeDirection.NORTH : ForgeDirection.SOUTH; - } - if(yOff != 0 && xOff == 0 && zOff == 0) { - return yOff < 0 ? ForgeDirection.DOWN : ForgeDirection.UP; - } - return ForgeDirection.UNKNOWN; - } - - public static int getProgressScaled(int scale, IProgressTile tile) { - return (int) (tile.getProgress() * scale); - } - - // copied from WAILA source to avoid API dependency - public static String WailaStyle = "\u00A4"; - public static String WailaIcon = "\u00A5"; - public static String TAB = WailaStyle + WailaStyle +"a"; - public static String ALIGNRIGHT = WailaStyle + WailaStyle +"b"; - public static String ALIGNCENTER = WailaStyle + WailaStyle +"c"; - public static String HEART = WailaStyle + WailaIcon +"a"; - public static String HHEART = WailaStyle + WailaIcon +"b"; - public static String EHEART = WailaStyle + WailaIcon +"c"; - -} diff --git a/src/main/java/crazypants/vecmath/Camera.java b/src/main/java/crazypants/vecmath/Camera.java deleted file mode 100644 index 1a6da335..00000000 --- a/src/main/java/crazypants/vecmath/Camera.java +++ /dev/null @@ -1,146 +0,0 @@ -package crazypants.vecmath; - -import java.awt.Rectangle; - -public class Camera { - - private Rectangle viewport; - - private Matrix4d projectionTranspose; - private Matrix4d projectionMatrix; - private Matrix4d projectionInverse; - - private Matrix4d viewTranspose; - private Matrix4d viewMatrix; - private Matrix4d viewInverse; - - public boolean isValid() { - return viewMatrix != null && projectionMatrix != null && viewport != null; - } - - public void setProjectionMatrixAsPerspective(double fovDegrees, double near, double far, int viewportWidth, int viewportHeight) { - setProjectionMatrix(VecmathUtil.createProjectionMatrixAsPerspective(fovDegrees, near, far, viewportWidth, viewportHeight)); - } - - public void setViewMatrixAsLookAt(Vector3d eyePos, Vector3d lookAtPos, Vector3d upVec) { - setViewMatrix(VecmathUtil.createMatrixAsLookAt(eyePos, lookAtPos, upVec)); - } - - public Vector3d getEyePoint() { - Matrix4d vpm = new Matrix4d(); - Matrix4d ivm = getInverseViewMatrix(); - if(ivm == null) { - return null; - } - Matrix4d ipm = getInverseProjectionMatrix(); - if(ipm == null) { - return null; - } - vpm.mul(ivm, ipm); - - Vector3d eye = new Vector3d(); - ivm.getTranslation(eye); - return eye; - } - - public boolean getRayForPixel(int x, int y, Vector3d eyeOut, Vector3d normalOut) { - if(isValid()) { - VecmathUtil.computeRayForPixel(viewport, getInverseProjectionMatrix(), getInverseViewMatrix(), x, y, eyeOut, normalOut); - return true; - } - return false; - } - - public Vector2d getScreenPoint(Vector3d point3d) { - Vector4d transPoint = new Vector4d(point3d.x, point3d.y, point3d.z, 1); - - viewMatrix.transform(transPoint); - projectionMatrix.transform(transPoint); - - int halfWidth = viewport.width / 2; - int halfHeight = viewport.height / 2; - Vector2d screenPos = new Vector2d(transPoint.x, transPoint.y); - screenPos.scale(1 / transPoint.w); - screenPos.x = screenPos.x * halfWidth + halfWidth; - screenPos.y = -screenPos.y * halfHeight + halfHeight; - - return screenPos; - } - - public void setViewport(Rectangle viewport) { - if(viewport != null) { - setViewport(viewport.x, viewport.y, viewport.width, viewport.height); - } - } - - public void setViewport(int x, int y, int width, int height) { - viewport = new Rectangle(x, y, width, height); - } - - public Rectangle getViewport() { - return viewport; - } - - public Matrix4d getProjectionMatrix() { - return projectionMatrix; - } - - public Matrix4d getTransposeProjectionMatrix() { - return projectionTranspose; - } - - public Matrix4d getInverseProjectionMatrix() { - if(projectionMatrix != null) { - if(projectionInverse == null) { - projectionInverse = new Matrix4d(projectionMatrix); - projectionInverse.invert(); - } - return projectionInverse; - } else { - return null; - } - } - - public void setProjectionMatrix(Matrix4d matrix) { - if(projectionMatrix == null) { - projectionMatrix = new Matrix4d(); - projectionTranspose = new Matrix4d(); - } - projectionMatrix.set(matrix); - projectionTranspose.set(matrix); - projectionTranspose.transpose(); - projectionInverse = null; - } - - public Matrix4d getViewMatrix() { - return viewMatrix; - } - - public Matrix4d getTransposeViewMatrix() { - return viewTranspose; - } - - public Matrix4d getInverseViewMatrix() { - if(viewMatrix != null) { - if(viewInverse == null) { - viewInverse = new Matrix4d(viewMatrix); - viewInverse.invert(); - } - return viewInverse; - } else { - return null; - } - } - - public void setViewMatrix(Matrix4d matrix) { - if(viewMatrix == null) { - viewMatrix = new Matrix4d(); - viewTranspose = new Matrix4d(); - } - viewMatrix.set(matrix); - viewTranspose.set(matrix); - viewTranspose.transpose(); - viewInverse = null; - } - -} diff --git a/src/main/java/crazypants/vecmath/Matrix4d.java b/src/main/java/crazypants/vecmath/Matrix4d.java deleted file mode 100644 index c6e34a6f..00000000 --- a/src/main/java/crazypants/vecmath/Matrix4d.java +++ /dev/null @@ -1,591 +0,0 @@ -package crazypants.vecmath; - -import java.nio.FloatBuffer; - -public class Matrix4d { - - public double m00 = 0; - public double m01 = 0; - public double m02 = 0; - public double m03 = 0; - public double m10 = 0; - public double m11 = 0; - public double m12 = 0; - public double m13 = 0; - public double m20 = 0; - public double m21 = 0; - public double m22 = 0; - public double m23 = 0; - public double m30 = 0; - public double m31 = 0; - public double m32 = 0; - public double m33 = 0; - - public Matrix4d() { - } - - public Matrix4d(float[] arr) { - m00 = arr[0]; - m01 = arr[1]; - m02 = arr[2]; - m03 = arr[3]; - - m10 = arr[4]; - m11 = arr[5]; - m12 = arr[6]; - m13 = arr[7]; - - m20 = arr[8]; - m21 = arr[9]; - m22 = arr[10]; - m23 = arr[11]; - - m30 = arr[12]; - m31 = arr[13]; - m32 = arr[14]; - m33 = arr[15]; - } - - public Matrix4d(double[] arr) { - m00 = arr[0]; - m01 = arr[1]; - m02 = arr[2]; - m03 = arr[3]; - - m10 = arr[4]; - m11 = arr[5]; - m12 = arr[6]; - m13 = arr[7]; - - m20 = arr[8]; - m21 = arr[9]; - m22 = arr[10]; - m23 = arr[11]; - - m30 = arr[12]; - m31 = arr[13]; - m32 = arr[14]; - m33 = arr[15]; - } - - public Matrix4d(Matrix4d other) { - m00 = other.m00; - m01 = other.m01; - m02 = other.m02; - m03 = other.m03; - - m10 = other.m10; - m11 = other.m11; - m12 = other.m12; - m13 = other.m13; - - m20 = other.m20; - m21 = other.m21; - m22 = other.m22; - m23 = other.m23; - - m30 = other.m30; - m31 = other.m31; - m32 = other.m32; - m33 = other.m33; - } - - public Matrix4d(double m00, double m01, double m02, double m03, - double m10, double m11, double m12, double m13, - double m20, double m21, double m22, double m23, - double m30, double m31, double m32, double m33) { - - this.m00 = m00; - this.m01 = m01; - this.m02 = m02; - this.m03 = m03; - - this.m10 = m10; - this.m11 = m11; - this.m12 = m12; - this.m13 = m13; - - this.m20 = m20; - this.m21 = m21; - this.m22 = m22; - this.m23 = m23; - - this.m30 = m30; - this.m31 = m31; - this.m32 = m32; - this.m33 = m33; - - } - - public Matrix4d(FloatBuffer modelview) { - m00 = modelview.get(0); - m01 = modelview.get(1); - m02 = modelview.get(2); - m03 = modelview.get(3); - - m10 = modelview.get(4); - m11 = modelview.get(5); - m12 = modelview.get(6); - m13 = modelview.get(7); - - m20 = modelview.get(8); - m21 = modelview.get(9); - m22 = modelview.get(10); - m23 = modelview.get(11); - - m30 = modelview.get(12); - m31 = modelview.get(13); - m32 = modelview.get(14); - m33 = modelview.get(15); - } - - public final void setIdentity() { - m00 = 1.0; - m01 = 0.0; - m02 = 0.0; - m03 = 0.0; - - m10 = 0.0; - m11 = 1.0; - m12 = 0.0; - m13 = 0.0; - - m20 = 0.0; - m21 = 0.0; - m22 = 1.0; - m23 = 0.0; - - m30 = 0.0; - m31 = 0.0; - m32 = 0.0; - m33 = 1.0; - } - - public void set(Matrix4d other) { - m00 = other.m00; - m01 = other.m01; - m02 = other.m02; - m03 = other.m03; - - m10 = other.m10; - m11 = other.m11; - m12 = other.m12; - m13 = other.m13; - - m20 = other.m20; - m21 = other.m21; - m22 = other.m22; - m23 = other.m23; - - m30 = other.m30; - m31 = other.m31; - m32 = other.m32; - m33 = other.m33; - - } - - public void set(double[] values) { - m00 = values[0]; - m01 = values[1]; - m02 = values[2]; - m03 = values[3]; - m10 = values[4]; - m11 = values[5]; - m12 = values[6]; - m13 = values[7]; - m20 = values[8]; - m21 = values[9]; - m22 = values[10]; - m23 = values[11]; - m30 = values[12]; - m31 = values[13]; - m32 = values[14]; - m33 = values[15]; - } - - public double getElement(int row, int col) { - switch (row) { - case 0: - switch (col) { - case 0: - return m00; - case 1: - return m01; - case 2: - return m02; - case 3: - return m03; - default: - break; - } - break; - - case 1: - switch (col) { - case 0: - return m10; - case 1: - return m11; - case 2: - return m12; - case 3: - return m13; - default: - break; - } - break; - - case 2: - switch (col) { - case 0: - return m20; - case 1: - return m21; - case 2: - return m22; - case 3: - return m23; - default: - break; - } - break; - - case 3: - switch (col) { - case 0: - return m30; - case 1: - return m31; - case 2: - return m32; - case 3: - return m33; - default: - break; - } - break; - - default: - break; - } - return 0; - } - - public void setElement(int row, int column, double val) { - switch (row) { - - case 0: - switch (column) { - case 0: - m00 = val; - break; - case 1: - m01 = val; - break; - case 2: - m02 = val; - break; - case 3: - m03 = val; - break; - default: - break; - } - break; - - case 1: - switch (column) { - case 0: - m10 = val; - break; - case 1: - m11 = val; - break; - case 2: - m12 = val; - break; - case 3: - m13 = val; - break; - default: - break; - } - break; - - case 2: - switch (column) { - case 0: - m20 = val; - break; - case 1: - m21 = val; - break; - case 2: - m22 = val; - break; - case 3: - m23 = val; - break; - default: - break; - } - break; - - case 3: - switch (column) { - case 0: - m30 = val; - break; - case 1: - m31 = val; - break; - case 2: - m32 = val; - break; - case 3: - m33 = val; - break; - default: - break; - } - break; - - default: - break; - } - - } - - public void getTranslation(Vector3d trans) { - trans.x = m03; - trans.y = m13; - trans.z = m23; - } - - public void setTranslation(Vector3d trans) { - m03 = trans.x; - m13 = trans.y; - m23 = trans.z; - } - - public void makeRotationX(double angle) { - setIdentity(); - double sin = Math.sin(angle); - double cos = Math.cos(angle); - m11 = cos; - m12 = -sin; - m21 = sin; - m22 = cos; - } - - public void makeRotationY(double angle) { - setIdentity(); - double sin = Math.sin(angle); - double cos = Math.cos(angle); - m00 = cos; - m02 = sin; - m20 = -sin; - m22 = cos; - } - - public void makeRotationZ(double angle) { - setIdentity(); - double sin = Math.sin(angle); - double cos = Math.cos(angle); - m00 = cos; - m01 = -sin; - m10 = sin; - m11 = cos; - } - - public void transform(Vector3d vec) { - double x = m00 * vec.x + m01 * vec.y + m02 * vec.z + m03; - double y = m10 * vec.x + m11 * vec.y + m12 * vec.z + m13; - vec.z = m20 * vec.x + m21 * vec.y + m22 * vec.z + m23; - vec.x = x; - vec.y = y; - } - - public void transform(Vector4d vec) { - double x = m00 * vec.x + m01 * vec.y + m02 * vec.z + m03 * vec.w; - double y = m10 * vec.x + m11 * vec.y + m12 * vec.z + m13 * vec.w; - double z = m20 * vec.x + m21 * vec.y + m22 * vec.z + m23 * vec.w; - vec.w = m30 * vec.x + m31 * vec.y + m32 * vec.z + m33 * vec.w; - vec.x = x; - vec.y = y; - vec.z = z; - } - - public void transformNormal(Vector3f normal) { - double x = m00 * normal.x + m01 * normal.y + m02 * normal.z; - double y = m10 * normal.x + m11 * normal.y + m12 * normal.z; - normal.z = (float) (m20 * normal.x + m21 * normal.y + m22 * normal.z); - normal.x = (float) x; - normal.y = (float) y; - - } - - public void transformNormal(Vector3d normal) { - double x = m00 * normal.x + m01 * normal.y + m02 * normal.z; - double y = m10 * normal.x + m11 * normal.y + m12 * normal.z; - normal.z = m20 * normal.x + m21 * normal.y + m22 * normal.z; - normal.x = x; - normal.y = y; - } - - public void mul(Matrix4d m1, Matrix4d m2) { - set(m1); - mul(m2); - } - - public void mul(Matrix4d m) { - double m00Tmp = m00 * m.m00 + m01 * m.m10 + m02 * m.m20 + m03 * m.m30; - double m01Tmp = m00 * m.m01 + m01 * m.m11 + m02 * m.m21 + m03 * m.m31; - double m02Tmp = m00 * m.m02 + m01 * m.m12 + m02 * m.m22 + m03 * m.m32; - double m03Tmp = m00 * m.m03 + m01 * m.m13 + m02 * m.m23 + m03 * m.m33; - - double m10Tmp = m10 * m.m00 + m11 * m.m10 + m12 * m.m20 + m13 * m.m30; - double m11Tmp = m10 * m.m01 + m11 * m.m11 + m12 * m.m21 + m13 * m.m31; - double m12Tmp = m10 * m.m02 + m11 * m.m12 + m12 * m.m22 + m13 * m.m32; - double m13Tmp = m10 * m.m03 + m11 * m.m13 + m12 * m.m23 + m13 * m.m33; - - double m20Tmp = m20 * m.m00 + m21 * m.m10 + m22 * m.m20 + m23 * m.m30; - double m21Tmp = m20 * m.m01 + m21 * m.m11 + m22 * m.m21 + m23 * m.m31; - double m22Tmp = m20 * m.m02 + m21 * m.m12 + m22 * m.m22 + m23 * m.m32; - double m23Tmp = m20 * m.m03 + m21 * m.m13 + m22 * m.m23 + m23 * m.m33; - - double m30Tmp = m30 * m.m00 + m31 * m.m10 + m32 * m.m20 + m33 * m.m30; - double m31Tmp = m30 * m.m01 + m31 * m.m11 + m32 * m.m21 + m33 * m.m31; - double m32Tmp = m30 * m.m02 + m31 * m.m12 + m32 * m.m22 + m33 * m.m32; - double m33Tmp = m30 * m.m03 + m31 * m.m13 + m32 * m.m23 + m33 * m.m33; - - m00 = m00Tmp; - m01 = m01Tmp; - m02 = m02Tmp; - m03 = m03Tmp; - m10 = m10Tmp; - m11 = m11Tmp; - m12 = m12Tmp; - m13 = m13Tmp; - m20 = m20Tmp; - m21 = m21Tmp; - m22 = m22Tmp; - m23 = m23Tmp; - m30 = m30Tmp; - m31 = m31Tmp; - m32 = m32Tmp; - m33 = m33Tmp; - } - - public void transpose() { - double tmp = m10; - m10 = m01; - m01 = tmp; - - tmp = m20; - m20 = m02; - m02 = tmp; - - tmp = m30; - m30 = m03; - m03 = tmp; - - tmp = m21; - m21 = m12; - m12 = tmp; - - tmp = m31; - m31 = m13; - m13 = tmp; - - tmp = m32; - m32 = m23; - m23 = tmp; - } - - public void invert() { - double det = determinant(); - if(det == 0) { - throw new RuntimeException("Cannot invert matrix with a determinat of 0."); - } - double detInv = 1f / det; - - // first row - double t00 = determinant3x3(m11, m21, m31, m12, m22, m32, m13, m23, m33); - double t01 = -determinant3x3(m01, m21, m31, m02, m22, m32, m03, m23, m33); - double t02 = determinant3x3(m01, m11, m31, m02, m12, m32, m03, m13, m33); - double t03 = -determinant3x3(m01, m11, m21, m02, m12, m22, m03, m13, m23); - // second row - double t10 = -determinant3x3(m10, m20, m30, m12, m22, m32, m13, m23, m33); - double t11 = determinant3x3(m00, m20, m30, m02, m22, m32, m03, m23, m33); - double t12 = -determinant3x3(m00, m10, m30, m02, m12, m32, m03, m13, m33); - double t13 = determinant3x3(m00, m10, m20, m02, m12, m22, m03, m13, m23); - // third row - double t20 = determinant3x3(m10, m20, m30, m11, m21, m31, m13, m23, m33); - double t21 = -determinant3x3(m00, m20, m30, m01, m21, m31, m03, m23, m33); - double t22 = determinant3x3(m00, m10, m30, m01, m11, m31, m03, m13, m33); - double t23 = -determinant3x3(m00, m10, m20, m01, m11, m21, m03, m13, m23); - // fourth row - double t30 = -determinant3x3(m10, m20, m30, m11, m21, m31, m12, m22, m32); - double t31 = determinant3x3(m00, m20, m30, m01, m21, m31, m02, m22, m32); - double t32 = -determinant3x3(m00, m10, m30, m01, m11, m31, m02, m12, m32); - double t33 = determinant3x3(m00, m10, m20, m01, m11, m21, m02, m12, m22); - - m00 = t00 * detInv; - m11 = t11 * detInv; - m22 = t22 * detInv; - m33 = t33 * detInv; - m10 = t10 * detInv; - m01 = t01 * detInv; - m02 = t02 * detInv; - m20 = t20 * detInv; - m21 = t21 * detInv; - m12 = t12 * detInv; - m30 = t30 * detInv; - m03 = t03 * detInv; - m31 = t31 * detInv; - m13 = t13 * detInv; - m23 = t23 * detInv; - m32 = t32 * detInv; - - } - - public double determinant() { - double result = - m00 - * ((m11 * m22 * m33 + m21 * m32 * m13 + m31 * m12 * m23) - - m31 * m22 * m13 - - m11 * m32 * m23 - - m21 * m12 * m33); - result -= m10 - * ((m01 * m22 * m33 + m21 * m32 * m03 + m31 * m02 * m23) - - m31 * m22 * m03 - - m01 * m32 * m23 - - m21 * m02 * m33); - result += m20 - * ((m01 * m12 * m33 + m11 * m32 * m03 + m31 * m02 * m13) - - m31 * m12 * m03 - - m01 * m32 * m13 - - m11 * m02 * m33); - result -= m30 - * ((m01 * m12 * m23 + m11 * m22 * m03 + m21 * m02 * m13) - - m21 * m12 * m03 - - m01 * m22 * m13 - - m11 * m02 * m23); - return result; - } - - private double determinant3x3(double e00, double e01, double e02, double e10, double e11, double e12, double e20, double e21, double e22) { - return e00 * (e11 * e22 - e12 * e21) + e01 * (e12 * e20 - e10 * e22) + e02 * (e10 * e21 - e11 * e20); - } - - @Override - public String toString() { - return "Matrix4d(\n" + - " " + m00 + ", " + m01 + ", " + m02 + ", " + m03 + "\n" + - " " + m10 + ", " + m11 + ", " + m12 + ", " + m13 + "\n" + - " " + m20 + ", " + m21 + ", " + m22 + ", " + m23 + "\n" + - " " + m30 + ", " + m31 + ", " + m32 + ", " + m33 + "\n" + - ")\n"; - } -} diff --git a/src/main/java/crazypants/vecmath/Quat4d.java b/src/main/java/crazypants/vecmath/Quat4d.java deleted file mode 100644 index d37ef5de..00000000 --- a/src/main/java/crazypants/vecmath/Quat4d.java +++ /dev/null @@ -1,57 +0,0 @@ -package crazypants.vecmath; - -public class Quat4d { - - public static Quat4d makeRotate(double angle, Vector3d axis) { - double epsilon = 0.0000001; - - double x = axis.x; - double y = axis.y; - double z = axis.z; - double length = Math.sqrt(x * x + y * y + z * z); - if(length < epsilon) { - // ~zero length axis, so reset rotation to zero. - return new Quat4d(); - } - - double inversenorm = 1.0 / length; - double coshalfangle = Math.cos(0.5 * angle); - double sinhalfangle = Math.sin(0.5 * angle); - - Quat4d res = new Quat4d(); - res.x = x * sinhalfangle * inversenorm; - res.y = y * sinhalfangle * inversenorm; - res.z = z * sinhalfangle * inversenorm; - res.w = coshalfangle; - return res; - } - - public double x; - public double y; - public double z; - public double w; - - public Quat4d() { - } - - public void rotate(Vector3d vec) { - double d = -x * vec.x - y * vec.y - z * vec.z; - double d1 = w * vec.x + y * vec.z - z * vec.y; - double d2 = w * vec.y - x * vec.z + z * vec.x; - double d3 = w * vec.z + x * vec.y - y * vec.x; - vec.x = d1 * w - d * x - d2 * z + d3 * y; - vec.y = d2 * w - d * y + d1 * z - d3 * x; - vec.z = d3 * w - d * z - d1 * y + d2 * x; - } - - public void rotate(Vector3f vec) { - double d = -x * vec.x - y * vec.y - z * vec.z; - double d1 = w * vec.x + y * vec.z - z * vec.y; - double d2 = w * vec.y - x * vec.z + z * vec.x; - double d3 = w * vec.z + x * vec.y - y * vec.x; - vec.x = (float) (d1 * w - d * x - d2 * z + d3 * y); - vec.y = (float) (d2 * w - d * y + d1 * z - d3 * x); - vec.z = (float) (d3 * w - d * z - d1 * y + d2 * x); - } - -} diff --git a/src/main/java/crazypants/vecmath/VecmathUtil.java b/src/main/java/crazypants/vecmath/VecmathUtil.java deleted file mode 100644 index 81ac9c49..00000000 --- a/src/main/java/crazypants/vecmath/VecmathUtil.java +++ /dev/null @@ -1,637 +0,0 @@ -package crazypants.vecmath; - -import java.awt.Rectangle; - -public class VecmathUtil { - - /** - * Returns the distance from a point to a plane. - * - * @param plane - * the plane. - * @param point - * the point. - * @return the distance between them. - */ - public static double distanceFromPointToPlane(Vector4d plane, Vector3d point) { - Vector4d newPoint = new Vector4d(point.x, point.y, point.z, 1); - return plane.dot(newPoint); - } - - public static void computePlaneEquation(Vector4d a, Vector4d b, Vector4d c, Vector4d result) { - computePlaneEquation(new Vector3d(a.x, a.y, a.z), new Vector3d(b.x, b.y, b.z), new Vector3d(c.x, c.y, c.z), result); - } - - public static Vector3d clamp(Vector3d v, double min, double max) { - v.x = clamp(v.x, min, max); - v.y = clamp(v.y, min, max); - v.z = clamp(v.z, min, max); - return v; - } - - public static double clamp(double val, double min, double max) { - return val < min ? min : (val > max ? max : val); - } - - public static int clamp(int val, int min, int max) { - return val < min ? min : (val > max ? max : val); - } - - /** - * Compute the plane equation Ax + By + Cz + D = 0 for the plane - * defined by the three points which lie on the plane, a, b, and c, and - * placing the result into r. The plane equation can be summarised as the - * normal vector of the plane (A,B,C) and the distance to the plane from the - * origin (D). - * - * @param a - * vector a. - * @param b - * vector b. - * @param c - * vector c. - * @param result - * the result (A,B,C,D) of plane equation. - */ - public static void computePlaneEquation(Vector3d a, Vector3d b, - Vector3d c, Vector4d result) { - Vector3d i = new Vector3d(); - Vector3d j = new Vector3d(); - Vector3d k = new Vector3d(); - - // compute normal vector - i.x = c.x - a.x; - i.y = c.y - a.y; - i.z = c.z - a.z; - - j.x = b.x - a.x; - j.y = b.y - a.y; - j.z = b.z - a.z; - - k.cross(j, i); - k.normalize(); - - // plane equation: Ax + By + Cz + D = 0 - result.x = k.x; // A - result.y = k.y; // B - result.z = k.z; // C - result.w = -(result.x * a.x + result.y * a.y + result.z * a.z); // D - } - - /** - * Projects the point onto the plane. - * - * @param plane - * the plane. - * @param point - * the point. - */ - public static void projectPointOntoPlane(Vector4d plane, Vector4d point) { - double distance = plane.dot(point); - Vector4d newPoint = new Vector4d(point); - Vector3d planeNormal = new Vector3d(plane.x, plane.y, plane.z); - planeNormal.normalize(); - planeNormal.scale(distance); - newPoint.sub(new Vector4d(planeNormal.x, planeNormal.y, planeNormal.z, 0)); - point.set(newPoint); - } - - /** - * This method calculates the intersection between a line and a plane. - * - * @param plane - * the plane (x,y,z = normal, w = distance from origin) - * @param pointInLine - * a point in the line. - * @param lineDirection - * the direction of the line. - * @return the intersection or null if there is no intersection or the line is - * on the plane. - */ - public static Vector3d computeIntersectionBetweenPlaneAndLine(Vector4d plane, - Vector3d pointInLine, Vector3d lineDirection) { - // check for no intersection - Vector3d planeNormal = new Vector3d(plane.x, plane.y, plane.z); - if(planeNormal.dot(lineDirection) == 0) { - // line and plane are perpendicular - return null; - } - // check if line is on the plane - if(planeNormal.dot(pointInLine) + plane.w == 0) { - return null; - } - - // we have an intersection - Vector4d point = new Vector4d(pointInLine.x, pointInLine.y, pointInLine.z, 1); - Vector4d lineNorm = new Vector4d(lineDirection.x, lineDirection.y, lineDirection.z, 0); - double t = -(plane.dot(point) / plane.dot(lineNorm)); - - Vector3d result = new Vector3d(pointInLine); - lineDirection.scale(t); - result.add(lineDirection); - return result; - } - - /** - * This function computes the ray that goes from the eye, through the - * specified pixel. - * - * @param x - * the x pixel location (x = 0 is the left most pixel) - * @param y - * the y pixel location (y = 0 is the bottom most pixel) - * @param eyeOut - * the eyes position. - * @param normalOut - * the normal description the directional component of the ray. - */ - public static void computeRayForPixel(Rectangle vp, Matrix4d ipm, Matrix4d ivm, int x, int y, - Vector3d eyeOut, Vector3d normalOut) { - - // grab the eye's position - ivm.getTranslation(eyeOut); - - Matrix4d vpm = new Matrix4d(); - vpm.mul(ivm, ipm); - - // Calculate the pixel location in screen clip space (width and height from - // -1 to 1) - double screenX = (x - vp.getX()) / vp.getWidth(); - double screenY = (y - vp.getY()) / vp.getHeight(); - screenX = (screenX * 2.0) - 1.0; - screenY = (screenY * 2.0) - 1.0; - - // Now calculate the XYZ location of this point on the near plane - Vector4d tmp = new Vector4d(); - tmp.x = screenX; - tmp.y = screenY; - tmp.z = -1; - tmp.w = 1.0; - vpm.transform(tmp); - - double w = tmp.w; - Vector3d nearXYZ = new Vector3d(tmp.x / w, tmp.y / w, tmp.z / w); - - // and then on the far plane - tmp.x = screenX; - tmp.y = screenY; - tmp.z = 1; - tmp.w = 1.0; - vpm.transform(tmp); - - w = tmp.w; - Vector3d farXYZ = new Vector3d(tmp.x / w, tmp.y / w, tmp.z / w); - - normalOut.set(farXYZ); - normalOut.sub(nearXYZ); - normalOut.normalize(); - - } - - // /** - // * Make a rotation Quat which will rotate vec1 to vec2 - // *

- // * This routine uses only fast geometric transforms, without costly acos/sin - // computations. It's - // * exact, fast, and with less degenerate cases than the acos/sin method. - // *

- // * For an explanation of the math used, you may see for example: - // * http://logiciels.cnes.fr/MARMOTTES/marmottes-mathematique.pdf - // *

- // * NB: This is the rotation with shortest angle, which is the one equivalent - // to the acos/sin - // * transform method. Other rotations exists, for example to additionally - // keep a local horizontal - // * attitude. - // * - // * @param from - // * rotate from this vector - // * @param to - // * to this one - // * @return the rotation to apply to from to get to to. - // */ - // - // public static Quat4d makeRotate( Vector3d from, Vector3d to) { - // - // Quat4d res = new Quat4d(); - // - // // This routine takes any vector as argument but normalized - // // vectors are necessary, if only for computing the dot product. - // // Too bad the API is that generic, it leads to performance loss. - // // Even in the case the 2 vectors are not normalized but same length, - // // the sqrt could be shared, but we have no way to know beforehand - // // at this point, while the caller may know. - // // So, we have to test... in the hope of saving at least a sqrt - // Vector3d sourceVector = new Vector3d(from); - // Vector3d targetVector = new Vector3d(to); - // - // double fromLen2 = sourceVector.lengthSquared(); - // double fromLen; - // // normalize only when necessary, epsilon test - // if ((fromLen2 < 1.0 - 1e-7) || (fromLen2 > 1.0 + 1e-7)) { - // fromLen = Math.sqrt(fromLen2); - // sourceVector.x /= fromLen; - // sourceVector.y /= fromLen; - // sourceVector.z /= fromLen; - // - // } else { - // fromLen = 1.0; - // } - // - // double toLen2 = targetVector.lengthSquared(); - // // normalize only when necessary, epsilon test - // if ((toLen2 < 1.0 - 1e-7) || (toLen2 > 1.0 + 1e-7)) { - // double toLen; - // // re-use fromLen for case of mapping 2 vectors of the same length - // if ((toLen2 > fromLen2 - 1e-7) && (toLen2 < fromLen2 + 1e-7)) { - // toLen = fromLen; - // } else { - // toLen = Math.sqrt(toLen2); - // } - // - // targetVector.x /= toLen; - // targetVector.y /= toLen; - // targetVector.z /= toLen; - // } - // - // // Now let's get into the real stuff - // // Use "dot product plus one" as test as it can be re-used later on - // double dotProdPlus1 = 1.0 + sourceVector.dot(targetVector); - // - // // Check for degenerate case of full u-turn. Use epsilon for detection - // if (dotProdPlus1 < 1e-7) { - // - // // Get an orthogonal vector of the given vector - // // in a plane with maximum vector coordinates. - // // Then use it as quaternion axis with pi angle - // // Trick is to realize one value at least is >0.6 for a normalized vector. - // if (Math.abs(sourceVector.x) < 0.6) { - // - // double norm = Math.sqrt(1.0 - sourceVector.x * sourceVector.x); - // res.x = 0.0; - // res.y = sourceVector.z / norm; - // res.z = -sourceVector.y / norm; - // res.w = 0.0; - // } else if (Math.abs(sourceVector.y) < 0.6) { - // double norm = Math.sqrt(1.0 - sourceVector.y * sourceVector.y); - // res.x = -sourceVector.z / norm; - // res.y = 0.0; - // res.z = sourceVector.x / norm; - // res.w = 0.0; - // } else { - // double norm = Math.sqrt(1.0 - sourceVector.z * sourceVector.z); - // res.x = sourceVector.y / norm; - // res.y = -sourceVector.x / norm; - // res.z = 0.0; - // res.w = 0.0; - // } - // } else { - // // Find the shortest angle quaternion that transforms normalized vectors - // // into one other. Formula is still valid when vectors are colinear - // double s = Math.sqrt(0.5 * dotProdPlus1); - // double val = (2.0 * s); - // targetVector.x /= val; - // targetVector.y /= val; - // targetVector.z /= val; - // - // Vector3d tmp = new Vector3d(); - // tmp.cross(sourceVector, targetVector); - // - // res.x = tmp.x; - // res.y = tmp.y; - // res.z = tmp.z; - // res.w = s; - // } - // - // return res; - // } - // - // /** - // * Makes a rotation of angle (radians) around the axis specified by the - // x,y,z values. - // * - // * @param angle - // * the angle in radians for the rotation - // * @param axis - // * the axis to rotate about. - // * @return the quaternion defining the rotation. - // */ - - /** - * Creates a perspective projection matrix. - * - * @param fovDegrees - * The field of view angle in degrees. - * @param near - * near plane. - * @param far - * far plane. - * @param viewportWidth - * viewport width. - * @param viewportHeight - * viewport height. - * @return the matrix. - */ - - public static Matrix4d createProjectionMatrixAsPerspective(double fovDegrees, double near, - double far, int viewportWidth, int viewportHeight) { - - Matrix4d matrix = new Matrix4d(); - // for impl details see gluPerspective doco in OpenGL reference manual - double aspect = (double) viewportWidth / (double) viewportHeight; - - double theta = (Math.toRadians(fovDegrees) / 2d); - double f = Math.cos(theta) / Math.sin(theta); - - double a = (far + near) / (near - far); - double b = (2d * far * near) / (near - far); - - matrix.set(new double[] { f / aspect, 0, 0, 0, 0, f, 0, 0, 0, 0, a, b, 0, 0, -1, 0 }); - - return matrix; - } - - /** - * Creates a projection matrix as per glFrustrum. - * - * @param left - * coordinate of left clip plane. - * @param right - * coordinate of right clip plane. - * @param bottom - * coordinate of bottom clip plane. - * @param top - * coordinate of left top plane. - * @param zNear - * distance of the near plane. - * @param zFar - * distance of the near plane. - * @return the matrix. - */ - - public static Matrix4d createProjectionMatrixAsPerspective(double left, double right, - double bottom, double top, double zNear, double zFar) { - - double A = (right + left) / (right - left); - double B = (top + bottom) / (top - bottom); - double C = (Math.abs(zFar) > Double.MAX_VALUE) ? -1. : -(zFar + zNear) / (zFar - zNear); - double D = (Math.abs(zFar) > Double.MAX_VALUE) ? -2. * zNear : -2.0 * zFar * zNear - / (zFar - zNear); - - Matrix4d matrix = new Matrix4d(); - matrix.set(new double[] { 2.0 * zNear / (right - left), 0.0, 0.0, 0.0, 0.0, - 2.0 * zNear / (top - bottom), 0.0, 0.0, A, B, C, -1.0, 0.0, 0.0, D, 0.0 - - }); - - matrix.transpose(); - return matrix; - } - - /** - * Sets the orthographic projection matrix. - * - * @param left - * the left value. - * @param right - * the right value. - * @param bottom - * the bottom value. - * @param top - * the top value. - * @param near - * near plane. - * @param far - * far plane. - * @return the ortho matrix. - */ - - public static Matrix4d createProjectionMatrixAsOrtho(double left, double right, double bottom, - double top, double near, double far) { - - Matrix4d matrix = new Matrix4d(); - // for impl details see glOrtho doco in OpenGL reference manual - double tx = -((right + left) / (right - left)); - double ty = -((top + bottom) / (top - bottom)); - double tz = -((far + near) / (far - near)); - - matrix.set(new double[] { 2d / (right - left), 0, 0, tx, 0, 2d / (top - bottom), 0, ty, 0, 0, - -2d / (far - near), tz, 0, 0, 0, 1 }); - - return matrix; - } - - /** - * Sets the near and far values on an existing perspective projection matrix. - * - * @param projMat - * the matrix to be modified. - * @param near - * the new near value. - * @param far - * the new far value. - */ - public static void setNearFarOnPerspectiveProjectionMatrix(Matrix4d projMat, - double near, double far) { - - projMat.transpose(); - - double transNearPlane = (-near * projMat.getElement(2, 2) + projMat.getElement(3, 2)) - / (-near * projMat.getElement(2, 3) + projMat.getElement(3, 3)); - double transFarPlane = (-far * projMat.getElement(2, 2) + projMat.getElement(3, 2)) - / (-far * projMat.getElement(2, 3) + projMat.getElement(3, 3)); - - double ratio = Math.abs(2.0 / (transNearPlane - transFarPlane)); - double center = -(transNearPlane + transFarPlane) / 2.0; - - Matrix4d mat = new Matrix4d(); - mat.setIdentity(); - mat.setElement(2, 2, ratio); - mat.setElement(3, 2, center * ratio); - - projMat.mul(mat); - projMat.transpose(); - - } - - /** - * Creates a look at matrix. - * - * @param eyePos - * the position of the eye. - * @param lookAtPos - * the point to look at. - * @param upVec - * the up vector. - * @return the look at matrix. - */ - - public static Matrix4d createMatrixAsLookAt(Vector3d eyePos, - Vector3d lookAtPos, Vector3d upVec) { - - Vector3d eye = new Vector3d(eyePos); - Vector3d lookAt = new Vector3d(lookAtPos); - Vector3d up = new Vector3d(upVec); - - Vector3d forwardVec = new Vector3d(lookAt); - forwardVec.sub(eye); - forwardVec.normalize(); - - Vector3d sideVec = new Vector3d(); - sideVec.cross(forwardVec, up); - sideVec.normalize(); - - Vector3d upVed = new Vector3d(); - upVed.cross(sideVec, forwardVec); - upVed.normalize(); - - Matrix4d mat = new Matrix4d(sideVec.x, sideVec.y, sideVec.z, 0, upVed.x, upVed.y, upVed.z, 0, - -forwardVec.x, -forwardVec.y, -forwardVec.z, 0, 0, 0, 0, 1); - - eye.negate(); - // mat.transform(eye); - mat.transformNormal(eye); - mat.setTranslation(eye); - - return mat; - } - - /** - * Pre-multiplies the vector by the matrix. - * - * @param v - * the vector. - * @param mat - * the matrix. - * @return the result of the multiplication. - */ - - public static Vector3d preMultiply(Vector3d v, Matrix4d mat) { - Matrix4d m = new Matrix4d(mat); - m.transpose(); - double d = 1.0f / (m.getElement(0, 3) * v.x + m.getElement(1, 3) * v.y + m.getElement(2, 3) - * v.z + m.getElement(3, 3)); - double x = (m.getElement(0, 0) * v.x + m.getElement(1, 0) * v.y + m.getElement(2, 0) * v.z + m - .getElement(3, 0)) * d; - double y = (m.getElement(0, 1) * v.x + m.getElement(1, 1) * v.y + m.getElement(2, 1) * v.z + m - .getElement(3, 1)) * d; - double z = (m.getElement(0, 2) * v.x + m.getElement(1, 2) * v.y + m.getElement(2, 2) * v.z + m - .getElement(3, 2) * d); - return new Vector3d(x, y, z); - } - - /** - * Extracts the s,t,r and q eye planes from the specified matrix. - * - * @param matrix - * the matrix to extract the planes from. - * @return the s,t,r and q planes from the specified matrix. - */ - - public static Vector4d[] getEyePlanesForMatrix(Matrix4d matrix) { - - Matrix4d copy = new Matrix4d(matrix); - copy.transpose(); - - Vector4d[] res = new Vector4d[4]; - // s plane - res[0] = new Vector4d(copy.getElement(0, 0), copy.getElement(1, 0), copy.getElement(2, 0), - copy.getElement(3, 0)); - // t plane - res[1] = new Vector4d(copy.getElement(0, 1), copy.getElement(1, 1), copy.getElement(2, 1), - copy.getElement(3, 1)); - // r plane - res[2] = new Vector4d(copy.getElement(0, 2), copy.getElement(1, 2), copy.getElement(2, 2), - copy.getElement(3, 2)); - // q plane - res[3] = new Vector4d(copy.getElement(0, 3), copy.getElement(1, 3), copy.getElement(2, 3), - copy.getElement(3, 3)); - - return res; - } - - /** - * Computes the cross product of the two tuples. - * - * @param vec1 - * the first tuple. - * @param vec2 - * the second tuple. - * @return the cross product of the two tuples. - */ - - public static Vector3d cross(Vector3d vec1, Vector3d vec2) { - Vector3d res = new Vector3d(); - res.cross(new Vector3d(vec1), new Vector3d(vec2)); - return res; - } - - /** - * Returns the distance between the two point from and to. - * - * @param from - * the from point. - * @param to - * the to point. - * @return the distance between the two point from and to. - */ - public static double distance(Vector3d from, Vector3d to) { - return from.distance(to); - } - - /** - * Returns the distance squared between the two point from and to. - * - * @param from - * the from point. - * @param to - * the to point. - * @return the distance squared between the two point from and to. - */ - public static double distanceSquared(Vector3d from, Vector3d to) { - return from.distanceSquared(to); - } - - /** - * Extracts the directional vectors from the specified view matrix. - * - * @param matrix - * the view matrix. - * @param upVecOut - * the up vector. - * @param sideVecOut - * the side vector. - * @param lookVecOut - * the look vector. - */ - public static void getVectorsForMatrix(Matrix4d matrix, Vector3d upVecOut, - Vector3d sideVecOut, Vector3d lookVecOut) { - - sideVecOut.set(matrix.getElement(0, 0), matrix.getElement(0, 1), matrix.getElement(0, 2)); - sideVecOut.normalize(); - - upVecOut.set(matrix.getElement(1, 0), matrix.getElement(1, 1), matrix.getElement(1, 2)); - upVecOut.normalize(); - - lookVecOut.set(matrix.getElement(2, 0), matrix.getElement(2, 1), matrix.getElement(2, 2)); - lookVecOut.negate(); - lookVecOut.normalize(); - - } - - /** - * Extracts the up vector from the specified view matrix. - * - * @param matrix - * the matrix. - * @return the up vector from the specified view matrix. - */ - - public static Vector3d getUpFromMatrix(Matrix4d matrix) { - Vector3d res = new Vector3d(matrix.getElement(1, 0), matrix.getElement(1, 1), - matrix.getElement(1, 2)); - res.normalize(); - return res; - } - -} diff --git a/src/main/java/crazypants/vecmath/Vector2d.java b/src/main/java/crazypants/vecmath/Vector2d.java deleted file mode 100644 index 001180cd..00000000 --- a/src/main/java/crazypants/vecmath/Vector2d.java +++ /dev/null @@ -1,96 +0,0 @@ -package crazypants.vecmath; - -public class Vector2d { - - public double x; - public double y; - - public Vector2d() { - x = 0; - y = 0; - } - - public Vector2d(double x, double y) { - this.x = x; - this.y = y; - } - - public Vector2d(Vector2d other) { - this(other.x, other.y); - } - - public void set(double x, double y) { - this.x = x; - this.y = y; - } - - public void set(Vector2f vec) { - x = vec.x; - y = vec.y; - } - - public void set(Vector2d vec) { - x = vec.x; - y = vec.y; - } - - public void add(Vector2d vec) { - x += vec.x; - y += vec.y; - } - - public void sub(Vector2d vec) { - x -= vec.x; - y -= vec.y; - } - - public void add(Vector2f vec) { - x += vec.x; - y += vec.y; - } - - public void sub(Vector2f vec) { - x -= vec.x; - y -= vec.y; - } - - public void negate() { - x = -x; - y = -y; - } - - public void scale(double s) { - x *= s; - y *= s; - } - - public void normalize() { - double scale = 1.0 / Math.sqrt(x * x + y * y); - scale(scale); - } - - public double lengthSquared() { - return x * x + y * y; - } - - public double length() { - return Math.sqrt(lengthSquared()); - } - - public double distanceSquared(Vector2d v) { - double dx, dy, dz; - dx = x - v.x; - dy = y - v.y; - return (dx * dx + dy * dy); - } - - public double distance(Vector2d v) { - return Math.sqrt(distanceSquared(v)); - } - - @Override - public String toString() { - return "Vector2d(" + x + ", " + y + ")"; - } - -} diff --git a/src/main/java/crazypants/vecmath/Vector2f.java b/src/main/java/crazypants/vecmath/Vector2f.java deleted file mode 100644 index 08735df3..00000000 --- a/src/main/java/crazypants/vecmath/Vector2f.java +++ /dev/null @@ -1,95 +0,0 @@ -package crazypants.vecmath; - -public class Vector2f { - - public float x; - public float y; - - public Vector2f() { - x = 0; - y = 0; - } - - public Vector2f(double x, double y) { - this.x = (float) x; - this.y = (float) y; - } - - public Vector2f(float x, float y) { - this.x = x; - this.y = y; - } - - public Vector2f(Vector2d other) { - this(other.x, other.y); - } - - public Vector2f(Vector2f other) { - this(other.x, other.y); - } - - public void set(double x, double y) { - this.x = (float) x; - this.y = (float) y; - } - - public void set(float x, float y) { - this.x = x; - this.y = y; - } - - public void set(Vector2f vec) { - x = vec.x; - y = vec.y; - } - - public void add(Vector2f vec) { - x += vec.x; - y += vec.y; - } - - public void sub(Vector2f vec) { - x -= vec.x; - y -= vec.y; - } - - public void negate() { - x = -x; - y = -y; - } - - public void scale(double s) { - x *= s; - y *= s; - } - - public void normalize() { - double scale = 1.0 / Math.sqrt(x * x + y * y); - scale(scale); - } - - public double lengthSquared() { - return x * x + y * y; - } - - public double length() { - return Math.sqrt(lengthSquared()); - } - - public double distanceSquared(Vector2f v) { - double dx, dy, dz; - dx = x - v.x; - dy = y - v.y; - return (dx * dx + dy * dy); - } - - public double distance(Vector2f v) { - return Math.sqrt(distanceSquared(v)); - } - - @Override - public String toString() { - return "Vector2f(" + x + ", " + y + ")"; - } - -} diff --git a/src/main/java/crazypants/vecmath/Vector3d.java b/src/main/java/crazypants/vecmath/Vector3d.java deleted file mode 100644 index 2bb55999..00000000 --- a/src/main/java/crazypants/vecmath/Vector3d.java +++ /dev/null @@ -1,153 +0,0 @@ -package crazypants.vecmath; - -import net.minecraft.util.Vec3; -import net.minecraftforge.client.model.obj.Vertex; - -public class Vector3d { - - public double x; - public double y; - public double z; - - public Vector3d() { - x = 0; - y = 0; - z = 0; - } - - public Vector3d(double x, double y, double z) { - this.x = x; - this.y = y; - this.z = z; - } - - public Vector3d(Vector3d other) { - this(other.x, other.y, other.z); - } - - public Vector3d(Vector3f corner) { - this(corner.x, corner.y, corner.z); - } - - public Vector3d(Vertex vert) { - this(vert.x, vert.y, vert.z); - } - - public void set(double x, double y, double z) { - this.x = x; - this.y = y; - this.z = z; - } - - public void set(Vector3f v) { - set(v.x, v.y, v.z); - } - - public void set(Vector3d vec) { - x = vec.x; - y = vec.y; - z = vec.z; - } - - public Vector3d add(Vector3d vec) { - x += vec.x; - y += vec.y; - z += vec.z; - return this; - } - - public Vector3d add(Vector3f vec) { - x += vec.x; - y += vec.y; - z += vec.z; - return this; - } - - public Vector3d add(double x2, double y2, double z2) { - x += x2; - y += y2; - z += z2; - return this; - } - - public void sub(Vector3d vec) { - x -= vec.x; - y -= vec.y; - z -= vec.z; - } - - public void sub(Vector3f vec) { - x -= vec.x; - y -= vec.y; - z -= vec.z; - } - - public Vector3d negate() { - x = -x; - y = -y; - z = -z; - return this; - } - - public void scale(double s) { - x *= s; - y *= s; - z *= s; - } - - public void scale(double sx, double sy, double sz) { - x *= sx; - y *= sy; - z *= sz; - } - - public void normalize() { - double scale = 1.0 / Math.sqrt(x * x + y * y + z * z); - scale(scale); - } - - public double dot(Vector3d other) { - return x * other.x + y * other.y + z * other.z; - } - - public void cross(Vector3d v1, Vector3d v2) { - x = v1.y * v2.z - v1.z * v2.y; - y = v2.x * v1.z - v2.z * v1.x; - z = v1.x * v2.y - v1.y * v2.x; - } - - public double lengthSquared() { - return x * x + y * y + z * z; - } - - public double length() { - return Math.sqrt(lengthSquared()); - } - - public double distanceSquared(Vector3d v) { - double dx, dy, dz; - dx = x - v.x; - dy = y - v.y; - dz = z - v.z; - return (dx * dx + dy * dy + dz * dz); - } - - public double distance(Vector3d v) { - return Math.sqrt(distanceSquared(v)); - } - - @Override - public String toString() { - return "Vector3d(" + x + ", " + y + ", " + z + ")"; - } - - public void abs() { - x = Math.abs(x); - y = Math.abs(y); - z = Math.abs(z); - } - - public Vec3 getVec3() { - return Vec3.createVectorHelper(x, y, z); - } -} diff --git a/src/main/java/crazypants/vecmath/Vector3f.java b/src/main/java/crazypants/vecmath/Vector3f.java deleted file mode 100644 index de77c27e..00000000 --- a/src/main/java/crazypants/vecmath/Vector3f.java +++ /dev/null @@ -1,119 +0,0 @@ -package crazypants.vecmath; - -public class Vector3f { - - public float x; - public float y; - public float z; - - public Vector3f() { - x = 0; - y = 0; - z = 0; - } - - public Vector3f(double x, double y, double z) { - this.x = (float) x; - this.y = (float) y; - this.z = (float) z; - } - - public Vector3f(float x, float y, float z) { - this.x = x; - this.y = y; - this.z = z; - } - - public Vector3f(Vector3d other) { - this(other.x, other.y, other.z); - } - - public Vector3f(Vector3f other) { - this(other.x, other.y, other.z); - } - - public void set(float x, float y, float z) { - this.x = x; - this.y = y; - this.z = z; - } - - public void set(Vector3f vec) { - x = vec.x; - y = vec.y; - z = vec.z; - } - - public void add(Vector3f vec) { - x += vec.x; - y += vec.y; - z += vec.z; - } - - public void add(Vector3d vec) { - x += vec.x; - y += vec.y; - z += vec.z; - } - - public void add(int x2, int y2, int z2) { - x += x2; - y += y2; - z += z2; - } - - public void sub(Vector3f vec) { - x -= vec.x; - y -= vec.y; - z -= vec.z; - } - - public void sub(Vector3d vec) { - x -= vec.x; - y -= vec.y; - z -= vec.z; - } - - public void negate() { - x = -x; - y = -y; - z = -z; - } - - public void scale(float s) { - x *= s; - y *= s; - z *= s; - } - - public void normalize() { - double scale = 1.0 / Math.sqrt(x * x + y * y + z * z); - x *= scale; - y *= scale; - z *= scale; - } - - public double dot(Vector3f other) { - return x * other.x + y * other.y + z * other.z; - } - - public double lengthSquared() { - return x * x + y * y + z * z; - } - - public double length() { - return Math.sqrt(lengthSquared()); - } - - @Override - public String toString() { - return "Vector3f(" + x + ", " + y + ", " + z + ")"; - } - - public Vector3d asVector3d() { - return new Vector3d(x, y, z); - } - - - -} diff --git a/src/main/java/crazypants/vecmath/Vector4d.java b/src/main/java/crazypants/vecmath/Vector4d.java deleted file mode 100644 index bf70121d..00000000 --- a/src/main/java/crazypants/vecmath/Vector4d.java +++ /dev/null @@ -1,91 +0,0 @@ -package crazypants.vecmath; - -public class Vector4d { - - public double x; - public double y; - public double z; - public double w; - - public Vector4d() { - x = 0; - y = 0; - z = 0; - w = 0; - } - - public Vector4d(double x, double y, double z, double w) { - this.x = x; - this.y = y; - this.z = z; - this.w = w; - } - - public Vector4d(Vector4d other) { - this(other.x, other.y, other.z, other.w); - } - - public void set(Vector4d vec) { - x = vec.x; - y = vec.y; - z = vec.z; - w = vec.w; - } - - public void set(double x, double y, double z, double w) { - this.x = x; - this.y = y; - this.z = z; - this.w = w; - } - - public void add(Vector4d vec) { - x += vec.x; - y += vec.y; - z += vec.z; - w += vec.w; - } - - public void sub(Vector4d vec) { - x -= vec.x; - y -= vec.y; - z -= vec.z; - w -= vec.w; - } - - public void negate() { - x = -x; - y = -y; - z = -z; - w = -w; - } - - public void scale(double s) { - x *= s; - y *= s; - z *= s; - w *= s; - } - - public void normalize() { - double scale = 1.0 / Math.sqrt(x * x + y * y + z * z + w * w); - scale(scale); - } - - public double dot(Vector4d other) { - return x * other.x + y * other.y + z * other.z + w * other.w; - } - - public double lengthSquared() { - return x * x + y * y + z * z + w * w; - } - - public double length() { - return Math.sqrt(lengthSquared()); - } - - @Override - public String toString() { - return "Vector4d(" + x + ", " + y + ", " + z + ", " + w + ")"; - } -} diff --git a/src/main/java/crazypants/vecmath/Vector4f.java b/src/main/java/crazypants/vecmath/Vector4f.java deleted file mode 100644 index 901edf84..00000000 --- a/src/main/java/crazypants/vecmath/Vector4f.java +++ /dev/null @@ -1,108 +0,0 @@ -package crazypants.vecmath; - -public class Vector4f { - public float x; - public float y; - public float z; - public float w; - - public Vector4f() { - x = 0; - y = 0; - z = 0; - w = 0; - } - - public Vector4f(float x, float y, float z, float w) { - this.x = x; - this.y = y; - this.z = z; - this.w = w; - } - - public Vector4f(double x, double y, double z, double w) { - this.x = (float) x; - this.y = (float) y; - this.z = (float) z; - this.w = (float) w; - } - - public Vector4f(Vector4f other) { - this(other.x, other.y, other.z, other.w); - } - - public void interpolate(Vector4f destination, float factor) { - x = (1 - factor) * x + factor * destination.x; - y = (1 - factor) * y + factor * destination.y; - z = (1 - factor) * z + factor * destination.z; - w = (1 - factor) * w + factor * destination.w; - } - - public void set(Vector4f vec) { - x = vec.x; - y = vec.y; - z = vec.z; - w = vec.w; - } - - public void set(float x, float y, float z, float w) { - this.x = x; - this.y = y; - this.z = z; - this.w = w; - } - - public void add(Vector4f vec) { - x += vec.x; - y += vec.y; - z += vec.z; - w += vec.w; - } - - public void sub(Vector4f vec) { - x -= vec.x; - y -= vec.y; - z -= vec.z; - w -= vec.w; - } - - public void negate() { - x = -x; - y = -y; - z = -z; - w = -w; - } - - public void scale(double s) { - x *= s; - y *= s; - z *= s; - w *= s; - } - - public void normalize() { - double scale = 1.0 / Math.sqrt(x * x + y * y + z * z + w * w); - scale(scale); - } - - public double dot(Vector4f other) { - return x * other.x + y * other.y + z * other.z + w * other.w; - } - - public double lengthSquared() { - return x * x + y * y + z * z + w * w; - } - - public double length() { - return Math.sqrt(lengthSquared()); - } - - public Vector3f toVector3f() { - return new Vector3f(x, y, z); - } - - @Override - public String toString() { - return "Vector4f(" + x + ", " + y + ", " + z + ", " + w + ")"; - } -} diff --git a/src/main/java/crazypants/vecmath/Vertex.java b/src/main/java/crazypants/vecmath/Vertex.java deleted file mode 100644 index cb39708d..00000000 --- a/src/main/java/crazypants/vecmath/Vertex.java +++ /dev/null @@ -1,149 +0,0 @@ -package crazypants.vecmath; - -public class Vertex { - - public Vector3d xyz = new Vector3d(); - public Vector2f uv = null; - public Vector3f normal = null; - public Vector4f color = null; - - public int brightness = -1; - - public Vertex() { - } - - public Vertex(Vertex other) { - xyz.set(other.xyz); - if(other.uv != null) { - uv = new Vector2f(other.uv); - } - if(other.normal != null) { - normal = new Vector3f(other.normal); - } - if(other.color != null) { - color = new Vector4f(other.color); - } - brightness = other.brightness; - } - - public Vertex(Vector3d xyz, Vector3f normal, Vector2f uv) { - this.xyz.set(xyz); - this.normal = new Vector3f(normal); - this.uv = new Vector2f(uv); - } - - public Vertex(double x, double y, double z, double u, double v, int brightness, float r, float g, float b, float a) { - xyz.set(x, y, z); - uv = new Vector2f(u, v); - this.brightness = brightness; - color = new Vector4f(r, g, b, a); - } - - public Vertex(double x, double y, double z, double u, double v) { - xyz.set(x, y, z); - uv = new Vector2f(u, v); - } - - public void setXYZ(double x, double y, double z) { - xyz.set(x, y, z); - } - - public void setUV(double u, double v) { - if(uv == null) { - uv = new Vector2f(u, v); - } else { - uv.set(u, v); - } - } - - public void setNormal(double x, double y, double z) { - if(normal == null) { - normal = new Vector3f(); - } - normal.set((float) x, (float) y, (float) z); - normal.normalize(); - } - - public void setNormal(Vector3f normal2) { - if(normal2 == null) { - normal = null; - return; - } - setNormal(normal2.x, normal2.y, normal2.z); - } - - public void setBrightness(int brightness) { - this.brightness = brightness; - } - - public Vector4f getColor() { - return color; - } - - public void setColor(Vector4f color) { - this.color = color; - } - - public void transform(Matrix4d xform) { - xform.transform(xyz); - xform.transformNormal(normal); - } - - public void translate(Vector3d trans) { - xyz.add(trans); - } - - public double x() { - return xyz.x; - } - - public double y() { - return xyz.y; - } - - public double z() { - return xyz.z; - } - - public float nx() { - return normal.x; - } - - public float ny() { - return normal.y; - } - - public float nz() { - return normal.z; - } - - public float u() { - return uv.x; - } - - public float v() { - return uv.y; - } - - public float r() { - return color.x; - } - - public float g() { - return color.y; - } - - public float b() { - return color.z; - } - - public float a() { - return color.w; - } - - @Override - public String toString() { - return "Vertex [xyz=" + xyz + ", uv=" + uv + ", normal=" + normal + ", color=" + color + ", brightness=" + brightness + "]"; - } - -} diff --git a/src/main/java/crazypants/vecmath/ViewFrustum.java b/src/main/java/crazypants/vecmath/ViewFrustum.java deleted file mode 100644 index 42af6bff..00000000 --- a/src/main/java/crazypants/vecmath/ViewFrustum.java +++ /dev/null @@ -1,172 +0,0 @@ -package crazypants.vecmath; - -public class ViewFrustum { - - public static final int LTN = 0; - public static final int LTF = 1; - public static final int LBN = 2; - public static final int LBF = 3; - public static final int RTN = 4; - public static final int RTF = 5; - public static final int RBN = 6; - public static final int RBF = 7; - - public static final int VERTEX_COUNT = 8; - - public static final int PLANE_COUNT = 6; - - private static final int TOP = 0; - private static final int BOTTOM = 1; - private static final int LEFT = 2; - private static final int RIGHT = 3; - private static final int NEAR = 4; - private static final int FAR = 5; - - private Vector4d vertices[] = new Vector4d[8]; - private Vector4d planes[] = new Vector4d[6]; - - private Vector3d eye; - - private Vector3d min; - private Vector3d max; - - public ViewFrustum() { - eye = new Vector3d(); - min = new Vector3d(); - max = new Vector3d(); - for (int i = 0; i < VERTEX_COUNT; i++) { - vertices[i] = new Vector4d(); - } - for (int i = 0; i < PLANE_COUNT; i++) { - planes[i] = new Vector4d(); - } - } - - public ViewFrustum(ViewFrustum other) { - eye = new Vector3d(other.eye); - min = new Vector3d(other.min); - max = new Vector3d(other.max); - for (int i = 0; i < VERTEX_COUNT; i++) { - vertices[i] = new Vector4d(other.vertices[i]); - } - for (int i = 0; i < PLANE_COUNT; i++) { - planes[i] = new Vector4d(other.planes[i]); - } - } - - public boolean containsPoint(Vector3d point) { - for (Vector4d plane : planes) { - if(distanceFromPointToPlane(plane, point) < 0) { - return false; - } - } - return true; - } - - private Vector3d toThreeComponent(Vector3d from) { - return new Vector3d(from.x, from.y, from.z); - } - - private double distanceFromPointToPlane(Vector4d plane, Vector3d point) { - Vector4d newPoint = new Vector4d(point.x, point.y, point.z, 1); - return plane.dot(newPoint); - } - - public Vector4d getVertex(int index) { - return vertices[index]; - } - - public Vector3d getEye() { - return eye; - } - - public Vector3d getMin() { - return min; - } - - public Vector3d getMax() { - return max; - } - - public Vector4d getLeftPlane() { - return getPlane(LEFT); - } - - public Vector4d getRightPlane() { - return getPlane(RIGHT); - } - - public Vector4d getTopPlane() { - return getPlane(TOP); - } - - public Vector4d getBottomPlane() { - return getPlane(BOTTOM); - } - - public Vector4d getNearPlane() { - return getPlane(NEAR); - } - - public Vector4d getFarPlane() { - return getPlane(FAR); - } - - /** - * @param ivm - * the inverse view transformation matrix - * @param ipm - * the inverse projection matrix - */ - public void computeFrustum(Matrix4d ivm, Matrix4d ipm) { - - Matrix4d vpm = new Matrix4d(); - vpm.mul(ivm, ipm); - - ivm.getTranslation(eye); - - vertices[LBF].set(-1, -1, 1, 1); - vertices[LTF].set(-1, 1, 1, 1); - vertices[RTF].set(1, 1, 1, 1); - vertices[RBF].set(1, -1, 1, 1); - vertices[LBN].set(-1, -1, -1, 1); - vertices[LTN].set(-1, 1, -1, 1); - vertices[RTN].set(1, 1, -1, 1); - vertices[RBN].set(1, -1, -1, 1); - - min.set(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); - max.set(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); - - for (int i = 0; i < VERTEX_COUNT; i++) { - vpm.transform(vertices[i]); - double w = vertices[i].w; - // apply perspective - vertices[i].x /= w; - vertices[i].y /= w; - vertices[i].z /= w; - - min.x = Math.min(min.x, vertices[i].x); - min.y = Math.min(min.y, vertices[i].y); - min.z = Math.min(min.z, vertices[i].z); - - max.x = Math.max(max.x, vertices[i].x); - max.y = Math.max(max.y, vertices[i].y); - max.z = Math.max(max.z, vertices[i].z); - } - - VecmathUtil.computePlaneEquation(vertices[LBN], vertices[LBF], vertices[LTF], planes[LEFT]); - VecmathUtil.computePlaneEquation(vertices[LBN], vertices[LBF], vertices[LTF], planes[LEFT]); - VecmathUtil.computePlaneEquation(vertices[RBN], vertices[RTF], vertices[RBF], planes[RIGHT]); - VecmathUtil.computePlaneEquation(vertices[LTN], vertices[LTF], vertices[RTF], planes[TOP]); - VecmathUtil.computePlaneEquation(vertices[LBN], vertices[RBF], vertices[LBF], planes[BOTTOM]); - VecmathUtil.computePlaneEquation(vertices[LBN], vertices[LTN], vertices[RTN], planes[NEAR]); - VecmathUtil.computePlaneEquation(vertices[LBF], vertices[RTF], vertices[LTF], planes[FAR]); - - } - - private final Vector4d getPlane(int index) { - assert ((index >= 0) && (index < PLANE_COUNT)) : "Illegal index : 0 <= index < " + PLANE_COUNT; - return planes[index]; - } - -}