mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-19 19:59:58 +00:00
Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git
This commit is contained in:
commit
f931999cfb
3 files changed
+6
-5
No files matched your search
@@ -35,6 +35,7 @@ public class ClearFilterRecipe implements IRecipe{
|
||||
|
||||
if (count == 1 && FilterRegister.isFilterSet(input)) {
|
||||
ItemStack out = input.copy();
|
||||
out.stackSize = 1;
|
||||
out.stackTagCompound = null;
|
||||
this.output = out;
|
||||
} else {
|
||||
|
||||
@@ -78,7 +78,7 @@ public final class Config {
|
||||
|
||||
public static double transceiverBucketTransmissionCost = 1;
|
||||
|
||||
public static int transceiverMaxIO = 256;
|
||||
public static int transceiverMaxIO = 2048;
|
||||
|
||||
public static File configDirectory;
|
||||
|
||||
|
||||
@@ -113,17 +113,17 @@ public class PowerHandlerUtil {
|
||||
}
|
||||
|
||||
public static int recieveRedstoneFlux(ForgeDirection from, PowerHandler powerHandler, int maxReceive, boolean simulate, boolean tickPH) {
|
||||
int canRecieve = (int) getMaxEnergyRecievedMj(powerHandler, maxReceive / 10, from);
|
||||
double canRecieve = getMaxEnergyRecievedMj(powerHandler, maxReceive / 10d, from);
|
||||
if(!simulate) {
|
||||
if(tickPH) {
|
||||
doBuildCraftEnergyTick(powerHandler, from);
|
||||
}
|
||||
powerHandler.setEnergy(powerHandler.getEnergyStored() + canRecieve);
|
||||
}
|
||||
return canRecieve * 10;
|
||||
return (int)(canRecieve * 10);
|
||||
}
|
||||
|
||||
public static float getMaxEnergyRecievedMj(PowerHandler ph, float max, ForgeDirection from) {
|
||||
public static double getMaxEnergyRecievedMj(PowerHandler ph, double max, ForgeDirection from) {
|
||||
if(ph == null) {
|
||||
return 0;
|
||||
}
|
||||
@@ -133,7 +133,7 @@ public class PowerHandlerUtil {
|
||||
if(canRecieve <= ph.getMinEnergyReceived()) {
|
||||
return 0;
|
||||
}
|
||||
return (float) canRecieve;
|
||||
return canRecieve;
|
||||
}
|
||||
|
||||
public static void doBuildCraftEnergyTick(PowerHandler ph, ForgeDirection from) {
|
||||
|
||||
Reference in new issue
Block a user