sync
This commit is contained in:
parent
a5be97b80a
commit
dccac5415d
4 changed files with 21 additions and 16 deletions
|
@ -65,11 +65,12 @@ public class DarkMain extends ModPrefab
|
|||
public static final String MINOR_VERSION = "@MINOR@";
|
||||
public static final String REVIS_VERSION = "@REVIS@";
|
||||
public static final String BUILD_VERSION = "@BUILD@";
|
||||
public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVIS_VERSION + "." + BUILD_VERSION;
|
||||
|
||||
// @Mod
|
||||
public static final String MOD_ID = "DarkCore";
|
||||
public static final String MOD_NAME = "Darks CoreMachine";
|
||||
public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVIS_VERSION + "." + BUILD_VERSION;
|
||||
|
||||
|
||||
@SidedProxy(clientSide = "dark.core.client.ClientProxy", serverSide = "dark.core.common.CommonProxy")
|
||||
public static CommonProxy proxy;
|
||||
|
|
|
@ -32,7 +32,7 @@ public class PacketHandler implements IPacketHandler, IPacketReceiver
|
|||
{
|
||||
public static PacketHandler instance;
|
||||
|
||||
public static HashMap<Integer, IPacketManager> packetTypes = new HashMap();
|
||||
public static HashMap<Integer, IPacketManager> packetTypes = new HashMap<Integer, IPacketManager>();
|
||||
|
||||
public static PacketManagerTile tile = new PacketManagerTile();
|
||||
public static PacketManagerEffects effects = new PacketManagerEffects();
|
||||
|
|
|
@ -88,9 +88,11 @@ public class FluidHelper
|
|||
|
||||
public static FluidStack getStack(FluidStack stack, int amount)
|
||||
{
|
||||
if (stack != null && stack.getFluid() != null)
|
||||
if (stack != null)
|
||||
{
|
||||
return new FluidStack(stack.getFluid().getID(), amount, stack.tag);
|
||||
FluidStack newStack = stack.copy();
|
||||
newStack.amount = amount;
|
||||
return newStack;
|
||||
}
|
||||
return stack;
|
||||
}
|
||||
|
|
|
@ -2,8 +2,10 @@ 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;
|
||||
import net.minecraft.world.World;
|
||||
|
@ -18,7 +20,7 @@ import dark.core.prefab.helpers.ConnectionHelper;
|
|||
public abstract class NetworkTileEntities
|
||||
{
|
||||
/* BLOCK THAT ACT AS FLUID CONVEYORS ** */
|
||||
public final List<INetworkPart> networkMember = new ArrayList<INetworkPart>();
|
||||
public final Set<INetworkPart> networkMember = new HashSet<INetworkPart>();
|
||||
|
||||
public NetworkTileEntities(INetworkPart... parts)
|
||||
{
|
||||
|
@ -128,7 +130,7 @@ public abstract class NetworkTileEntities
|
|||
}
|
||||
|
||||
/** Gets the list of network members */
|
||||
public List<INetworkPart> getNetworkMemebers()
|
||||
public Set<INetworkPart> getNetworkMemebers()
|
||||
{
|
||||
return this.networkMember;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue