update deps

Co-authored-by: GitHub GTNH Actions <>

dependencies.gradle

@@ -2,9 +2,9 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta6:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.35-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.0:api')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha52:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.11-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.6.2: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

@@ -85,11 +85,6 @@ accessTransformersFile =
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
 
-# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
-# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
-# Mixin classes will have access to "main" classes, but not the other way around.
-separateMixinSourceSet =
-
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false
 
@@ -122,15 +117,9 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
-# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
-# list of strings, with the acceptable keys being(case does not matter):
-# cursemaven
-# modrinth
-excludeWellKnownRepositories =
-
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -86,8 +84,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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

settings.gradle

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

src/main/java/forestry/Forestry.java

@@ -15,7 +15,6 @@ import net.minecraft.item.Item;
 import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.ModAPIManager;
@@ -80,15 +79,11 @@ public class Forestry {
 
     public static PacketHandler packetHandler;
 
-    public static boolean isDreamcraftLoaded;
-
     @EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         checkForCoFHLib();
         packetHandler = new PacketHandler();
 
-        isDreamcraftLoaded = Loader.isModLoaded("dreamcraft");
-
         // Register event handler
         EventHandlerCore eventHandlerCore = new EventHandlerCore();
         MinecraftForge.EVENT_BUS.register(eventHandlerCore);

src/main/java/forestry/api/genetics/IIndividual.java

@@ -52,8 +52,4 @@ public interface IIndividual extends INBTTagable {
     IIndividual copy();
 
     boolean isPureBred(IChromosomeType chromosomeType);
-
-    default void addLore(List<String> text) {}
-
-    default void addDiscoveredBy(List<String> text) {}
 }

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

@@ -18,8 +18,6 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -378,36 +376,6 @@ public class Bee extends IndividualLiving implements IBee {
         return suitableBiomes;
     }
 
-    @Override
-    public void addLore(List<String> text) {
-        IAlleleBeeSpecies primary = genome.getPrimary();
-        String descTokens[] = primary.getDescription().split("\\|");
-
-        if (descTokens.length > 0) {
-            String speciesLore = descTokens[0];
-            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
-                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
-                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
-                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
-                text.addAll(formattedLoreList);
-            }
-        }
-    }
-
-    @Override
-    public void addDiscoveredBy(List<String> text) {
-        IAlleleBeeSpecies primary = genome.getPrimary();
-        String descTokens[] = primary.getDescription().split("\\|");
-
-        if (descTokens.length > 2) {
-            String discoveredBy = descTokens[2];
-            if (!discoveredBy.isEmpty()) {
-                text.add("");
-                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
-            }
-        }
-    }
-
     @Override
     public void addTooltip(List<String> list) {
 

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

@@ -51,8 +51,12 @@ public class BeeMutation extends Mutation implements IBeeMutationCustom {
         IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
         IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier();
 
-        processedChance = safeMultiply(processedChance, beeHousingModifier.getMutationModifier(genome0, genome1, 1.0F));
-        processedChance = safeMultiply(processedChance, beeModeModifier.getMutationModifier(genome0, genome1, 1.0F));
+        processedChance = safeMultiply(
+                processedChance,
+                beeHousingModifier.getMutationModifier(genome0, genome1, processedChance));
+        processedChance = safeMultiply(
+                processedChance,
+                beeModeModifier.getMutationModifier(genome0, genome1, processedChance));
 
         return processedChance;
     }

src/main/java/forestry/arboriculture/genetics/Tree.java

@@ -16,8 +16,6 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
@@ -300,36 +298,6 @@ public class Tree extends Individual implements ITree, IPlantable {
         return plantTypes;
     }
 
-    @Override
-    public void addLore(List<String> text) {
-        IAlleleTreeSpecies primary = genome.getPrimary();
-        String descTokens[] = primary.getDescription().split("\\|");
-
-        if (descTokens.length > 0) {
-            String speciesLore = descTokens[0];
-            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
-                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
-                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
-                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
-                text.addAll(formattedLoreList);
-            }
-        }
-    }
-
-    @Override
-    public void addDiscoveredBy(List<String> text) {
-        IAlleleTreeSpecies primary = genome.getPrimary();
-        String descTokens[] = primary.getDescription().split("\\|");
-
-        if (descTokens.length > 2) {
-            String discoveredBy = descTokens[2];
-            if (!discoveredBy.isEmpty()) {
-                text.add("");
-                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
-            }
-        }
-    }
-
     @Override
     public void addTooltip(List<String> list) {
 

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

@@ -72,12 +72,6 @@ public abstract class ItemGE extends ItemForestry {
         if (individual.isAnalyzed()) {
             if (Proxies.common.isShiftDown()) {
                 individual.addTooltip(list);
-                individual.addDiscoveredBy(list);
-                if (Proxies.common.isCtrlDown()) {
-                    individual.addLore(list);
-                } else {
-                    list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tml") + ">");
-                }
             } else {
                 list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tmi") + ">");
             }

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

@@ -8,8 +8,6 @@
  ******************************************************************************/
 package forestry.core.items;
 
-import static forestry.Forestry.isDreamcraftLoaded;
-
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
@@ -89,26 +87,19 @@ public class ItemRegistryCore extends ItemRegistry {
         fertilizerBio = registerItem(new ItemForestry(), "fertilizerBio");
         fertilizerCompound = registerItem(new ItemForestryBonemeal(), "fertilizerCompound");
 
+        apatite = registerItem(new ItemForestry(), "apatite");
+        OreDictionary.registerOre("gemApatite", apatite);
+
         researchNote = registerItem(new ItemResearchNote(), "researchNote");
 
-        if (!isDreamcraftLoaded) {
-            apatite = registerItem(new ItemForestry(), "apatite");
-            OreDictionary.registerOre("gemApatite", apatite);
+        ingotCopper = registerItem(new ItemForestry(), "ingotCopper");
+        OreDictionary.registerOre("ingotCopper", ingotCopper);
 
-            ingotCopper = registerItem(new ItemForestry(), "ingotCopper");
-            OreDictionary.registerOre("ingotCopper", ingotCopper);
+        ingotTin = registerItem(new ItemForestry(), "ingotTin");
+        OreDictionary.registerOre("ingotTin", ingotTin);
 
-            ingotTin = registerItem(new ItemForestry(), "ingotTin");
-            OreDictionary.registerOre("ingotTin", ingotTin);
-
-            ingotBronze = registerItem(new ItemForestry(), "ingotBronze");
-            OreDictionary.registerOre("ingotBronze", ingotBronze);
-        } else {
-            apatite = null;
-            ingotCopper = null;
-            ingotTin = null;
-            ingotBronze = null;
-        }
+        ingotBronze = registerItem(new ItemForestry(), "ingotBronze");
+        OreDictionary.registerOre("ingotBronze", ingotBronze);
 
         wrench = registerItem(new ItemWrench(), "wrench");
         pipette = registerItem(new ItemPipette(), "pipette");

src/main/java/forestry/core/proxy/ProxyCommon.java

@@ -61,10 +61,6 @@ public class ProxyCommon {
         return false;
     }
 
-    public boolean isCtrlDown() {
-        return false;
-    }
-
     public void playSoundFX(World world, int x, int y, int z, Block block) {
         Proxies.net.sendNetworkPacket(new PacketFXSignal(PacketFXSignal.SoundFXType.LEAF, x, y, z, block, 0), world);
     }

src/main/java/forestry/core/proxy/ProxyCommonClient.java

@@ -63,11 +63,6 @@ public class ProxyCommonClient extends ProxyCommon {
         return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
     }
 
-    @Override
-    public boolean isCtrlDown() {
-        return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
-    }
-
     @Override
     public String getDisplayName(ItemStack itemstack) {
         return itemstack.getItem().getItemStackDisplayName(itemstack);

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

@@ -241,16 +241,16 @@ public abstract class BlockUtil {
         if (bw) try {
             // noinspection unchecked
             BW_MetaGenerated_WerkstoffBlocksClass = (Class<? extends Block>) Class
-                    .forName("bartworks.system.material.BWMetaGeneratedWerkstoffBlocks");
-            BWBlocks = (Block) Class.forName("bartworks.system.material.WerkstoffLoader").getField("BWBlocks")
-                    .get(null);
+                    .forName("com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_WerkstoffBlocks");
+            BWBlocks = (Block) Class.forName("com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader")
+                    .getField("BWBlocks").get(null);
         } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();
         }
         if (gt) try {
             // noinspection unchecked
-            GTBlockMachines_Class = (Class<? extends Block>) Class.forName("gregtech.common.blocks.BlockMachines");
-            GTBlockMachines = (Block) Class.forName("gregtech.api.GregTechAPI").getField("sBlockMachines").get(null);
+            GTBlockMachines_Class = (Class<? extends Block>) Class.forName("gregtech.common.blocks.GT_Block_Machines");
+            GTBlockMachines = (Block) Class.forName("gregtech.api.GregTech_API").getField("sBlockMachines").get(null);
         } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();
         }

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

@@ -1,30 +1,29 @@
 package forestry.core.utils;
 
-import java.math.BigDecimal;
-
 public class MathUtil {
 
-    private static final BigDecimal MAX_FLOAT = BigDecimal.valueOf(Float.MAX_VALUE);
-    private static final BigDecimal MIN_FLOAT = BigDecimal.valueOf(-Float.MAX_VALUE);
-
-    private static float clampToFloatRange(BigDecimal result) {
-        if (result.compareTo(MAX_FLOAT) > 0) {
-            return Float.MAX_VALUE;
-        } else if (result.compareTo(MIN_FLOAT) < 0) {
-            return -Float.MAX_VALUE;
-        }
-        return result.floatValue();
-    }
-
     public static float safeMultiply(float a, float b) {
-        BigDecimal bigA = BigDecimal.valueOf(a);
-        BigDecimal bigB = BigDecimal.valueOf(b);
-        return clampToFloatRange(bigA.multiply(bigB));
+        if (a > 0 && b > 0 && a > Float.MAX_VALUE / b) {
+            return Float.MAX_VALUE;
+        } else if (a > 0 && b < 0 && a > Float.MIN_VALUE / b) {
+            return Float.MIN_VALUE;
+        } else if (a < 0 && b > 0 && a < Float.MIN_VALUE / b) {
+            return Float.MIN_VALUE;
+        } else if (a < 0 && b < 0 && a < Float.MAX_VALUE / b) {
+            return Float.MAX_VALUE;
+        } else {
+            return a * b;
+        }
     }
 
     public static float safeAdd(float a, float b) {
-        BigDecimal bigA = BigDecimal.valueOf(a);
-        BigDecimal bigB = BigDecimal.valueOf(b);
-        return clampToFloatRange(bigA.add(bigB));
+        if (a > 0 && b > 0 && a > Float.MAX_VALUE - b) {
+            return Float.MAX_VALUE;
+        } else if (a < 0 && b < 0 && a < Float.MIN_VALUE - b) {
+            return Float.MIN_VALUE;
+        } else {
+            return a + b;
+        }
     }
+
 }

src/main/java/forestry/lepidopterology/genetics/Butterfly.java

@@ -14,8 +14,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -62,36 +60,6 @@ public class Butterfly extends IndividualLiving implements IButterfly {
         this.genome = genome;
     }
 
-    @Override
-    public void addLore(List<String> text) {
-        IAlleleButterflySpecies primary = genome.getPrimary();
-        String descTokens[] = primary.getDescription().split("\\|");
-
-        if (descTokens.length > 0) {
-            String speciesLore = descTokens[0];
-            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
-                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
-                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
-                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
-                text.addAll(formattedLoreList);
-            }
-        }
-    }
-
-    @Override
-    public void addDiscoveredBy(List<String> text) {
-        IAlleleButterflySpecies primary = genome.getPrimary();
-        String descTokens[] = primary.getDescription().split("\\|");
-
-        if (descTokens.length > 2) {
-            String discoveredBy = descTokens[2];
-            if (!discoveredBy.isEmpty()) {
-                text.add("");
-                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
-            }
-        }
-    }
-
     @Override
     public void addTooltip(List<String> list) {
         IAlleleButterflySpecies primary = genome.getPrimary();

src/main/java/forestry/plugins/PluginCore.java

@@ -8,8 +8,6 @@
  ******************************************************************************/
 package forestry.plugins;
 
-import static forestry.Forestry.isDreamcraftLoaded;
-
 import java.util.ArrayList;
 
 import net.minecraft.command.ICommand;
@@ -134,16 +132,14 @@ public class PluginCore extends ForestryPlugin {
 
         // forestry items
         crateRegistry.registerCrate(items.peat, "cratedPeat");
+        crateRegistry.registerCrate(items.apatite, "cratedApatite");
         crateRegistry.registerCrate(items.fertilizerCompound, "cratedFertilizer");
         crateRegistry.registerCrate(items.mulch, "cratedMulch");
         crateRegistry.registerCrate(items.phosphor, "cratedPhosphor");
         crateRegistry.registerCrate(items.ash, "cratedAsh");
-        if (!isDreamcraftLoaded) {
-            crateRegistry.registerCrate(items.apatite, "cratedApatite");
-            crateRegistry.registerCrateUsingOreDict(items.ingotTin, "cratedTin");
-            crateRegistry.registerCrateUsingOreDict(items.ingotCopper, "cratedCopper");
-            crateRegistry.registerCrateUsingOreDict(items.ingotBronze, "cratedBronze");
-        }
+        crateRegistry.registerCrateUsingOreDict(items.ingotTin, "cratedTin");
+        crateRegistry.registerCrateUsingOreDict(items.ingotCopper, "cratedCopper");
+        crateRegistry.registerCrateUsingOreDict(items.ingotBronze, "cratedBronze");
 
         // forestry blocks
         crateRegistry.registerCrate(blocks.soil.get(BlockSoil.SoilType.HUMUS, 1), "cratedHumus");
@@ -199,14 +195,9 @@ public class PluginCore extends ForestryPlugin {
     protected void registerRecipes() {
 
         /* SMELTING RECIPES */
-        if (!isDreamcraftLoaded) {
-            RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.APATITE, 1), items.apatite, 0.5f);
-            RecipeUtil.addSmelting(
-                    blocks.resources.get(BlockResourceOre.ResourceType.COPPER, 1),
-                    items.ingotCopper,
-                    0.5f);
-            RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.TIN, 1), items.ingotTin, 0.5f);
-        }
+        RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.APATITE, 1), items.apatite, 0.5f);
+        RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.COPPER, 1), items.ingotCopper, 0.5f);
+        RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.TIN, 1), items.ingotTin, 0.5f);
         RecipeUtil.addSmelting(new ItemStack(items.peat), items.ash, 0.0f);
 
         /* BRONZE INGOTS */
@@ -391,43 +382,41 @@ public class PluginCore extends ForestryPlugin {
                 new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE));
 
         // Storage Blocks
-        if (!isDreamcraftLoaded) {
-            RecipeUtil.addRecipe(
-                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.APATITE),
-                    "###",
-                    "###",
-                    "###",
-                    '#',
-                    "gemApatite");
-            RecipeUtil.addShapelessRecipe(new ItemStack(items.apatite, 9), "blockApatite");
+        RecipeUtil.addRecipe(
+                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.APATITE),
+                "###",
+                "###",
+                "###",
+                '#',
+                "gemApatite");
+        RecipeUtil.addShapelessRecipe(new ItemStack(items.apatite, 9), "blockApatite");
 
-            RecipeUtil.addRecipe(
-                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.COPPER),
-                    "###",
-                    "###",
-                    "###",
-                    '#',
-                    "ingotCopper");
-            RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotCopper, 9), "blockCopper");
+        RecipeUtil.addRecipe(
+                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.COPPER),
+                "###",
+                "###",
+                "###",
+                '#',
+                "ingotCopper");
+        RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotCopper, 9), "blockCopper");
 
-            RecipeUtil.addRecipe(
-                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.TIN),
-                    "###",
-                    "###",
-                    "###",
-                    '#',
-                    "ingotTin");
-            RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotTin, 9), "blockTin");
+        RecipeUtil.addRecipe(
+                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.TIN),
+                "###",
+                "###",
+                "###",
+                '#',
+                "ingotTin");
+        RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotTin, 9), "blockTin");
 
-            RecipeUtil.addRecipe(
-                    blocks.resourceStorage.get(BlockResourceStorage.ResourceType.BRONZE),
-                    "###",
-                    "###",
-                    "###",
-                    '#',
-                    "ingotBronze");
-            RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotBronze, 9), "blockBronze");
-        }
+        RecipeUtil.addRecipe(
+                blocks.resourceStorage.get(BlockResourceStorage.ResourceType.BRONZE),
+                "###",
+                "###",
+                "###",
+                '#',
+                "ingotBronze");
+        RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotBronze, 9), "blockBronze");
     }
 
     @Override

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

@@ -8,8 +8,6 @@
  ******************************************************************************/
 package forestry.plugins;
 
-import static forestry.Forestry.isDreamcraftLoaded;
-
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -646,20 +644,18 @@ public class PluginFactory extends ForestryPlugin {
                 new Object[] { " # ", " X ", " X ", '#', "ingotBronze", 'X', "stickWood" });
 
         // Reclamation
-        if (!isDreamcraftLoaded) {
-            RecipeManagers.carpenterManager.addRecipe(
-                    null,
-                    PluginCore.items.ingotBronze.getItemStack(2),
-                    "#",
-                    '#',
-                    PluginCore.items.brokenBronzePickaxe);
-            RecipeManagers.carpenterManager.addRecipe(
-                    null,
-                    PluginCore.items.ingotBronze.getItemStack(),
-                    "#",
-                    '#',
-                    PluginCore.items.brokenBronzeShovel);
-        }
+        RecipeManagers.carpenterManager.addRecipe(
+                null,
+                PluginCore.items.ingotBronze.getItemStack(2),
+                "#",
+                '#',
+                PluginCore.items.brokenBronzePickaxe);
+        RecipeManagers.carpenterManager.addRecipe(
+                null,
+                PluginCore.items.ingotBronze.getItemStack(),
+                "#",
+                '#',
+                PluginCore.items.brokenBronzeShovel);
 
         // Crating and uncrating
         if (PluginManager.Module.STORAGE.isEnabled()) {

src/main/java/forestry/plugins/PluginFluids.java

@@ -8,8 +8,6 @@
  ******************************************************************************/
 package forestry.plugins;
 
-import static forestry.Forestry.isDreamcraftLoaded;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -132,13 +130,11 @@ public class PluginFluids extends ForestryPlugin {
         }
 
         if (RecipeManagers.squeezerManager != null) {
-            if (!isDreamcraftLoaded) {
-                RecipeManagers.squeezerManager.addContainerRecipe(
-                        10,
-                        items.canEmpty.getItemStack(),
-                        PluginCore.items.ingotTin.getItemStack(),
-                        0.05f);
-            }
+            RecipeManagers.squeezerManager.addContainerRecipe(
+                    10,
+                    items.canEmpty.getItemStack(),
+                    PluginCore.items.ingotTin.getItemStack(),
+                    0.05f);
             RecipeManagers.squeezerManager.addContainerRecipe(
                     10,
                     items.waxCapsuleEmpty.getItemStack(),

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

@@ -335,7 +335,6 @@ for.gui.temperature=Temperatur
 for.gui.tolerance=Toleranz
 for.gui.temptol=Temp.Tol
 for.gui.tooltip.tmi=Drücke die Umschalttaste für mehr Infos.
-for.gui.tooltip.tml=Drücke die Steuerungstaste für mehr Geschichte.
 for.gui.triple=Dreifache
 for.gui.unknown=Unbekannt
 for.gui.warm=Warm

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

@@ -341,7 +341,6 @@ for.gui.temperature=Temperature
 for.gui.tolerance=Tolerance
 for.gui.temptol=Temperature Tol.
 for.gui.tooltip.tmi=Hold shift for details
-for.gui.tooltip.tml=Hold ctrl for lore
 for.gui.triple=Triple
 for.gui.unknown=Unknown genome
 for.gui.warm=Warm

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

@@ -244,7 +244,6 @@ gui.higher=Higher
 gui.highest=Highest
 gui.fecundated=Mated
 gui.tooltip.tmi=Hold shift for details
-gui.tooltip.tml=Hold ctrl for lore
 gui.worktable.clear=Click to clear Grid
 gui.escritoire.probe=Examine Specimens
 hints.beebiomes.tag=Choose your biome!