Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Adding Multismelter paraller count info to scanner,

Browse source 
Adding EBF Heat Capacity to scanner,
 reformatting rest of scanner msgs to be unified
This commit is contained in:
Technus 2016-04-17 13:08:19 +02:00
parent 4c76b14530
commit c68814f780
5 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
View file

@ -660,7 +660,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
public String[] getInfoData() { public String[] getInfoData() {
return new String[]{ return new String[]{
mNEIName, mNEIName,
"Progress:", (mProgresstime / 20) + " secs", "Progress:",
(mProgresstime / 20) + " secs",
(mMaxProgresstime / 20) + " secs", (mMaxProgresstime / 20) + " secs",
"Stored Energy:", "Stored Energy:",
getBaseMetaTileEntity().getStoredEU() + "EU", getBaseMetaTileEntity().getStoredEU() + "EU",

2
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
View file

@ -776,7 +776,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
@Override @Override
public String[] getInfoData() { public String[] getInfoData() {
return new String[]{"Progress:", (mProgresstime / 20) + "secs", (mMaxProgresstime / 20) + "secs", "Efficiency:", (mEfficiency / 100.0F) + "%", "Problems:", "" + (getIdealStatus() - getRepairStatus())}; return new String[]{"Progress:", (mProgresstime / 20) + " secs", (mMaxProgresstime / 20) + " secs", "Efficiency: " + (mEfficiency / 100.0F) + "%", "Problems: " + (getIdealStatus() - getRepairStatus())};
} }
@Override @Override

1
src/main/java/gregtech/api/util/GT_Utility.java
View file

@ -11,6 +11,7 @@ import gregtech.api.events.BlockScanningEvent;
import gregtech.api.interfaces.IDebugableBlock; import gregtech.api.interfaces.IDebugableBlock;
import gregtech.api.interfaces.IProjectileItem; import gregtech.api.interfaces.IProjectileItem;
import gregtech.api.interfaces.tileentity.*; import gregtech.api.interfaces.tileentity.*;
import gregtech.api.interfaces.metatileentity.*;
import gregtech.api.items.GT_EnergyArmor_Item; import gregtech.api.items.GT_EnergyArmor_Item;
import gregtech.api.items.GT_Generic_Item; import gregtech.api.items.GT_Generic_Item;
import gregtech.api.net.GT_Packet_Sound; import gregtech.api.net.GT_Packet_Sound;

14
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
View file

@ -121,7 +121,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
return false; return false;
} }
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { private boolean checkMachineFunction(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
@ -194,6 +194,12 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
return true; return true;
} }
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack){
boolean result= this.checkMachineFunction(aBaseMetaTileEntity,aStack);
if (!result) this.mHeatingCapacity=0;
return result;
}
public int getMaxEfficiency(ItemStack aStack) { public int getMaxEfficiency(ItemStack aStack) {
return 10000; return 10000;
} }
@ -213,4 +219,10 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
public boolean explodesOnComponentBreak(ItemStack aStack) { public boolean explodesOnComponentBreak(ItemStack aStack) {
return false; return false;
} }
@Override
public String[] getInfoData() {
return new String[]{"Heating Capacity: " + (this.mHeatingCapacity) + "K", "Progress:", (mProgresstime / 20) + " secs", (mMaxProgresstime / 20) + " secs", "Efficiency: " + (mEfficiency / 100.0F) + "%", "Problems: " + (getIdealStatus() - getRepairStatus())};
}
} }

14
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
View file

@ -85,7 +85,7 @@ public class GT_MetaTileEntity_MultiFurnace
return false; return false;
} }
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { private boolean checkMachineFunction(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
@ -148,6 +148,12 @@ public class GT_MetaTileEntity_MultiFurnace
return true; return true;
} }
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack){
boolean result= this.checkMachineFunction(aBaseMetaTileEntity,aStack);
if (!result) this.mLevel=0;
return result;
}
public int getMaxEfficiency(ItemStack aStack) { public int getMaxEfficiency(ItemStack aStack) {
return 10000; return 10000;
} }
@ -167,4 +173,10 @@ public class GT_MetaTileEntity_MultiFurnace
public boolean explodesOnComponentBreak(ItemStack aStack) { public boolean explodesOnComponentBreak(ItemStack aStack) {
return false; return false;
} }
@Override
public String[] getInfoData() {
return new String[]{"Parallel smelting: " + this.mLevel*8, "Progress:", (mProgresstime / 20) + " secs", (mMaxProgresstime / 20) + " secs", "Efficiency: " + (mEfficiency / 100.0F) + "%", "Problems: " + (getIdealStatus() - getRepairStatus())};
}
} }