From 147ae58b4c476e4e8aa09e9c10092a0dd61ec5b1 Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Sat, 29 Dec 2012 11:25:11 +0800 Subject: [PATCH] Reformat and Reorganize --- .../client/render/RenderConveyorBelt.java | 8 +++--- .../client/render/RenderDetector.java | 3 +-- .../client/render/RenderFilterable.java | 15 ++++++----- .../client/render/RenderHelper.java | 9 ++++++- .../client/render/RenderSorter.java | 9 +------ .../common/machine/TileEntityFilterable.java | 22 ++++++++-------- .../common/machine/TileEntityRejector.java | 26 +++---------------- .../machine/belt/TileEntityConveyorBelt.java | 16 +++++++----- .../machine/detector/BlockDetector.java | 5 +--- .../machine/detector/TileEntityDetector.java | 13 ---------- .../machine/filter/ContainerStamper.java | 4 +-- 11 files changed, 50 insertions(+), 80 deletions(-) diff --git a/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java b/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java index 43372bd7..75b8b1b1 100644 --- a/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java +++ b/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java @@ -26,11 +26,13 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); GL11.glRotatef(180f, 0f, 0f, 1f); - + int frame = tileEntity.getAnimationFrame(); - this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "belt/frame" + frame + ".png"); //belt/frame0.png through belt/frame13.png - //System.out.println(AssemblyLine.TEXTURE_PATH + "belt/frame" + frame + ".png"); + this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "belt/frame" + frame + ".png"); // belt/frame0.png + // through + // belt/frame13.png + // System.out.println(AssemblyLine.TEXTURE_PATH + "belt/frame" + frame + ".png"); switch (face) { diff --git a/src/minecraft/assemblyline/client/render/RenderDetector.java b/src/minecraft/assemblyline/client/render/RenderDetector.java index 4879545c..698838de 100644 --- a/src/minecraft/assemblyline/client/render/RenderDetector.java +++ b/src/minecraft/assemblyline/client/render/RenderDetector.java @@ -7,7 +7,6 @@ import static assemblyline.client.model.ModelHelper.setTextureSubResolution; import static org.lwjgl.opengl.GL11.glPopMatrix; import static org.lwjgl.opengl.GL11.glPushMatrix; import static org.lwjgl.opengl.GL11.glTranslated; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.ForgeHooksClient; import universalelectricity.core.vector.Vector3; @@ -25,7 +24,7 @@ public class RenderDetector extends RenderFilterable { if (tileEntity instanceof TileEntityDetector) { - //this.render(((TileEntityDetector) tileEntity).isInverted(), new Vector3(x, y, z)); + // this.render(((TileEntityDetector) tileEntity).isInverted(), new Vector3(x, y, z)); } super.renderTileEntityAt(tileEntity, x, y, z, var8); } diff --git a/src/minecraft/assemblyline/client/render/RenderFilterable.java b/src/minecraft/assemblyline/client/render/RenderFilterable.java index e38c1e63..f82d4ba4 100644 --- a/src/minecraft/assemblyline/client/render/RenderFilterable.java +++ b/src/minecraft/assemblyline/client/render/RenderFilterable.java @@ -2,25 +2,28 @@ package assemblyline.client.render; import java.util.ArrayList; -import assemblyline.common.machine.TileEntityFilterable; -import assemblyline.common.machine.filter.ItemFilter; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import assemblyline.common.machine.TileEntityFilterable; +import assemblyline.common.machine.filter.ItemFilter; +/** + * @author Briman0094 + */ public abstract class RenderFilterable extends TileEntitySpecialRenderer { - @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float var8) { if (tileEntity instanceof TileEntityFilterable) { TileEntityFilterable filterable = (TileEntityFilterable) tileEntity; - EntityPlayer p = Minecraft.getMinecraft().thePlayer; - double dist = p.getDistance(filterable.xCoord, filterable.yCoord, filterable.zCoord); + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + + double dist = player.getDistance(filterable.xCoord, filterable.yCoord, filterable.zCoord); if (dist < 5) { ItemStack filter = filterable.getFilter(); @@ -29,7 +32,7 @@ public abstract class RenderFilterable extends TileEntitySpecialRenderer ArrayList filters = ItemFilter.getFilters(filter); for (int i = 0; i < filters.size(); i++) { - RenderHelper.renderFloatingText(filters.get(i).getTooltip(p, Minecraft.getMinecraft().gameSettings.advancedItemTooltips).get(0).toString(), (float) x + 0.5f, ((float) y + (i * 0.25f)) - 1f, (float) z + 0.5f); + RenderHelper.renderFloatingText(filters.get(i).getTooltip(player, Minecraft.getMinecraft().gameSettings.advancedItemTooltips).get(0).toString(), (float) x + 0.5f, ((float) y + (i * 0.25f)) - 1f, (float) z + 0.5f); } } } diff --git a/src/minecraft/assemblyline/client/render/RenderHelper.java b/src/minecraft/assemblyline/client/render/RenderHelper.java index b84483ac..896a9e4f 100644 --- a/src/minecraft/assemblyline/client/render/RenderHelper.java +++ b/src/minecraft/assemblyline/client/render/RenderHelper.java @@ -1,14 +1,21 @@ package assemblyline.client.render; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import org.lwjgl.opengl.GL11; +/** + * + * @author Briman0094 + * + */ public class RenderHelper { + /** + * Renders a floating text in a specific position. + */ public static void renderFloatingText(String text, float x, float y, float z) { RenderManager renderManager = RenderManager.instance; diff --git a/src/minecraft/assemblyline/client/render/RenderSorter.java b/src/minecraft/assemblyline/client/render/RenderSorter.java index 6fbcef71..98302886 100644 --- a/src/minecraft/assemblyline/client/render/RenderSorter.java +++ b/src/minecraft/assemblyline/client/render/RenderSorter.java @@ -1,11 +1,5 @@ package assemblyline.client.render; -import java.util.ArrayList; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; @@ -13,7 +7,6 @@ import org.lwjgl.opengl.GL11; import assemblyline.client.model.ModelSorter; import assemblyline.common.AssemblyLine; import assemblyline.common.machine.TileEntityRejector; -import assemblyline.common.machine.filter.ItemFilter; public class RenderSorter extends RenderFilterable { @@ -58,7 +51,7 @@ public class RenderSorter extends RenderFilterable public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) { this.renderAModelAt((TileEntityRejector) tileEntity, var2, var4, var6, var8); - super.renderTileEntityAt(tileEntity, var2, var4, var6, var8); + super.renderTileEntityAt(tileEntity, var2, var4, var6, var8); } } \ No newline at end of file diff --git a/src/minecraft/assemblyline/common/machine/TileEntityFilterable.java b/src/minecraft/assemblyline/common/machine/TileEntityFilterable.java index e7252883..c1d4027a 100644 --- a/src/minecraft/assemblyline/common/machine/TileEntityFilterable.java +++ b/src/minecraft/assemblyline/common/machine/TileEntityFilterable.java @@ -6,8 +6,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import com.google.common.io.ByteArrayDataInput; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -23,10 +21,12 @@ import universalelectricity.prefab.network.PacketManager.PacketType; import assemblyline.api.IFilterable; import assemblyline.common.AssemblyLine; +import com.google.common.io.ByteArrayDataInput; + public abstract class TileEntityFilterable extends TileEntityAssemblyNetwork implements IRotatable, IFilterable, IPacketReceiver, IInventory { private ItemStack filterItem; - + @Override public int getSizeInventory() { @@ -108,15 +108,15 @@ public abstract class TileEntityFilterable extends TileEntityAssemblyNetwork imp @Override public void openChest() { - + } @Override public void closeChest() { - + } - + @Override public void setFilter(ItemStack filter) { @@ -150,7 +150,7 @@ public abstract class TileEntityFilterable extends TileEntityAssemblyNetwork imp { return 1; } - + @Override public Packet getDescriptionPacket() { @@ -198,23 +198,23 @@ public abstract class TileEntityFilterable extends TileEntityAssemblyNetwork imp e.printStackTrace(); } } - + @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - + NBTTagCompound filter = new NBTTagCompound(); if (getFilter() != null) getFilter().writeToNBT(filter); nbt.setTag("filter", filter); } - + @Override public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - + NBTTagCompound filter = nbt.getCompoundTag("filter"); setInventorySlotContents(0, ItemStack.loadItemStackFromNBT(filter)); } diff --git a/src/minecraft/assemblyline/common/machine/TileEntityRejector.java b/src/minecraft/assemblyline/common/machine/TileEntityRejector.java index 0cff44cd..f34584d2 100644 --- a/src/minecraft/assemblyline/common/machine/TileEntityRejector.java +++ b/src/minecraft/assemblyline/common/machine/TileEntityRejector.java @@ -1,40 +1,20 @@ package assemblyline.common.machine; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector3; import universalelectricity.prefab.TranslationHelper; -import universalelectricity.prefab.implement.IRotatable; -import universalelectricity.prefab.network.IPacketReceiver; import universalelectricity.prefab.network.PacketManager; -import universalelectricity.prefab.network.PacketManager.PacketType; -import assemblyline.api.IFilterable; -import assemblyline.common.AssemblyLine; import assemblyline.common.machine.filter.ItemFilter; - -import com.google.common.io.ByteArrayDataInput; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.relauncher.Side; @@ -149,7 +129,7 @@ public class TileEntityRejector extends TileEntityFilterable entity.motionX = (double) side.offsetX * 0.1; entity.motionY += 0.10000000298023224D; entity.motionZ = (double) side.offsetZ * 0.1; - + PacketManager.sendPacketToClients(getDescriptionPacket()); } @@ -255,7 +235,7 @@ public class TileEntityRejector extends TileEntityFilterable public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - + firePiston = nbt.getBoolean("piston"); } @@ -266,7 +246,7 @@ public class TileEntityRejector extends TileEntityFilterable public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - + nbt.setBoolean("piston", firePiston); } } diff --git a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java index 0524c5ae..e11de49c 100644 --- a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java +++ b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java @@ -29,7 +29,7 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements { NONE, UP, DOWN } - + public static final int NUM_FRAMES = 13; /** @@ -39,7 +39,7 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements public final float maxSpeed = 0.1f; public float wheelRotation = 0; - public int animFrame = 0; //this is from 0 to 15 + public int animFrame = 0; // this is from 0 to 15 private SlantType slantType = SlantType.NONE; public TileEntityConveyorBelt() @@ -120,11 +120,13 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements if (this.wheelRotation > 360) this.wheelRotation = 0; - + float wheelRotPct = wheelRotation / 360f; - animFrame = (int) (wheelRotPct * NUM_FRAMES); //sync the animation - if (animFrame < 0) animFrame = 0; - if (animFrame > NUM_FRAMES) animFrame = NUM_FRAMES; + animFrame = (int) (wheelRotPct * NUM_FRAMES); // sync the animation + if (animFrame < 0) + animFrame = 0; + if (animFrame > NUM_FRAMES) + animFrame = NUM_FRAMES; } } @@ -252,7 +254,7 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements AxisAlignedBB bounds = AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord, this.zCoord, this.xCoord + 1, this.yCoord + 1, this.zCoord + 1); return worldObj.getEntitiesWithinAABB(Entity.class, bounds); } - + public int getAnimationFrame() { TileEntity te = null; diff --git a/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java b/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java index 284d8922..ec5c6ae9 100644 --- a/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java +++ b/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java @@ -123,10 +123,7 @@ public class BlockDetector extends BlockFilterable TileEntity tileEntity = world.getBlockTileEntity(x, y, z); if (tileEntity != null) { - if (tileEntity instanceof TileEntityDetector) - { - return ((TileEntityDetector) tileEntity).isPoweringTo(ForgeDirection.getOrientation(direction)); - } + if (tileEntity instanceof TileEntityDetector) { return ((TileEntityDetector) tileEntity).isPoweringTo(ForgeDirection.getOrientation(direction)); } } return false; diff --git a/src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java b/src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java index f7ca7a4a..b4f9d61e 100644 --- a/src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java +++ b/src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java @@ -1,31 +1,18 @@ package assemblyline.common.machine.detector; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; import java.util.ArrayList; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.prefab.TranslationHelper; import universalelectricity.prefab.network.PacketManager; import assemblyline.common.AssemblyLine; import assemblyline.common.machine.TileEntityFilterable; import assemblyline.common.machine.filter.ItemFilter; -import com.google.common.io.ByteArrayDataInput; - public class TileEntityDetector extends TileEntityFilterable { private boolean powering = false; diff --git a/src/minecraft/assemblyline/common/machine/filter/ContainerStamper.java b/src/minecraft/assemblyline/common/machine/filter/ContainerStamper.java index 5bb602ad..7363901f 100644 --- a/src/minecraft/assemblyline/common/machine/filter/ContainerStamper.java +++ b/src/minecraft/assemblyline/common/machine/filter/ContainerStamper.java @@ -80,10 +80,10 @@ public class ContainerStamper extends Container implements IInventory { ItemStack slotStack = slotObj.getStack(); copyStack = slotStack.copy(); - + if (slot == 2) { - setInventorySlotContents(0, null); //prevent filter from being duplicated + setInventorySlotContents(0, null); // prevent filter from being duplicated } if (slot > 4)