From 2db8e30b1d2151fdde5d08a6c06aef55f0c397d2 Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Fri, 27 Jan 2017 11:32:28 +0300 Subject: License, readme and stuff --- ihl/tunneling_shield/DriverContainer.java | 2 +- ihl/tunneling_shield/DriverGui.java | 4 ++-- ihl/tunneling_shield/DriverRenderEntity.java | 3 --- ihl/tunneling_shield/DriverTileEntity.java | 18 ++++++++---------- ihl/tunneling_shield/HorizontalMiningPipe.java | 2 +- .../HydrotransportPulpRegeneratorContainer.java | 5 +++-- .../HydrotransportPulpRegeneratorGui.java | 4 ---- .../HydrotransportPulpRegeneratorTileEntity.java | 4 ++-- ihl/tunneling_shield/MultiBlockSpacerBlock.java | 17 +++++++---------- 9 files changed, 24 insertions(+), 35 deletions(-) (limited to 'ihl/tunneling_shield') diff --git a/ihl/tunneling_shield/DriverContainer.java b/ihl/tunneling_shield/DriverContainer.java index b7e8687..ee14de8 100644 --- a/ihl/tunneling_shield/DriverContainer.java +++ b/ihl/tunneling_shield/DriverContainer.java @@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; -public class DriverContainer extends ContainerBase { +public class DriverContainer extends ContainerBase { protected DriverTileEntity tileEntity; public int lastStorage = -1; diff --git a/ihl/tunneling_shield/DriverGui.java b/ihl/tunneling_shield/DriverGui.java index c7c8664..446c9f1 100644 --- a/ihl/tunneling_shield/DriverGui.java +++ b/ihl/tunneling_shield/DriverGui.java @@ -10,7 +10,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import ic2.core.network.NetworkManager; @SideOnly(Side.CLIENT) public class DriverGui extends GuiContainer { @@ -23,7 +22,8 @@ public class DriverGui extends GuiContainer { this.container=container1; } - @Override + @SuppressWarnings("unchecked") + @Override public void initGui() { super.initGui(); diff --git a/ihl/tunneling_shield/DriverRenderEntity.java b/ihl/tunneling_shield/DriverRenderEntity.java index 127c9a3..40ed977 100644 --- a/ihl/tunneling_shield/DriverRenderEntity.java +++ b/ihl/tunneling_shield/DriverRenderEntity.java @@ -11,11 +11,8 @@ public class DriverRenderEntity extends Render{ private DriverModel model = new DriverModel(); private ResourceLocation tex = new ResourceLocation(IHLModInfo.MODID+":textures/blocks/shield.png"); - private float rotationSpeed=0F; private float rotationAmount=1F; private float rotationAmount2=0F; - private float shiftCorrection=0F; - public DriverRenderEntity() { super(); diff --git a/ihl/tunneling_shield/DriverTileEntity.java b/ihl/tunneling_shield/DriverTileEntity.java index 2c3f2d8..f547dec 100644 --- a/ihl/tunneling_shield/DriverTileEntity.java +++ b/ihl/tunneling_shield/DriverTileEntity.java @@ -26,7 +26,6 @@ import ic2.core.block.invslot.InvSlotConsumableId; import ic2.core.block.invslot.InvSlot; import ic2.core.block.invslot.InvSlotUpgrade; import ic2.core.block.invslot.InvSlot.Access; -import ic2.core.network.NetworkManager; import ic2.core.upgrade.IUpgradableBlock; import ic2.core.upgrade.UpgradableProperty; import ic2.core.util.StackUtil; @@ -86,8 +85,8 @@ public class DriverTileEntity extends TileEntityInventory implements IEnergySink public boolean reverseModeOn=false; public boolean autoReverseModeOn=true; private float lastModelShiftAmount=1F; - private List blockBlackList = new ArrayList(); - private List blockWhiteList = new ArrayList(); + private List blockBlackList = new ArrayList(); + private List blockWhiteList = new ArrayList(); public boolean advancedShield=false; public DriverTileEntity() @@ -225,7 +224,8 @@ public class DriverTileEntity extends TileEntityInventory implements IEnergySink } - @Override + @SuppressWarnings("unchecked") + @Override public void updateEntityClient() { super.updateEntityClient(); @@ -318,7 +318,8 @@ public class DriverTileEntity extends TileEntityInventory implements IEnergySink } } - @Override + @SuppressWarnings("unchecked") + @Override public void updateEntityServer() { if (IC2.platform.isSimulating()) @@ -720,7 +721,7 @@ public class DriverTileEntity extends TileEntityInventory implements IEnergySink } @Override - public ContainerBase getGuiContainer(EntityPlayer arg0) { + public ContainerBase getGuiContainer(EntityPlayer arg0) { return new DriverContainer(arg0, this); } @@ -799,9 +800,6 @@ public class DriverTileEntity extends TileEntityInventory implements IEnergySink private AxisAlignedBB getShieldBladesZone(double offset) { - int x=this.xCoord; - int y=this.yCoord; - int z=this.zCoord; double extension=this.getModelShiftAmount()+offset; double xShieldMinD=this.xCoord+extension*this.mX()-1D*Math.max(this.mX(), 0)-2D*Math.abs(this.mZ()); double xShieldMaxD=this.xCoord+extension*this.mX()-1D*Math.min(this.mX(), 0)+3D*Math.abs(this.mZ()); @@ -960,7 +958,7 @@ public class DriverTileEntity extends TileEntityInventory implements IEnergySink HydrotransportPulpRegeneratorTileEntity hprte = (HydrotransportPulpRegeneratorTileEntity) te; if(hprte.getActive()) { - ArrayList drops1 = new ArrayList(); + ArrayList drops1 = new ArrayList(); Iterator dropsIterator = drops.iterator(); while(dropsIterator.hasNext()) { diff --git a/ihl/tunneling_shield/HorizontalMiningPipe.java b/ihl/tunneling_shield/HorizontalMiningPipe.java index 8048d45..9409d27 100644 --- a/ihl/tunneling_shield/HorizontalMiningPipe.java +++ b/ihl/tunneling_shield/HorizontalMiningPipe.java @@ -23,7 +23,7 @@ import net.minecraft.world.World; public class HorizontalMiningPipe extends Block { - public static ArrayList teList = new ArrayList(); + public static ArrayList teList = new ArrayList(); public HorizontalMiningPipe() { super(Material.iron); diff --git a/ihl/tunneling_shield/HydrotransportPulpRegeneratorContainer.java b/ihl/tunneling_shield/HydrotransportPulpRegeneratorContainer.java index fade7a0..82445d7 100644 --- a/ihl/tunneling_shield/HydrotransportPulpRegeneratorContainer.java +++ b/ihl/tunneling_shield/HydrotransportPulpRegeneratorContainer.java @@ -10,7 +10,7 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraftforge.fluids.FluidStack; -public class HydrotransportPulpRegeneratorContainer extends ContainerBase { +public class HydrotransportPulpRegeneratorContainer extends ContainerBase { protected HydrotransportPulpRegeneratorTileEntity tileEntity; public int lastFluidAmount = -1; @@ -18,6 +18,7 @@ public class HydrotransportPulpRegeneratorContainer extends ContainerBase { public short lastProgress = -1; public short lastTemperature = -1; private int lastEnergy = -1; + @SuppressWarnings("unused") private List fluidTankFluidList; private final static int height=166; @@ -39,7 +40,7 @@ public class HydrotransportPulpRegeneratorContainer extends ContainerBase { } this.addSlotToContainer(new SlotInvSlot(tileEntity1.drainInputSlot, 0, 32, 13)); this.addSlotToContainer(new SlotInvSlot(tileEntity1.emptyFluidItemsSlot, 0, 32, 51)); - this.addSlotToContainer(new SlotInvSlot(tileEntity1.engine, 0, 8, 32)); + this.addSlotToContainer(new SlotInvSlot(tileEntity1.dischargeSlot, 0, 8, 32)); for(col=0;col<4;col++) { for(row=0;row<3;row++) diff --git a/ihl/tunneling_shield/HydrotransportPulpRegeneratorGui.java b/ihl/tunneling_shield/HydrotransportPulpRegeneratorGui.java index 263d2e1..bd86dd7 100644 --- a/ihl/tunneling_shield/HydrotransportPulpRegeneratorGui.java +++ b/ihl/tunneling_shield/HydrotransportPulpRegeneratorGui.java @@ -44,10 +44,6 @@ public class HydrotransportPulpRegeneratorGui extends GuiContainer { IHLRenderUtils.instance.renderIHLFluidTank(this.container.tileEntity.fluidTank, 57, 16, 69, 63, zLevel, par1, par2, xOffset, yOffset); } this.mc.renderEngine.bindTexture(background); - if(!this.container.tileEntity.engine.correctContent()) - { - IHLRenderUtils.instance.drawMissingEngineTooltip(this, par1, par2, 26, 33, xOffset, yOffset); - } } @Override diff --git a/ihl/tunneling_shield/HydrotransportPulpRegeneratorTileEntity.java b/ihl/tunneling_shield/HydrotransportPulpRegeneratorTileEntity.java index e1d2b39..dc5e114 100644 --- a/ihl/tunneling_shield/HydrotransportPulpRegeneratorTileEntity.java +++ b/ihl/tunneling_shield/HydrotransportPulpRegeneratorTileEntity.java @@ -40,7 +40,6 @@ public class HydrotransportPulpRegeneratorTileEntity extends BasicElectricMotorT this.drainInputSlot = new InvSlotConsumableLiquidIHL(this, "drainInput", -1, InvSlot.Access.I, 1, InvSlot.InvSide.TOP, InvSlotConsumableLiquid.OpType.Drain); this.emptyFluidItemsSlot = new InvSlotOutput(this, "fluidCellsOutput", 2, 1); this.outputSlot = new InvSlotOutput(this, "output", 3, 12); - this.isGuiScreenOpened=true; this.operationLength=26; } @@ -211,9 +210,10 @@ public class HydrotransportPulpRegeneratorTileEntity extends BasicElectricMotorT private boolean isMachineOperational() { - return this.engine.correctContent() && this.energy>=this.energyConsume/this.engine.getEfficiency(); + return this.energy>=this.energyConsume; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public List[] getInput() { diff --git a/ihl/tunneling_shield/MultiBlockSpacerBlock.java b/ihl/tunneling_shield/MultiBlockSpacerBlock.java index 511d8cd..79e5955 100644 --- a/ihl/tunneling_shield/MultiBlockSpacerBlock.java +++ b/ihl/tunneling_shield/MultiBlockSpacerBlock.java @@ -22,7 +22,7 @@ import net.minecraft.world.World; public class MultiBlockSpacerBlock extends Block { - public static Set teList = new HashSet(); + public static Set teList = new HashSet(); public MultiBlockSpacerBlock() { @@ -37,7 +37,12 @@ public class MultiBlockSpacerBlock extends Block { { return -2; } - + + @Override + public ArrayList getDrops(World world,int x, int y, int z, int meta, int flag) + { + return new ArrayList(); + } @Override public void onBlockDestroyedByExplosion(World world, int x, int y, int z, Explosion explosion) { @@ -100,14 +105,6 @@ public class MultiBlockSpacerBlock extends Block { return null; } - @Override - public ArrayList getDrops(World world,int x, int y, int z, int meta, int flag) - { - ArrayList nothing = new ArrayList(); - nothing.clear(); - return nothing; - } - /** * Is this block (a) opaque and (B) a full 1m cube? This determines whether or not to render the shared face of two * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block. -- cgit v1.2.3