Add Localizations (#87)

(cherry picked from commit 3dccc7e06d)

.gitignore

@@ -30,4 +30,3 @@ 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-beta46:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.57-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.43:api')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta27:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.52-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.0:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39: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.
-# When false, com.github.GTNewHorizons is used.
+# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -80,7 +80,7 @@ apiPackage = api
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
 # There can be multiple files in a space-separated list.
 # Example value: mymodid_at.cfg nei_at.cfg
-accessTransformersFile = forestry_at.cfg
+accessTransformersFile =
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -86,7 +86,8 @@ 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\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -205,7 +206,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_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.38'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
 }
 
 

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

@@ -12,15 +12,11 @@ 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/fuels/RainSubstrate.java

@@ -9,37 +9,33 @@ import net.minecraft.item.ItemStack;
 
 public class RainSubstrate {
 
-    public enum WeatherState {
-        CLEAR,
-        RAIN,
-        STORM
-    }
-
     /**
      * Rain substrate capable of activating the rainmaker.
      */
     public ItemStack item;
     /**
-     * Duration of the weather event triggered by this substrate in Minecraft ticks.
+     * Duration of the rain shower triggered by this substrate in Minecraft ticks.
      */
     public int duration;
     /**
      * Speed of activation sequence triggered.
      */
     public float speed;
-    /**
-     * The type of weather triggered.
-     */
-    public WeatherState weather;
 
-    public RainSubstrate(ItemStack item, float speed, WeatherState weather) {
-        this(item, 0, speed, weather);
+    public boolean reverse;
+
+    public RainSubstrate(ItemStack item, int duration, float speed) {
+        this(item, duration, speed, false);
     }
 
-    public RainSubstrate(ItemStack item, int duration, float speed, WeatherState weather) {
+    public RainSubstrate(ItemStack item, float speed) {
+        this(item, 0, speed, true);
+    }
+
+    public RainSubstrate(ItemStack item, int duration, float speed, boolean reverse) {
         this.item = item;
         this.duration = duration;
         this.speed = speed;
-        this.weather = weather;
+        this.reverse = reverse;
     }
 }

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

@@ -49,14 +49,6 @@ 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,8 +9,6 @@ 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.
  */
@@ -47,15 +45,4 @@ 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/flowers/FlowerRegistry.java

@@ -213,7 +213,6 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe
 
     private static boolean isAcceptedFlower(String flowerType, Set<Block> acceptedBlocks, Set<Flower> acceptedFlowers,
             World world, int x, int y, int z) {
-        if (!world.blockExists(x, y, z)) return false;
         Block block = world.getBlock(x, y, z);
 
         final int meta;

src/main/java/forestry/apiculture/flowers/GrowthRuleDirtGrass.java

@@ -24,7 +24,7 @@ public class GrowthRuleDirtGrass implements IFlowerGrowthRule {
     @Override
     public boolean growFlower(IFlowerRegistry flowerRegistry, String flowerType, World world, IIndividual individual,
             int x, int y, int z) {
-        if (!world.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
+        if (!world.isAirBlock(x, y, z)) {
             return false;
         }
 
@@ -39,7 +39,7 @@ public class GrowthRuleDirtGrass implements IFlowerGrowthRule {
 
     @Override
     public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) {
-        if (!world.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
+        if (!world.isAirBlock(x, y, z)) {
             return false;
         }
 

src/main/java/forestry/apiculture/flowers/GrowthRuleFlowerPot.java

@@ -34,10 +34,6 @@ public class GrowthRuleFlowerPot implements IFlowerGrowthRule {
     }
 
     private static boolean growFlower(String flowerType, World world, int x, int y, int z) {
-        if (!world.blockExists(x, y, z)) {
-            return false;
-        }
-
         TileEntity tile = world.getTileEntity(x, y, z);
         if (!(tile instanceof TileEntityFlowerPot)) {
             return false;

src/main/java/forestry/apiculture/genetics/Bee.java

@@ -773,9 +773,6 @@ public class Bee extends IndividualLiving implements IBee {
         for (int i = 0; i < 20; i++) {
             Vect randomPos = Vect.getRandomPositionInArea(random, area);
             Vect blockPos = Vect.add(housingPos, randomPos, offset);
-            if (!world.blockExists(blockPos.x, blockPos.y, blockPos.z)) {
-                continue;
-            }
             TileEntity tile = world.getTileEntity(blockPos.x, blockPos.y, blockPos.z);
 
             if (tile instanceof IPollinatable) {

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

@@ -71,8 +71,9 @@ 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);
 
-        EnumTemperature temperature = EnumTemperature
-                .getFromBiome(currentBiome, (int) player.posX, (int) player.posY, (int) player.posZ);
+        float temperatureValue = currentBiome
+                .getFloatTemperature((int) player.posX, (int) player.posY, (int) player.posZ);
+        EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue);
         EnumHumidity humidity = EnumHumidity.getFromValue(currentBiome.rainfall);
 
         list.add(StringUtil.localize("gui.currentBiome") + ": " + currentBiome.biomeName);

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

@@ -9,10 +9,8 @@
 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;
@@ -61,9 +59,7 @@ 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 TreeSet<>(
-            Comparator.comparingInt(IAlvearyComponent.Climatiser::getPriority).thenComparingInt(Object::hashCode)
-                    .reversed());
+    private final Set<IAlvearyComponent.Climatiser> climatisers = new HashSet<>();
     private final Set<IAlvearyComponent.Active> activeComponents = new HashSet<>();
 
     // CLIENT
@@ -237,24 +233,26 @@ 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 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);
+    private static float equalizeChange(float change) {
+        if (change == 0) {
+            return 0;
         }
+
+        change *= 0.95f;
+        if (change <= 0.001f && change >= -0.001f) {
+            change = 0;
+        }
+        return change;
     }
 
     @Override
@@ -412,13 +410,19 @@ public class AlvearyController extends RectangularMultiblockControllerBase
         ChunkCoordinates coordinates = getCoordinates();
 
         float temperature = getBiome().getFloatTemperature(coordinates.posX, coordinates.posY, coordinates.posZ);
-        tempChange = applyChange(temperature, tempChange, change, boundaryDown, boundaryUp);
+
+        tempChange += change;
+        tempChange = Math.max(boundaryDown - temperature, tempChange);
+        tempChange = Math.min(boundaryUp - temperature, tempChange);
     }
 
     @Override
     public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
         float humidity = getBiome().rainfall;
-        humidChange = applyChange(humidity, humidChange, change, boundaryDown, boundaryUp);
+
+        humidChange += change;
+        humidChange = Math.max(boundaryDown - humidity, humidChange);
+        humidChange = Math.min(boundaryUp - humidity, humidChange);
     }
 
     /* GUI */

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

@@ -19,7 +19,6 @@ 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;
@@ -32,8 +31,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, IMultiblockComponent.HasInventory {
+public class TileAlvearyHygroregulator extends TileAlveary
+        implements IInventory, ILiquidTankTile, IFluidHandler, IAlvearyComponent.Climatiser {
 
     private final HygroregulatorRecipe[] recipes;
 
@@ -57,9 +56,9 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory
         this.tankManager = new TankManager(this, liquidTank);
 
         this.recipes = new HygroregulatorRecipe[] {
-                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) };
+                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) };
     }
 
     @Override
@@ -112,11 +111,6 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory
         }
     }
 
-    @Override
-    public int getPriority() {
-        return 100;
-    }
-
     /* SAVING & LOADING */
     @Override
     public void readFromNBT(NBTTagCompound nbttagcompound) {

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

@@ -18,7 +18,6 @@ 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;
@@ -26,8 +25,7 @@ import forestry.apiculture.inventory.InventoryAlvearySieve;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.inventory.watchers.ISlotPickupWatcher;
 
-public class TileAlvearySieve extends TileAlveary
-        implements IAlvearyComponent.BeeListener, IMultiblockComponent.HasInventory {
+public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.BeeListener {
 
     private final IBeeListener beeListener;
     private final InventoryAlvearySieve inventory;

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

@@ -22,7 +22,6 @@ 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;
@@ -38,8 +37,7 @@ 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, IMultiblockComponent.HasInventory {
+public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, IActivatable, IAlvearyComponent.Active {
 
     private final InventorySwarmer inventory;
     private final Deque<ItemStack> pendingSpawns = new ArrayDeque<>();

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

@@ -116,12 +116,6 @@ 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/config/Constants.java

@@ -109,7 +109,6 @@ public class Constants implements IForestryConstants {
     public static final int MACHINE_MAX_ENERGY = 5000;
 
     public static final int RAINMAKER_RAIN_DURATION_IODINE = 10000;
-    public static final int RAINMAKER_RAIN_DURATION_PHOSPHORICIODINE = 10000;
 
     public static final int STILL_DESTILLATION_DURATION = 100;
     public static final int STILL_DESTILLATION_INPUT = 10;

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

@@ -78,7 +78,6 @@ public class ItemRegistryCore extends ItemRegistry {
     /* Rainmaker */
     public final ItemForestry iodineCharge;
     public final ItemForestry phosphor;
-    public final ItemForestry phosphorCharge;
 
     /* Misc */
     public final ItemCraftingMaterial craftingMaterial;
@@ -182,8 +181,8 @@ public class ItemRegistryCore extends ItemRegistry {
 
         // / RAINMAKER SUBSTRATES
         iodineCharge = registerItem(new ItemForestry(), "iodineCapsule");
+
         phosphor = registerItem(new ItemForestry(), "phosphor");
-        phosphorCharge = registerItem(new ItemForestry(), "phosphoricIodineCapsule");
 
         // / BEE RESOURCES
         beeswax = registerItem(new ItemForestry(), "beeswax");

src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java

@@ -112,12 +112,18 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
     public List<String> handleTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, int recipe) {
         super.handleTooltip(guiRecipe, currenttip, recipe);
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
-
         if (GuiContainerManager.shouldShowTooltip(guiRecipe)) {
             Point mouse = GuiDraw.getMousePosition();
-            Point offset = guiRecipe.getRecipePosition(recipe);
-            Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
-            currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
+            int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
+
+            if (recipeIndex >= 0) {
+                Point offset = guiRecipe.getRecipePosition(recipeIndex);
+                Point relMouse = new Point(
+                        mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
+                        mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
+
+                currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
+            }
         }
 
         return currenttip;
@@ -129,10 +135,18 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
         super.handleItemTooltip(guiRecipe, itemStack, currenttip, recipe);
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
         Point mouse = GuiDraw.getMousePosition();
-        Point offset = guiRecipe.getRecipePosition(recipe);
-        Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
+        int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
 
-        return this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
+        if (recipeIndex >= 0) {
+            Point offset = guiRecipe.getRecipePosition(recipeIndex);
+            Point relMouse = new Point(
+                    mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
+                    mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
+
+            currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
+        }
+
+        return currenttip;
     }
 
     public List<String> provideTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, CachedBaseRecipe crecipe,
@@ -196,9 +210,11 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
 
     protected boolean transferFluidTank(GuiRecipe<?> guiRecipe, int recipe, boolean usage) {
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
-        Point mouse = GuiDraw.getMousePosition();
+        Point mousepos = GuiDraw.getMousePosition();
         Point offset = guiRecipe.getRecipePosition(recipe);
-        Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
+        Point relMouse = new Point(
+                mousepos.x - (guiRecipe.width - 176) / 2 - offset.x,
+                mousepos.y - (guiRecipe.height - 166) / 2 - offset.y);
 
         if (crecipe.getFluidTanks() != null) {
             for (PositionedFluidTank tank : crecipe.getFluidTanks()) {

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

@@ -37,8 +37,7 @@ 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").replaceAll("§\\d", ""));
+            int levelCount = Integer.valueOf(StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count"));
             for (int i = 1; i <= levelCount; i++) {
                 String note = StringUtil.localize("gui.escritoire.notes." + notesLevel + '.' + i);
                 researchNotes.put(notesLevel, note);

src/main/java/forestry/core/utils/GeneticsUtil.java

@@ -96,8 +96,6 @@ public class GeneticsUtil {
      * altering the world by changing vanilla leaves to forestry ones.
      */
     public static ICheckPollinatable getCheckPollinatable(World world, final int x, final int y, final int z) {
-        if (!world.blockExists(x, y, z)) return null;
-
         TileEntity tile = world.getTileEntity(x, y, z);
 
         if (tile instanceof IPollinatable) {

src/main/java/forestry/factory/inventory/InventoryRainmaker.java

@@ -26,14 +26,16 @@ public class InventoryRainmaker extends InventoryAdapterTile<TileMillRainmaker>
     @Override
     public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
         if (slotIndex == SLOT_SUBSTRATE) {
-            if (getStackInSlot(SLOT_SUBSTRATE) != null) {
-                return false;
-            }
             if (FuelManager.rainSubstrate.containsKey(itemStack) && tile.charge == 0 && tile.progress == 0) {
                 RainSubstrate substrate = FuelManager.rainSubstrate.get(itemStack);
-                return tile.isValidSubstrate(substrate);
+                if (tile.getWorld().isRaining() && substrate.reverse) {
+                    return true;
+                } else if (!tile.getWorld().isRaining() && !substrate.reverse) {
+                    return true;
+                }
             }
         }
+
         return false;
     }
 

src/main/java/forestry/factory/tiles/TileMillRainmaker.java

@@ -10,7 +10,6 @@ package forestry.factory.tiles;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.storage.WorldInfo;
 
 import forestry.api.fuels.FuelManager;
 import forestry.api.fuels.RainSubstrate;
@@ -21,7 +20,7 @@ import forestry.factory.inventory.InventoryRainmaker;
 public class TileMillRainmaker extends TileMill {
 
     private int duration;
-    private RainSubstrate.WeatherState weather;
+    private boolean reverse;
 
     public TileMillRainmaker() {
         super(null);
@@ -40,9 +39,9 @@ public class TileMillRainmaker extends TileMill {
         }
 
         // We don't have a gui, but we can be activated
-        if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0 && progress == 0) {
+        if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0) {
             RainSubstrate substrate = FuelManager.rainSubstrate.get(player.inventory.getCurrentItem());
-            if (isValidSubstrate(substrate)) {
+            if (substrate.item.isItemEqual(player.inventory.getCurrentItem())) {
                 addCharge(substrate);
                 player.inventory.getCurrentItem().stackSize--;
             }
@@ -50,17 +49,6 @@ public class TileMillRainmaker extends TileMill {
         sendNetworkUpdate();
     }
 
-    public boolean isValidSubstrate(RainSubstrate substrate) {
-        boolean thundering = getWorld().isThundering();
-        boolean raining = getWorld().isRaining();
-
-        return switch (substrate.weather) {
-            case CLEAR -> (thundering || raining);
-            case RAIN -> (thundering || !raining);
-            case STORM -> (!thundering);
-        };
-    }
-
     @Override
     public void readFromNBT(NBTTagCompound nbttagcompound) {
         super.readFromNBT(nbttagcompound);
@@ -69,7 +57,7 @@ public class TileMillRainmaker extends TileMill {
         progress = nbttagcompound.getFloat("Progress");
         stage = nbttagcompound.getInteger("Stage");
         duration = nbttagcompound.getInteger("Duration");
-        weather = RainSubstrate.WeatherState.valueOf(nbttagcompound.getString("Weather"));
+        reverse = nbttagcompound.getBoolean("Reverse");
     }
 
     @Override
@@ -80,14 +68,14 @@ public class TileMillRainmaker extends TileMill {
         nbttagcompound.setFloat("Progress", progress);
         nbttagcompound.setInteger("Stage", stage);
         nbttagcompound.setInteger("Duration", duration);
-        nbttagcompound.setString("Weather", weather.name());
+        nbttagcompound.setBoolean("Reverse", reverse);
     }
 
     public void addCharge(RainSubstrate substrate) {
         charge = 1;
         speed = substrate.speed;
         duration = substrate.duration;
-        weather = substrate.weather;
+        reverse = substrate.reverse;
         sendNetworkUpdate();
     }
 
@@ -115,26 +103,15 @@ public class TileMillRainmaker extends TileMill {
         }
 
         if (!worldObj.isRemote) {
-            WorldInfo world = worldObj.getWorldInfo();
-            switch (weather) {
-                case CLEAR:
-                    world.setRaining(false);
-                    world.setThundering(false);
-                    break;
-                case STORM:
-                    world.setRaining(true);
-                    world.setRainTime(duration);
-                    world.setThundering(true);
-                    world.setThunderTime(duration);
-                    break;
-                case RAIN:
-                    world.setRaining(true);
-                    world.setRainTime(duration);
-                    world.setThundering(false);
-                    break;
+            if (reverse) {
+                worldObj.getWorldInfo().setRaining(false);
+            } else {
+                worldObj.getWorldInfo().setRaining(true);
+                worldObj.getWorldInfo().setRainTime(duration);
             }
             charge = 0;
             duration = 0;
+            reverse = false;
             sendNetworkUpdate();
         }
     }

src/main/java/forestry/plugins/PluginFactory.java

@@ -222,23 +222,9 @@ public class PluginFactory extends ForestryPlugin {
         // Set rain substrates
         ItemStack iodineCharge = coreItems.iodineCharge.getItemStack();
         ItemStack dissipationCharge = coreItems.craftingMaterial.getDissipationCharge();
-        ItemStack phosphorCharge = coreItems.phosphorCharge.getItemStack();
-        FuelManager.rainSubstrate.put(
-                iodineCharge,
-                new RainSubstrate(
-                        iodineCharge,
-                        Constants.RAINMAKER_RAIN_DURATION_IODINE,
-                        0.01f,
-                        RainSubstrate.WeatherState.RAIN));
         FuelManager.rainSubstrate
-                .put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f, RainSubstrate.WeatherState.CLEAR));
-        FuelManager.rainSubstrate.put(
-                phosphorCharge,
-                new RainSubstrate(
-                        phosphorCharge,
-                        Constants.RAINMAKER_RAIN_DURATION_PHOSPHORICIODINE,
-                        0.008f,
-                        RainSubstrate.WeatherState.STORM));
+                .put(iodineCharge, new RainSubstrate(iodineCharge, Constants.RAINMAKER_RAIN_DURATION_IODINE, 0.01f));
+        FuelManager.rainSubstrate.put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f));
 
         for (BlockFactoryTesrType type : BlockFactoryTesrType.VALUES) {
             MachineDefinition machineDefinition = new MachineDefinition(type);
@@ -608,15 +594,6 @@ public class PluginFactory extends ForestryPlugin {
                     PluginFluids.items.canEmpty,
                     'Z',
                     beeItems.honeydew);
-            RecipeManagers.carpenterManager.addRecipe(
-                    5,
-                    PluginCore.items.iodineCharge.getItemStack(),
-                    PluginCore.items.phosphorCharge.getItemStack(),
-                    "# #",
-                    " # ",
-                    "# #",
-                    '#',
-                    PluginCore.items.phosphor.getItemStack());
         }
 
         // Ender pearl

src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java

@@ -197,6 +197,8 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
                     FlowerManager.FlowerTypeVanilla,
                     FlowerManager.FlowerTypeSnow,
                     FlowerManager.FlowerTypeMushrooms); // Swampflower
+            // FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 2, 1.0, FlowerManager.FlowerTypeNether);
+            // //Deathbloom
             FlowerManager.flowerRegistry.registerPlantableFlower(
                     flowers,
                     3,
@@ -246,8 +248,16 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
                     1.0,
                     FlowerManager.FlowerTypeVanilla,
                     FlowerManager.FlowerTypeSnow); // Waterlily
+            FlowerManager.flowerRegistry.registerPlantableFlower(
+                    flowers,
+                    11,
+                    1.0,
+                    FlowerManager.FlowerTypeVanilla,
+                    FlowerManager.FlowerTypeSnow); // EnderLotus (does not actually spawn in the end)
             FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 12, 1.0, FlowerManager.FlowerTypeCacti); // Bromeliad
             FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 13, 1.0, FlowerManager.FlowerTypeNether); // EyeBulb
+            // FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 14, 1.0, FlowerManager.FlowerTypeNether);
+            // // Unlisted top of the eyebulb
             FlowerManager.flowerRegistry.registerPlantableFlower(
                     flowers,
                     15,
@@ -273,6 +283,8 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
             FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 3, 1.0, FlowerManager.FlowerTypeVanilla); // Lavender
             FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 4, 1.0, FlowerManager.FlowerTypeVanilla); // Goldenrod
             FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 5, 1.0, FlowerManager.FlowerTypeVanilla); // Bluebells
+            FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 6, 1.0, FlowerManager.FlowerTypeVanilla); // Miner's
+                                                                                                                     // delight
             FlowerManager.flowerRegistry.registerPlantableFlower(
                     flowers2,
                     7,

src/main/resources/META-INF/forestry_at.cfg

@@ -1,5 +0,0 @@
-# Forestry Access Transformer configuration file
-public net.minecraft.client.gui.inventory.GuiContainer field_146999_f #xSize
-public net.minecraft.client.gui.inventory.GuiContainer field_147000_g #ySize
-public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft
-public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop

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

@@ -171,7 +171,6 @@ 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
 
@@ -755,7 +754,6 @@ item.for.naturalistHelmet.name=Spectacles
 item.for.oakStick.name=Impregnated Stick
 item.for.peat.name=Peat
 item.for.phosphor.name=Phosphor
-item.for.phosphoricIodineCapsule.name=Phosphoric Iodine Capsule
 item.for.pipette.name=Pipette
 
 item.for.pollenFertile.name=Fertile Pollen