update

dependencies.gradle

@@ -2,8 +2,8 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta38:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta42:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.44-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')

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.

settings.gradle

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

src/main/java/forestry/api/fuels/RainSubstrate.java

@@ -9,33 +9,37 @@ 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 rain shower triggered by this substrate in Minecraft ticks.
+     * Duration of the weather event 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 boolean reverse;
-
-    public RainSubstrate(ItemStack item, int duration, float speed) {
-        this(item, duration, speed, false);
+    public RainSubstrate(ItemStack item, float speed, WeatherState weather) {
+        this(item, 0, speed, weather);
     }
 
-    public RainSubstrate(ItemStack item, float speed) {
-        this(item, 0, speed, true);
-    }
-
-    public RainSubstrate(ItemStack item, int duration, float speed, boolean reverse) {
+    public RainSubstrate(ItemStack item, int duration, float speed, WeatherState weather) {
         this.item = item;
         this.duration = duration;
         this.speed = speed;
-        this.reverse = reverse;
+        this.weather = weather;
     }
 }

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/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;
 

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/config/Constants.java

@@ -109,6 +109,7 @@ 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,6 +78,7 @@ public class ItemRegistryCore extends ItemRegistry {
     /* Rainmaker */
     public final ItemForestry iodineCharge;
     public final ItemForestry phosphor;
+    public final ItemForestry phosphorCharge;
 
     /* Misc */
     public final ItemCraftingMaterial craftingMaterial;
@@ -181,8 +182,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/factory/inventory/InventoryRainmaker.java

@@ -26,16 +26,14 @@ 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);
-                if (tile.getWorld().isRaining() && substrate.reverse) {
-                    return true;
-                } else if (!tile.getWorld().isRaining() && !substrate.reverse) {
-                    return true;
-                }
+                return tile.isValidSubstrate(substrate);
             }
         }
-
         return false;
     }
 

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

@@ -10,6 +10,7 @@ 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;
@@ -20,7 +21,7 @@ import forestry.factory.inventory.InventoryRainmaker;
 public class TileMillRainmaker extends TileMill {
 
     private int duration;
-    private boolean reverse;
+    private RainSubstrate.WeatherState weather;
 
     public TileMillRainmaker() {
         super(null);
@@ -39,9 +40,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) {
+        if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0 && progress == 0) {
             RainSubstrate substrate = FuelManager.rainSubstrate.get(player.inventory.getCurrentItem());
-            if (substrate.item.isItemEqual(player.inventory.getCurrentItem())) {
+            if (isValidSubstrate(substrate)) {
                 addCharge(substrate);
                 player.inventory.getCurrentItem().stackSize--;
             }
@@ -49,6 +50,17 @@ 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);
@@ -57,7 +69,7 @@ public class TileMillRainmaker extends TileMill {
         progress = nbttagcompound.getFloat("Progress");
         stage = nbttagcompound.getInteger("Stage");
         duration = nbttagcompound.getInteger("Duration");
-        reverse = nbttagcompound.getBoolean("Reverse");
+        weather = RainSubstrate.WeatherState.valueOf(nbttagcompound.getString("Weather"));
     }
 
     @Override
@@ -68,14 +80,14 @@ public class TileMillRainmaker extends TileMill {
         nbttagcompound.setFloat("Progress", progress);
         nbttagcompound.setInteger("Stage", stage);
         nbttagcompound.setInteger("Duration", duration);
-        nbttagcompound.setBoolean("Reverse", reverse);
+        nbttagcompound.setString("Weather", weather.name());
     }
 
     public void addCharge(RainSubstrate substrate) {
         charge = 1;
         speed = substrate.speed;
         duration = substrate.duration;
-        reverse = substrate.reverse;
+        weather = substrate.weather;
         sendNetworkUpdate();
     }
 
@@ -103,15 +115,26 @@ public class TileMillRainmaker extends TileMill {
         }
 
         if (!worldObj.isRemote) {
-            if (reverse) {
-                worldObj.getWorldInfo().setRaining(false);
-            } else {
-                worldObj.getWorldInfo().setRaining(true);
-                worldObj.getWorldInfo().setRainTime(duration);
+            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;
             }
             charge = 0;
             duration = 0;
-            reverse = false;
             sendNetworkUpdate();
         }
     }

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

@@ -222,9 +222,23 @@ 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(iodineCharge, new RainSubstrate(iodineCharge, Constants.RAINMAKER_RAIN_DURATION_IODINE, 0.01f));
-        FuelManager.rainSubstrate.put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f));
+                .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));
 
         for (BlockFactoryTesrType type : BlockFactoryTesrType.VALUES) {
             MachineDefinition machineDefinition = new MachineDefinition(type);
@@ -594,6 +608,15 @@ 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/resources/assets/forestry/lang/en_US.lang

@@ -755,6 +755,7 @@ 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