Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Finished implementation of stripes pipe (#1491 and #1512).

Browse source 
Started experiments migrating pipes to simpler energy framework (#1532)
This commit is contained in:
SpaceToad 2014-03-18 23:53:34 +01:00
parent 4bf1d3cd49
commit 0ea21b9162
6 changed files with 175 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/api/mj/MjBattery.java
View file

@ -25,6 +25,10 @@ import java.lang.annotation.Target;
* receive up to "maxReceivedPerCyle" units of energy. As an optional behavior,
* the system can have a minimum amount of energy consumed even if the system
* is at max capacity, modelized by the "minimumConsumption" value.
*
* If the field designated by MjBattery is an object, then BuildCraft will
* consider that this is a case of a nested battery, and will look for the
* field in the designated object.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)

96
common/buildcraft/core/ReflectMjAPI.java
View file

@ -8,9 +8,14 @@ import buildcraft.api.mj.MjBattery;
public class ReflectMjAPI {
public static class BatteryField {
enum BatteryKind {
Value, Container
}
private static class BatteryField {
public Field field;
public MjBattery battery;
public BatteryKind kind;
public double getEnergyRequested (Object obj) {
try {
@ -35,27 +40,98 @@ public class ReflectMjAPI {
}
}
public static class BatteryObject {
BatteryField f;
Object o;
public double getEnergyRequested () {
return f.getEnergyRequested(o);
}
public double addEnergy(double watts) {
try {
double e = f.field.getDouble(o);
double max = f.battery.maxCapacity();
double used = 0;
if (e + watts <= max) {
used = watts;
} else {
used = max - e;
}
f.field.setDouble(o, e + used);
return used;
} catch (IllegalArgumentException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
}
return 0;
}
public double miniumConsumption() {
return f.battery.miniumConsumption();
}
}
public static BatteryObject getMjBattery (Object o) {
BatteryField f = getMjBattery (o.getClass());
if (f == null) {
return null;
} else if (f.kind == BatteryKind.Value) {
BatteryObject obj = new BatteryObject();
obj.o = o;
obj.f = f;
return obj;
} else {
try {
return getMjBattery(f.field.get(o));
} catch (IllegalArgumentException e) {
e.printStackTrace();
return null;
} catch (IllegalAccessException e) {
e.printStackTrace();
return null;
}
}
}
static Map <Class, BatteryField> MjBatteries = new HashMap <Class, BatteryField> ();
public static BatteryField getMjBattery (Class c) {
private static BatteryField getMjBattery (Class c) {
if (!MjBatteries.containsKey(c)) {
for (Field f : c.getFields()) {
MjBattery battery = f.getAnnotation (MjBattery.class);
if (battery != null) {
if (!f.getType().equals(double.class)) {
throw new RuntimeException("MjBattery need to be of type double");
} else {
BatteryField bField = new BatteryField();
bField.field = f;
bField.battery = battery;
BatteryField bField = new BatteryField();
bField.field = f;
bField.battery = battery;
return MjBatteries.put(c, bField);
if (f.getType().equals(double.class)) {
bField.kind = BatteryKind.Value;
} else if (f.getType().isPrimitive()) {
throw new RuntimeException(
"MJ battery needs to be object or double type");
} else {
bField.kind = BatteryKind.Container;
}
MjBatteries.put(c, bField);
return bField;
}
}
return MjBatteries.put(c, null);
MjBatteries.put(c, null);
return null;
} else {
return MjBatteries.get(c);
}

24
common/buildcraft/energy/TileEngine.java
View file

@ -29,7 +29,7 @@ import buildcraft.api.transport.IPipeTile;
import buildcraft.api.transport.IPipeTile.PipeType;
import buildcraft.core.DefaultProps;
import buildcraft.core.ReflectMjAPI;
import buildcraft.core.ReflectMjAPI.BatteryField;
import buildcraft.core.ReflectMjAPI.BatteryObject;
import buildcraft.core.TileBuffer;
import buildcraft.core.TileBuildCraft;
import buildcraft.core.network.NetworkData;
@ -238,8 +238,8 @@ public abstract class TileEngine extends TileBuildCraft implements IPowerRecepto
return extractEnergy(receptor.getMinEnergyReceived(),
receptor.getMaxEnergyReceived(), false);
} else {
return extractEnergy(0, ReflectMjAPI.getMjBattery(tile.getClass())
.getEnergyRequested(tile), false);
return extractEnergy(0, ReflectMjAPI.getMjBattery(tile)
.getEnergyRequested(), false);
}
}
@ -260,20 +260,10 @@ public abstract class TileEngine extends TileBuildCraft implements IPowerRecepto
extractEnergy(receptor.getMinEnergyReceived(), needed, true);
}
} else {
try {
BatteryField f = ReflectMjAPI.getMjBattery(tile.getClass());
BatteryObject battery = ReflectMjAPI.getMjBattery(tile);
f.field.set(
tile,
f.field.getDouble(tile)
+ extractEnergy(0,
extracted + f.battery.miniumConsumption(),
true) - f.battery.miniumConsumption());
} catch (IllegalArgumentException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
}
battery.addEnergy(extractEnergy(0, battery.miniumConsumption(),
true));
}
}
}
@ -484,7 +474,7 @@ public abstract class TileEngine extends TileBuildCraft implements IPowerRecepto
return false;
} else if (tile instanceof IPowerReceptor) {
return ((IPowerReceptor) tile).getPowerReceiver(side.getOpposite()) != null;
} else if (ReflectMjAPI.getMjBattery(tile.getClass()) != null) {
} else if (ReflectMjAPI.getMjBattery(tile) != null) {
return true;
} else {
return false;

35
common/buildcraft/transport/PipeTransportPower.java
View file

@ -26,7 +26,7 @@ import buildcraft.api.power.PowerHandler.Type;
import buildcraft.api.transport.IPipeTile.PipeType;
import buildcraft.core.DefaultProps;
import buildcraft.core.ReflectMjAPI;
import buildcraft.core.ReflectMjAPI.BatteryField;
import buildcraft.core.ReflectMjAPI.BatteryObject;
import buildcraft.transport.network.PacketPowerUpdate;
import buildcraft.transport.pipes.PipePowerCobblestone;
import buildcraft.transport.pipes.PipePowerDiamond;
@ -115,7 +115,7 @@ public class PipeTransportPower extends PipeTransport {
}
}
if (ReflectMjAPI.getMjBattery(tile.getClass()) != null) {
if (ReflectMjAPI.getMjBattery(tile) != null) {
return true;
}
@ -180,7 +180,7 @@ public class PipeTransportPower extends PipeTransport {
if (tiles[j] != null
&& (tiles[j] instanceof TileGenericPipe
|| tiles[j] instanceof IPowerReceptor || ReflectMjAPI
.getMjBattery(tiles[j].getClass()) != null)) {
.getMjBattery(tiles[j]) != null)) {
totalPowerQuery += powerQuery[j];
}
}
@ -206,26 +206,13 @@ public class PipeTransportPower extends PipeTransport {
} else if (tiles[j] != null) {
// Look for the simplified power framework
BatteryField f = ReflectMjAPI.getMjBattery(tiles [j].getClass());
BatteryObject battery = ReflectMjAPI.getMjBattery(tiles [j]);
try {
if (f != null) {
watts = (internalPower[i] / totalPowerQuery) * powerQuery[j];
if (battery != null) {
watts = (internalPower[i] / totalPowerQuery)
* powerQuery[j];
double energy = f.field.getDouble (tiles[j]);
if (energy < 100) {
energy += watts;
f.field.setDouble(tiles [j], energy);
internalPower[i] -= watts;
}
}
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (IllegalAccessException e) {
// TODO Auto-generated catch block
e.printStackTrace();
internalPower[i] -= battery.addEnergy(watts);
}
}
@ -267,10 +254,10 @@ public class PipeTransportPower extends PipeTransport {
}
if (tile != null) {
BatteryField f = ReflectMjAPI.getMjBattery(tile.getClass());
BatteryObject battery = ReflectMjAPI.getMjBattery(tile);
if (f != null) {
requestEnergy(dir, f.getEnergyRequested(tile));
if (battery != null) {
requestEnergy(dir, battery.getEnergyRequested());
}
}
}

32
common/buildcraft/transport/TileGenericPipe.java
View file

@ -39,9 +39,7 @@ import buildcraft.api.gates.GateExpansions;
import buildcraft.api.gates.IGateExpansion;
import buildcraft.api.gates.IOverrideDefaultTriggers;
import buildcraft.api.gates.ITrigger;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import buildcraft.api.mj.MjBattery;
import buildcraft.api.transport.IPipeConnection;
import buildcraft.api.transport.IPipeTile;
import buildcraft.api.transport.PipeWire;
@ -62,7 +60,8 @@ import buildcraft.transport.gates.GateFactory;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class TileGenericPipe extends TileEntity implements IPowerReceptor, IFluidHandler, IPipeTile, IOverrideDefaultTriggers, ITileBufferHolder,
public class TileGenericPipe extends TileEntity implements IFluidHandler,
IPipeTile, IOverrideDefaultTriggers, ITileBufferHolder,
IDropControlInventory, ISyncedTile, ISolidSideTile, IGuiReturnHandler {
public class CoreState implements IClientState {
@ -101,7 +100,10 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, IFlui
private TileBuffer[] tileBuffer;
public boolean[] pipeConnectionsBuffer = new boolean[6];
public SafeTimeTracker networkSyncTracker = new SafeTimeTracker();
@MjBattery
public Pipe pipe;
private boolean sendClientUpdate = false;
private boolean blockNeighborChange = false;
private boolean refreshRenderState = false;
@ -272,12 +274,6 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, IFlui
refreshRenderState = false;
}
PowerReceiver provider = getPowerReceiver(null);
if (provider != null) {
provider.update();
}
if (sendClientUpdate) {
sendClientUpdate = false;
@ -410,22 +406,6 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, IFlui
return initialized;
}
@Override
public PowerHandler.PowerReceiver getPowerReceiver(ForgeDirection side) {
if (BlockGenericPipe.isValid(pipe) && pipe instanceof IPowerReceptor) {
return ((IPowerReceptor) pipe).getPowerReceiver(null);
} else {
return null;
}
}
@Override
public void doWork(PowerHandler workProvider) {
if (BlockGenericPipe.isValid(pipe) && pipe instanceof IPowerReceptor) {
((IPowerReceptor) pipe).doWork(workProvider);
}
}
public void scheduleNeighborChange() {
blockNeighborChange = true;
}

122
common/buildcraft/transport/pipes/PipeItemsStripes.java
View file

@ -8,59 +8,82 @@
*/
package buildcraft.transport.pipes;
import java.util.ArrayList;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftTransport;
import buildcraft.api.core.IIconProvider;
import buildcraft.api.core.Position;
import buildcraft.api.mj.MjBattery;
import buildcraft.core.proxy.CoreProxy;
import buildcraft.transport.BlockGenericPipe;
import buildcraft.transport.ItemPipe;
import buildcraft.transport.Pipe;
import buildcraft.transport.PipeIconProvider;
import buildcraft.transport.PipeTransportItems;
import buildcraft.transport.TileGenericPipe;
import buildcraft.transport.TravelingItem;
import buildcraft.transport.pipes.events.PipeEventItem;
import buildcraft.transport.utils.TransportUtils;
public class PipeItemsStripes extends Pipe {
public class PipeItemsStripes extends Pipe <PipeTransportItems> {
@MjBattery (maxCapacity = 1, maxReceivedPerCycle = 1, miniumConsumption = 1)
public double mjStored = 0;
public PipeItemsStripes(Item item) {
super(new PipeTransportItems(), item);
//((PipeTransportItems) transport).travelHook = this;
}
/*@Override
public void doWork() {
if (powerProvider.useEnergy(1, 1, true) == 1) {
@Override
public void updateEntity() {
super.updateEntity();
if (container.getWorldObj().isRemote) {
return;
}
if (mjStored > 0) {
ForgeDirection o = getOpenOrientation();
if (o != ForgeDirection.Unknown) {
Position p = new Position(xCoord, yCoord, zCoord, o);
if (o != ForgeDirection.UNKNOWN) {
Position p = new Position(container.xCoord, container.yCoord,
container.zCoord, o);
p.moveForwards(1.0);
ArrayList<ItemStack> stacks = BuildCraftBlockUtil
.getItemStackFromBlock(worldObj, (int) p.x, (int) p.y,
(int) p.z);
ArrayList<ItemStack> stacks = getWorld().getBlock(
(int) p.x, (int) p.y, (int) p.z)
.getDrops(
getWorld(),
(int) p.x,
(int) p.y,
(int) p.z,
getWorld().getBlockMetadata((int) p.x,
(int) p.y, (int) p.z), 0);
if (stacks != null) {
for (ItemStack s : stacks) {
if (s != null) {
IPipedItem newItem = new EntityPassiveItem(
worldObj, xCoord + 0.5, yCoord
+ Utils.getPipeFloorOf(s),
zCoord + 0.5, s);
TravelingItem newItem = TravelingItem.make(
container.xCoord + 0.5, container.yCoord
+ TransportUtils.getPipeFloorOf(s),
container.zCoord + 0.5, s);
this.container.entityEntering(newItem, o.reverse());
transport.injectItem(newItem, o.getOpposite());
}
}
}
worldObj.setBlock((int) p.x, (int) p.y, (int) p.z, 0);
getWorld().setBlockToAir((int) p.x, (int) p.y, (int) p.z);
}
}
}*/
mjStored = 0;
}
public void eventHandler(PipeEventItem.DropItem event) {
Position p = new Position(container.xCoord, container.yCoord,
@ -68,67 +91,44 @@ public class PipeItemsStripes extends Pipe {
Position from = new Position (p);
p.moveForwards(1.0);
if (getWorld().getBlock((int) p.x, (int) p.y, (int) p.z) == Blocks.air) {
if (convertPipe(transport, event.item)) {
BuildCraftTransport.pipeItemsStripes.onItemUse(new ItemStack(
BuildCraftTransport.pipeItemsStripes), CoreProxy
.proxy.getBuildCraftPlayer(getWorld()), getWorld(), (int) p.x,
(int) p.y, (int) p.z, 1, 0, 0, 0);
} else if (getWorld().getBlock((int) p.x, (int) p.y, (int) p.z) == Blocks.air) {
event.entity.getEntityItem().tryPlaceItemIntoWorld(
CoreProxy.proxy.getBuildCraftPlayer(getWorld()),
getWorld(), (int) p.x, (int) p.y - 1, (int) p.z, 1, 0.0f, 0.0f,
0.0f);
} else {
event.entity.getEntityItem().tryPlaceItemIntoWorld(
CoreProxy.proxy.getBuildCraftPlayer(getWorld()),
getWorld(), (int) p.x, (int) p.y, (int) p.z, 1, 0.0f, 0.0f,
0.0f);
}
/*if (convertPipe(pipe, data)) {
BuildCraftTransport.pipeItemsStipes.onItemUse(new ItemStack(
BuildCraftTransport.pipeItemsStipes), CoreProxy
.getBuildCraftPlayer(worldObj), worldObj, (int) p.x,
(int) p.y - 1, (int) p.z, 1);
} else else {
data.item
.getItemStack()
.getItem()
.tryPlaceIntoWorld(data.item.getItemStack(),
CoreProxy.getBuildCraftPlayer(worldObj), worldObj,
(int) p.x, (int) p.y, (int) p.z, 1, 0.0f, 0.0f,
0.0f);
}*/
}
/*@Override
public void centerReached(PipeTransportItems pipe, EntityData data) {
convertPipe(pipe, data);
}*/
/*@SuppressWarnings("unchecked")
public boolean convertPipe(PipeTransportItems pipe, EntityItem data) {
if (data.getEntityItem().getItem() instanceof ItemPipe) {
if (!(data.getEntityItem().getItem() == BuildCraftTransport.pipeItemsStripes)) {
Pipe newPipe = BlockGenericPipe.createPipe(data.getEntityItem().getItem());
@SuppressWarnings("unchecked")
public boolean convertPipe(PipeTransportItems pipe, TravelingItem item) {
if (item.getItemStack().getItem() instanceof ItemPipe) {
if (!(item.getItemStack().getItem() == BuildCraftTransport.pipeItemsStripes)) {
Pipe newPipe = BlockGenericPipe.createPipe(item.getItemStack().getItem());
newPipe.setTile(this.container);
this.container.pipe = newPipe;
((PipeTransportItems) newPipe.transport).travelingEntities = (TreeMap<Integer, EntityData>) pipe.travelingEntities
.clone();
data.getEntityItem().stackSize--;
item.getItemStack().stackSize--;
if (data.getEntityItem().stackSize <= 0) {
((PipeTransportItems) newPipe.transport).travelingEntities
.remove(data.getEntityId());
if (item.getItemStack().stackSize <= 0) {
((PipeTransportItems) newPipe.transport).items.remove(item);
}
pipe.scheduleRemoval(data.item);
return true;
}
}
return false;
}*/
/*
@Override
public void endReached(PipeTransportItems pipe, EntityData data,
TileEntity tile) {
}*/
}
@Override
public IIconProvider getIconProvider() {