Reformat and Reorganize
This commit is contained in:
parent
142c25603a
commit
147ae58b4c
11 changed files with 50 additions and 80 deletions
|
@ -29,8 +29,10 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer
|
|||
|
||||
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)
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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<ItemStack> 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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,6 +21,8 @@ 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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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()
|
||||
|
@ -122,9 +122,11 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements
|
|||
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;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -83,7 +83,7 @@ public class ContainerStamper extends Container implements IInventory
|
|||
|
||||
if (slot == 2)
|
||||
{
|
||||
setInventorySlotContents(0, null); //prevent filter from being duplicated
|
||||
setInventorySlotContents(0, null); // prevent filter from being duplicated
|
||||
}
|
||||
|
||||
if (slot > 4)
|
||||
|
|
Loading…
Reference in a new issue