From 2fd66e113b7a407d73b9fe10831e6b348f266552 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Fri, 13 Sep 2013 08:57:40 -0400 Subject: [PATCH] cleanup --- .../client/renders/RenderBlockEntity.java | 3 --- src/dark/core/common/DarkMain.java | 1 - src/dark/core/network/PacketHandler.java | 4 ++-- src/dark/core/prefab/FluidSelectiveTank.java | 2 +- src/dark/core/prefab/TileEntityMachine.java | 4 ++-- .../core/prefab/damage/IDamageableTile.java | 3 ++- src/dark/core/prefab/entity/EntityBlock.java | 4 ++-- .../{damage => entity}/EntityTileDamage.java | 3 ++- src/dark/core/prefab/helpers/FluidHelper.java | 16 +++++++-------- .../tilenetwork/NetworkTileEntities.java | 20 ++++++++----------- 10 files changed, 27 insertions(+), 33 deletions(-) rename src/dark/core/prefab/{damage => entity}/EntityTileDamage.java (98%) diff --git a/src/dark/core/client/renders/RenderBlockEntity.java b/src/dark/core/client/renders/RenderBlockEntity.java index c0d578c4..e68a1d88 100644 --- a/src/dark/core/client/renders/RenderBlockEntity.java +++ b/src/dark/core/client/renders/RenderBlockEntity.java @@ -1,11 +1,9 @@ package dark.core.client.renders; -import net.minecraft.block.Block; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.util.Icon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -13,7 +11,6 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import universalelectricity.core.vector.Vector3; - import dark.core.prefab.entity.EntityBlock; public class RenderBlockEntity extends Render diff --git a/src/dark/core/common/DarkMain.java b/src/dark/core/common/DarkMain.java index 64d1c134..e1b6bbc0 100644 --- a/src/dark/core/common/DarkMain.java +++ b/src/dark/core/common/DarkMain.java @@ -71,7 +71,6 @@ public class DarkMain extends ModPrefab public static final String MOD_ID = "DarkCore"; public static final String MOD_NAME = "Darks CoreMachine"; - @SidedProxy(clientSide = "dark.core.client.ClientProxy", serverSide = "dark.core.common.CommonProxy") public static CommonProxy proxy; diff --git a/src/dark/core/network/PacketHandler.java b/src/dark/core/network/PacketHandler.java index 80200a20..1cdbab35 100644 --- a/src/dark/core/network/PacketHandler.java +++ b/src/dark/core/network/PacketHandler.java @@ -26,7 +26,7 @@ import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; /** Packet manager based off the PacketManager from UE created by Calclavia - * + * * @author DarkGuardsman */ public class PacketHandler implements IPacketHandler, IPacketReceiver { @@ -169,7 +169,7 @@ public class PacketHandler implements IPacketHandler, IPacketReceiver } /** Gets a packet for the tile entity. - * + * * @return */ @SuppressWarnings("resource") public Packet getPacket(String channelName, TileEntity sender, Object... sendData) diff --git a/src/dark/core/prefab/FluidSelectiveTank.java b/src/dark/core/prefab/FluidSelectiveTank.java index fbf66897..b851b15c 100644 --- a/src/dark/core/prefab/FluidSelectiveTank.java +++ b/src/dark/core/prefab/FluidSelectiveTank.java @@ -8,7 +8,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; /** Selective fluid version of the FluidTank - * + * * @author DarkGuardsman */ public class FluidSelectiveTank extends FluidTank { diff --git a/src/dark/core/prefab/TileEntityMachine.java b/src/dark/core/prefab/TileEntityMachine.java index 318558bb..059cc6e5 100644 --- a/src/dark/core/prefab/TileEntityMachine.java +++ b/src/dark/core/prefab/TileEntityMachine.java @@ -33,7 +33,7 @@ import dark.core.prefab.invgui.InvChest; /** Prefab for most machines in the CoreMachine set. Provides basic power updates, packet updates, * inventory handling, and other handy methods. - * + * * @author DarkGuardsman */ public abstract class TileEntityMachine extends TileEntityUniversalElectrical implements ISidedInventory, IExternalInv, IDisableable, IPacketReceiver, IPowerLess { @@ -273,7 +273,7 @@ public abstract class TileEntityMachine extends TileEntityUniversalElectrical im } /** Handles reduced data from the main packet method - * + * * @param id - packet ID * @param dis - data * @param player - player diff --git a/src/dark/core/prefab/damage/IDamageableTile.java b/src/dark/core/prefab/damage/IDamageableTile.java index 4568de9f..d46d4fda 100644 --- a/src/dark/core/prefab/damage/IDamageableTile.java +++ b/src/dark/core/prefab/damage/IDamageableTile.java @@ -5,7 +5,8 @@ import net.minecraft.util.DamageSource; import dark.core.interfaces.IBlockActivated; /** Used by tiles that want to pretend to be living objects. Will require the use of this interface - * as well spawning a EntityTileDamage entity as its location + * as well spawning a EntityTileDamage entity as its location. Then entity if larger than the tile + * will pass all interaction events to the block * * @author DarkGuardsman */ public interface IDamageableTile extends IBlockActivated diff --git a/src/dark/core/prefab/entity/EntityBlock.java b/src/dark/core/prefab/entity/EntityBlock.java index 5c56be96..c4a78033 100644 --- a/src/dark/core/prefab/entity/EntityBlock.java +++ b/src/dark/core/prefab/entity/EntityBlock.java @@ -1,11 +1,11 @@ package dark.core.prefab.entity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Icon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class EntityBlock extends Entity { diff --git a/src/dark/core/prefab/damage/EntityTileDamage.java b/src/dark/core/prefab/entity/EntityTileDamage.java similarity index 98% rename from src/dark/core/prefab/damage/EntityTileDamage.java rename to src/dark/core/prefab/entity/EntityTileDamage.java index 9ce64858..ae0319e0 100644 --- a/src/dark/core/prefab/damage/EntityTileDamage.java +++ b/src/dark/core/prefab/entity/EntityTileDamage.java @@ -1,4 +1,4 @@ -package dark.core.prefab.damage; +package dark.core.prefab.entity; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -20,6 +20,7 @@ import com.google.common.io.ByteArrayDataOutput; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import dark.core.prefab.damage.IDamageableTile; /** Entity designed to take damage and apply it to the tile from an Entity. Simulates the tile is * alive and can be harmed by normal AIs without additional code. diff --git a/src/dark/core/prefab/helpers/FluidHelper.java b/src/dark/core/prefab/helpers/FluidHelper.java index ef48998c..f4c6dcbd 100644 --- a/src/dark/core/prefab/helpers/FluidHelper.java +++ b/src/dark/core/prefab/helpers/FluidHelper.java @@ -59,7 +59,7 @@ public class FluidHelper } /** Gets the block's fluid if it has one - * + * * @param world - world we are working in * @param vector - 3D location in world * @return @Fluid that the block is */ @@ -98,10 +98,10 @@ public class FluidHelper } /** Drains a block of fluid - * + * * @Note sets the block with a client update only. Doesn't tick the block allowing for better * placement of fluid that can flow infinitely - * + * * @param doDrain - do the action * @return FluidStack drained from the block */ public static FluidStack drainBlock(World world, Vector3 node, boolean doDrain) @@ -110,7 +110,7 @@ public class FluidHelper } /** Drains a block of fluid - * + * * @param doDrain - do the action * @param update - block update flag to use * @return FluidStack drained from the block */ @@ -209,9 +209,9 @@ public class FluidHelper } /** Helper method to fill a location with a fluid - * + * * Note: This does not update the block to prevent the liquid from flowing - * + * * @return */ public static int fillBlock(World world, Vector3 node, FluidStack stack, boolean doFill) { @@ -245,7 +245,7 @@ public class FluidHelper } /** Fills all instances of IFluidHandler surrounding the origin - * + * * @param stack - FluidStack that will be filled into the tanks * @param doFill - Actually perform the action or simulate action * @param ignore - ForgeDirections to ignore @@ -278,7 +278,7 @@ public class FluidHelper } /** Fills an instance of IFluidHandler in the given direction - * + * * @param stack - FluidStack to fill the tank will * @param doFill - Actually perform the action or simulate action * @param direction - direction to fill in from the origin diff --git a/src/dark/core/prefab/tilenetwork/NetworkTileEntities.java b/src/dark/core/prefab/tilenetwork/NetworkTileEntities.java index f378c682..68d3f75a 100644 --- a/src/dark/core/prefab/tilenetwork/NetworkTileEntities.java +++ b/src/dark/core/prefab/tilenetwork/NetworkTileEntities.java @@ -1,10 +1,8 @@ package dark.core.prefab.tilenetwork; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Set; import net.minecraft.tileentity.TileEntity; @@ -13,7 +11,6 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.path.Pathfinder; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; -import cpw.mods.fml.common.FMLLog; import dark.api.parts.INetworkPart; import dark.core.prefab.helpers.ConnectionHelper; @@ -35,13 +32,13 @@ public abstract class NetworkTileEntities /** Creates a new instance of this network to be used to merge or split networks while still * maintaining each class that extends the base network class - * + * * @return - new network instance using the current networks properties */ public abstract NetworkTileEntities newInstance(); /** Adds a TileEntity to the network. extends this to catch non-network parts and add them to * other tile lists - * + * * @param tileEntity - tileEntity instance * @param member - add to network member list * @return */ @@ -108,7 +105,6 @@ public abstract class NetworkTileEntities return part != null && part instanceof TileEntity && !((TileEntity) part).isInvalid(); } - /** Gets the list of network members */ public Set getNetworkMemebers() { @@ -131,7 +127,7 @@ public abstract class NetworkTileEntities /** Combines two networks together into one. Calls to preMerge and doMerge instead of doing the * merge process itself - * + * * @param network * @param mergePoint */ public void merge(NetworkTileEntities network, INetworkPart mergePoint) @@ -147,17 +143,17 @@ public abstract class NetworkTileEntities /** Processing that needs too be done before the network merges. Use this to do final network * merge calculations and to cause network merge failure - * + * * @param network the network that is to merge with this one * @param part the part at which started the network merge. Use this to cause damage if two * networks merge with real world style failures - * + * * @return false if the merge needs to be canceled. - * + * * Cases in which the network should fail to merge are were the two networks merge with error. * Or, in the case of pipes the two networks merge and the merge point was destroyed by * combination of liquids. - * + * * Ex Lava and water */ public boolean preMergeProcessing(NetworkTileEntities network, INetworkPart part) { @@ -249,7 +245,7 @@ public abstract class NetworkTileEntities } /** invalidates/remove a tile from the networks that surround and connect to it - * + * * @param tileEntity - tile */ public static void invalidate(TileEntity tileEntity) {