tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove now-unused generics

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-06 07:57:26 -05:00
parent c282965fee
commit f982eb851c
22 changed files with 102 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/mekanism/api/gas/GasNetwork.java
View file

@ -17,7 +17,7 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event;
import cpw.mods.fml.common.FMLCommonHandler;
public class GasNetwork extends DynamicNetwork<IGasAcceptor, GasNetwork, Gas>
public class GasNetwork extends DynamicNetwork<IGasAcceptor, GasNetwork>
{
public int transferDelay = 0;
@ -27,13 +27,13 @@ public class GasNetwork extends DynamicNetwork<IGasAcceptor, GasNetwork, Gas>
public float gasScale;
public Gas refGas = null;
public GasNetwork(ITransmitter<GasNetwork, Gas>... varPipes)
public GasNetwork(ITransmitter<GasNetwork>... varPipes)
{
transmitters.addAll(Arrays.asList(varPipes));
register();
}
public GasNetwork(Collection<ITransmitter<GasNetwork, Gas>> collection)
public GasNetwork(Collection<ITransmitter<GasNetwork>> collection)
{
transmitters.addAll(collection);
register();
@ -181,15 +181,15 @@ public class GasNetwork extends DynamicNetwork<IGasAcceptor, GasNetwork, Gas>
@Override
public synchronized void refresh()
{
Set<ITransmitter<GasNetwork, Gas>> iterTubes = (Set<ITransmitter<GasNetwork, Gas>>)transmitters.clone();
Iterator<ITransmitter<GasNetwork, Gas>> it = iterTubes.iterator();
Set<ITransmitter<GasNetwork>> iterTubes = (Set<ITransmitter<GasNetwork>>)transmitters.clone();
Iterator<ITransmitter<GasNetwork>> it = iterTubes.iterator();
possibleAcceptors.clear();
acceptorDirections.clear();
while(it.hasNext())
{
ITransmitter<GasNetwork, Gas> conductor = (ITransmitter<GasNetwork, Gas>)it.next();
ITransmitter<GasNetwork> conductor = (ITransmitter<GasNetwork>)it.next();
if(conductor == null || ((TileEntity)conductor).isInvalid())
{
@ -201,7 +201,7 @@ public class GasNetwork extends DynamicNetwork<IGasAcceptor, GasNetwork, Gas>
}
}
for(ITransmitter<GasNetwork, Gas> pipe : transmitters)
for(ITransmitter<GasNetwork> pipe : transmitters)
{
IGasAcceptor[] acceptors = GasTransmission.getConnectedAcceptors((TileEntity)pipe);
@ -251,7 +251,7 @@ public class GasNetwork extends DynamicNetwork<IGasAcceptor, GasNetwork, Gas>
}
@Override
protected GasNetwork create(ITransmitter<GasNetwork, Gas>... varTransmitters)
protected GasNetwork create(ITransmitter<GasNetwork>... varTransmitters)
{
GasNetwork network = new GasNetwork(varTransmitters);
network.refGas = refGas;
@ -260,7 +260,7 @@ public class GasNetwork extends DynamicNetwork<IGasAcceptor, GasNetwork, Gas>
}
@Override
protected GasNetwork create(Collection<ITransmitter<GasNetwork, Gas>> collection)
protected GasNetwork create(Collection<ITransmitter<GasNetwork>> collection)
{
GasNetwork network = new GasNetwork(collection);
network.refGas = refGas;

2
common/mekanism/api/gas/GasTransmission.java
View file

@ -97,7 +97,7 @@ public final class GasTransmission
if(TransmissionType.checkTransmissionType(pointer, TransmissionType.GAS, sender))
{
return ((ITransmitter<GasNetwork, Gas>)pointer).getTransmitterNetwork().emit(stack, sender);
return ((ITransmitter<GasNetwork>)pointer).getTransmitterNetwork().emit(stack, sender);
}
return 0;

2
common/mekanism/api/gas/IGasTransmitter.java
View file

@ -3,7 +3,7 @@ package mekanism.api.gas;
import mekanism.api.transmitters.ITransmitter;
import net.minecraft.tileentity.TileEntity;
public interface IGasTransmitter extends ITransmitter<GasNetwork, Gas>
public interface IGasTransmitter extends ITransmitter<GasNetwork>
{
public boolean canTransferGasToTube(TileEntity tile);
}

34
common/mekanism/api/transmitters/DynamicNetwork.java
View file

@ -20,9 +20,9 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event;
import cpw.mods.fml.common.FMLCommonHandler;
public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N, D>, D> implements ITransmitterNetwork<A, N, D>, IClientTicker
public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implements ITransmitterNetwork<A, N>, IClientTicker
{
public HashSet<ITransmitter<N, D>> transmitters = new HashSet<ITransmitter<N, D>>();
public HashSet<ITransmitter<N>> transmitters = new HashSet<ITransmitter<N>>();
public HashSet<A> possibleAcceptors = new HashSet<A>();
public HashMap<A, ForgeDirection> acceptorDirections = new HashMap<A, ForgeDirection>();
@ -35,19 +35,19 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N, D>, D> im
protected boolean needsUpdate = false;
protected abstract ITransmitterNetwork<A, N, D> create(ITransmitter<N, D>... varTransmitters);
protected abstract ITransmitterNetwork<A, N> create(ITransmitter<N>... varTransmitters);
protected abstract ITransmitterNetwork<A, N, D> create(Collection<ITransmitter<N, D>> collection);
protected abstract ITransmitterNetwork<A, N> create(Collection<ITransmitter<N>> collection);
protected abstract ITransmitterNetwork<A, N, D> create(Set<N> networks);
protected abstract ITransmitterNetwork<A, N> create(Set<N> networks);
public void addAllTransmitters(Set<ITransmitter<N, D>> newTransmitters)
public void addAllTransmitters(Set<ITransmitter<N>> newTransmitters)
{
transmitters.addAll(newTransmitters);
}
@Override
public void removeTransmitter(ITransmitter<N, D> transmitter)
public void removeTransmitter(ITransmitter<N> transmitter)
{
transmitters.remove(transmitter);
@ -61,7 +61,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N, D>, D> im
public void register()
{
try {
ITransmitter<N, D> aTransmitter = transmitters.iterator().next();
ITransmitter<N> aTransmitter = transmitters.iterator().next();
if(aTransmitter instanceof TileEntity)
{
@ -137,13 +137,13 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N, D>, D> im
}
@Override
public synchronized void fixMessedUpNetwork(ITransmitter<N, D> transmitter)
public synchronized void fixMessedUpNetwork(ITransmitter<N> transmitter)
{
if(transmitter instanceof TileEntity)
{
NetworkFinder finder = new NetworkFinder(((TileEntity)transmitter).getWorldObj(), getTransmissionType(), Object3D.get((TileEntity)transmitter));
List<Object3D> partNetwork = finder.exploreNetwork();
Set<ITransmitter<N, D>> newTransporters = new HashSet<ITransmitter<N, D>>();
Set<ITransmitter<N>> newTransporters = new HashSet<ITransmitter<N>>();
for(Object3D node : partNetwork)
{
@ -151,12 +151,12 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N, D>, D> im
if(TransmissionType.checkTransmissionType(nodeTile, getTransmissionType(), (TileEntity)transmitter))
{
((ITransmitter<N, D>)nodeTile).removeFromTransmitterNetwork();
newTransporters.add((ITransmitter<N, D>)nodeTile);
((ITransmitter<N>)nodeTile).removeFromTransmitterNetwork();
newTransporters.add((ITransmitter<N>)nodeTile);
}
}
ITransmitterNetwork<A, N, D> newNetwork = create(newTransporters);
ITransmitterNetwork<A, N> newNetwork = create(newTransporters);
newNetwork.refresh();
newNetwork.setFixed(true);
deregister();
@ -164,7 +164,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N, D>, D> im
}
@Override
public synchronized void split(ITransmitter<N, D> splitPoint)
public synchronized void split(ITransmitter<N> splitPoint)
{
if(splitPoint instanceof TileEntity)
{
@ -205,7 +205,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N, D>, D> im
}
}
Set<ITransmitter<N, D>> newNetCables = new HashSet<ITransmitter<N, D>>();
Set<ITransmitter<N>> newNetCables = new HashSet<ITransmitter<N>>();
for(Object3D node : finder.iterated)
{
@ -215,12 +215,12 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N, D>, D> im
{
if(nodeTile != splitPoint)
{
newNetCables.add((ITransmitter<N, D>)nodeTile);
newNetCables.add((ITransmitter<N>)nodeTile);
}
}
}
ITransmitterNetwork<A, N, D> newNetwork = create(newNetCables);
ITransmitterNetwork<A, N> newNetwork = create(newNetCables);
newNetwork.refresh();
}
}

2
common/mekanism/api/transmitters/ITransmitter.java
View file

@ -3,7 +3,7 @@ package mekanism.api.transmitters;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
public interface ITransmitter<N extends DynamicNetwork<?, N, D>, D>
public interface ITransmitter<N extends DynamicNetwork<?, N>>
{
/**
* Get the transmitter's transmission type

8
common/mekanism/api/transmitters/ITransmitterNetwork.java
View file

@ -2,7 +2,7 @@ package mekanism.api.transmitters;
import java.util.Set;
public interface ITransmitterNetwork<A, N extends DynamicNetwork<A, N, D>, D>
public interface ITransmitterNetwork<A, N extends DynamicNetwork<A, N>>
{
public void tick();
@ -16,15 +16,15 @@ public interface ITransmitterNetwork<A, N extends DynamicNetwork<A, N, D>, D>
public Set<A> getAcceptors(Object... data);
public void removeTransmitter(ITransmitter<N, D> transmitter);
public void removeTransmitter(ITransmitter<N> transmitter);
public void refresh();
public void split(ITransmitter<N, D> splitPoint);
public void split(ITransmitter<N> splitPoint);
public void merge(N network);
public void fixMessedUpNetwork(ITransmitter<N, D> transmitter);
public void fixMessedUpNetwork(ITransmitter<N> transmitter);
public void register();

2
common/mekanism/api/transmitters/TransmissionType.java
View file

@ -23,7 +23,7 @@ public enum TransmissionType
{
if(sideTile instanceof ITransmitter)
{
if(((ITransmitter<?, ?>)sideTile).getTransmissionType() == this)
if(((ITransmitter<?>)sideTile).getTransmissionType() == this)
{
return true;
}

4
common/mekanism/api/transmitters/TransmitterNetworkRegistry.java
View file

@ -111,11 +111,13 @@ public class TransmitterNetworkRegistry implements ITickHandler
{
String[] strings = new String[networks.size()];
int i = 0;
for(ITransmitterNetwork<?,?,?> network : networks)
for(ITransmitterNetwork<?, ?> network : networks)
{
strings[i] = network.toString();
++i;
}
return strings;
}

6
common/mekanism/client/render/RenderPartTransmitter.java
View file

@ -337,7 +337,7 @@ public class RenderPartTransmitter implements IIconRegister
GL11.glPopMatrix();
}
public void renderStatic(PartTransmitter<?, ?> transmitter)
public void renderStatic(PartTransmitter<?> transmitter)
{
TextureUtils.bindAtlas(0);
CCRenderState.reset();
@ -350,7 +350,7 @@ public class RenderPartTransmitter implements IIconRegister
}
}
public void renderSide(ForgeDirection side, PartTransmitter<?, ?> transmitter)
public void renderSide(ForgeDirection side, PartTransmitter<?> transmitter)
{
boolean connected = PartTransmitter.connectionMapContainsSide(transmitter.getAllCurrentConnections(), side);
String name = side.name().toLowerCase();
@ -385,7 +385,7 @@ public class RenderPartTransmitter implements IIconRegister
cc.render(0, cc.verts.length, new Translation(0, 0, 0), new IconTransformation(icon), new ColourMultiplier(colour));
}
public Icon getIconForPart(PartTransmitter<?, ?> part)
public Icon getIconForPart(PartTransmitter<?> part)
{
Icon[] icons = typeMap.get(part.getTransmissionType());
return icons[part.isActive ? 1 : 0];

18
common/mekanism/common/EnergyNetwork.java
View file

@ -31,7 +31,7 @@ import buildcraft.api.power.PowerHandler.Type;
import cofh.api.energy.IEnergyHandler;
import cpw.mods.fml.common.FMLCommonHandler;
public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork, Double>
public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
{
private double lastPowerScale = 0;
private double joulesTransmitted = 0;
@ -39,13 +39,13 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork, Dou
public double clientEnergyScale = 0;
public EnergyNetwork(ITransmitter<EnergyNetwork, Double>... varCables)
public EnergyNetwork(ITransmitter<EnergyNetwork>... varCables)
{
transmitters.addAll(Arrays.asList(varCables));
register();
}
public EnergyNetwork(Collection<ITransmitter<EnergyNetwork, Double>> collection)
public EnergyNetwork(Collection<ITransmitter<EnergyNetwork>> collection)
{
transmitters.addAll(collection);
register();
@ -323,15 +323,15 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork, Dou
@Override
public synchronized void refresh()
{
Set<ITransmitter<EnergyNetwork, Double>> iterCables = (Set<ITransmitter<EnergyNetwork, Double>>)transmitters.clone();
Iterator<ITransmitter<EnergyNetwork, Double>> it = iterCables.iterator();
Set<ITransmitter<EnergyNetwork>> iterCables = (Set<ITransmitter<EnergyNetwork>>)transmitters.clone();
Iterator<ITransmitter<EnergyNetwork>> it = iterCables.iterator();
possibleAcceptors.clear();
acceptorDirections.clear();
while(it.hasNext())
{
ITransmitter<EnergyNetwork, Double> conductor = (ITransmitter<EnergyNetwork, Double>)it.next();
ITransmitter<EnergyNetwork> conductor = (ITransmitter<EnergyNetwork>)it.next();
if(conductor == null || ((TileEntity)conductor).isInvalid())
{
@ -343,7 +343,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork, Dou
}
}
for(ITransmitter<EnergyNetwork, Double> cable : iterCables)
for(ITransmitter<EnergyNetwork> cable : iterCables)
{
TileEntity[] acceptors = CableUtils.getConnectedEnergyAcceptors((TileEntity)cable);
@ -435,7 +435,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork, Dou
}
@Override
protected EnergyNetwork create(ITransmitter<EnergyNetwork, Double>... varTransmitters)
protected EnergyNetwork create(ITransmitter<EnergyNetwork>... varTransmitters)
{
EnergyNetwork network = new EnergyNetwork(varTransmitters);
network.clientEnergyScale = clientEnergyScale;
@ -446,7 +446,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork, Dou
}
@Override
protected EnergyNetwork create(Collection<ITransmitter<EnergyNetwork, Double>> collection)
protected EnergyNetwork create(Collection<ITransmitter<EnergyNetwork>> collection)
{
EnergyNetwork network = new EnergyNetwork(collection);
network.clientEnergyScale = clientEnergyScale;

16
common/mekanism/common/FluidNetwork.java
View file

@ -23,7 +23,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import cpw.mods.fml.common.FMLCommonHandler;
public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork, FluidStack>
public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
{
public int transferDelay = 0;
@ -33,13 +33,13 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork, Fl
public float fluidScale;
public Fluid refFluid = null;
public FluidNetwork(ITransmitter<FluidNetwork, FluidStack>... varPipes)
public FluidNetwork(ITransmitter<FluidNetwork>... varPipes)
{
transmitters.addAll(Arrays.asList(varPipes));
register();
}
public FluidNetwork(Collection<ITransmitter<FluidNetwork, FluidStack>> collection)
public FluidNetwork(Collection<ITransmitter<FluidNetwork>> collection)
{
transmitters.addAll(collection);
register();
@ -200,7 +200,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork, Fl
@Override
public synchronized void refresh()
{
Set<ITransmitter<FluidNetwork, FluidStack>> iterPipes = (Set<ITransmitter<FluidNetwork, FluidStack>>)transmitters.clone();
Set<ITransmitter<FluidNetwork>> iterPipes = (Set<ITransmitter<FluidNetwork>>)transmitters.clone();
Iterator it = iterPipes.iterator();
possibleAcceptors.clear();
@ -208,7 +208,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork, Fl
while(it.hasNext())
{
ITransmitter<FluidNetwork, FluidStack> conductor = (ITransmitter<FluidNetwork, FluidStack>)it.next();
ITransmitter<FluidNetwork> conductor = (ITransmitter<FluidNetwork>)it.next();
if(conductor == null || ((TileEntity)conductor).isInvalid())
{
@ -220,7 +220,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork, Fl
}
}
for(ITransmitter<FluidNetwork, FluidStack> pipe : iterPipes)
for(ITransmitter<FluidNetwork> pipe : iterPipes)
{
if(pipe instanceof TileEntityMechanicalPipe && ((TileEntityMechanicalPipe)pipe).isActive) continue;
@ -272,7 +272,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork, Fl
}
@Override
protected FluidNetwork create(ITransmitter<FluidNetwork, FluidStack>... varTransmitters)
protected FluidNetwork create(ITransmitter<FluidNetwork>... varTransmitters)
{
FluidNetwork network = new FluidNetwork(varTransmitters);
network.refFluid = refFluid;
@ -281,7 +281,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork, Fl
}
@Override
protected FluidNetwork create(Collection<ITransmitter<FluidNetwork, FluidStack>> collection)
protected FluidNetwork create(Collection<ITransmitter<FluidNetwork>> collection)
{
FluidNetwork network = new FluidNetwork(collection);
network.refFluid = refFluid;

2
common/mekanism/common/item/ItemNetworkReader.java
View file

@ -32,7 +32,7 @@ public class ItemNetworkReader extends ItemEnergized
{
setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE);
ITransmitter<?, ?> transmitter = (ITransmitter<?, ?>)tileEntity;
ITransmitter<?> transmitter = (ITransmitter<?>)tileEntity;
player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"));
player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().getSize()));

10
common/mekanism/common/multipart/PartMechanicalPipe.java
View file

@ -3,9 +3,6 @@ package mekanism.common.multipart;
import java.util.Arrays;
import java.util.Set;
import codechicken.lib.vec.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.api.Object3D;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
@ -20,8 +17,11 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import codechicken.lib.vec.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class PartMechanicalPipe extends PartTransmitter<FluidNetwork, FluidStack> implements IFluidHandler
public class PartMechanicalPipe extends PartTransmitter<FluidNetwork> implements IFluidHandler
{
/** The fake tank used for fluid transfer calculations. */
public FluidTank dummyTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
@ -45,7 +45,7 @@ public class PartMechanicalPipe extends PartTransmitter<FluidNetwork, FluidStack
}
@Override
public FluidNetwork createNetworkFromSingleTransmitter(ITransmitter<FluidNetwork, FluidStack> transmitter)
public FluidNetwork createNetworkFromSingleTransmitter(ITransmitter<FluidNetwork> transmitter)
{
return new FluidNetwork(transmitter);
}

4
common/mekanism/common/multipart/PartPressurizedTube.java
View file

@ -14,7 +14,7 @@ import mekanism.client.render.RenderPartTransmitter;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
public class PartPressurizedTube extends PartTransmitter<GasNetwork, Gas>
public class PartPressurizedTube extends PartTransmitter<GasNetwork>
{
@Override
public String getType()
@ -35,7 +35,7 @@ public class PartPressurizedTube extends PartTransmitter<GasNetwork, Gas>
}
@Override
public GasNetwork createNetworkFromSingleTransmitter(ITransmitter<GasNetwork, Gas> transmitter)
public GasNetwork createNetworkFromSingleTransmitter(ITransmitter<GasNetwork> transmitter)
{
return new GasNetwork(transmitter);
}

30
common/mekanism/common/multipart/PartTransmitter.java
View file

@ -44,7 +44,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public abstract class PartTransmitter<N extends DynamicNetwork<?, N, D>, D> extends TMultiPart implements TSlottedPart, JNormalOcclusion, IHollowConnect, JIconHitEffects, ITransmitter<N, D>, ITileNetwork
public abstract class PartTransmitter<N extends DynamicNetwork<?, N>> extends TMultiPart implements TSlottedPart, JNormalOcclusion, IHollowConnect, JIconHitEffects, ITransmitter<N>, ITileNetwork
{
public int delayTicks;
public N theNetwork;
@ -87,7 +87,7 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N, D>, D> exte
{
getTransmitterNetwork().transmitters.remove(tile());
super.bind(t);
getTransmitterNetwork().transmitters.add((ITransmitter<N, D>) tile());
getTransmitterNetwork().transmitters.add((ITransmitter<N>) tile());
}
else {
super.bind(t);
@ -162,7 +162,7 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N, D>, D> exte
if(or != possibleTransmitters)
{
((DynamicNetwork<?, N, D>)getTransmitterNetwork()).split((ITransmitter<N, D>)tile());
((DynamicNetwork<?, N>)getTransmitterNetwork()).split((ITransmitter<N>)tile());
setTransmitterNetwork(null);
}
@ -174,13 +174,13 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N, D>, D> exte
if(TransmissionType.checkTransmissionType(tileEntity, getTransmissionType()))
{
((DynamicNetwork<?,N, D>)getTransmitterNetwork()).merge(((ITransmitter<N, D>)tileEntity).getTransmitterNetwork());
((DynamicNetwork<?,N>)getTransmitterNetwork()).merge(((ITransmitter<N>)tileEntity).getTransmitterNetwork());
}
}
}
}
((DynamicNetwork<?,N, D>)getTransmitterNetwork()).refresh();
((DynamicNetwork<?,N>)getTransmitterNetwork()).refresh();
if(!world().isRemote)
{
@ -322,25 +322,25 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N, D>, D> exte
if(connectionMapContainsSide(possibleTransmitters, side))
{
TileEntity cable = Object3D.get(tile()).getFromSide(side).getTileEntity(world());
if(TransmissionType.checkTransmissionType(cable, TransmissionType.ENERGY) && ((ITransmitter<N, D>)cable).getTransmitterNetwork(false) != null)
if(TransmissionType.checkTransmissionType(cable, TransmissionType.ENERGY) && ((ITransmitter<N>)cable).getTransmitterNetwork(false) != null)
{
connectedNets.add(((ITransmitter<N, D>)cable).getTransmitterNetwork());
connectedNets.add(((ITransmitter<N>)cable).getTransmitterNetwork());
}
}
}
if(connectedNets.size() == 0)
{
theNetwork = createNetworkFromSingleTransmitter((ITransmitter<N, D>)tile());
theNetwork = createNetworkFromSingleTransmitter((ITransmitter<N>)tile());
}
else if(connectedNets.size() == 1)
{
theNetwork = connectedNets.iterator().next();
theNetwork.transmitters.add((ITransmitter<N, D>)tile());
theNetwork.transmitters.add((ITransmitter<N>)tile());
}
else {
theNetwork = createNetworkByMergingSet(connectedNets);
theNetwork.transmitters.add((ITransmitter<N, D>)tile());
theNetwork.transmitters.add((ITransmitter<N>)tile());
}
}
@ -352,19 +352,19 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N, D>, D> exte
{
if(theNetwork != null)
{
theNetwork.removeTransmitter((ITransmitter<N, D>) tile());
theNetwork.removeTransmitter((ITransmitter<N>) tile());
}
}
@Override
public void fixTransmitterNetwork()
{
getTransmitterNetwork().fixMessedUpNetwork((ITransmitter<N, D>) tile());
getTransmitterNetwork().fixMessedUpNetwork((ITransmitter<N>) tile());
}
public abstract boolean isValidAcceptor(TileEntity tile, ForgeDirection side);
public abstract N createNetworkFromSingleTransmitter(ITransmitter<N, D> transmitter);
public abstract N createNetworkFromSingleTransmitter(ITransmitter<N> transmitter);
public abstract N createNetworkByMergingSet(Set<N> networks);
@ -374,7 +374,7 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N, D>, D> exte
if(!canConnect(side)) return false;
TileEntity tile = Object3D.get(tile()).getFromSide(side).getTileEntity(world());
return (!(tile instanceof ITransmitter) || ((ITransmitter<?, ?>)tile).canConnect(side.getOpposite()));
return (!(tile instanceof ITransmitter) || ((ITransmitter<?>)tile).canConnect(side.getOpposite()));
}
@Override
@ -454,7 +454,7 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N, D>, D> exte
{
if(tile() instanceof ITransmitter)
{
getTransmitterNetwork().split((ITransmitter<N, D>)tile());
getTransmitterNetwork().split((ITransmitter<N>)tile());
if(!world().isRemote)
{

10
common/mekanism/common/multipart/PartUniversalCable.java
View file

@ -2,17 +2,13 @@ package mekanism.common.multipart;
import ic2.api.energy.event.EnergyTileLoadEvent;
import ic2.api.energy.event.EnergyTileUnloadEvent;
import ic2.api.energy.tile.IEnergyAcceptor;
import ic2.api.energy.tile.IEnergySink;
import ic2.api.energy.tile.IEnergySource;
import ic2.api.energy.tile.IEnergyTile;
import java.util.ArrayList;
import java.util.Set;
import mekanism.api.Object3D;
import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.render.RenderPartTransmitter;
@ -24,14 +20,12 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import universalelectricity.core.block.IElectrical;
import universalelectricity.core.electricity.ElectricityPack;
import buildcraft.api.power.IPowerEmitter;
import buildcraft.api.power.IPowerReceptor;
import codechicken.lib.vec.Vector3;
import cofh.api.energy.IEnergyHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class PartUniversalCable extends PartTransmitter<EnergyNetwork, Double> implements IEnergySink, IEnergyHandler, IElectrical
public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implements IEnergySink, IEnergyHandler, IElectrical
{
public PartUniversalCable()
{
@ -51,7 +45,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork, Double> i
}
@Override
public EnergyNetwork createNetworkFromSingleTransmitter(ITransmitter<EnergyNetwork, Double> transmitter)
public EnergyNetwork createNetworkFromSingleTransmitter(ITransmitter<EnergyNetwork> transmitter)
{
return new EnergyNetwork(transmitter);
}

10
common/mekanism/common/network/PacketTransmitterUpdate.java
View file

@ -87,7 +87,7 @@ public class PacketTransmitterUpdate implements IMekanismPacket
if(tileEntity != null)
{
((ITransmitter<EnergyNetwork, Double>)tileEntity).getTransmitterNetwork().clientEnergyScale = powerLevel;
((ITransmitter<EnergyNetwork>)tileEntity).getTransmitterNetwork().clientEnergyScale = powerLevel;
}
}
else if(transmitterType == 2)
@ -99,8 +99,8 @@ public class PacketTransmitterUpdate implements IMekanismPacket
if(tileEntity != null)
{
((ITransmitter<GasNetwork, Gas>)tileEntity).getTransmitterNetwork().refGas = gasType;
((ITransmitter<GasNetwork, Gas>)tileEntity).getTransmitterNetwork().didTransfer = didGasTransfer;
((ITransmitter<GasNetwork>)tileEntity).getTransmitterNetwork().refGas = gasType;
((ITransmitter<GasNetwork>)tileEntity).getTransmitterNetwork().didTransfer = didGasTransfer;
}
}
else if(transmitterType == 3)
@ -113,8 +113,8 @@ public class PacketTransmitterUpdate implements IMekanismPacket
if(tileEntity != null)
{
((ITransmitter<FluidNetwork, FluidStack>)tileEntity).getTransmitterNetwork().refFluid = fluidType;
((ITransmitter<FluidNetwork, FluidStack>)tileEntity).getTransmitterNetwork().didTransfer = didFluidTransfer;
((ITransmitter<FluidNetwork>)tileEntity).getTransmitterNetwork().refFluid = fluidType;
((ITransmitter<FluidNetwork>)tileEntity).getTransmitterNetwork().didTransfer = didFluidTransfer;
}
}
}

8
common/mekanism/common/tileentity/TileEntityMechanicalPipe.java
View file

@ -31,7 +31,7 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork, FluidStack> implements IFluidHandler
public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork> implements IFluidHandler
{
/** The fake tank used for fluid transfer calculations. */
public FluidTank dummyTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
@ -55,9 +55,9 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
for(TileEntity pipe : adjacentPipes)
{
if(TransmissionType.checkTransmissionType(pipe, getTransmissionType()) && ((ITransmitter<FluidNetwork, FluidStack>)pipe).getTransmitterNetwork(false) != null)
if(TransmissionType.checkTransmissionType(pipe, getTransmissionType()) && ((ITransmitter<FluidNetwork>)pipe).getTransmitterNetwork(false) != null)
{
connectedNets.add(((ITransmitter<FluidNetwork, FluidStack>)pipe).getTransmitterNetwork());
connectedNets.add(((ITransmitter<FluidNetwork>)pipe).getTransmitterNetwork());
}
}
@ -124,7 +124,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
if(TransmissionType.checkTransmissionType(tileEntity, getTransmissionType()))
{
getTransmitterNetwork().merge(((ITransmitter<FluidNetwork, FluidStack>)tileEntity).getTransmitterNetwork());
getTransmitterNetwork().merge(((ITransmitter<FluidNetwork>)tileEntity).getTransmitterNetwork());
}
}

9
common/mekanism/common/tileentity/TileEntityPressurizedTube.java
View file

@ -3,7 +3,6 @@ package mekanism.common.tileentity;
import java.util.HashSet;
import mekanism.api.Object3D;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasNetwork;
import mekanism.api.gas.GasTransmission;
import mekanism.api.gas.IGasTransmitter;
@ -14,7 +13,7 @@ import mekanism.api.transmitters.TransmitterNetworkRegistry;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork, Gas> implements ITubeConnection, IGasTransmitter
public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork> implements ITubeConnection, IGasTransmitter
{
@Override
public TransmissionType getTransmissionType()
@ -32,9 +31,9 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork,
for(TileEntity tube : adjacentTubes)
{
if(TransmissionType.checkTransmissionType(tube, TransmissionType.GAS, this) && ((ITransmitter<GasNetwork, Gas>)tube).getTransmitterNetwork(false) != null)
if(TransmissionType.checkTransmissionType(tube, TransmissionType.GAS, this) && ((ITransmitter<GasNetwork>)tube).getTransmitterNetwork(false) != null)
{
connectedNets.add(((ITransmitter<GasNetwork, Gas>)tube).getTransmitterNetwork());
connectedNets.add(((ITransmitter<GasNetwork>)tube).getTransmitterNetwork());
}
}
@ -101,7 +100,7 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork,
if(TransmissionType.checkTransmissionType(tileEntity, TransmissionType.GAS, this))
{
getTransmitterNetwork().merge(((ITransmitter<GasNetwork, Gas>)tileEntity).getTransmitterNetwork());
getTransmitterNetwork().merge(((ITransmitter<GasNetwork>)tileEntity).getTransmitterNetwork());
}
}

4
common/mekanism/common/tileentity/TileEntityTransmitter.java
View file

@ -19,7 +19,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public abstract class TileEntityTransmitter<N extends DynamicNetwork<?, N, D>, D> extends TileEntity implements ITransmitter<N, D>, ITileNetwork, IConfigurable
public abstract class TileEntityTransmitter<N extends DynamicNetwork<?, N>> extends TileEntity implements ITransmitter<N>, ITileNetwork, IConfigurable
{
public N theNetwork;
@ -84,7 +84,7 @@ public abstract class TileEntityTransmitter<N extends DynamicNetwork<?, N, D>, D
if(!canConnect(side)) return false;
TileEntity tile = Object3D.get(this).getFromSide(side).getTileEntity(worldObj);
return (!(tile instanceof ITransmitter) || ((ITransmitter<?, ?>)tile).canConnect(side.getOpposite()));
return (!(tile instanceof ITransmitter) || ((ITransmitter<?>)tile).canConnect(side.getOpposite()));
}
@Override

8
common/mekanism/common/tileentity/TileEntityUniversalCable.java
View file

@ -28,7 +28,7 @@ import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import cofh.api.energy.IEnergyHandler;
public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwork, Double> implements IPowerReceptor, IEnergySink, IEnergyHandler, IElectrical
public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwork> implements IPowerReceptor, IEnergySink, IEnergyHandler, IElectrical
{
/** A fake power handler used to initiate energy transfer calculations. */
public PowerHandler powerHandler;
@ -61,9 +61,9 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
for(TileEntity cable : adjacentCables)
{
if(TransmissionType.checkTransmissionType(cable, TransmissionType.ENERGY) && ((ITransmitter<EnergyNetwork, Double>)cable).getTransmitterNetwork(false) != null)
if(TransmissionType.checkTransmissionType(cable, TransmissionType.ENERGY) && ((ITransmitter<EnergyNetwork>)cable).getTransmitterNetwork(false) != null)
{
connectedNets.add(((ITransmitter<EnergyNetwork, Double>)cable).getTransmitterNetwork());
connectedNets.add(((ITransmitter<EnergyNetwork>)cable).getTransmitterNetwork());
}
}
@ -139,7 +139,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
if(TransmissionType.checkTransmissionType(tileEntity, TransmissionType.ENERGY))
{
getTransmitterNetwork().merge(((ITransmitter<EnergyNetwork, Double>)tileEntity).getTransmitterNetwork());
getTransmitterNetwork().merge(((ITransmitter<EnergyNetwork>)tileEntity).getTransmitterNetwork());
}
}

2
common/mekanism/common/util/CableUtils.java
View file

@ -229,7 +229,7 @@ public final class CableUtils
if(TransmissionType.checkTransmissionType(pointer, TransmissionType.ENERGY))
{
ITransmitter<EnergyNetwork, Double> cable = (ITransmitter<EnergyNetwork, Double>)pointer;
ITransmitter<EnergyNetwork> cable = (ITransmitter<EnergyNetwork>)pointer;
ArrayList<TileEntity> ignored = new ArrayList<TileEntity>();
ignored.add(sender);