From 1d8882eee354a03851028ece3ade6068993352b1 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Fri, 1 May 2015 09:23:22 +0200 Subject: [PATCH 1/3] #2407 allow more localization --- resources/assets/enderio/lang/cs_CZ.lang | 2 +- resources/assets/enderio/lang/de_DE.lang | 2 +- resources/assets/enderio/lang/en_US.lang | 3 ++- resources/assets/enderio/lang/fr_FR.lang | 2 +- resources/assets/enderio/lang/ko_KR.lang | 2 +- resources/assets/enderio/lang/pt_BR.lang | 2 +- resources/assets/enderio/lang/pt_PT.lang | 2 +- resources/assets/enderio/lang/ru_RU.lang | 2 +- resources/assets/enderio/lang/zh_CN.lang | 2 +- resources/assets/enderio/lang/zh_TW.lang | 2 +- src/main/java/crazypants/enderio/gui/TooltipAddera.java | 3 ++- .../java/crazypants/enderio/nei/SagMillRecipeHandler.java | 7 ++----- 12 files changed, 15 insertions(+), 16 deletions(-) diff --git a/resources/assets/enderio/lang/cs_CZ.lang b/resources/assets/enderio/lang/cs_CZ.lang index 05f12700..717c062e 100644 --- a/resources/assets/enderio/lang/cs_CZ.lang +++ b/resources/assets/enderio/lang/cs_CZ.lang @@ -112,7 +112,7 @@ item.bucketXpjuice.name=Kbelík tekutých XP enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=Detaily paliva -enderio.fuel.tooltip.burnTime=spalovací čas +enderio.fuel.tooltip.burnTime=spalovací čas {0,number} enderio.fluid.millibucketsTick=mB/t enderio.gas.gasTick=Plyn/t diff --git a/resources/assets/enderio/lang/de_DE.lang b/resources/assets/enderio/lang/de_DE.lang index 2dbca7d0..5b644c05 100644 --- a/resources/assets/enderio/lang/de_DE.lang +++ b/resources/assets/enderio/lang/de_DE.lang @@ -89,7 +89,7 @@ item.bucketFire_water.name=Eimer mit Spiritus enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=Treibstoffdetails -enderio.fuel.tooltip.burnTime=Brenndauer +enderio.fuel.tooltip.burnTime=Brenndauer {0,number} enderio.fluid.millibucketsTick=mB/t diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index c49f2f34..0e91875c 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -153,7 +153,7 @@ item.bucketXpjuice.name=XP Bucket enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=Fuel Details -enderio.fuel.tooltip.burnTime=burn time +enderio.fuel.tooltip.burnTime=burn time {0,number} enderio.fluid.millibucketsTick=mB/t enderio.coolant.tooltip.heading=Coolant enderio.coolant.tooltip.degreesPerBucket=Deg per bucket @@ -1056,6 +1056,7 @@ enderio.keybind.magnet=Toggle Electromagnet enderio.nei.alloysmelter=Alloy Smelter enderio.nei.enchanter=Enchanter enderio.nei.sagmill=SAG Mill +enderio.nei.sagmill.outputchance=Chance: {0,choice,0#'<1'|0<{0,number}}% enderio.nei.slicensplice=Slice'N'Splice enderio.nei.soulbinder=Soul Binder enderio.nei.vat=Vat diff --git a/resources/assets/enderio/lang/fr_FR.lang b/resources/assets/enderio/lang/fr_FR.lang index c7844c4d..497b77c5 100644 --- a/resources/assets/enderio/lang/fr_FR.lang +++ b/resources/assets/enderio/lang/fr_FR.lang @@ -145,7 +145,7 @@ item.bucketXpjuice.name=Sceau d'Exp. Liquide enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=Détails du carburant -enderio.fuel.tooltip.burnTime=temps de combustion +enderio.fuel.tooltip.burnTime=temps de combustion {0,number} enderio.fluid.millibucketsTick=mB/t enderio.coolant.tooltip.heading=Liquide de refroidissement enderio.coolant.tooltip.degreesPerBucket=Degrés par sceau diff --git a/resources/assets/enderio/lang/ko_KR.lang b/resources/assets/enderio/lang/ko_KR.lang index f2d968fd..33a47507 100644 --- a/resources/assets/enderio/lang/ko_KR.lang +++ b/resources/assets/enderio/lang/ko_KR.lang @@ -122,7 +122,7 @@ item.bucketXpjuice.name=XP 양동이 enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=연료 세부사항 -enderio.fuel.tooltip.burnTime=연료 소모시간 +enderio.fuel.tooltip.burnTime=연료 소모시간 {0,number} enderio.fluid.millibucketsTick=mB/t coolant.tooltip.heading=냉각제 enderio.fuel.tooltip.degreesPerBucket=양동이당 온도 diff --git a/resources/assets/enderio/lang/pt_BR.lang b/resources/assets/enderio/lang/pt_BR.lang index 00a692c9..39b5ebf1 100644 --- a/resources/assets/enderio/lang/pt_BR.lang +++ b/resources/assets/enderio/lang/pt_BR.lang @@ -135,7 +135,7 @@ item.bucketXpjuice.name=Balde de XP enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=Detalhes do Combustível -enderio.fuel.tooltip.burnTime=tempo de queima +enderio.fuel.tooltip.burnTime=tempo de queima {0,number} enderio.fluid.millibucketsTick=mB/t enderio.coolant.tooltip.heading=Refrigerante enderio.coolant.tooltip.degreesPerBucket=Graus por balde diff --git a/resources/assets/enderio/lang/pt_PT.lang b/resources/assets/enderio/lang/pt_PT.lang index ee77e677..afa82d96 100644 --- a/resources/assets/enderio/lang/pt_PT.lang +++ b/resources/assets/enderio/lang/pt_PT.lang @@ -135,7 +135,7 @@ item.bucketXpjuice.name=Balde de XP enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=Detalhes do Combustível -enderio.fuel.tooltip.burnTime=tempo de queima +enderio.fuel.tooltip.burnTime=tempo de queima {0,number} enderio.fluid.millibucketsTick=mB/t enderio.coolant.tooltip.heading=Refrigerante enderio.coolant.tooltip.degreesPerBucket=Graus por balde diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang index a4585f30..5308a527 100644 --- a/resources/assets/enderio/lang/ru_RU.lang +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -146,7 +146,7 @@ item.bucketXpjuice.name=Ведро опыта enderio.fluid.millibucket.abr=мВ enderio.fuel.tooltip.heading=Информация о топливе -enderio.fuel.tooltip.burnTime=время горения +enderio.fuel.tooltip.burnTime=время горения {0,number} enderio.fluid.millibucketsTick=мВ/тик enderio.coolant.tooltip.heading=Хладагент enderio.coolant.tooltip.degreesPerBucket=Градус за ведро diff --git a/resources/assets/enderio/lang/zh_CN.lang b/resources/assets/enderio/lang/zh_CN.lang index 106291ae..6d42a110 100644 --- a/resources/assets/enderio/lang/zh_CN.lang +++ b/resources/assets/enderio/lang/zh_CN.lang @@ -144,7 +144,7 @@ item.bucketXpjuice.name=桶装液态XP enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=燃料详情 -enderio.fuel.tooltip.burnTime=燃烧时间 +enderio.fuel.tooltip.burnTime=燃烧时间 {0,number} enderio.fluid.millibucketsTick=mB/t coolant.tooltip.heading=冷却剂 enderio.fuel.tooltip.degreesPerBucket=deg per bucket diff --git a/resources/assets/enderio/lang/zh_TW.lang b/resources/assets/enderio/lang/zh_TW.lang index 3259511d..af6399b0 100644 --- a/resources/assets/enderio/lang/zh_TW.lang +++ b/resources/assets/enderio/lang/zh_TW.lang @@ -120,7 +120,7 @@ item.bucketXpjuice.name=桶裝液態XP enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=燃料詳情 -enderio.fuel.tooltip.burnTime=燃燒時間 +enderio.fuel.tooltip.burnTime=燃燒時間 {0,number} enderio.fluid.millibucketsTick=mB/t coolant.tooltip.heading=冷卻劑 enderio.fuel.tooltip.degreesPerBucket=每單位一桶 diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 1e83d649..30a162db 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -1,5 +1,6 @@ package crazypants.enderio.gui; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -183,7 +184,7 @@ public class TooltipAddera { if(showAdvancedTooltips()) { list.add(Lang.localize("fuel.tooltip.heading")); list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.getPowerPerCycle())); - list.add(EnumChatFormatting.ITALIC + " " + fuel.getTotalBurningTime() + " " + Lang.localize("fuel.tooltip.burnTime")); + list.add(EnumChatFormatting.ITALIC + " " + MessageFormat.format(Lang.localize("fuel.tooltip.burnTime"), fuel.getTotalBurningTime())); } else { addShowDetailsTooltip(list); } diff --git a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java index 9c3d6cc1..e344315d 100644 --- a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java @@ -1,6 +1,7 @@ package crazypants.enderio.nei; import java.awt.Rectangle; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -126,11 +127,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { float chance = recipe.getChanceForOutput(stack); if(chance > 0 && chance < 1) { int chanceInt = (int) (chance * 100); - if(chanceInt == 0) { - currenttip.add(EnumChatFormatting.GRAY + "Chance: <1%"); - } else { - currenttip.add(EnumChatFormatting.GRAY + "Chance: " + chanceInt + "%"); - } + currenttip.add(EnumChatFormatting.GRAY + MessageFormat.format(StatCollector.translateToLocal("enderio.nei.sagmill.outputchance"), chanceInt)); } return currenttip; } From 912667c4d440993f6b57a54de0395fda6876120d Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Fri, 1 May 2015 23:29:52 +0200 Subject: [PATCH 2/3] Fix: Shift-Click handling * Fixes mixup of TE slots and GUI slots * Fixes off-by-one erro with hotbar * re #2410 --- .../machine/gui/AbstractMachineContainer.java | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index 5c38259f..9726fbb1 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -158,39 +158,47 @@ public abstract class AbstractMachineContainer extends Container { return new SlotRange(startHotBarSlot, endHotBarSlot, false); } + protected void addInventorySlotRange(List res, int start, int end) { + for (int i = start; i < end; i++) { + int slotNumber = getSlotFromInventory(tileEntity, i).slotNumber; + res.add(new SlotRange(slotNumber, slotNumber + 1, false)); + } + } + protected void addInputSlotRanges(List res) { SlotDefinition slotDef = tileEntity.getSlotDefinition(); if(slotDef.getNumInputSlots() > 0) { - res.add(new SlotRange(slotDef.getMinInputSlot(), slotDef.getMaxInputSlot() + 1, false)); + addInventorySlotRange(res, slotDef.getMinInputSlot(), slotDef.getMaxInputSlot() + 1); } } protected void addUpgradeSlotRanges(List res) { SlotDefinition slotDef = tileEntity.getSlotDefinition(); if(slotDef.getNumUpgradeSlots() > 0) { - res.add(new SlotRange(slotDef.getMinUpgradeSlot(), slotDef.getMaxUpgradeSlot() + 1, false)); + addInventorySlotRange(res, slotDef.getMinUpgradeSlot(), slotDef.getMaxUpgradeSlot() + 1); } } protected void addPlayerSlotRanges(List res, int slotIndex) { - if(slotIndex <= endPlayerSlot) { + if (slotIndex < endPlayerSlot) { res.add(getPlayerHotbarSlotRange()); } - if(slotIndex >= startHotBarSlot && slotIndex <= endHotBarSlot) { + if (slotIndex >= startHotBarSlot && slotIndex < endHotBarSlot) { res.add(getPlayerInventoryWithoutHotbarSlotRange()); } } protected List getTargetSlotsForTransfer(int slotIndex, Slot slot) { - SlotDefinition slotDef = tileEntity.getSlotDefinition(); - if(slotDef.isInputSlot(slotIndex) || slotDef.isUpgradeSlot(slotIndex)) { - return Collections.singletonList(getPlayerInventorySlotRange(false)); - } - if(slotDef.isOutputSlot(slotIndex)) { - return Collections.singletonList(getPlayerInventorySlotRange(true)); - } - if(slotIndex >= startPlayerSlot) { - ArrayList res = new ArrayList(); + if (slot.inventory == tileEntity) { + SlotDefinition slotDef = tileEntity.getSlotDefinition(); + if (slotDef.isInputSlot(slot.slotNumber) || slotDef.isUpgradeSlot(slot.slotNumber)) { + return Collections.singletonList(getPlayerInventorySlotRange(false)); + } + if (slotDef.isOutputSlot(slot.slotNumber)) { + return Collections.singletonList(getPlayerInventorySlotRange(true)); + } + } else if (slotIndex >= startPlayerSlot) { + List res = new ArrayList(); addInputSlotRanges(res); addUpgradeSlotRanges(res); addPlayerSlotRanges(res, slotIndex); @@ -221,10 +229,10 @@ public abstract class AbstractMachineContainer extends Container { slot = (Slot) this.inventorySlots.get(checkIndex); itemstack1 = slot.getStack(); - if(itemstack1 != null && itemstack1.getItem() == par1ItemStack.getItem() + if (itemstack1 != null && itemstack1.getItem() == par1ItemStack.getItem() && (!par1ItemStack.getHasSubtypes() || par1ItemStack.getItemDamage() == itemstack1.getItemDamage()) - && ItemStack.areItemStackTagsEqual(par1ItemStack, itemstack1) - && slot.isItemValid(par1ItemStack)) { + && ItemStack.areItemStackTagsEqual(par1ItemStack, itemstack1) && slot.isItemValid(par1ItemStack) + && par1ItemStack != itemstack1) { int mergedSize = itemstack1.stackSize + par1ItemStack.stackSize; int maxStackSize = Math.min(par1ItemStack.getMaxStackSize(), slot.getSlotStackLimit()); From a1fcc934b4d4280ede986482e679f548efb8d064 Mon Sep 17 00:00:00 2001 From: Henry Loenwind Date: Mon, 4 May 2015 17:56:13 +0200 Subject: [PATCH 3/3] More Config for Magnet * Config values re #2387 (defaults unchanged) * Fix to @Optional.Method annotation might help with #2414 #2246 --- .../java/crazypants/enderio/config/Config.java | 16 ++++++++++++++++ .../java/crazypants/enderio/item/ItemMagnet.java | 12 +++++++++--- .../java/crazypants/enderio/item/KeyTracker.java | 3 ++- .../enderio/item/MagnetController.java | 13 +++++++++---- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 19e721a8..e3ef7ec2 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -311,6 +311,11 @@ public final class Config { public static String[] magnetBlacklist = new String[] { "appliedenergistics2:item.ItemCrystalSeed", "Botania:livingrock", "Botania:manaTablet" }; + public static boolean magnetAllowInMainInventory = false; + public static boolean magnetAllowInBaublesSlot = true; + public static boolean magnetAllowDeactivatedInBaublesSlot = false; + public static String magnetBaublesType = "AMULET"; + public static boolean useCombustionGenModel = false; public static int crafterRfPerCraft = 2500; @@ -1046,6 +1051,17 @@ public final class Config { magnetBlacklist = config.getStringList("magnetBlacklist", sectionMagnet.name, magnetBlacklist, "These items will not be picked up by the magnet."); + magnetAllowInMainInventory = config.get(sectionMagnet.name, "magnetAllowInMainInventory", magnetAllowInMainInventory, + "If true the magnet will also work in the main inventory, not just the hotbar").getBoolean(magnetAllowInMainInventory); + + magnetAllowInBaublesSlot = config.get(sectionMagnet.name, "magnetAllowInBaublesSlot", magnetAllowInBaublesSlot, + "If true the magnet can be put into the 'amulet' Baubles slot (requires Baubles to be installed)").getBoolean(magnetAllowInBaublesSlot); + magnetAllowDeactivatedInBaublesSlot = config.get(sectionMagnet.name, "magnetAllowDeactivatedInBaublesSlot", magnetAllowDeactivatedInBaublesSlot, + "If true the magnet can be put into the 'amulet' Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getBoolean(magnetAllowDeactivatedInBaublesSlot); + + magnetBaublesType = config.get(sectionMagnet.name, "magnetBaublesType", magnetBaublesType, + "The BaulesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getString(); + useCombustionGenModel = config.get(sectionAesthetic.name, "useCombustionGenModel", useCombustionGenModel, "If set to true: WIP Combustion Generator model will be used").getBoolean(useCombustionGenModel); diff --git a/src/main/java/crazypants/enderio/item/ItemMagnet.java b/src/main/java/crazypants/enderio/item/ItemMagnet.java index f6f0dead..15e48cac 100644 --- a/src/main/java/crazypants/enderio/item/ItemMagnet.java +++ b/src/main/java/crazypants/enderio/item/ItemMagnet.java @@ -173,9 +173,15 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP } @Override - @Method(modid = "Baubles") + @Method(modid = "Baubles|API") public BaubleType getBaubleType(ItemStack itemstack) { - return baubles.api.BaubleType.AMULET; + BaubleType t = null; + try { + t = BaubleType.valueOf(Config.magnetBaublesType); + } catch (Exception e) { + //NOP + } + return t != null ? t : BaubleType.AMULET; } @Override @@ -206,7 +212,7 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP @Override public boolean canEquip(ItemStack itemstack, EntityLivingBase player) { - return isActive(itemstack); + return Config.magnetAllowInBaublesSlot && (Config.magnetAllowDeactivatedInBaublesSlot || isActive(itemstack)); } @Override diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index b6b034dd..3cfd6681 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -113,7 +113,8 @@ public class KeyTracker { for (int i = 0; i < baubles.getSizeInventory(); i++) { ItemStack stack = baubles.getStackInSlot(i); if(stack != null && stack.getItem() != null && stack.getItem() == itemMagnet) { - PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.BAUBLES, i, false)); + boolean isActive = !ItemMagnet.isActive(inv[i]); + PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.BAUBLES, i, isActive)); return; } } diff --git a/src/main/java/crazypants/enderio/item/MagnetController.java b/src/main/java/crazypants/enderio/item/MagnetController.java index 1a98ce8a..f87c20b3 100644 --- a/src/main/java/crazypants/enderio/item/MagnetController.java +++ b/src/main/java/crazypants/enderio/item/MagnetController.java @@ -46,7 +46,8 @@ public class MagnetController implements IEntitySelector { private ActiveMagnet getActiveMagnet(EntityPlayer player) { ItemStack[] inv = player.inventory.mainInventory; - for(int i=0;i<9;i++) { + int maxSlot = Config.magnetAllowInMainInventory ? 4 * 9 : 9; + for (int i = 0; i < maxSlot;i++) { if(ItemMagnet.isActive(inv[i]) && ItemMagnet.hasPower(inv[i])) { return new ActiveMagnet(inv[i], i); } @@ -149,7 +150,7 @@ public class MagnetController implements IEntitySelector { if (stack == null || stack.getItem() == null || stack.getItem() != itemMagnet || ItemMagnet.isActive(stack) == isActive) { return; } - if (type == SlotType.BAUBLES) { + if (!Config.magnetAllowDeactivatedInBaublesSlot && type == SlotType.BAUBLES && !isActive) { ItemStack[] inv = player.inventory.mainInventory; for (int i = 0; i < inv.length && dropOff < 0; i++) { if (inv[i] == null) { @@ -169,8 +170,12 @@ public class MagnetController implements IEntitySelector { case ARMOR: return; case BAUBLES: - baubles.setInventorySlotContents(slot, null); - player.inventory.setInventorySlotContents(dropOff, stack); + if (dropOff < 0) { + player.inventory.setInventorySlotContents(slot, stack); + } else { + baubles.setInventorySlotContents(slot, null); + player.inventory.setInventorySlotContents(dropOff, stack); + } player.inventory.markDirty(); break; }