diff options
Diffstat (limited to 'src/Java/miscutil/enderio/conduit')
12 files changed, 68 insertions, 84 deletions
diff --git a/src/Java/miscutil/enderio/conduit/gas/AbstractGasConduit.java b/src/Java/miscutil/enderio/conduit/gas/AbstractGasConduit.java index 2bc3be3d67..0cdee252b0 100644 --- a/src/Java/miscutil/enderio/conduit/gas/AbstractGasConduit.java +++ b/src/Java/miscutil/enderio/conduit/gas/AbstractGasConduit.java @@ -1,5 +1,14 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; + +import mekanism.api.gas.IGasHandler; +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; @@ -9,17 +18,6 @@ import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.reservoir.TileReservoir; import crazypants.util.BlockCoord; import crazypants.util.DyeColor; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import mekanism.api.gas.IGasHandler; -import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public abstract class AbstractGasConduit extends AbstractConduit diff --git a/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduit.java b/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduit.java index 5a0b50c370..7b8e36f498 100644 --- a/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduit.java +++ b/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduit.java @@ -1,22 +1,18 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; -import crazypants.enderio.conduit.AbstractConduitNetwork; -import crazypants.enderio.conduit.ConduitUtil; -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.conduit.RaytraceResult; -import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.enderio.tool.ToolUtil; -import crazypants.util.BlockCoord; import java.util.List; + import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +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; public abstract class AbstractGasTankConduit extends AbstractGasConduit diff --git a/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduitNetwork.java b/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduitNetwork.java index 62d8daa205..ec75d1319e 100644 --- a/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduitNetwork.java +++ b/src/Java/miscutil/enderio/conduit/gas/AbstractGasTankConduitNetwork.java @@ -1,7 +1,7 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; -import crazypants.enderio.conduit.AbstractConduitNetwork; import mekanism.api.gas.GasStack; +import crazypants.enderio.conduit.AbstractConduitNetwork; public class AbstractGasTankConduitNetwork<T extends AbstractGasTankConduit> extends AbstractConduitNetwork<IGasConduit, T> diff --git a/src/Java/miscutil/enderio/conduit/gas/ConduitGasTank.java b/src/Java/miscutil/enderio/conduit/gas/ConduitGasTank.java index 521e08a589..3e944a2f2c 100644 --- a/src/Java/miscutil/enderio/conduit/gas/ConduitGasTank.java +++ b/src/Java/miscutil/enderio/conduit/gas/ConduitGasTank.java @@ -1,6 +1,5 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; -import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/Java/miscutil/enderio/conduit/gas/GasConduit.java b/src/Java/miscutil/enderio/conduit/gas/GasConduit.java index 59300c4aa8..bac24cabfd 100644 --- a/src/Java/miscutil/enderio/conduit/gas/GasConduit.java +++ b/src/Java/miscutil/enderio/conduit/gas/GasConduit.java @@ -1,26 +1,25 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; +import java.util.HashMap; +import java.util.Map; + +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasStack; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.config.Config; import crazypants.render.IconUtil; -import crazypants.render.IconUtil.IIconProvider; import crazypants.util.BlockCoord; -import java.util.HashMap; -import java.util.Map; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public class GasConduit extends AbstractGasTankConduit diff --git a/src/Java/miscutil/enderio/conduit/gas/GasConduitNetwork.java b/src/Java/miscutil/enderio/conduit/gas/GasConduitNetwork.java index 43db642248..a93a418627 100644 --- a/src/Java/miscutil/enderio/conduit/gas/GasConduitNetwork.java +++ b/src/Java/miscutil/enderio/conduit/gas/GasConduitNetwork.java @@ -1,21 +1,18 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; -import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; -import crazypants.enderio.conduit.ConduitNetworkTickHandler; -import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener; -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.util.BlockCoord; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Set; + import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.gameevent.TickEvent; +import crazypants.enderio.conduit.ConduitNetworkTickHandler; +import crazypants.enderio.conduit.IConduit; +import crazypants.util.BlockCoord; public class GasConduitNetwork extends AbstractGasTankConduitNetwork<GasConduit> @@ -27,7 +24,7 @@ public class GasConduitNetwork private boolean lastSyncedActive = false; private int lastSyncedVolume = -1; private long timeAtLastApply; - private final InnerTickHandler tickHandler = new InnerTickHandler(null); + private final InnerTickHandler tickHandler = new InnerTickHandler(); public GasConduitNetwork() { diff --git a/src/Java/miscutil/enderio/conduit/gas/GasConduitRenderer.java b/src/Java/miscutil/enderio/conduit/gas/GasConduitRenderer.java index 9b53361b44..b8b6450a47 100644 --- a/src/Java/miscutil/enderio/conduit/gas/GasConduitRenderer.java +++ b/src/Java/miscutil/enderio/conduit/gas/GasConduitRenderer.java @@ -1,7 +1,13 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; +import java.util.List; + +import mekanism.api.gas.GasStack; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.BlockConduitBundle; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; @@ -13,16 +19,8 @@ import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.RenderUtil; -import crazypants.vecmath.Vector2f; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vertex; -import java.util.List; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; public class GasConduitRenderer extends DefaultConduitRenderer @@ -146,7 +144,7 @@ public class GasConduitRenderer { int[] res = { -1, -1 }; boolean highest = (edge.offsetX > 0) || (edge.offsetY > 0) || (edge.offsetZ > 0); - double minMax = highest ? -1.797693134862316E+308D : 1.7976931348623157E+308D; + double minMax = /*highest ? -1.797693134862316E+308D :*/ 1.7976931348623157E+308D; int index = 0; for (Vertex v : vertices) { diff --git a/src/Java/miscutil/enderio/conduit/gas/GasOutput.java b/src/Java/miscutil/enderio/conduit/gas/GasOutput.java index f8757b204d..ff0c699700 100644 --- a/src/Java/miscutil/enderio/conduit/gas/GasOutput.java +++ b/src/Java/miscutil/enderio/conduit/gas/GasOutput.java @@ -1,7 +1,7 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; -import crazypants.util.BlockCoord; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.util.BlockCoord; public class GasOutput { diff --git a/src/Java/miscutil/enderio/conduit/gas/GasUtil.java b/src/Java/miscutil/enderio/conduit/gas/GasUtil.java index fcc02ca942..7b85ee017b 100644 --- a/src/Java/miscutil/enderio/conduit/gas/GasUtil.java +++ b/src/Java/miscutil/enderio/conduit/gas/GasUtil.java @@ -1,16 +1,14 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.IGasHandler; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.config.Config; import crazypants.util.BlockCoord; -import java.util.Map; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import mekanism.api.gas.IGasHandler; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; public final class GasUtil { diff --git a/src/Java/miscutil/enderio/conduit/gas/IGasConduit.java b/src/Java/miscutil/enderio/conduit/gas/IGasConduit.java index 6b09293e63..1f79988a82 100644 --- a/src/Java/miscutil/enderio/conduit/gas/IGasConduit.java +++ b/src/Java/miscutil/enderio/conduit/gas/IGasConduit.java @@ -1,9 +1,9 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; -import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.IExtractor; import mekanism.api.gas.IGasHandler; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IExtractor; public abstract interface IGasConduit extends IConduit, IGasHandler, IExtractor diff --git a/src/Java/miscutil/enderio/conduit/gas/ItemGasConduit.java b/src/Java/miscutil/enderio/conduit/gas/ItemGasConduit.java index d09e657023..887b0edd28 100644 --- a/src/Java/miscutil/enderio/conduit/gas/ItemGasConduit.java +++ b/src/Java/miscutil/enderio/conduit/gas/ItemGasConduit.java @@ -1,5 +1,9 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ModObject; @@ -10,9 +14,6 @@ import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.util.Lang; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; public class ItemGasConduit extends AbstractItemConduit diff --git a/src/Java/miscutil/enderio/conduit/gas/PacketGasLevel.java b/src/Java/miscutil/enderio/conduit/gas/PacketGasLevel.java index 15ea65840a..a7f90f67a4 100644 --- a/src/Java/miscutil/enderio/conduit/gas/PacketGasLevel.java +++ b/src/Java/miscutil/enderio/conduit/gas/PacketGasLevel.java @@ -1,15 +1,13 @@ -package crazypants.enderio.conduit.gas; +package miscutil.enderio.conduit.gas; +import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; 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.IConduitBundle; import crazypants.enderio.network.MessageTileEntity; -import crazypants.util.ClientUtil; -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; public class PacketGasLevel extends MessageTileEntity<TileEntity> @@ -40,7 +38,7 @@ public class PacketGasLevel public IMessage onMessage(PacketGasLevel message, MessageContext ctx) { - ClientUtil.doGasLevelUpdate(message.x, message.y, message.z, message); + //ClientUtil.doGasLevelUpdate(message.x, message.y, message.z, message); return null; } } |