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

generalized previous change

Browse source
This commit is contained in:
SpaceToad 2014-03-29 11:07:46 +01:00
parent 4191f69e14
commit df2d09e176
6 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/builders/TileBuilder.java
View file

@ -67,7 +67,7 @@ public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IM
private SafeTimeTracker debugBuildTracker = new SafeTimeTracker(5);
@MjBattery (maxReceivedPerCycle = 25)
public double mjStored = 0;
private double mjStored = 0;
private class PathIterator {

2
common/buildcraft/builders/TileFiller.java
View file

@ -58,7 +58,7 @@ public class TileFiller extends TileBuildCraft implements IBuilderInventory, IMa
private SimpleInventory inv = new SimpleInventory(27, "Filler", 64);
@MjBattery (maxReceivedPerCycle = 25)
public double mjStored = 0;
private double mjStored = 0;
public TileFiller() {
inv.addListener(this);

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

@ -1,8 +1,7 @@
package buildcraft.core;
import java.lang.reflect.Modifier;
import java.lang.reflect.Method;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Map;
@ -116,12 +115,8 @@ public class ReflectMjAPI {
MjBattery battery = f.getAnnotation (MjBattery.class);
if (battery != null) {
for (Method method : c.getMethods()) {
if (method.getName().equals(f.getName() + "_$eq")) {
f.setAccessible(true);
break;
}
}
f.setAccessible(true);
if (f.isAccessible() || Modifier.isPublic(f.getModifiers())) {
BatteryField bField = new BatteryField();
bField.field = f;

2
common/buildcraft/transport/pipes/PipeFluidsWood.java
View file

@ -31,7 +31,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class PipeFluidsWood extends Pipe<PipeTransportFluids> {
@MjBattery (maxCapacity = 250, maxReceivedPerCycle = 100, minimumConsumption = 0)
public double mjStored = 0;
private double mjStored = 0;
public @NetworkData
int liquidToExtract;

2
common/buildcraft/transport/pipes/PipeItemsObsidian.java
View file

@ -41,7 +41,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class PipeItemsObsidian extends Pipe<PipeTransportItems> {
@MjBattery (maxCapacity = 256, maxReceivedPerCycle = 64, minimumConsumption = 0)
public double mjStored = 0;
private double mjStored = 0;
private static final PowerHandler.PerditionCalculator PERDITION = new PowerHandler.PerditionCalculator(0.5F);
private int[] entitiesDropped;

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

@ -33,7 +33,7 @@ import buildcraft.transport.utils.TransportUtils;
public class PipeItemsStripes extends Pipe <PipeTransportItems> {
@MjBattery (maxCapacity = 1, maxReceivedPerCycle = 1, minimumConsumption = 0)
public double mjStored = 0;
private double mjStored = 0;
public PipeItemsStripes(Item item) {
super(new PipeTransportItems(), item);