@SideOnly(Side.CLIENT)

This commit is contained in:
DarkGuardsman 2013-09-05 20:40:27 -04:00
parent 5b57572c89
commit 1ac9228879
33 changed files with 101 additions and 41 deletions

View file

@ -7,6 +7,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.client.gui.GuiEncoder;
import dark.assembly.client.gui.GuiImprinter;
import dark.assembly.client.render.BlockRenderingHandler;
@ -29,7 +31,7 @@ import dark.assembly.common.machine.belt.TileEntityConveyorBelt;
import dark.assembly.common.machine.crane.TileEntityCraneController;
import dark.assembly.common.machine.crane.TileEntityCraneRail;
import dark.assembly.common.machine.encoder.TileEntityEncoder;
@SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy
{

View file

@ -1,9 +1,11 @@
package dark.assembly.client;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.client.event.sound.SoundLoadEvent;
import net.minecraftforge.event.ForgeSubscribe;
import dark.assembly.common.AssemblyLine;
@SideOnly(Side.CLIENT)
public class SoundHandler
{
public static final SoundHandler INSTANCE = new SoundHandler();

View file

@ -8,7 +8,9 @@ import net.minecraft.client.renderer.Tessellator;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.GuiScrollingList;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiCommandList extends GuiScrollingList
{
private ArrayList<String> commands;

View file

@ -24,12 +24,14 @@ import org.lwjgl.opengl.GL11;
import universalelectricity.prefab.TranslationHelper;
import universalelectricity.prefab.network.PacketManager;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.machine.encoder.ContainerEncoder;
import dark.assembly.common.machine.encoder.IInventoryWatcher;
import dark.assembly.common.machine.encoder.ItemDisk;
import dark.assembly.common.machine.encoder.TileEntityEncoder;
@SideOnly(Side.CLIENT)
public class GuiEncoder extends GuiContainer implements IInventoryWatcher
{
private static final int MAX_COMMANDS = 6;

View file

@ -6,11 +6,14 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import universalelectricity.prefab.TranslationHelper;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.imprinter.ContainerImprinter;
import dark.assembly.common.imprinter.TileEntityImprinter;
@SideOnly(Side.CLIENT)
public class GuiImprinter extends GuiContainer
{
private int containerWidth;

View file

@ -6,9 +6,11 @@
package dark.assembly.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@SideOnly(Side.CLIENT)
public class ModelAngledBelt extends ModelBase
{
// fields

View file

@ -6,6 +6,9 @@ import net.minecraft.entity.Entity;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelArmbot extends ModelBase
{
// fields
@ -141,7 +144,7 @@ public class ModelArmbot extends ModelBase
* clampClawLower.rotationPointY, baseRotation.rotationPointX);
* clampClawLower2.setRotationPoint(baseRotation.rotationPointX,
* clampClawLower2.rotationPointY, baseRotation.rotationPointX);
*
*
* armMountRight.rotateAngleY = armBot.rotationYaw; armMountLeft.rotateAngleY =
* armBot.rotationYaw; armLower.rotateAngleY = armBot.rotationYaw; armUpper.rotateAngleY =
* armBot.rotationYaw; baseRotation.rotateAngleY = armBot.rotationYaw;

View file

@ -1,8 +1,10 @@
package dark.assembly.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@SideOnly(Side.CLIENT)
public class ModelConveyorBelt extends ModelBase
{
// fields

View file

@ -1,8 +1,10 @@
package dark.assembly.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@SideOnly(Side.CLIENT)
public class ModelCraneArmMount extends ModelBase
{
// fields

View file

@ -6,9 +6,11 @@
package dark.assembly.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@SideOnly(Side.CLIENT)
public class ModelCraneController extends ModelBase
{
// fields

View file

@ -1,8 +1,10 @@
package dark.assembly.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@SideOnly(Side.CLIENT)
public class ModelCraneRail extends ModelBase
{
// left

View file

@ -1,8 +1,10 @@
package dark.assembly.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@SideOnly(Side.CLIENT)
public class ModelDropBox extends ModelBase
{
// fields

View file

@ -5,9 +5,11 @@ import static org.lwjgl.opengl.GL11.glBegin;
import static org.lwjgl.opengl.GL11.glEnd;
import static org.lwjgl.opengl.GL11.glTexCoord2f;
import static org.lwjgl.opengl.GL11.glVertex3d;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.util.Vec3;
import net.minecraftforge.common.ForgeDirection;
@SideOnly(Side.CLIENT)
public class ModelHelper
{
private static int gTexWidth = 64;
@ -184,7 +186,7 @@ public class ModelHelper
}
/** Sets whether or not to clip the texture.
*
*
* @param clip If true, textures on blocks less than 1x1x1 will be clipped. If false, they will
* be scaled. */
public static void setTextureClip(boolean clip)

View file

@ -1,8 +1,10 @@
package dark.assembly.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@SideOnly(Side.CLIENT)
public class ModelLaserDrill extends ModelBase
{
// fields

View file

@ -1,8 +1,10 @@
package dark.assembly.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@SideOnly(Side.CLIENT)
public class ModelManipulator extends ModelBase
{
// fields

View file

@ -6,9 +6,11 @@
package dark.assembly.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@SideOnly(Side.CLIENT)
public class ModelRejectorPiston extends ModelBase
{
// fields

View file

@ -14,11 +14,14 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import universalelectricity.core.vector.Vector3;
import dark.assembly.client.model.ModelArmbot;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.armbot.TileEntityArmbot;
@SideOnly(Side.CLIENT)
public class RenderArmbot extends TileEntitySpecialRenderer
{
public static final ModelArmbot MODEL = new ModelArmbot();

View file

@ -6,6 +6,8 @@ import static org.lwjgl.opengl.GL11.glPopMatrix;
import static org.lwjgl.opengl.GL11.glPushMatrix;
import static org.lwjgl.opengl.GL11.glRotatef;
import static org.lwjgl.opengl.GL11.glTranslated;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.ForgeDirection;
@ -13,7 +15,7 @@ import dark.assembly.client.model.ModelCraneController;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.machine.crane.CraneHelper;
import dark.assembly.common.machine.crane.TileEntityCraneController;
@SideOnly(Side.CLIENT)
public class RenderCraneController extends RenderImprintable
{
public static final String TEXTURE = "crane_controller_off.png";

View file

@ -6,6 +6,8 @@ import static org.lwjgl.opengl.GL11.glPopMatrix;
import static org.lwjgl.opengl.GL11.glPushMatrix;
import static org.lwjgl.opengl.GL11.glRotatef;
import static org.lwjgl.opengl.GL11.glTranslated;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
@ -14,7 +16,7 @@ import dark.assembly.client.model.ModelCraneRail;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.machine.crane.CraneHelper;
import dark.assembly.common.machine.crane.TileEntityCraneRail;
@SideOnly(Side.CLIENT)
public class RenderCraneFrame extends TileEntitySpecialRenderer
{
public static final String TEXTURE = "crane_frame.png";

View file

@ -17,9 +17,12 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import universalelectricity.core.vector.Vector3;
import dark.assembly.common.machine.TileEntityCrate;
@SideOnly(Side.CLIENT)
public class RenderCrate extends TileEntitySpecialRenderer
{
private final RenderBlocks renderBlocks = new RenderBlocks();
@ -96,7 +99,7 @@ public class RenderCrate extends TileEntitySpecialRenderer
/*
* switch (tileEntity.getTier()) { default: { itemName = "\u00a7a" + itemName;
* break; } case 1: { itemName = "\u00a74" + itemName;
*
*
* break; } case 2: { itemName = "\u00a79" + itemName; break; } }
*/

View file

@ -7,7 +7,11 @@ import net.minecraft.client.renderer.entity.RenderManager;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/** @author Briman0094 */
@SideOnly(Side.CLIENT)
public class RenderHelper
{
public static void renderFloatingText(String text, float x, float y, float z)

View file

@ -2,6 +2,9 @@ package dark.assembly.client.render;
import java.util.ArrayList;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.player.EntityPlayer;
@ -12,6 +15,7 @@ import dark.assembly.common.imprinter.ItemImprinter;
import dark.assembly.common.imprinter.prefab.TileEntityFilterable;
/** @author Briman0094 */
@SideOnly(Side.CLIENT)
public abstract class RenderImprintable extends TileEntitySpecialRenderer
{
@Override

View file

@ -5,10 +5,13 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.client.model.ModelManipulator;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.machine.TileEntityManipulator;
@SideOnly(Side.CLIENT)
public class RenderManipulator extends RenderImprintable
{
private ModelManipulator model = new ModelManipulator();

View file

@ -5,10 +5,13 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.client.model.ModelRejectorPiston;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.machine.TileEntityRejector;
@SideOnly(Side.CLIENT)
public class RenderRejector extends RenderImprintable
{
private ModelRejectorPiston model = new ModelRejectorPiston();

View file

@ -47,6 +47,7 @@ public class BlockImprinter extends BlockAssembly
/** Returns the block texture based on the side being looked at. Args: side */
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (side == 1)

View file

@ -19,7 +19,7 @@ import dark.assembly.common.AssemblyLine;
/** A block that allows the placement of mass amount of a specific item within it. It will be allowed
* to go on Conveyor Belts
*
*
* @author Calclavia */
public class BlockCrate extends BlockAssembly
{
@ -38,12 +38,13 @@ public class BlockCrate extends BlockAssembly
}
@Override
@SideOnly(Side.CLIENT)
public Icon getBlockTexture(IBlockAccess iBlockAccess, int x, int y, int z, int side)
{
return this.crate_icon;
}
@Override
@Override @SideOnly(Side.CLIENT)
public Icon getIcon(int side, int metadata)
{
return this.crate_icon;
@ -210,7 +211,7 @@ public class BlockCrate extends BlockAssembly
}
/** Inserts all items of the same type this player has into the crate.
*
*
* @return True on success */
public boolean insertAllItems(TileEntityCrate tileEntity, EntityPlayer player)
{
@ -255,7 +256,7 @@ public class BlockCrate extends BlockAssembly
}
/** Ejects and item out of the crate and spawn it under the player entity.
*
*
* @param tileEntity
* @param player
* @param requestSize - The maximum stack size to take out. Default should be 64.
@ -307,7 +308,7 @@ public class BlockCrate extends BlockAssembly
}
/** Puts an itemStack into the crate.
*
*
* @param tileEntity
* @param itemStack */
public static ItemStack addStackToCrate(TileEntityCrate tileEntity, ItemStack itemStack)

View file

@ -71,7 +71,7 @@ public class BlockDetector extends BlockImprintable
this.eye_red = iconReg.registerIcon(AssemblyLine.instance.PREFIX + "detector_red");
}
@Override
@Override@SideOnly(Side.CLIENT)
public Icon getBlockTexture(IBlockAccess iBlockAccess, int x, int y, int z, int side)
{
TileEntity tileEntity = iBlockAccess.getBlockTileEntity(x, y, z);
@ -94,7 +94,7 @@ public class BlockDetector extends BlockImprintable
return this.machine_icon;
}
@Override
@Override@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int metadata)
{
if (side == ForgeDirection.SOUTH.ordinal())
@ -146,7 +146,7 @@ public class BlockDetector extends BlockImprintable
return false;
}
@Override
@Override@SideOnly(Side.CLIENT)
public boolean renderAsNormalBlock()
{
return false;

View file

@ -13,7 +13,7 @@ import dark.assembly.common.TabAssemblyLine;
import dark.assembly.common.imprinter.prefab.BlockImprintable;
/** A block that manipulates item movement between inventories.
*
*
* @author Calclavia */
public class BlockManipulator extends BlockImprintable
{
@ -97,7 +97,7 @@ public class BlockManipulator extends BlockImprintable
return false;
}
@Override
@Override@SideOnly(Side.CLIENT)
public boolean renderAsNormalBlock()
{
return false;

View file

@ -28,7 +28,7 @@ public class BlockRejector extends BlockImprintable
return false;
}
@Override
@Override@SideOnly(Side.CLIENT)
public boolean renderAsNormalBlock()
{
return false;

View file

@ -22,7 +22,7 @@ import dark.assembly.common.machine.BlockAssembly;
import dark.assembly.common.machine.belt.TileEntityConveyorBelt.SlantType;
/** The block for the actual conveyor belt!
*
*
* @author Calclavia, DarkGuardsman */
public class BlockConveyorBelt extends BlockAssembly
{
@ -343,7 +343,7 @@ public class BlockConveyorBelt extends BlockAssembly
return false;
}
@Override
@Override@SideOnly(Side.CLIENT)
public boolean renderAsNormalBlock()
{
return false;

View file

@ -24,7 +24,7 @@ public class BlockCraneController extends BlockAssembly
return false;
}
@Override
@Override@SideOnly(Side.CLIENT)
public boolean renderAsNormalBlock()
{
return false;

View file

@ -139,7 +139,7 @@ public class BlockCraneFrame extends BlockAssembly
return new TileEntityCraneRail();
}
@Override
@Override@SideOnly(Side.CLIENT)
public boolean renderAsNormalBlock()
{
return false;

View file

@ -34,14 +34,14 @@ public class BlockEncoder extends BlockAssembly
}
/** Returns the block texture based on the side being looked at. Args: side */
@Override
@Override@SideOnly(Side.CLIENT)
public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side)
{
return getIcon(side, 0);
}
/** Returns the block texture based on the side being looked at. Args: side */
@Override
@Override@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (side == 1)