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

make StatementParameterItemStacks override the description and output the item stack desc

Browse source
This commit is contained in:
asiekierka 2015-03-21 18:31:37 +01:00
parent b59ce91945
commit bcb2a40fa5
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildcraft_resources/changelog/7.0.0
View file

@ -12,6 +12,7 @@ Additions:
* Gates: * Gates:
* Gate recipes now show up in NEI properly (asie) * Gate recipes now show up in NEI properly (asie)
* Light Sensor expansion for detecting brightness in front of a gate (asie) * Light Sensor expansion for detecting brightness in front of a gate (asie)
* Gate statement parameters now display the item stack information (asie)
* Pipes: * Pipes:
* Massive optimizations - up to 3x less server-intensive (asie, Player) * Massive optimizations - up to 3x less server-intensive (asie, Player)
* Improvements to Stripes Pipes: * Improvements to Stripes Pipes:
@ -46,3 +47,4 @@ APIs:
Breaking changes: Breaking changes:
* Item pipes may no longer be connected to the front of the Mining Well or Quarry. * Item pipes may no longer be connected to the front of the Mining Well or Quarry.
* Behaviour change: robots now always output to item/fluid pipes, not item/fluid containers * Behaviour change: robots now always output to item/fluid pipes, not item/fluid containers
* Lists are no longer recursive

4
common/buildcraft/core/lib/gui/StatementParameterSlot.java
View file

@ -3,6 +3,7 @@ package buildcraft.core.lib.gui;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.IStatementParameter;
import buildcraft.api.statements.StatementParameterItemStack;
/** /**
* Created by asie on 1/24/15. * Created by asie on 1/24/15.
@ -28,7 +29,8 @@ public abstract class StatementParameterSlot extends AdvancedSlot {
public String getDescription() { public String getDescription() {
IStatementParameter parameter = getParameter(); IStatementParameter parameter = getParameter();
if (parameter != null) { // HACK: We're explicitly returning null so that the item stack description is used.
if (parameter != null && !(parameter instanceof StatementParameterItemStack)) {
return parameter.getDescription() != null ? parameter.getDescription() : ""; return parameter.getDescription() != null ? parameter.getDescription() : "";
} else { } else {
return null; return null;