Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed status for blocks including a video channel property

Browse source
This commit is contained in:
Unknown 2019-09-21 09:27:22 +02:00
parent 626566150a
commit ff1a8d3b09
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java
View file

@ -370,20 +370,24 @@ public abstract class TileEntityAbstractBase extends TileEntity implements IBloc
}
if (isUpgradeable()) {
// show updates details in the world or while sneaking in the inventory
boolean showDetails = hasWorld();
if (Commons.isClientThread()) {
final int keyCodeSneak = Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyCode();
final String keyName = Minecraft.getMinecraft().gameSettings.keyBindSneak.getDisplayName();
showDetails = Keyboard.isKeyDown(keyCodeSneak);
if (!showDetails) {
message.append(null, "warpdrive.upgrade.status_line.upgradeable",
new WarpDriveText(Commons.getStyleCommand(), "%1$s", keyName) );
// hide upgrades in the world on client side (server side will do it)
if ( !hasWorld()
|| !world.isRemote ) {
// show updates details in the world or while sneaking in the inventory
boolean showDetails = hasWorld();
if (Commons.isClientThread()) {
final int keyCodeSneak = Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyCode();
final String keyName = Minecraft.getMinecraft().gameSettings.keyBindSneak.getDisplayName();
showDetails = Keyboard.isKeyDown(keyCodeSneak);
if (!showDetails) {
message.append(null, "warpdrive.upgrade.status_line.upgradeable",
new WarpDriveText(Commons.getStyleCommand(), "%1$s", keyName));
}
}
if (showDetails) {
// show animation only in the inventory (i.e. no world defined)
message.append(getUpgradeStatus(!hasWorld()));
}
}
if (showDetails) {
// show animation only in the inventory (i.e. no world defined)
message.append(getUpgradeStatus(!hasWorld()));
}
}

1
src/main/java/cr0s/warpdrive/block/TileEntityAbstractMachine.java
View file

@ -112,6 +112,7 @@ public abstract class TileEntityAbstractMachine extends TileEntityAbstractInterf
public WarpDriveText getStatus() {
final WarpDriveText textStatus = super.getStatus();
if ( world != null
&& !world.isRemote
&& !textValidityIssues.isEmpty() ) {
textStatus.append(textValidityIssues);
}