tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Auto-Sync

Browse source
This commit is contained in:
DarkGuardsman 2013-09-16 07:30:20 -04:00
parent 7ce107e991
commit 6f48a50674
38 changed files with 58 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/minecraft/dark/assembly/client/ClientProxy.java
View file

@ -34,6 +34,7 @@ import dark.assembly.common.machine.crane.TileEntityCraneController;
import dark.assembly.common.machine.crane.TileEntityCraneRail;
import dark.assembly.common.machine.encoder.TileEntityEncoder;
import dark.assembly.common.machine.processor.TileEntityProcessor;
@SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy
{

1
src/minecraft/dark/assembly/client/SoundHandler.java
View file

@ -5,6 +5,7 @@ import net.minecraftforge.event.ForgeSubscribe;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.common.AssemblyLine;
@SideOnly(Side.CLIENT)
public class SoundHandler
{

1
src/minecraft/dark/assembly/client/gui/GuiCommandList.java
View file

@ -10,6 +10,7 @@ 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
{

1
src/minecraft/dark/assembly/client/gui/GuiImprinter.java
View file

@ -12,6 +12,7 @@ import cpw.mods.fml.relauncher.SideOnly;
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
{

7
src/minecraft/dark/assembly/client/gui/GuiProcessor.java
View file

@ -1,15 +1,14 @@
package dark.assembly.client.gui;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ContainerFurnace;
import net.minecraft.tileentity.TileEntityFurnace;
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.common.AssemblyLine;
import dark.assembly.common.machine.processor.ContainerProcessor;
import dark.assembly.common.machine.processor.TileEntityProcessor;

1
src/minecraft/dark/assembly/client/model/ModelAngledBelt.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelAngledBelt extends ModelBase
{

1
src/minecraft/dark/assembly/client/model/ModelArmbot.java
View file

@ -8,6 +8,7 @@ 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
{

1
src/minecraft/dark/assembly/client/model/ModelConveyorBelt.java
View file

@ -4,6 +4,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelConveyorBelt extends ModelBase
{

1
src/minecraft/dark/assembly/client/model/ModelCraneArmMount.java
View file

@ -4,6 +4,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelCraneArmMount extends ModelBase
{

1
src/minecraft/dark/assembly/client/model/ModelCraneController.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelCraneController extends ModelBase
{

1
src/minecraft/dark/assembly/client/model/ModelCraneRail.java
View file

@ -4,6 +4,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelCraneRail extends ModelBase
{

2
src/minecraft/dark/assembly/client/model/ModelCrusher.java
View file

@ -8,8 +8,6 @@ package dark.assembly.client.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
public class ModelCrusher extends ModelBase
{

1
src/minecraft/dark/assembly/client/model/ModelDropBox.java
View file

@ -4,6 +4,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelDropBox extends ModelBase
{

3
src/minecraft/dark/assembly/client/model/ModelHelper.java
View file

@ -9,6 +9,7 @@ import net.minecraft.util.Vec3;
import net.minecraftforge.common.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelHelper
{
@ -186,7 +187,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)

1
src/minecraft/dark/assembly/client/model/ModelLaserDrill.java
View file

@ -4,6 +4,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelLaserDrill extends ModelBase
{

1
src/minecraft/dark/assembly/client/model/ModelManipulator.java
View file

@ -4,6 +4,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelManipulator extends ModelBase
{

1
src/minecraft/dark/assembly/client/model/ModelRejectorPiston.java
View file

@ -10,6 +10,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelRejectorPiston extends ModelBase
{

1
src/minecraft/dark/assembly/client/render/RenderArmbot.java
View file

@ -20,6 +20,7 @@ import cpw.mods.fml.relauncher.SideOnly;
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
{

1
src/minecraft/dark/assembly/client/render/RenderCraneController.java
View file

@ -15,6 +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
{

1
src/minecraft/dark/assembly/client/render/RenderCraneFrame.java
View file

@ -16,6 +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
{

1
src/minecraft/dark/assembly/client/render/RenderCrate.java
View file

@ -21,6 +21,7 @@ import universalelectricity.core.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.common.machine.TileEntityCrate;
@SideOnly(Side.CLIENT)
public class RenderCrate extends TileEntitySpecialRenderer
{

1
src/minecraft/dark/assembly/client/render/RenderManipulator.java
View file

@ -10,6 +10,7 @@ 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
{

1
src/minecraft/dark/assembly/client/render/RenderProcessor.java
View file

@ -8,7 +8,6 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ProcessorRecipes.ProcessorType;
import dark.assembly.client.model.ModelCrusher;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.machine.processor.TileEntityProcessor;

1
src/minecraft/dark/assembly/client/render/RenderRejector.java
View file

@ -10,6 +10,7 @@ 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
{

2
src/minecraft/dark/assembly/common/imprinter/TileEntityImprinter.java
View file

@ -190,7 +190,7 @@ public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInv
}
/** Construct an InventoryCrafting Matrix on the fly.
*
*
* @return */
public InventoryCrafting getCraftingMatrix()
{

11
src/minecraft/dark/assembly/common/machine/BlockCrate.java
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
{
@ -44,7 +44,8 @@ public class BlockCrate extends BlockAssembly
return this.crate_icon;
}
@Override @SideOnly(Side.CLIENT)
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int metadata)
{
return this.crate_icon;
@ -211,7 +212,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)
{
@ -256,7 +257,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.
@ -308,7 +309,7 @@ public class BlockCrate extends BlockAssembly
}
/** Puts an itemStack into the crate.
*
*
* @param tileEntity
* @param itemStack */
public static ItemStack addStackToCrate(TileEntityCrate tileEntity, ItemStack itemStack)

9
src/minecraft/dark/assembly/common/machine/BlockDetector.java
View file

@ -71,7 +71,8 @@ public class BlockDetector extends BlockImprintable
this.eye_red = iconReg.registerIcon(AssemblyLine.instance.PREFIX + "detector_red");
}
@Override@SideOnly(Side.CLIENT)
@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 +95,8 @@ public class BlockDetector extends BlockImprintable
return this.machine_icon;
}
@Override@SideOnly(Side.CLIENT)
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int metadata)
{
if (side == ForgeDirection.SOUTH.ordinal())
@ -146,7 +148,8 @@ public class BlockDetector extends BlockImprintable
return false;
}
@Override@SideOnly(Side.CLIENT)
@Override
@SideOnly(Side.CLIENT)
public boolean renderAsNormalBlock()
{
return false;

5
src/minecraft/dark/assembly/common/machine/BlockManipulator.java
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,8 @@ public class BlockManipulator extends BlockImprintable
return false;
}
@Override@SideOnly(Side.CLIENT)
@Override
@SideOnly(Side.CLIENT)
public boolean renderAsNormalBlock()
{
return false;

3
src/minecraft/dark/assembly/common/machine/BlockRejector.java
View file

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

2
src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java
View file

@ -17,7 +17,7 @@ import dark.core.prefab.tilenetwork.NetworkTileEntities;
/** A class to be inherited by all machines on the assembly line. This class acts as a single peace
* in a network of similar tiles allowing all to share power from one or more sources
*
*
* @author DarkGuardsman */
public abstract class TileEntityAssembly extends TileEntityMachine implements INetworkEnergyPart
{

2
src/minecraft/dark/assembly/common/machine/TileEntityCrate.java
View file

@ -51,7 +51,7 @@ public class TileEntityCrate extends TileEntityInv implements IPacketReceiver, I
/** Turns the inventory array into a single stack of matching items. This assumes that all items
* in the crate are the same TODO eject minority items and only keep the majority that are the
* same to prevent duplication issues
*
*
* @param force - force a rebuild of the inventory from the single stack created */
public void buildSampleStack()
{

5
src/minecraft/dark/assembly/common/machine/belt/BlockConveyorBelt.java
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,8 @@ public class BlockConveyorBelt extends BlockAssembly
return false;
}
@Override@SideOnly(Side.CLIENT)
@Override
@SideOnly(Side.CLIENT)
public boolean renderAsNormalBlock()
{
return false;

2
src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java
View file

@ -21,7 +21,7 @@ import dark.assembly.common.machine.TileEntityAssembly;
import dark.core.network.PacketHandler;
/** Conveyer belt TileEntity that allows entities of all kinds to be moved
*
*
* @author DarkGuardsman */
public class TileEntityConveyorBelt extends TileEntityAssembly implements IPacketReceiver, IBelt, IRotatable
{

3
src/minecraft/dark/assembly/common/machine/crane/BlockCraneController.java
View file

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

3
src/minecraft/dark/assembly/common/machine/crane/BlockCraneFrame.java
View file

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

6
src/minecraft/dark/assembly/common/machine/encoder/BlockEncoder.java
View file

@ -34,14 +34,16 @@ public class BlockEncoder extends BlockAssembly
}
/** Returns the block texture based on the side being looked at. Args: side */
@Override@SideOnly(Side.CLIENT)
@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@SideOnly(Side.CLIENT)
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (side == 1)

2
src/minecraft/dark/assembly/common/machine/processor/ContainerProcessor.java
View file

@ -7,8 +7,6 @@ import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
import net.minecraft.inventory.SlotFurnace;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.tileentity.TileEntityFurnace;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ProcessorRecipes;

5
src/minecraft/dark/assembly/common/machine/processor/TileEntityProcessor.java
View file

@ -3,22 +3,19 @@ package dark.assembly.common.machine.processor;
import java.io.DataInputStream;
import java.io.IOException;
import universalelectricity.core.vector.Vector3;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet;
import net.minecraftforge.common.ForgeDirection;
import dark.api.ProcessorRecipes;
import dark.api.ProcessorRecipes.ProcessorType;
import dark.core.network.PacketHandler;
import dark.core.prefab.TileEntityMachine;
import dark.core.prefab.TileEntityMachine.TilePacketTypes;
import dark.core.prefab.invgui.InvChest;
/** Basic A -> B recipe processor machine designed mainly to handle ore blocks
*
*
* @author DarkGuardsman */
public class TileEntityProcessor extends TileEntityMachine
{