Fix other-language block names showing as unlocalized .name keys (#132)

Co-authored-by: Alex Vermette <vermz@hotmail.ca>

CONTRIBUTING.md

@@ -1,29 +0,0 @@
-How to submit a bug report to Forestry
-====================================
-Please make sure the bug has not already been reported by [searching the issues](https://github.com/ForestryMC/ForestryMC/issues?q=is%3Aissue).
-
-If you can, see if the bug still happens with the latest unstable build.  
-[The latest unstable builds are available here](http://jenkins.ic2.player.to/job/Forestry_Dev/)
-
-For crashes, you must post a link to the full crash report.  
-[gist.github.com](gist.github.com) or [pastebin.com](www.pastebin.com) are good places to upload them.  
-Full crash reports are located in [the minecraft data folder](http://hopper.minecraft.net/help/finding-minecraft-data-folder/), in "crash-reports".
-
-Thank you for reporting bugs!
-
-How to contribute to Forestry
-====================================
-
-### Contributor License Agreement
-
-Before pull requests can be accepted, the contributor needs to sign a contributor license agreement. (Essentially giving a license for using his code and/or media and for re-licensing it, for details read the agreement linked below.) 
-
-### How do I sign?
-
-To keep the hassle for everyone involved to a minimum, Forestry uses CLAHub to manage the agreements. To get started, <a href="https://www.clahub.com/agreements/ForestryMC/ForestryMC">sign the Contributor License Agreement</a>.
-
-### Why is this needed?
-
-Without CLAs it at some point becomes essentially impossible to change the license of a project which accepts contributions from third parties. Without an explicit agreement every contributor would still own the copyright to his code. So as long as it (or parts of it) remain in the code base, he would have to agree to every license change. If enough time has passed, there may be dozens, perhaps even hundreds of contributors involved and it will be very hard to track down each and every one of them and get them to agree on a new license.
-
-This would make it impossible to change the license to a more permissive one at a later date, so the code would be locked into CC BY-NC-ND 3.0 until it passes into the public domain about a hundred years from now. This situation is to be avoided and that’s why you are being bothered with this CLA.

src/main/java/forestry/api/apiculture/IArmorApiarist.java

@@ -25,19 +25,6 @@ public interface IArmorApiarist {
      */
     boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect);
 
-    /**
-     * Called to determine how many pieces an armor "counts for". For instance, if this returns 4, the single piece will
-     * act as full protection.
-     * 
-     * @param entity Entity being attacked
-     * @param armor  Armor item
-     * @param cause  Optional cause of attack, such as a bee effect identifier
-     * @return Amount of effective protected slots
-     */
-    default int getProtectionCount(EntityLivingBase entity, ItemStack armor, String cause) {
-        return 1;
-    }
-
     /**
      * Called when the apiarist's armor acts as protection against an attack.
      *

src/main/java/forestry/api/apiculture/IArmorApiaristMulti.java

@@ -0,0 +1,20 @@
+package forestry.api.apiculture;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+
+public interface IArmorApiaristMulti extends IArmorApiarist {
+
+    /**
+     * Called to determine how many pieces an armor "counts for". For instance, if this returns 4, the single piece will
+     * act as full protection.
+     *
+     * @param entity Entity being attacked
+     * @param armor  Armor item
+     * @param cause  Optional cause of attack, such as a bee effect identifier
+     * @return Amount of effective protected slots
+     */
+    default int getProtectionCount(EntityLivingBase entity, ItemStack armor, String cause) {
+        return 1;
+    }
+}

src/main/java/forestry/apiculture/ArmorApiaristHelper.java

@@ -10,10 +10,12 @@ package forestry.apiculture;
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import forestry.api.apiculture.IArmorApiarist;
 import forestry.api.apiculture.IArmorApiaristHelper;
+import forestry.api.apiculture.IArmorApiaristMulti;
 
 public class ArmorApiaristHelper implements IArmorApiaristHelper {
 
@@ -40,7 +42,9 @@ public class ArmorApiaristHelper implements IArmorApiaristHelper {
         for (int i = 1; i <= 4; i++) {
             ItemStack armorItem = entity.getEquipmentInSlot(i);
             if (isArmorApiarist(armorItem, entity, cause, doProtect)) {
-                count += ((IArmorApiarist) armorItem.getItem()).getProtectionCount(entity, armorItem, cause);
+                Item item = armorItem.getItem();
+                if (item instanceof IArmorApiaristMulti am) count += am.getProtectionCount(entity, armorItem, cause);
+                else count++;
             }
         }
 

src/main/java/forestry/apiculture/multiblock/AlvearyController.java

@@ -111,6 +111,14 @@ public class AlvearyController extends RectangularMultiblockControllerBase
         this.readFromNBT(data);
     }
 
+    @Override
+    public void detachBlock(IMultiblockComponent part, boolean chunkUnloading) {
+        if (!chunkUnloading) {
+            inventory.dumpInventoryIntoWorld(this.worldObj, part.getCoordinates());
+        }
+        super.detachBlock(part, chunkUnloading);
+    }
+
     @Override
     protected void onBlockAdded(IMultiblockComponent newPart) {
         if (newPart instanceof IAlvearyComponent) {
@@ -159,8 +167,6 @@ public class AlvearyController extends RectangularMultiblockControllerBase
                 activeComponents.remove(oldPart);
             }
         }
-
-        inventory.dumpInventoryIntoWorld(this.worldObj, oldPart.getCoordinates());
     }
 
     @Override

src/main/java/forestry/arboriculture/blocks/BlockSlab.java

@@ -16,8 +16,8 @@ import net.minecraft.block.material.Material;
 import net.minecraft.client.particle.EffectRenderer;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -72,7 +72,7 @@ public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyp
     @SideOnly(Side.CLIENT)
     @Override
     public IIcon getIcon(int side, int meta) {
-        return IconProviderWood.getPlankIcon(EnumWoodType.LARCH);
+        return IconProviderWood.getPlankIcon(EnumWoodType.VALUES[meta]);
     }
 
     @Override
@@ -84,7 +84,8 @@ public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyp
 
     @Override
     protected ItemStack createStackedBlock(int meta) {
-        return new ItemStack(Blocks.wooden_slab, 2, meta & 7);
+        Item item = Item.getItemFromBlock(this);
+        return item != null ? new ItemStack(item, 2, 0) : null;
     }
 
     @Override
@@ -107,6 +108,18 @@ public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyp
         return new TileWood();
     }
 
+    @Override
+    public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
+        // Special case for double slabs placed by building mods (e.g., MatterManipulator)
+        if (stack == null) return;
+        int damage = stack.getItemDamage();
+        if (damage < 0 || damage >= EnumWoodType.VALUES.length) return;
+        TileWood tile = TileWood.getWoodTile(world, x, y, z);
+        if (tile != null) {
+            tile.setWoodType(EnumWoodType.VALUES[damage]);
+        }
+    }
+
     /* PROPERTIES */
     @Override
     public final ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {

src/main/java/forestry/core/genetics/Genome.java

@@ -202,7 +202,8 @@ public abstract class Genome implements IGenome {
     private static IChromosome[] getChromosomes(NBTTagCompound genomeNBT, ISpeciesRoot speciesRoot) {
 
         NBTTagList chromosomesNBT = genomeNBT.getTagList("Chromosomes", 10);
-        IChromosome[] chromosomes = new IChromosome[speciesRoot.getDefaultTemplate().length];
+        IAllele[] defaultTemplate = speciesRoot.getDefaultTemplate();
+        IChromosome[] chromosomes = new IChromosome[defaultTemplate.length];
 
         for (int i = 0; i < chromosomesNBT.tagCount(); i++) {
             NBTTagCompound chromosomeNBT = chromosomesNBT.getCompoundTagAt(i);
@@ -213,7 +214,7 @@ public abstract class Genome implements IGenome {
                 chromosomes[chromosomeOrdinal] = chromosome;
 
                 if (Config.clearInvalidChromosomes) {
-                    IAllele template = speciesRoot.getDefaultTemplate()[chromosomeOrdinal];
+                    IAllele template = defaultTemplate[chromosomeOrdinal];
                     Class<? extends IAllele> chromosomeClass = speciesRoot.getKaryotype()[chromosomeOrdinal]
                             .getAlleleClass();
                     if (chromosome.overrideInvalidAlleles(template, chromosomeClass)) {

src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java

@@ -32,6 +32,10 @@ public class MutationConditionRequiresResource implements IMutationCondition {
         blockRequired = new ItemStack(block, 1, meta);
     }
 
+    public ItemStack getBlockRequired() {
+        return blockRequired.copy();
+    }
+
     @Override
     public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0,
             IGenome genome1, IClimateProvider climate) {

src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java

@@ -39,6 +39,10 @@ public class MutationConditionRequiresResourceOreDict implements IMutationCondit
         }
     }
 
+    public int getOreDictId() {
+        return oreDictId;
+    }
+
     @Override
     public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0,
             IGenome genome1, IClimateProvider climate) {

src/main/java/forestry/core/inventory/ItemInventory.java

@@ -87,7 +87,7 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate {
     public boolean isParentItemEquipped() {
         return switch (location.type()) {
             case HELD_BY_PLAYER, UNKNOWN -> isSameItemInventory(player.getCurrentEquippedItem(), parent);
-            case PLAYER_INVENTORY -> true;
+            case PLAYER_INVENTORY -> isSameItemInventory(player.inventory.getStackInSlot(location.slotIdx()), parent);
         };
     }
 
@@ -95,6 +95,10 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate {
         return player;
     }
 
+    public ItemLocation getLocation() {
+        return location;
+    }
+
     public boolean isParentItemInventory(ItemStack itemStack) {
         ItemStack parent = getParent();
         return isSameItemInventory(parent, itemStack);

src/main/java/forestry/core/items/ItemWithGui.java

@@ -33,7 +33,7 @@ public abstract class ItemWithGui extends ItemForestry implements IGuiHandlerIte
     }
 
     protected void openGui(EntityPlayer entityplayer) {
-        GuiHandler.openGui(entityplayer, this);
+        GuiHandler.openGui(entityplayer, this, (short) 0, entityplayer.inventory.currentItem);
     }
 
     @Override

src/main/java/forestry/mail/LetterProperties.java

@@ -25,16 +25,22 @@ import forestry.plugins.PluginMail;
 public class LetterProperties {
 
     private enum State {
+
         FRESH,
         STAMPED,
         OPENED,
-        EMPTIED
+        EMPTIED;
+
+        public static final State[] VALUES = values();
     }
 
     private enum Size {
+
         EMPTY,
         SMALL,
-        BIG
+        BIG;
+
+        public static final Size[] VALUES = values();
     }
 
     public static ItemStack createStampedLetterStack(ILetter letter) {
@@ -98,8 +104,8 @@ public class LetterProperties {
 
     @SuppressWarnings("unchecked")
     public static void getSubItems(Item item, CreativeTabs tab, @SuppressWarnings("rawtypes") List list) {
-        for (State state : State.values()) {
-            for (Size size : Size.values()) {
+        for (State state : State.VALUES) {
+            for (Size size : Size.VALUES) {
                 int meta = encodeMeta(state, size);
                 ItemStack letter = new ItemStack(item, 1, meta);
                 list.add(letter);
@@ -117,7 +123,7 @@ public class LetterProperties {
 
     private static State getState(int meta) {
         int ordinal = meta & 0x0f;
-        State[] values = State.values();
+        State[] values = State.VALUES;
         if (ordinal >= values.length) {
             ordinal = 0;
         }
@@ -126,7 +132,7 @@ public class LetterProperties {
 
     private static Size getSize(int meta) {
         int ordinal = meta >> 4;
-        Size[] values = Size.values();
+        Size[] values = Size.VALUES;
         if (ordinal >= values.length) {
             ordinal = 0;
         }

src/main/java/forestry/storage/inventory/ItemInventoryBackpackPaged.java

@@ -28,6 +28,11 @@ public class ItemInventoryBackpackPaged extends ItemInventoryBackpack implements
 
     @Override
     public void flipPage(EntityPlayer player, short page) {
-        GuiHandler.openGui(player, backpackNaturalist, page);
+        ItemLocation loc = getLocation();
+        if (loc.type() == ItemLocation.Type.PLAYER_INVENTORY) {
+            GuiHandler.openGui(player, backpackNaturalist, page, loc.slotIdx());
+        } else {
+            GuiHandler.openGui(player, backpackNaturalist, page);
+        }
     }
 }

src/main/java/forestry/storage/items/ItemBackpack.java

@@ -72,7 +72,7 @@ public class ItemBackpack extends ItemWithGui implements ActivatableFromInventor
 
     @Override
     protected void openGui(EntityPlayer entityplayer) {
-        GuiHandler.openGui(entityplayer, this, (short) type.ordinal());
+        GuiHandler.openGui(entityplayer, this, (short) type.ordinal(), entityplayer.inventory.currentItem);
     }
 
     @Override

src/main/java/forestry/storage/items/ItemBackpackNaturalist.java

@@ -34,7 +34,7 @@ public class ItemBackpackNaturalist extends ItemBackpack {
 
     @Override
     protected void openGui(EntityPlayer entityplayer) {
-        GuiHandler.openGui(entityplayer, this);
+        GuiHandler.openGui(entityplayer, this, (short) 0, entityplayer.inventory.currentItem);
     }
 
     @Override

src/main/resources/assets/forestry/lang/cs_CZ.lang

@@ -708,9 +708,11 @@ tile.candle.dyed.stump=Unlit Dyed Candle
 tile.candle.lit=Lit Candle
 tile.candle.dyed.lit=Lit Dyed Candle
 tile.stump.0=Candle Stump
-tile.for.apiculture.0=Apiary
-tile.for.apiculture.1=Apiarist's Chest
-tile.for.apiculture.2=Bee House
+tile.for.apiculture.name=Apiary
+tile.for.apiculture.0.name=Apiary
+tile.for.apicultureChest.name=Apiarist's Chest
+tile.for.apicultureChest.0.name=Apiarist's Chest
+tile.for.apiculture.2.name=Bee House
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -759,7 +761,7 @@ tile.log=Wood
 tile.planks=Wood Planks
 tile.slab=Wood Slab
 tile.fences=Fence
-tile.for.stairs=Stairs
+tile.for.stairs.name=Stairs
 wood.0=Larch
 wood.1=Teak
 wood.2=Acacia
@@ -784,7 +786,8 @@ wood.20=Pine
 wood.21=Plum
 wood.22=Maple
 wood.23=Citrus
-tile.for.arboriculture.0=Arborist's Chest
+tile.for.arboriculture.name=Arborist's Chest
+tile.for.arboriculture.0.name=Arborist's Chest
 
 ####################
 # FARMING
@@ -857,7 +860,8 @@ item.butterfly=Butterfly
 item.moth=Moth
 item.flutterlyzer=Flutterlyzer
 storage.backpack.lepidopterist=Lepidopterist's Backpack
-tile.for.lepidopterology.0=Lepidopterist's Chest
+tile.for.lepidopterology.name=Lepidopterist's Chest
+tile.for.lepidopterology.0.name=Lepidopterist's Chest
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/es_AR.lang

@@ -685,9 +685,11 @@ tile.alveary.6=Estabilizador de Enjambre
 tile.alveary.7=Tamiz para Enjambre
 tile.candle.0=Vela
 tile.stump.0=Tocуn de Vela
-tile.for.apiculture.0=Apiario
-tile.for.apiculture.1=Cofre de Apicultor
-tile.for.apiculture.2=Casa de Abejas
+tile.for.apiculture.name=Apiario
+tile.for.apiculture.0.name=Apiario
+tile.for.apicultureChest.name=Cofre de Apicultor
+tile.for.apicultureChest.0.name=Cofre de Apicultor
+tile.for.apiculture.2.name=Casa de Abejas
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -736,7 +738,7 @@ tile.log=Madera
 tile.planks=Tablones de Madera
 tile.slab=Losa de Madera
 tile.fences=Cerca
-tile.for.stairs=Escaleras
+tile.for.stairs.name=Escaleras
 wood.0=Alerce
 wood.1=Teca
 wood.2=Acacia
@@ -761,7 +763,8 @@ wood.20=Pino
 wood.21=Ciruela
 wood.22=Arce
 wood.23=Citrus
-tile.for.arboriculture.0=Cofre de Arborista
+tile.for.arboriculture.name=Cofre de Arborista
+tile.for.arboriculture.0.name=Cofre de Arborista
 
 ####################
 # FARMING
@@ -834,7 +837,8 @@ item.butterfly=Mariposa
 item.moth=Polilla
 item.flutterlyzer=Mariposanalizador
 storage.backpack.lepidopterist=Mochila de Lepidopterуlogo
-tile.for.lepidopterology.0=Cofre de Lepidopterуlogo
+tile.for.lepidopterology.name=Cofre de Lepidopterуlogo
+tile.for.lepidopterology.0.name=Cofre de Lepidopterуlogo
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/es_ES.lang

@@ -692,9 +692,11 @@ tile.alveary.6=Estabilizador de Enjambre
 tile.alveary.7=Tamiz para Enjambre
 tile.candle.0=Vela
 tile.stump.0=Tocуn de Vela
-tile.for.apiculture.0=Apiario
-tile.for.apiculture.1=Cofre de Apicultor
-tile.for.apiculture.2=Casa de Abejas
+tile.for.apiculture.name=Apiario
+tile.for.apiculture.0.name=Apiario
+tile.for.apicultureChest.name=Cofre de Apicultor
+tile.for.apicultureChest.0.name=Cofre de Apicultor
+tile.for.apiculture.2.name=Casa de Abejas
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -743,7 +745,7 @@ tile.log=Madera
 tile.planks=Tablones de Madera
 tile.slab=Losa de Madera
 tile.fences=Cerca
-tile.for.stairs=Escaleras
+tile.for.stairs.name=Escaleras
 wood.0=Alerce
 wood.1=Teca
 wood.2=Acacia
@@ -768,7 +770,8 @@ wood.20=Pino
 wood.21=Ciruela
 wood.22=Arce
 wood.23=Citrus
-tile.for.arboriculture.0=Cofre de Arborista
+tile.for.arboriculture.name=Cofre de Arborista
+tile.for.arboriculture.0.name=Cofre de Arborista
 
 ####################
 # FARMING
@@ -841,7 +844,8 @@ item.butterfly=Mariposa
 item.moth=Polilla
 item.flutterlyzer=Mariposanalizador
 storage.backpack.lepidopterist=Mochila de Lepidopterуlogo
-tile.for.lepidopterology.0=Cofre de Lepidopterуlogo
+tile.for.lepidopterology.name=Cofre de Lepidopterуlogo
+tile.for.lepidopterology.0.name=Cofre de Lepidopterуlogo
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/es_MX.lang

@@ -685,9 +685,11 @@ tile.alveary.6=Estabilizador de Enjambre
 tile.alveary.7=Tamiz para Enjambre
 tile.candle.0=Vela
 tile.stump.0=Tocуn de Vela
-tile.for.apiculture.0=Apiario
-tile.for.apiculture.1=Cofre de Apicultor
-tile.for.apiculture.2=Casa de Abejas
+tile.for.apiculture.name=Apiario
+tile.for.apiculture.0.name=Apiario
+tile.for.apicultureChest.name=Cofre de Apicultor
+tile.for.apicultureChest.0.name=Cofre de Apicultor
+tile.for.apiculture.2.name=Casa de Abejas
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -736,7 +738,7 @@ tile.log=Madera
 tile.planks=Tablones de Madera
 tile.slab=Losa de Madera
 tile.fences=Cerca
-tile.for.stairs=Escaleras
+tile.for.stairs.name=Escaleras
 wood.0=Alerce
 wood.1=Teca
 wood.2=Acacia
@@ -761,7 +763,8 @@ wood.20=Pino
 wood.21=Ciruela
 wood.22=Arce
 wood.23=Citrus
-tile.for.arboriculture.0=Cofre de Arborista
+tile.for.arboriculture.name=Cofre de Arborista
+tile.for.arboriculture.0.name=Cofre de Arborista
 
 ####################
 # FARMING
@@ -834,7 +837,8 @@ item.butterfly=Mariposa
 item.moth=Polilla
 item.flutterlyzer=Mariposanalizador
 storage.backpack.lepidopterist=Mochila de Lepidopterуlogo
-tile.for.lepidopterology.0=Cofre de Lepidopterуlogo
+tile.for.lepidopterology.name=Cofre de Lepidopterуlogo
+tile.for.lepidopterology.0.name=Cofre de Lepidopterуlogo
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/es_UY.lang

@@ -685,9 +685,11 @@ tile.alveary.6=Estabilizador de Enjambre
 tile.alveary.7=Tamiz para Enjambre
 tile.candle.0=Vela
 tile.stump.0=Tocуn de Vela
-tile.for.apiculture.0=Apiario
-tile.for.apiculture.1=Cofre de Apicultor
-tile.for.apiculture.2=Casa de Abejas
+tile.for.apiculture.name=Apiario
+tile.for.apiculture.0.name=Apiario
+tile.for.apicultureChest.name=Cofre de Apicultor
+tile.for.apicultureChest.0.name=Cofre de Apicultor
+tile.for.apiculture.2.name=Casa de Abejas
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -736,7 +738,7 @@ tile.log=Madera
 tile.planks=Tablones de Madera
 tile.slab=Losa de Madera
 tile.fences=Cerca
-tile.for.stairs=Escaleras
+tile.for.stairs.name=Escaleras
 wood.0=Alerce
 wood.1=Teca
 wood.2=Acacia
@@ -761,7 +763,8 @@ wood.20=Pino
 wood.21=Ciruela
 wood.22=Arce
 wood.23=Citrus
-tile.for.arboriculture.0=Cofre de Arborista
+tile.for.arboriculture.name=Cofre de Arborista
+tile.for.arboriculture.0.name=Cofre de Arborista
 
 ####################
 # FARMING
@@ -834,7 +837,8 @@ item.butterfly=Mariposa
 item.moth=Polilla
 item.flutterlyzer=Mariposanalizador
 storage.backpack.lepidopterist=Mochila de Lepidopterуlogo
-tile.for.lepidopterology.0=Cofre de Lepidopterуlogo
+tile.for.lepidopterology.name=Cofre de Lepidopterуlogo
+tile.for.lepidopterology.0.name=Cofre de Lepidopterуlogo
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/es_VE.lang

@@ -685,9 +685,11 @@ tile.alveary.6=Estabilizador de Enjambre
 tile.alveary.7=Tamiz para Enjambre
 tile.candle.0=Vela
 tile.stump.0=Tocуn de Vela
-tile.for.apiculture.0=Apiario
-tile.for.apiculture.1=Cofre de Apicultor
-tile.for.apiculture.2=Casa de Abejas
+tile.for.apiculture.name=Apiario
+tile.for.apiculture.0.name=Apiario
+tile.for.apicultureChest.name=Cofre de Apicultor
+tile.for.apicultureChest.0.name=Cofre de Apicultor
+tile.for.apiculture.2.name=Casa de Abejas
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -736,7 +738,7 @@ tile.log=Madera
 tile.planks=Tablones de Madera
 tile.slab=Losa de Madera
 tile.fences=Cerca
-tile.for.stairs=Escaleras
+tile.for.stairs.name=Escaleras
 wood.0=Alerce
 wood.1=Teca
 wood.2=Acacia
@@ -761,7 +763,8 @@ wood.20=Pino
 wood.21=Ciruela
 wood.22=Arce
 wood.23=Citrus
-tile.for.arboriculture.0=Cofre de Arborista
+tile.for.arboriculture.name=Cofre de Arborista
+tile.for.arboriculture.0.name=Cofre de Arborista
 
 ####################
 # FARMING
@@ -834,7 +837,8 @@ item.butterfly=Mariposa
 item.moth=Polilla
 item.flutterlyzer=Mariposanalizador
 storage.backpack.lepidopterist=Mochila de Lepidopterуlogo
-tile.for.lepidopterology.0=Cofre de Lepidopterуlogo
+tile.for.lepidopterology.name=Cofre de Lepidopterуlogo
+tile.for.lepidopterology.0.name=Cofre de Lepidopterуlogo
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/et_EE.lang

@@ -699,9 +699,11 @@ tile.candle.dyed.stump=Unlit Dyed Candle
 tile.candle.lit=Lit Candle
 tile.candle.dyed.lit=Lit Dyed Candle
 tile.stump.0=Candle Stump
-tile.for.apiculture.0=Apiary
-tile.for.apiculture.1=Apiarist's Chest
-tile.for.apiculture.2=Bee House
+tile.for.apiculture.name=Apiary
+tile.for.apiculture.0.name=Apiary
+tile.for.apicultureChest.name=Apiarist's Chest
+tile.for.apicultureChest.0.name=Apiarist's Chest
+tile.for.apiculture.2.name=Bee House
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -750,7 +752,7 @@ tile.log=Wood
 tile.planks=Wood Planks
 tile.slab=Wood Slab
 tile.fences=Fence
-tile.for.stairs=Stairs
+tile.for.stairs.name=Stairs
 wood.0=Larch
 wood.1=Teak
 wood.2=Acacia
@@ -775,7 +777,8 @@ wood.20=Pine
 wood.21=Plum
 wood.22=Maple
 wood.23=Citrus
-tile.for.arboriculture.0=Arborist's Chest
+tile.for.arboriculture.name=Arborist's Chest
+tile.for.arboriculture.0.name=Arborist's Chest
 
 ####################
 # FARMING
@@ -848,7 +851,8 @@ item.butterfly=Butterfly
 item.moth=Moth
 item.flutterlyzer=Flutterlyzer
 storage.backpack.lepidopterist=Lepidopterist's Backpack
-tile.for.lepidopterology.0=Lepidopterist's Chest
+tile.for.lepidopterology.name=Lepidopterist's Chest
+tile.for.lepidopterology.0.name=Lepidopterist's Chest
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/fi_FI.lang

@@ -614,9 +614,11 @@ tile.candle.dyed.stump=Unlit Dyed Candle
 tile.candle.lit=Lit Candle
 tile.candle.dyed.lit=Lit Dyed Candle
 tile.stump.0=Candle Stump
-tile.for.apiculture.0=Apiary
-tile.for.apiculture.1=Apiarist's Chest
-tile.for.apiculture.2=Bee House
+tile.for.apiculture.name=Apiary
+tile.for.apiculture.0.name=Apiary
+tile.for.apicultureChest.name=Apiarist's Chest
+tile.for.apicultureChest.0.name=Apiarist's Chest
+tile.for.apiculture.2.name=Bee House
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -665,7 +667,7 @@ tile.log=Wood
 tile.planks=Wood Planks
 tile.slab=Wood Slab
 tile.fences=Fence
-tile.for.stairs=Stairs
+tile.for.stairs.name=Stairs
 wood.0=Larch
 wood.1=Teak
 wood.2=Acacia
@@ -690,7 +692,8 @@ wood.20=Pine
 wood.21=Plum
 wood.22=Maple
 wood.23=Citrus
-tile.for.arboriculture.0=Arborist's Chest
+tile.for.arboriculture.name=Arborist's Chest
+tile.for.arboriculture.0.name=Arborist's Chest
 
 ####################
 # FARMING
@@ -763,7 +766,8 @@ item.butterfly=Butterfly
 item.moth=Moth
 item.flutterlyzer=Flutterlyzer
 storage.backpack.lepidopterist=Lepidopterist's Backpack
-tile.for.lepidopterology.0=Lepidopterist's Chest
+tile.for.lepidopterology.name=Lepidopterist's Chest
+tile.for.lepidopterology.0.name=Lepidopterist's Chest
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/he_IL.lang

@@ -690,9 +690,11 @@ tile.candle.dyed.stump=Unlit Dyed Candle
 tile.candle.lit=Lit Candle
 tile.candle.dyed.lit=Lit Dyed Candle
 tile.stump.0=Candle Stump
-tile.for.apiculture.0=Apiary
-tile.for.apiculture.1=Apiarist's Chest
-tile.for.apiculture.2=Bee House
+tile.for.apiculture.name=Apiary
+tile.for.apiculture.0.name=Apiary
+tile.for.apicultureChest.name=Apiarist's Chest
+tile.for.apicultureChest.0.name=Apiarist's Chest
+tile.for.apiculture.2.name=Bee House
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -741,7 +743,7 @@ tile.log=Wood
 tile.planks=Wood Planks
 tile.slab=Wood Slab
 tile.fences=Fence
-tile.for.stairs=Stairs
+tile.for.stairs.name=Stairs
 wood.0=Larch
 wood.1=Teak
 wood.2=Acacia
@@ -766,7 +768,8 @@ wood.20=Pine
 wood.21=Plum
 wood.22=Maple
 wood.23=Citrus
-tile.for.arboriculture.0=Arborist's Chest
+tile.for.arboriculture.name=Arborist's Chest
+tile.for.arboriculture.0.name=Arborist's Chest
 
 ####################
 # FARMING
@@ -839,7 +842,8 @@ item.butterfly=Butterfly
 item.moth=Moth
 item.flutterlyzer=Flutterlyzer
 storage.backpack.lepidopterist=Lepidopterist's Backpack
-tile.for.lepidopterology.0=Lepidopterist's Chest
+tile.for.lepidopterology.name=Lepidopterist's Chest
+tile.for.lepidopterology.0.name=Lepidopterist's Chest
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/it_IT.lang

@@ -489,10 +489,10 @@ tile.for.log1=Legna
 tile.for.log2=Legna
 tile.for.log3=Legna
 tile.for.log4=Legna
-tile.for.planks=Assi di legno
+tile.for.planks.name=Assi di legno
 tile.for.slabs1=Lastra di legno
 tile.for.slabs2=Lastra di legno
-tile.for.fences=Staccionata
+tile.for.fences.name=Staccionata
 tile.harvester.0=Taglialegna
 tile.harvester.1=Combinatore
 tile.harvester.2=Raccogli-albero della gomma
@@ -741,7 +741,7 @@ tile.log=Wood
 tile.planks=Wood Planks
 tile.slab=Wood Slab
 tile.fences=Fence
-tile.for.stairs=Stairs
+tile.for.stairs.name=Stairs
 wood.0=Larch
 wood.1=Teak
 wood.2=Acacia
@@ -766,7 +766,8 @@ wood.20=Pine
 wood.21=Plum
 wood.22=Maple
 wood.23=Citrus
-tile.for.arboriculture.0=Arborist's Chest
+tile.for.arboriculture.name=Arborist's Chest
+tile.for.arboriculture.0.name=Arborist's Chest
 
 ####################
 # FARMING
@@ -836,7 +837,8 @@ item.butterfly=Butterfly
 item.moth=Moth
 item.flutterlyzer=Flutterlyzer
 storage.backpack.lepidopterist=Lepidopterist's Backpack
-tile.for.lepidopterology.0=Lepidopterist's Chest
+tile.for.lepidopterology.name=Lepidopterist's Chest
+tile.for.lepidopterology.0.name=Lepidopterist's Chest
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/ja_JP.lang

@@ -501,10 +501,10 @@ tile.for.log1=原木
 tile.for.log2=原木
 tile.for.log3=原木
 tile.for.log4=原木
-tile.for.planks=木材
+tile.for.planks.name=木材
 tile.for.slabs1=木材ハーフブロック
 tile.for.slabs2=木材ハーフブロック
-tile.for.fences=フェンス
+tile.for.fences.name=フェンス
 tile.harvester.0=伐採機
 tile.harvester.1=収穫機
 tile.harvester.2=ゴムの木収穫機
@@ -757,9 +757,11 @@ tile.candle.dyed.stump=Unlit Dyed Candle
 tile.candle.lit=Lit Candle
 tile.candle.dyed.lit=Lit Dyed Candle
 tile.stump.0=Candle Stump
-tile.for.apiculture.0=Apiary
-tile.for.apiculture.1=Apiarist's Chest
-tile.for.apiculture.2=Bee House
+tile.for.apiculture.name=養蜂箱
+tile.for.apiculture.0.name=養蜂箱
+tile.for.apicultureChest.name=養蜂家のチェスト
+tile.for.apicultureChest.0.name=養蜂家のチェスト
+tile.for.apiculture.2.name=ビーハウス
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -808,7 +810,7 @@ tile.log=Wood
 tile.planks=Wood Planks
 tile.slab=Wood Slab
 tile.fences=Fence
-tile.for.stairs=Stairs
+tile.for.stairs.name=階段
 wood.0=Larch
 wood.1=Teak
 wood.2=Acacia
@@ -833,7 +835,8 @@ wood.20=Pine
 wood.21=Plum
 wood.22=Maple
 wood.23=Citrus
-tile.for.arboriculture.0=Arborist's Chest
+tile.for.arboriculture.name=樹医のチェスト
+tile.for.arboriculture.0.name=樹医のチェスト
 
 ####################
 # FARMING
@@ -906,7 +909,8 @@ item.butterfly=Butterfly
 item.moth=Moth
 item.flutterlyzer=Flutterlyzer
 storage.backpack.lepidopterist=Lepidopterist's Backpack
-tile.for.lepidopterology.0=Lepidopterist's Chest
+tile.for.lepidopterology.name=鱗翅類学者のチェスト
+tile.for.lepidopterology.0.name=鱗翅類学者のチェスト
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/nl_NL.lang

@@ -709,9 +709,11 @@ tile.candle.dyed.stump=Unlit Dyed Candle
 tile.candle.lit=Lit Candle
 tile.candle.dyed.lit=Lit Dyed Candle
 tile.stump.0=Candle Stump
-tile.for.apiculture.0=Apiary
-tile.for.apiculture.1=Apiarist's Chest
-tile.for.apiculture.2=Bee House
+tile.for.apiculture.name=Apiary
+tile.for.apiculture.0.name=Apiary
+tile.for.apicultureChest.name=Apiarist's Chest
+tile.for.apicultureChest.0.name=Apiarist's Chest
+tile.for.apiculture.2.name=Bee House
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -760,7 +762,7 @@ tile.log=Hout
 tile.planks=houten planken
 tile.slab=houten plaat
 tile.fences=houten hek
-tile.for.stairs=houten treden
+tile.for.stairs.name=houten treden
 wood.0=Lariks
 wood.1=Teak
 wood.2=Acacia
@@ -857,7 +859,8 @@ item.butterfly=Butterfly
 item.moth=Moth
 item.flutterlyzer=Flutterlyzer
 storage.backpack.lepidopterist=Lepidopterist's Backpack
-tile.for.lepidopterology.0=Lepidopterist's Chest
+tile.for.lepidopterology.name=Lepidopterist's Chest
+tile.for.lepidopterology.0.name=Lepidopterist's Chest
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/no_NO.lang

@@ -710,9 +710,11 @@ tile.candle.dyed.stump=Unlit Dyed Candle
 tile.candle.lit=Lit Candle
 tile.candle.dyed.lit=Lit Dyed Candle
 tile.stump.0=Candle Stump
-tile.for.apiculture.0=Apiary
-tile.for.apiculture.1=Apiarist's Chest
-tile.for.apiculture.2=Bee House
+tile.for.apiculture.name=Apiary
+tile.for.apiculture.0.name=Apiary
+tile.for.apicultureChest.name=Apiarist's Chest
+tile.for.apicultureChest.0.name=Apiarist's Chest
+tile.for.apiculture.2.name=Bee House
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -761,7 +763,7 @@ tile.log=Wood
 tile.planks=Wood Planks
 tile.slab=Wood Slab
 tile.fences=Fence
-tile.for.stairs=Stairs
+tile.for.stairs.name=Stairs
 wood.0=Larch
 wood.1=Teak
 wood.2=Acacia
@@ -786,7 +788,8 @@ wood.20=Pine
 wood.21=Plum
 wood.22=Maple
 wood.23=Citrus
-tile.for.arboriculture.0=Arborist's Chest
+tile.for.arboriculture.name=Arborist's Chest
+tile.for.arboriculture.0.name=Arborist's Chest
 
 ####################
 # FARMING
@@ -859,7 +862,8 @@ item.butterfly=Butterfly
 item.moth=Moth
 item.flutterlyzer=Flutterlyzer
 storage.backpack.lepidopterist=Lepidopterist's Backpack
-tile.for.lepidopterology.0=Lepidopterist's Chest
+tile.for.lepidopterology.name=Lepidopterist's Chest
+tile.for.lepidopterology.0.name=Lepidopterist's Chest
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/pl_PL.lang

@@ -695,9 +695,11 @@ tile.alveary.6=Stabilizator Wielkiego Ula
 tile.alveary.7=Sito Wielkiego Ula
 tile.candle.0=świeca
 tile.stump.0=Postawa świecy
-tile.for.apiculture.0=Ul
-tile.for.apiculture.1=Skrzynia pszczelarza
-tile.for.apiculture.2=Dom pszczół
+tile.for.apiculture.name=Ul
+tile.for.apiculture.0.name=Ul
+tile.for.apicultureChest.name=Skrzynia pszczelarza
+tile.for.apicultureChest.0.name=Skrzynia pszczelarza
+tile.for.apiculture.2.name=Dom pszczół
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -746,7 +748,7 @@ tile.log=Drewno
 tile.planks=Drewniane Deski
 tile.slab=Drewniana Półpłytka
 tile.fences=Płotek
-tile.for.stairs=Schody
+tile.for.stairs.name=Schody
 wood.0=Modrzew
 wood.1=Tek
 wood.2=Akacja
@@ -771,7 +773,8 @@ wood.20=Sosna
 wood.21=Śliwka
 wood.22=Klon
 wood.23=Cytrus
-tile.for.arboriculture.0=Skrzynia Drzewiarza
+tile.for.arboriculture.name=Skrzynia Drzewiarza
+tile.for.arboriculture.0.name=Skrzynia Drzewiarza
 
 ####################
 # FARMING
@@ -844,7 +847,8 @@ item.butterfly=Motyl
 item.moth=Ćma
 item.flutterlyzer=Motyloanalizer
 storage.backpack.lepidopterist=Plecak Entomolog'a
-tile.for.lepidopterology.0=Skrzynia Entomolog'a
+tile.for.lepidopterology.name=Skrzynia Entomolog'a
+tile.for.lepidopterology.0.name=Skrzynia Entomolog'a
 
 ####################
 # MAIL

src/main/resources/assets/forestry/lang/pt_PT.lang

@@ -679,9 +679,11 @@ tile.alveary.6=Estabilizador de Colmeia
 tile.alveary.7=Peneira para Colmeia
 tile.candle.0=Vela
 tile.stump.0=Cepo de Vela
-tile.for.apiculture.0=Apiбrio
-tile.for.apiculture.1=Baъ de Apicultor
-tile.for.apiculture.2=Ninho para Abelhas
+tile.for.apiculture.name=Apiбrio
+tile.for.apiculture.0.name=Apiбrio
+tile.for.apicultureChest.name=Baъ de Apicultor
+tile.for.apicultureChest.0.name=Baъ de Apicultor
+tile.for.apiculture.2.name=Ninho para Abelhas
 item.for.beeQueenGE.name=Unknown Queen
 
 ####################
@@ -730,7 +732,7 @@ tile.log=Wood
 tile.planks=Tбbuas de Madeira
 tile.slab=Degrau de Madeira
 tile.fences=Cerca
-tile.for.stairs=Escadas
+tile.for.stairs.name=Escadas
 wood.0=Lariзo
 wood.1=Teca
 wood.2=Acбcia
@@ -827,7 +829,8 @@ item.butterfly=Borboleta
 item.moth=Mariposa
 item.flutterlyzer=Borboletizador
 storage.backpack.lepidopterist=Mala de Lepidopterologista
-tile.for.lepidopterology.0=Baъ de Lepidopterologista
+tile.for.lepidopterology.name=Baъ de Lepidopterologista
+tile.for.lepidopterology.0.name=Baъ de Lepidopterologista
 
 ####################
 # MAIL