maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cables got tooltip update. Closes #1627

Browse source
This commit is contained in:
drcrazy 2018-11-07 03:03:26 +03:00
parent 9f3a3eb026
commit 7ce4a022af
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/techreborn/blocks/cable/BlockCable.java
View file

@ -145,7 +145,7 @@ public class BlockCable extends BlockContainer {
@Nullable
@Override
public TileEntity createNewTileEntity(World worldIn, int meta) {
return new TileCable();
return new TileCable(getStateFromMeta(meta).getValue(TYPE));
}
// Block

33
src/main/java/techreborn/tiles/cable/TileCable.java
View file

@ -60,8 +60,22 @@ public class TileCable extends TileEntity
private ArrayList<EnumFacing> sendingFace = new ArrayList<EnumFacing>();
int ticksSinceLastChange = 0;
private EnumCableType getCableType() {
return world.getBlockState(pos).getValue(BlockCable.TYPE);
//MC calls this during world load. Keep it, please.
public TileCable() {
super();
}
public TileCable(EnumCableType cableType) {
this.cableType = cableType;
this.transferRate = cableType.transferRate * RebornCoreConfig.euPerFU;
}
private void updateCableType() {
if (cableType == null) {
cableType = world.getBlockState(pos).getValue(BlockCable.TYPE);
transferRate = cableType.transferRate * RebornCoreConfig.euPerFU;
}
return;
}
public boolean canReceiveFromFace(EnumFacing face) {
@ -132,8 +146,7 @@ public class TileCable extends TileEntity
}
if (cableType == null ){
cableType = getCableType();
transferRate = cableType.transferRate * RebornCoreConfig.euPerFU;
updateCableType();
}
ticksSinceLastChange++;
@ -187,8 +200,9 @@ public class TileCable extends TileEntity
}
int energyReceived = Math.min(getMaxEnergyStored() - getEnergyStored(), Math.min(transferRate, maxReceive));
if (!simulate)
if (!simulate) {
power += energyReceived;
}
return energyReceived;
}
@ -199,8 +213,9 @@ public class TileCable extends TileEntity
}
int energyExtracted = Math.min(getEnergyStored(), Math.min(transferRate, maxExtract));
if (!simulate)
if (!simulate) {
power -= energyExtracted;
}
return energyExtracted;
}
@ -233,18 +248,16 @@ public class TileCable extends TileEntity
// IListInfoProvider
@Override
public void addInfo(List<String> info, boolean isRealTile) {
if (isRealTile) {
info.add(TextFormatting.GRAY + StringUtils.t("techreborn.tooltip.transferRate") + ": "
+ TextFormatting.GOLD
+ PowerSystem.getLocaliszedPowerFormatted(transferRate / RebornCoreConfig.euPerFU) + "/t");
info.add(TextFormatting.GRAY + StringUtils.t("techreborn.tooltip.tier") + ": "
+ TextFormatting.GOLD + StringUtils.toFirstCapitalAllLowercase(this.cableType.tier.toString()));
}
+ TextFormatting.GOLD + StringUtils.toFirstCapitalAllLowercase(cableType.tier.toString()));
}
// IToolDrop
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return getCableType().getStack();
return cableType.getStack();
}
}