Merge pull request #2550 from MatthiasMann/conduit_inventory_names

don't crash for unnamed inventories or when the name contains special characters
This commit is contained in:
MatthiasMann committed 2015-06-06 22:52:04 +02:00
commit b32f3ce06f
2 files changed
+14 -3

No files matched your search

@@ -14,7 +14,6 @@ import crazypants.enderio.conduit.item.NetworkedInventory.Target;
import crazypants.enderio.conduit.item.filter.IItemFilter;
import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer;
import crazypants.util.BlockCoord;
import crazypants.util.Lang;
public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IItemConduit> {
@@ -180,7 +179,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
for (Target t : source.sendPriority) {
IItemFilter f = t.inv.con.getOutputFilter(t.inv.conDir);
if(input == null || f == null || f.doesItemPassFilter(t.inv, input)) {
String s = Lang.localize(t.inv.getInventory().getInventoryName(), false) + " " + t.inv.location.chatString() + " Distance [" + t.distance + "] ";
String s = t.inv.getLocalizedInventoryName() + " " + t.inv.location.chatString() + " Distance [" + t.distance + "] ";
result.add(s);
}
}
@@ -197,7 +196,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
if(inv.hasTarget(con, dir)) {
IItemFilter f = inv.con.getInputFilter(inv.conDir);
if(input == null || f == null || f.doesItemPassFilter(inv, input)) {
result.add(Lang.localize(inv.getInventory().getInventoryName(), false) + " " + inv.location.chatString());
result.add(inv.getLocalizedInventoryName() + " " + inv.location.chatString());
}
}
}
@@ -11,6 +11,7 @@ import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.conduit.ConnectionMode;
@@ -391,6 +392,17 @@ public class NetworkedInventory {
this.inventorySide = inventorySide;
}
public String getLocalizedInventoryName() {
String inventoryName = getInventory().getInventoryName();
if(inventoryName == null) {
return "null";
} else {
// don't use Lang.localize as that passes the localized string to
// String.format which might crash when it contains formatting specifiers
return StatCollector.translateToLocal(inventoryName);
}
}
static class Target implements Comparable<Target> {
NetworkedInventory inv;
int distance;