Fix multiblock components to drop inventory contents when broken (#93)

.gitignore

@@ -30,3 +30,4 @@ src/main/resources/mixins.*.json
 *.bat
 *.DS_Store
 !gradlew.bat
+layout.json

dependencies.gradle

@@ -2,10 +2,10 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta27:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.0-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.0:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta40:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.38-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly('curse.maven:craftguide-75557:2459320')
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = Forestry
 modGroup = forestry
 
 # Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+# When false, com.github.GTNewHorizons is used.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
 }
 
 

src/main/java/forestry/api/core/IClimateControlled.java

@@ -12,11 +12,15 @@ public interface IClimateControlled {
 
     /**
      * Change the temperature, but not lower than boundaryDown or higher than boundaryUp.
+     *
+     * When used in an alveary the change applies a 20x stronger effect
      */
     void addTemperatureChange(float change, float boundaryDown, float boundaryUp);
 
     /**
      * Change the humidity, but not lower than boundaryDown or higher than boundaryUp.
+     *
+     * When used in an alveary the change applies a 20x stronger effect
      */
     void addHumidityChange(float change, float boundaryDown, float boundaryUp);
 }

src/main/java/forestry/api/multiblock/IAlvearyComponent.java

@@ -49,6 +49,14 @@ public interface IAlvearyComponent<T extends IMultiblockLogicAlveary> extends IM
          * @param alveary   the climate controlled alveary
          */
         void changeClimate(int tickCount, IClimateControlled alveary);
+
+        /**
+         * Get the priority of this climatiser. Called when alveary is constructed.
+         * {@link #changeClimate(int, IClimateControlled)} are run in descending priority.
+         */
+        default int getPriority() {
+            return 0;
+        }
     }
 
     /**

src/main/java/forestry/api/multiblock/IMultiblockComponent.java

@@ -9,6 +9,8 @@ import net.minecraft.util.ChunkCoordinates;
 
 import com.mojang.authlib.GameProfile;
 
+import forestry.core.inventory.IInventoryAdapter;
+
 /**
  * Basic interface for a multiblock machine component. Implemented by TileEntities.
  */
@@ -45,4 +47,15 @@ public interface IMultiblockComponent {
      * Called when the machine is broken for game reasons, e.g. a player removed a block or an explosion occurred.
      */
     void onMachineBroken();
+
+    /**
+     * A component with a separate inventory, like the Alveary Swarmer or Alveary Sieve.
+     */
+    interface HasInventory {
+
+        /**
+         * Called when this part is destroyed to drop its contents.
+         */
+        IInventoryAdapter getInternalInventory();
+    }
 }

src/main/java/forestry/apiculture/items/ItemHabitatLocator.java

@@ -71,9 +71,8 @@ public class ItemHabitatLocator extends ItemWithGui {
     public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) {
         BiomeGenBase currentBiome = player.worldObj.getBiomeGenForCoords((int) player.posX, (int) player.posZ);
 
-        float temperatureValue = currentBiome
-                .getFloatTemperature((int) player.posX, (int) player.posY, (int) player.posZ);
-        EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue);
+        EnumTemperature temperature = EnumTemperature
+                .getFromBiome(currentBiome, (int) player.posX, (int) player.posY, (int) player.posZ);
         EnumHumidity humidity = EnumHumidity.getFromValue(currentBiome.rainfall);
 
         list.add(StringUtil.localize("gui.currentBiome") + ": " + currentBiome.biomeName);

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

@@ -9,8 +9,10 @@
 package forestry.apiculture.multiblock;
 
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.TreeSet;
 
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
@@ -59,7 +61,9 @@ public class AlvearyController extends RectangularMultiblockControllerBase
     // PARTS
     private final Set<IBeeModifier> beeModifiers = new HashSet<>();
     private final Set<IBeeListener> beeListeners = new HashSet<>();
-    private final Set<IAlvearyComponent.Climatiser> climatisers = new HashSet<>();
+    private final Set<IAlvearyComponent.Climatiser> climatisers = new TreeSet<>(
+            Comparator.comparingInt(IAlvearyComponent.Climatiser::getPriority).thenComparingInt(Object::hashCode)
+                    .reversed());
     private final Set<IAlvearyComponent.Active> activeComponents = new HashSet<>();
 
     // CLIENT
@@ -233,26 +237,24 @@ public class AlvearyController extends RectangularMultiblockControllerBase
             beekeepingLogic.doWork();
         }
 
+        tempChange = 0;
+        humidChange = 0;
         for (IAlvearyComponent.Climatiser climatiser : climatisers) {
             climatiser.changeClimate(tickCount, this);
         }
 
-        tempChange = equalizeChange(tempChange);
-        humidChange = equalizeChange(humidChange);
-
         return canWork;
     }
 
-    private static float equalizeChange(float change) {
-        if (change == 0) {
-            return 0;
+    private float applyChange(float base, float currentChange, float extraChange, float boundaryDown,
+            float boundaryUp) {
+        float boundedNewChange = Math.max(boundaryDown, Math.min(base + currentChange + (extraChange * 20), boundaryUp))
+                - base;
+        if (extraChange > 0) {
+            return Math.max(currentChange, boundedNewChange);
+        } else {
+            return Math.min(currentChange, boundedNewChange);
         }
-
-        change *= 0.95f;
-        if (change <= 0.001f && change >= -0.001f) {
-            change = 0;
-        }
-        return change;
     }
 
     @Override
@@ -410,19 +412,13 @@ public class AlvearyController extends RectangularMultiblockControllerBase
         ChunkCoordinates coordinates = getCoordinates();
 
         float temperature = getBiome().getFloatTemperature(coordinates.posX, coordinates.posY, coordinates.posZ);
-
-        tempChange += change;
-        tempChange = Math.max(boundaryDown - temperature, tempChange);
-        tempChange = Math.min(boundaryUp - temperature, tempChange);
+        tempChange = applyChange(temperature, tempChange, change, boundaryDown, boundaryUp);
     }
 
     @Override
     public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
         float humidity = getBiome().rainfall;
-
-        humidChange += change;
-        humidChange = Math.max(boundaryDown - humidity, humidChange);
-        humidChange = Math.min(boundaryUp - humidity, humidChange);
+        humidChange = applyChange(humidity, humidChange, change, boundaryDown, boundaryUp);
     }
 
     /* GUI */

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

@@ -19,6 +19,7 @@ import net.minecraftforge.fluids.IFluidHandler;
 
 import forestry.api.core.IClimateControlled;
 import forestry.api.multiblock.IAlvearyComponent;
+import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.blocks.BlockAlveary;
 import forestry.apiculture.gui.ContainerAlvearyHygroregulator;
 import forestry.apiculture.gui.GuiAlvearyHygroregulator;
@@ -31,8 +32,8 @@ import forestry.core.fluids.tanks.FilteredTank;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.tiles.ILiquidTankTile;
 
-public class TileAlvearyHygroregulator extends TileAlveary
-        implements IInventory, ILiquidTankTile, IFluidHandler, IAlvearyComponent.Climatiser {
+public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankTile, IFluidHandler,
+        IAlvearyComponent.Climatiser, IMultiblockComponent.HasInventory {
 
     private final HygroregulatorRecipe[] recipes;
 
@@ -56,9 +57,9 @@ public class TileAlvearyHygroregulator extends TileAlveary
         this.tankManager = new TankManager(this, liquidTank);
 
         this.recipes = new HygroregulatorRecipe[] {
-                new HygroregulatorRecipe(new FluidStack(water, 1), 1, +0.01f, -0.0005f),
-                new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.0005f),
-                new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.001f) };
+                new HygroregulatorRecipe(new FluidStack(water, 1), 1, +0.01f, -0.005f),
+                new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.005f),
+                new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.01f) };
     }
 
     @Override
@@ -111,6 +112,11 @@ public class TileAlvearyHygroregulator extends TileAlveary
         }
     }
 
+    @Override
+    public int getPriority() {
+        return 100;
+    }
+
     /* SAVING & LOADING */
     @Override
     public void readFromNBT(NBTTagCompound nbttagcompound) {

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

@@ -18,6 +18,7 @@ import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.ISpeciesRoot;
 import forestry.api.multiblock.IAlvearyComponent;
+import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.blocks.BlockAlveary;
 import forestry.apiculture.gui.ContainerAlvearySieve;
 import forestry.apiculture.gui.GuiAlvearySieve;
@@ -25,7 +26,8 @@ import forestry.apiculture.inventory.InventoryAlvearySieve;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.inventory.watchers.ISlotPickupWatcher;
 
-public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.BeeListener {
+public class TileAlvearySieve extends TileAlveary
+        implements IAlvearyComponent.BeeListener, IMultiblockComponent.HasInventory {
 
     private final IBeeListener beeListener;
     private final InventoryAlvearySieve inventory;

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

@@ -22,6 +22,7 @@ import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.apiculture.IBee;
 import forestry.api.multiblock.IAlvearyComponent;
+import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.blocks.BlockAlveary;
 import forestry.apiculture.gui.ContainerAlvearySwarmer;
 import forestry.apiculture.gui.GuiAlvearySwarmer;
@@ -37,7 +38,8 @@ import forestry.core.proxy.Proxies;
 import forestry.core.tiles.IActivatable;
 import forestry.core.utils.ItemStackUtil;
 
-public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, IActivatable, IAlvearyComponent.Active {
+public class TileAlvearySwarmer extends TileAlveary
+        implements ISidedInventory, IActivatable, IAlvearyComponent.Active, IMultiblockComponent.HasInventory {
 
     private final InventorySwarmer inventory;
     private final Deque<ItemStack> pendingSpawns = new ArrayDeque<>();

src/main/java/forestry/core/blocks/BlockStructure.java

@@ -116,6 +116,12 @@ public abstract class BlockStructure extends BlockForestry {
                     InventoryUtil.dropSockets((ISocketable) tile, world, x, y, z);
                 }
             }
+
+            if (tile instanceof IMultiblockComponent.HasInventory) {
+                IMultiblockComponent.HasInventory hasInventory = (IMultiblockComponent.HasInventory) tile;
+
+                InventoryUtil.dropInventory(hasInventory.getInternalInventory(), world, x, y, z);
+            }
         }
         super.breakBlock(world, x, y, z, block, meta);
     }

src/main/java/forestry/core/tiles/EscritoireTextSource.java

@@ -37,7 +37,8 @@ public class EscritoireTextSource {
         EnumSet<Notes> multipleTranslationNoteLevels = EnumSet
                 .of(Notes.level1, Notes.level2, Notes.level3, Notes.level4, Notes.success, Notes.failure);
         for (Notes notesLevel : multipleTranslationNoteLevels) {
-            int levelCount = Integer.valueOf(StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count"));
+            int levelCount = Integer.valueOf(
+                    StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count").replaceAll("§\\d", ""));
             for (int i = 1; i <= levelCount; i++) {
                 String note = StringUtil.localize("gui.escritoire.notes." + notesLevel + '.' + i);
                 researchNotes.put(notesLevel, note);

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

@@ -171,6 +171,7 @@ for.gui.imprinter.name=GENOME IMPRINTER
 for.gui.inactive=Inactive
 for.gui.life=Life
 for.gui.lifespan=Lifespan
+for.gui.none=None
 for.gui.normal=Normal
 for.gui.jubilance=Jubilance: %s
 
@@ -423,6 +424,122 @@ for.hints.usesofash.tag=Use your ash!
 
 for.item.crated.grammar=Crated %s
 for.item.crated.unknown=Crate with unknown content
+item.cratedAcaciaSapling.name=Crated Acacia Sapling
+item.cratedAcaciaWood.name=Crated Acacia Wood
+item.cratedApples.name=Crated Apple
+item.cratedAsh.name=Crated Ash
+item.cratedBeeswax.name=Crated Beeswax
+item.cratedBirchSapling.name=Crated Birch Sapling
+item.cratedBirchWood.name=Crated Birch Wood
+item.cratedBogearth.name=Crated Bog Earth
+item.cratedBrass.name=Crated Bronze Ingot
+item.cratedBrick.name=Crated Bricks
+item.cratedCacti.name=Crated Cactus
+item.cratedCarrots.name=Crated Carrot
+item.cratedCharcoal.name=Crated Charcoal
+item.cratedCherry.name=Crated Cherry
+item.cratedChestnut.name=Crated Chestnut
+item.cratedClay.name=Crated Clay
+item.cratedCoal.name=Crated Coal
+item.cratedCobblestone.name=Crated Cobblestone
+item.cratedCocoaComb.name=Crated Cocoa Comb
+item.cratedCookies.name=Crated Cookie
+item.cratedCrystallinePollen.name=Crated Crystalline Pollen Cluster
+item.cratedDarkOakSapling.name=Crated Dark Oak Sapling
+item.cratedDarkOakWood.name=Crated Dark Oak Wood
+item.cratedDates.name=Crated Date
+item.cratedDirt.name=Crated Dirt
+item.cratedDrippingCombs.name=Crated Dripping Comb
+item.cratedFertilizer.name=Crated Fertilizer
+item.cratedFrozenCombs.name=Crated Frozen Comb
+item.cratedGlowstone.name=Crated Glowstone Dust
+item.cratedGravel.name=Crated Gravel
+item.cratedHoneycombs.name=Crated Honey Comb
+item.cratedHoneydew.name=Crated Honeydew
+item.cratedHumus.name=Crated Humus
+item.cratedJungleSapling.name=Crated Jungle Sapling
+item.cratedJungleWood.name=Crated Jungle Wood
+item.cratedLapis.name=Crated Lapis Lazuli
+item.cratedLemon.name=Crated Lemon
+item.cratedMellowCombs.name=Crated Mellow Comb
+item.cratedMossyCombs.name=Crated Mossy Comb
+item.cratedMulch.name=Crated Mulch
+item.cratedMycelium.name=Crated Mycelium
+item.cratedMysteriousCombs.name=Crated Mysterious Comb
+item.cratedNaturaBarley.name=Crated Barley
+item.cratedNaturaBerryBlack.name=Crated Blackberry
+item.cratedNaturaBerryBlight.name=Crated Blightberry
+item.cratedNaturaBerryBlue.name=Crated Blueberry
+item.cratedNaturaBerryDusk.name=Crated Duskberry
+item.cratedNaturaBerryMalo.name=Crated Maloberry
+item.cratedNaturaBerryRasp.name=Crated Raspberry
+item.cratedNaturaBerrySky.name=Crated Skyberry
+item.cratedNaturaBerrySting.name=Crated Stingberry
+item.cratedNaturaBlockHeatsand.name=Crated Heat Sand
+item.cratedNaturaBlockTainted.name=Crated Tainted Soil
+item.cratedNaturaBlueGlowshroom.name=Crated Blue Glowshroom
+item.cratedNaturaGreenGlowshroom.name=Crated Green Glowshroom
+item.cratedNaturaLogBloodwood.name=Crated Bloodwood
+item.cratedNaturaLogDarkwood.name=Crated Darkwood
+item.cratedNaturaLogEucalyptus.name=Crated Eucalyptus Wood
+item.cratedNaturaLogFusewood.name=Crated Fusewood
+item.cratedNaturaLogGhostwood.name=Crated Ghostwood
+item.cratedNaturaLogHopseed.name=Crated Hopseed Wood
+item.cratedNaturaLogSakura.name=Crated Sakura Wood
+item.cratedNaturaLogWillow.name=Crated Willow Wood
+item.cratedNaturaPotashApple.name=Crated Potash Apple
+item.cratedNaturaPurpleGlowshroom.name=Crated Purple Glowshroom
+item.cratedNaturaSaplingBlood.name=Crated Blood Sapling
+item.cratedNaturaSaplingDarkwood.name=Crated Darkwood Sapling
+item.cratedNaturaSaplingEucalyptus.name=Crated Eucalyptus Sapling
+item.cratedNaturaSaplingFusewood.name=Crated Fusewood Sapling
+item.cratedNaturaSaplingGhostwood.name=Crated Ghostwood Sapling
+item.cratedNaturaSaplingHopseed.name=Crated Hopseed Sapling
+item.cratedNaturaSaplingMaple.name=Crated Maple Sapling
+item.cratedNaturaSaplingPurpleheart.name=Crated Amaranth Sapling
+item.cratedNaturaSaplingRedwood.name=Crated Redwood Sapling
+item.cratedNaturaSaplingSakura.name=Crated Sakura Sapling
+item.cratedNaturaSaplingSilverbell.name=Crated Silverbell Sapling
+item.cratedNaturaSaplingTiger.name=Crated Tigerwood Sapling
+item.cratedNaturaSaplingWillow.name=Crated Willow Sapling
+item.cratedNetherbrick.name=Crated Nether Brick
+item.cratedNetherrack.name=Crated Netherrack
+item.cratedNetherwart.name=Crated Nether Wart
+item.cratedObsidian.name=Crated Obsidian
+item.cratedPapaya.name=Crated Papaya
+item.cratedParchedCombs.name=Crated Parched Comb
+item.cratedPeat.name=Crated Peat
+item.cratedPhosphor.name=Crated Phosphor
+item.cratedPlum.name=Crated Plum
+item.cratedPodzol.name=Crated Podzol
+item.cratedPollen.name=Crated Pollen Cluster
+item.cratedPotatoes.name=Crated Potato
+item.cratedPowderyCombs.name=Crated Powdery Comb
+item.cratedPropolis.name=Crated Propolis
+item.cratedRedSand.name=Crated Red Sand
+item.cratedRedstone.name=Crated Redstone
+item.cratedReeds.name=Crated Sugar Canes
+item.cratedRefractoryWax.name=Crated Refractory Wax
+item.cratedResin.name=Crated Sticky Resin
+item.cratedRoyalJelly.name=Crated Royal Jelly
+item.cratedRubber.name=Crated Rubber
+item.cratedSand.name=Crated Sand
+item.cratedSandstone.name=Crated Sandstone
+item.cratedSaplings.name=Crated Oak Sapling
+item.cratedScrap.name=Crated Scrap
+item.cratedSeeds.name=Crated Seeds
+item.cratedSilkyCombs.name=Crated Silky Comb
+item.cratedSilver.name=Crated Silver Ingot
+item.cratedSimmeringCombs.name=Crated Simmering Comb
+item.cratedSoulsand.name=Crated Soul Sand
+item.cratedSpruceSapling.name=Crated Spruce Sapling
+item.cratedSpruceWood.name=Crated Spruce Wood
+item.cratedStone.name=Crated Stone
+item.cratedStringyCombs.name=Crated Stringy Comb
+item.cratedWalnut.name=Crated Walnut
+item.cratedWheat.name=Crated Wheat
+item.cratedWheatenCombs.name=Crated Wheaten Comb
+item.cratedWood.name=Crated Oak Wood
 
 for.no=No
 
@@ -493,6 +610,7 @@ item.for.habitatLocator.name=Habitat Locator
 item.for.cart.beehouse.name=Minecart with Bee House
 item.for.cart.apiary.name=Minecart with Apiary
 
+item.for.beeCombs.name=Comb
 item.for.beeCombs.cocoa.name=Cocoa Comb
 item.for.beeCombs.darkened.name=Darkened Comb
 item.for.beeCombs.dripping.name=Dripping Comb
@@ -513,6 +631,7 @@ item.for.beeCombs.wheaten.name=Wheaten Comb
 
 item.for.beeswax.name=Beeswax
 
+item.for.beverage.name=Mead
 item.for.beverage.meadCurative.name=Curative Mead
 item.for.beverage.meadShort.name=Short Mead
 item.for.beverage.mead.name=Mead
@@ -550,11 +669,13 @@ item.for.canSeedOil.name=Seed Oil Can
 item.for.canShortMead.name=Short Mead Can
 item.for.carton.name=Carton
 
+item.for.chipsets.name=Circuit Board
 item.for.circuitboard.basic.name=Basic Circuit Board
 item.for.circuitboard.enhanced.name=Enhanced Circuit Board
 item.for.circuitboard.intricate.name=Intricate Circuit Board
 item.for.circuitboard.refined.name=Refined Circuit Board
 
+item.for.craftingMaterial.name=Crafting Material
 item.for.craftingMaterial.dissipationCharge.name=Dissipation Charge
 item.for.craftingMaterial.iceShard.name=Ice Shard
 item.for.craftingMaterial.pulsatingDust.name=Pulsating Dust
@@ -585,6 +706,7 @@ for.frame.tooltip.production=Production:
 for.frame.tooltip.flowering=Flowering:
 for.frame.tooltip.geneticDecay=Genetic Decay:
 
+item.for.fruits.name=Fruit
 item.for.fruits.cherry.name=Cherry
 item.for.fruits.chestnut.name=Chestnut
 item.for.fruits.dates.name=Date
@@ -601,6 +723,7 @@ item.for.hardenedMachine.name=Hardened Casing
 
 item.for.honeydew.name=Honeydew
 
+item.for.honeyDrop.name=Drop
 item.for.honeyDrop.charged.name=Charged Drop
 item.for.honeyDrop.honey.name=Honey Drop
 item.for.honeyDrop.omega.name=Omega Drop
@@ -634,9 +757,12 @@ item.for.peat.name=Peat
 item.for.phosphor.name=Phosphor
 item.for.pipette.name=Pipette
 
+item.for.pollenFertile.name=Fertile Pollen
+item.for.pollen.name=Pollen Cluster
 item.for.pollen.crystalline.name=Crystalline Pollen Cluster
 item.for.pollen.normal.name=Pollen Cluster
 
+item.for.propolis.name=Propolis
 item.for.propolis.normal.name=Propolis
 item.for.propolis.pulsating.name=Pulsating Propolis
 item.for.propolis.silky.name=Silky Propolis
@@ -674,6 +800,7 @@ item.for.stamps.name=Stamp
 item.for.sturdyMachine.name=Sturdy Casing
 item.for.tent.name=Survivalist's Tent
 
+item.for.thermionicTubes.name=Electron Tube
 item.for.thermionicTubes.ex-0.name=Copper Electron Tube
 item.for.thermionicTubes.ex-1.name=Tin Electron Tube
 item.for.thermionicTubes.ex-2.name=Bronze Electron Tube
@@ -715,15 +842,18 @@ itemGroup.arboriculture=Arboriculture
 itemGroup.forestry=Forestry
 itemGroup.lepidopterology=Lepidopterology
 
+tile.for.core.name=Analyzer / Escritoire
 tile.for.core.0.name=Analyzer
 tile.for.core.1.name=Escritoire
 
+tile.for.engine.name=Engine
 tile.for.engine.0.name=Electrical Engine
 tile.for.engine.1.name=Peat-fired Engine
 tile.for.engine.2.name=Biogas Engine
 tile.for.engine.3.name=Bio Generator
 tile.for.engine.4.name=Clockwork Engine
 
+tile.for.factory.name=Machine
 tile.for.factory.0.name=Bottler
 tile.for.factory.1.name=Carpenter
 tile.for.factory.2.name=Centrifuge
@@ -732,23 +862,28 @@ tile.for.factory.4.name=Moistener
 tile.for.factory.5.name=Squeezer
 tile.for.factory.6.name=Still
 tile.for.factory.7.name=Rainmaker
+tile.for.factory2.name=Machine
 tile.for.factory2.0.name=Thermionic Fabricator
 tile.for.factory2.1.name=Raintank
 tile.for.factory2.2.name=Worktable
 
+tile.for.mail.name=Mailbox
 tile.for.mail.0.name=Mailbox
 tile.for.mail.1.name=Trade Station
 tile.for.mail.2.name=Stamp Collector
 
+tile.for.resources.name=Ore
 tile.for.resources.0.name=Apatite Ore
 tile.for.resources.1.name=Copper Ore
 tile.for.resources.2.name=Tin Ore
 
+tile.for.resourceStorage.name=Block
 tile.for.resourceStorage.0.name=Block of Apatite
 tile.for.resourceStorage.1.name=Block of Copper
 tile.for.resourceStorage.2.name=Block of Tin
 tile.for.resourceStorage.3.name=Block of Bronze
 
+tile.for.soil.name=Soil
 tile.for.soil.0.name=Humus
 tile.for.soil.1.name=Bog Earth
 tile.for.soil.2.name=Peat
@@ -915,6 +1050,8 @@ for.errors.wrongStacksize.help=Only single items can be used here.
 # APICULTURE
 ####################
 
+item.for.beeLarvaeGE.name=Larvae
+
 entity.Villager.apiarist=Apiarist
 
 death.bee.aggressive.player=%1$s encountered a swarm of bees. %2$s stole his apiarist's suit.
@@ -1129,6 +1266,7 @@ item.for.beePrincessGE.name=Princess
 item.for.beeQueenGE.name=Queen
 item.for.beeDroneGE.name=Drone
 
+tile.for.alveary.name=Alveary Part
 tile.for.alveary.0.name=Alveary
 tile.for.alveary.1.name=Alveary Entrance
 tile.for.alveary.2.name=Swarmer
@@ -1138,10 +1276,13 @@ tile.for.alveary.5.name=Alveary Hygroregulator
 tile.for.alveary.6.name=Alveary Stabiliser
 tile.for.alveary.7.name=Alveary Sieve
 
+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
 
+tile.for.beehives.name=Hive
 tile.for.beehives.1.name=Forest Hive
 tile.for.beehives.2.name=Meadows Hive
 tile.for.beehives.3.name=Modest Hive
@@ -1151,11 +1292,13 @@ tile.for.beehives.6.name=Wintry Hive
 tile.for.beehives.7.name=Marshy Hive
 tile.for.beehives.8.name=Swarm Hive
 
+tile.for.candle.name=Candle
 tile.for.candle.dyed.lit.name=Lit Dyed Candle
 tile.for.candle.dyed.stump.name=Unlit Dyed Candle
 tile.for.candle.lit.name=Lit Candle
 tile.for.candle.stump.name=Unlit Candle
 
+tile.for.stump.name=Candle Stump
 tile.for.stump.0.name=Candle Stump
 
 ####################
@@ -1270,8 +1413,10 @@ for.trees.grammar.germling.type=Germling
 for.trees.grammar.germling=%SPECIES %TYPE
 for.trees.grammar.pollen.type=Pollen
 for.trees.grammar.pollen=%SPECIES %TYPE
+tile.for.saplingGE.name=Sapling
 for.trees.grammar.sapling.type=Sapling
 for.trees.grammar.sapling=%SPECIES %TYPE
+tile.for.leaves.name=Leaves
 for.trees.grammar.leaves.type=Leaves
 for.trees.grammar.leaves=%SPECIES %TYPE
 
@@ -1313,10 +1458,21 @@ for.trees.species.padauk=Padauk
 for.trees.species.cocobolo=Cocobolo
 for.trees.species.zebrawood=Zebrawood
 
+tile.for.fences.name=Fence
 for.fences.grammar=%TYPE Fence
+tile.for.logs.name=Wood
+tile.for.logsFireproof.name=Wood (Fireproof)
 for.log.grammar=%TYPE Wood
+tile.for.planks.name=Wood Planks
+tile.for.planksFireproof.name=Wood Planks (Fireproof)
 for.planks.grammar=%TYPE Wood Planks
+tile.for.slabs.name=Wood Slab
+tile.for.slabsFireproof.name=Wood Slab (Fireproof)
+tile.for.slabsDouble.name=Wood Slab
+tile.for.slabsDoubleFireproof.name=Wood Slab (Fireproof)
 for.slab.grammar=%TYPE Wood Slab
+tile.for.stairs.name=Stairs
+tile.for.stairsFireproof.name=Stairs (Fireproof)
 for.stairs.grammar=%TYPE Stairs
 
 for.trees.woodType.larch=Larch
@@ -1349,15 +1505,19 @@ for.trees.woodType.padauk=Padauk
 for.trees.woodType.cocobolo=Cocobolo
 for.trees.woodType.zebrawood=Zebrawood
 
+tile.for.fencesFireproof.name=Fence (Fireproof)
 tile.for.fireproof=%s (Fireproof)
 
 item.for.grafter.name=Grafter
 item.for.grafterProven.name=Proven Grafter
 
+tile.for.arboriculture.name=Arborist's Chest
 tile.for.arboriculture.0.name=Arborist's Chest
 
+item.for.sapling.name=Sapling
 tile.for.saplingGE.0.name=Sapling
 tile.for.leaves.0.name=Leaves
+tile.for.pods.name=Pod
 tile.for.pods.0.name=Pod
 
 ####################
@@ -1411,12 +1571,14 @@ for.trigger.lowFertilizer=Fertilizer
 for.trigger.lowLiquid=Water Tank
 for.trigger.lowSoil=Soil
 
+tile.for.ffarm.name=Farm Block
 tile.for.ffarm.0.name=Farm Block
 tile.for.ffarm.2.name=Farm Gearbox
 tile.for.ffarm.3.name=Farm Hatch
 tile.for.ffarm.4.name=Farm Valve
 tile.for.ffarm.5.name=Farm Control
 
+tile.for.mushroom.name=Mushroom
 tile.for.mushroom.0.name=Mushroom
 tile.for.mushroom.1.name=Mushroom
 
@@ -1424,6 +1586,9 @@ tile.for.mushroom.1.name=Mushroom
 # LEPIDOPTEROLOGY
 ####################
 
+item.for.serumGE.name=Serum
+item.for.caterpillarGE.name=Caterpillar
+item.for.butterflyGE.name=Butterfly
 entity.Forestry.butterflyGE.name=Butterfly
 
 for.chat.command.forestry.butterfly.desc=- %s : Butterfly Commands
@@ -1482,6 +1647,7 @@ item.for.butterfly.name=Butterfly
 item.for.flutterlyzer.name=Flutterlyzer
 item.for.lepidopteristBag.name=Lepidopterist's Backpack
 item.for.moth.name=Moth
+tile.for.lepidopterology.name=Lepidopterist's Chest
 tile.for.lepidopterology.0.name=Lepidopterist's Chest
 
 ####################