From 0859b54a55feac2f08b821634d48e75b5c2e4e04 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 10 Mar 2014 17:03:22 -0400 Subject: [PATCH 1/6] Safer onUpdate in ItemProxy, should fix #1187 --- common/mekanism/common/item/ItemProxy.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/mekanism/common/item/ItemProxy.java b/common/mekanism/common/item/ItemProxy.java index 9377784f7..bf8bb4f18 100644 --- a/common/mekanism/common/item/ItemProxy.java +++ b/common/mekanism/common/item/ItemProxy.java @@ -87,11 +87,10 @@ public class ItemProxy extends Item if (par3Entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) par3Entity; - for (Object o : player.inventoryContainer.inventorySlots) + for (int i = 0; i < player.inventory.mainInventory.length; i++) { - Slot s = (Slot) o; - if (s.getStack() != null && s.getStack().getItem() == this) - player.inventory.decrStackSize(s.slotNumber, 64); + if (player.inventory.mainInventory[i] != null && player.inventory.mainInventory[i].getItem() == this) + player.inventory.mainInventory[i] = null; } } } From 97784044519d3bfd3d6e59ddeae76a97bfc1a4ae Mon Sep 17 00:00:00 2001 From: Vexatos Date: Wed, 12 Mar 2014 17:22:35 +0100 Subject: [PATCH 2/6] Update de_DE.lang --- resources/assets/mekanism/lang/de_DE.lang | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/assets/mekanism/lang/de_DE.lang b/resources/assets/mekanism/lang/de_DE.lang index f6122e9f1..ffd8b616e 100644 --- a/resources/assets/mekanism/lang/de_DE.lang +++ b/resources/assets/mekanism/lang/de_DE.lang @@ -33,6 +33,7 @@ item.Salt.name=Salz item.BrineBucket.name=Eimer mit Salzwasser item.FreeRunners.name=Freiläufer item.ArmoredJetpack.name=Panzer-Jetpack +item.FilterCard.name=Filterkarte //Gas Tank tile.GasTank.GasTank.name=Gastank @@ -250,6 +251,7 @@ gui.status=Status gui.autoEject=Auto-Auswerfen gui.itemstack=ItemStack gui.oredict=OreDict +gui.material=Material gui.out=Out gui.noFluid=Keine Flüssigk. gui.empty=Leer @@ -266,6 +268,8 @@ gui.on=An gui.off=Aus gui.filters=Filter gui.idle=Bereit +gui.data=Daten +gui.newFilter=Neuer Filter gui.chemicalInfuser.short=C. Infundierer gui.chemicalDissolutionChamber.short=C. Auflösungsk. @@ -288,6 +292,8 @@ gui.factory.purifying=Purifizieren gui.factory.injecting=Injezieren gui.factory.autoSort=Auto-Sortieren +gui.filterSelect.title=Neuen Filter kreieren + gui.oredictFilter=OreDict-Filter gui.oredictFilter.noKey=Keine Kennung eingegeben gui.oredictFilter.sameKey=Selbes Kennwort @@ -298,6 +304,9 @@ gui.itemFilter.details=ItemStack-Details gui.itemFilter.min=Min gui.itemFilter.max=Max +gui.materialFilter=Materialfilter +gui.materialFilter.details=Nutze Material von + gui.portableTeleporter=Tragbarer Teleporter gui.teleporter.notReady=Nicht bereit From 8ddc6a9c3775e3b58c4931cf58f4c46548e401c5 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Wed, 12 Mar 2014 17:27:56 +0100 Subject: [PATCH 3/6] Update de_DE.lang --- resources/assets/mekanism/lang/de_DE.lang | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/assets/mekanism/lang/de_DE.lang b/resources/assets/mekanism/lang/de_DE.lang index ffd8b616e..c88e9381e 100644 --- a/resources/assets/mekanism/lang/de_DE.lang +++ b/resources/assets/mekanism/lang/de_DE.lang @@ -365,6 +365,12 @@ tooltip.configurator.noLink=Kein Link tooltip.configurator.linkMsg=Verbunden mit tooltip.configurator.dim=Dimension +tooltip.filterCard.got=Empfing Filterdaten von +tooltip.filterCard.set=Injezierte Filterdaten vom Typ +tooltip.filterCard.unequal=Ungleiche Filter-Dateiformate +tooltip.filterCard.logisticalSorter=Logistischer Sortierer +tooltip.filterCard.digitalMiner=Digitalbergbaugerät + tooltip.balloon=Ballon tooltip.jetpack.regular=Regulär From e9e0ae96a8509abc340bf7c6a3e3daee7bdbe9d4 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Wed, 12 Mar 2014 17:32:34 +0100 Subject: [PATCH 4/6] Update ItemFilterCard.java --- common/mekanism/common/item/ItemFilterCard.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/mekanism/common/item/ItemFilterCard.java b/common/mekanism/common/item/ItemFilterCard.java index 6c7ecf7f2..245b09a79 100644 --- a/common/mekanism/common/item/ItemFilterCard.java +++ b/common/mekanism/common/item/ItemFilterCard.java @@ -46,7 +46,7 @@ public class ItemFilterCard extends ItemMekanism { data.setString("dataType", ((IFilterAccess)tileEntity).getDataType()); setData(stack, data); - player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.filterCard.got") + " " + EnumColor.INDIGO + MekanismUtils.localize(data.getString("dataType"))); + player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.filterCard.got").replaceAll("%s", EnumColor.INDIGO + MekanismUtils.localize(data.getString("dataType")) + EnumColor.GREY)); } return true; @@ -56,7 +56,7 @@ public class ItemFilterCard extends ItemMekanism if(((IFilterAccess)tileEntity).getDataType().equals(getDataType(stack))) { ((IFilterAccess)tileEntity).setFilterData(getData(stack)); - player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + MekanismUtils.localize("tooltip.filterCard.set") + " " + EnumColor.INDIGO + MekanismUtils.localize(getDataType(stack))); + player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + MekanismUtils.localize("tooltip.filterCard.set").replaceAll("%s", EnumColor.INDIGO + MekanismUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN)); setData(stack, null); } else { From 734f24d5928b1fc4df66e2b4aa27525d545db9ce Mon Sep 17 00:00:00 2001 From: Vexatos Date: Wed, 12 Mar 2014 17:33:50 +0100 Subject: [PATCH 5/6] Update de_DE.lang --- resources/assets/mekanism/lang/de_DE.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/mekanism/lang/de_DE.lang b/resources/assets/mekanism/lang/de_DE.lang index c88e9381e..442842e4d 100644 --- a/resources/assets/mekanism/lang/de_DE.lang +++ b/resources/assets/mekanism/lang/de_DE.lang @@ -365,8 +365,8 @@ tooltip.configurator.noLink=Kein Link tooltip.configurator.linkMsg=Verbunden mit tooltip.configurator.dim=Dimension -tooltip.filterCard.got=Empfing Filterdaten von -tooltip.filterCard.set=Injezierte Filterdaten vom Typ +tooltip.filterCard.got=Filterdaten von %s empfangen +tooltip.filterCard.set=Filterdaten vom Typ %s injeziert tooltip.filterCard.unequal=Ungleiche Filter-Dateiformate tooltip.filterCard.logisticalSorter=Logistischer Sortierer tooltip.filterCard.digitalMiner=Digitalbergbaugerät From 9e4d347f8ad816abe310b0ca3394aa00d0eed400 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Wed, 12 Mar 2014 17:34:17 +0100 Subject: [PATCH 6/6] Update en_US.lang --- resources/assets/mekanism/lang/en_US.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang index ee7993781..da7ea8a06 100644 --- a/resources/assets/mekanism/lang/en_US.lang +++ b/resources/assets/mekanism/lang/en_US.lang @@ -365,8 +365,8 @@ tooltip.configurator.noLink=No link tooltip.configurator.linkMsg=Bound to tooltip.configurator.dim=dimension -tooltip.filterCard.got=Retrieved filter data from -tooltip.filterCard.set=Injected filter data of type +tooltip.filterCard.got=Retrieved filter data from %s +tooltip.filterCard.set=Injected filter data of type %s tooltip.filterCard.unequal=Unequal filter data formats tooltip.filterCard.logisticalSorter=Logistical Sorter tooltip.filterCard.digitalMiner=Digital Miner