Merge remote-tracking branch 'origin/master' into mu

.gitattributes

@@ -32,6 +32,7 @@
 *.[dD][lL][lL]          binary
 *.[dD][yY][lL][iI][bB]  binary
 *.[pP][sS][dD]          binary
+*.[pP][dD][nN]          binary
 *.[tT][tT][fF]          binary
 *.[oO][tT][fF]          binary
 

.gitignore

@@ -28,6 +28,7 @@ whitelist.json
 *.iws
 src/main/resources/mixins.*([!.]).json
 *.bat
+*.sh
 *.DS_Store
 !gradlew.bat
 .factorypath
@@ -35,4 +36,4 @@ addon.local.gradle
 addon.local.gradle.kts
 addon.late.local.gradle
 addon.late.local.gradle.kts
-layout.json
+layout.json

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.11.28:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.11.30:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.39:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.11.54:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.105-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.162-GTNH:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.61:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.64:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -186,6 +186,11 @@ modrinthRelations =
 # Leave this empty if you don't want to publish on CurseForge.
 curseForgeProjectId =
 
+# Comma-separated supported CurseForge environments: client, server (case-insensitive).
+# Use client or server for mods that only support one environment. Defaults to client,server.
+# These tags describe where the mod can run, not whether installation is required on both sides.
+curseForgeEnvironments = client,server
+
 # The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
 # Syntax: type1:name1;type2:name2;...
 # Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],

gradle/gradle-daemon-jvm.properties

@@ -1,12 +1,12 @@
 #This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9064f22734b42ac03e85df04b632e167/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/4d0277c49991306ac78048580fe34bcf/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a9fa3b809e484a1e1ac4308a5dda661a/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/aa99913fa6d767d899ffc96082da01ca/redirect
 toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -19,12 +19,12 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,29 +65,18 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
 
 
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.26'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.34'
 }

src/main/java/binnie/botany/flower/ItemBotany.java

@@ -11,6 +11,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
@@ -19,18 +21,25 @@ import net.minecraft.world.World;
 import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
+import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumFlowerStage;
+import binnie.botany.api.IAlleleFlowerSpecies;
 import binnie.botany.api.IFlower;
 import binnie.botany.api.IFlowerColor;
 import binnie.botany.api.IFlowerGenome;
 import binnie.botany.api.IFlowerType;
 import binnie.botany.core.BotanyCore;
+import binnie.botany.genetics.AlleleColor;
+import binnie.botany.genetics.EnumFlowerColor;
 import binnie.botany.genetics.EnumFlowerType;
 import binnie.botany.genetics.Flower;
+import binnie.botany.genetics.FlowerSpecies;
 import binnie.core.BinnieCore;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IPollinatable;
 import forestry.core.config.Config;
@@ -61,12 +70,44 @@ public abstract class ItemBotany extends Item {
         return false;
     }
 
+    static IAllele getRenderAllele(ItemStack stack, EnumFlowerChromosome chromosome, boolean active) {
+        if (stack == null || !stack.hasTagCompound()) return null;
+
+        NBTTagCompound genome = stack.getTagCompound().getCompoundTag("Genome");
+        NBTTagList chromosomes = genome.getTagList("Chromosomes", 10);
+        int slot = chromosome.ordinal();
+        NBTTagCompound chromosomeTag = null;
+        for (int index = chromosomes.tagCount() - 1; index >= 0; index--) {
+            NBTTagCompound candidate = chromosomes.getCompoundTagAt(index);
+            if (candidate.getByte("Slot") == slot) {
+                chromosomeTag = candidate;
+                break;
+            }
+        }
+        if (chromosomeTag == null) return null;
+
+        Class<? extends IAllele> alleleClass = chromosome.getAlleleClass();
+        IAllele primary = AlleleManager.alleleRegistry.getAllele(chromosomeTag.getString("UID0"));
+        if (!alleleClass.isInstance(primary)) return null;
+        IAllele secondary = AlleleManager.alleleRegistry.getAllele(chromosomeTag.getString("UID1"));
+        if (!alleleClass.isInstance(secondary)) return null;
+        if (!active) return primary;
+
+        if (primary.isDominant()) return primary;
+        return secondary.isDominant() ? secondary : primary;
+    }
+
     @Override
     public boolean hasEffect(ItemStack stack, int pass) {
         if (!stack.hasTagCompound()) {
             return false;
         }
 
+        IAllele allele = getRenderAllele(stack, EnumFlowerChromosome.SPECIES, false);
+        if (allele instanceof IAlleleFlowerSpecies species) {
+            return species.hasEffect();
+        }
+
         IIndividual individual = getIndividual(stack);
         return individual != null && individual.getGenome() != null && individual.hasEffect();
     }
@@ -152,6 +193,17 @@ public abstract class ItemBotany extends Item {
 
     @Override
     public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
+        if (!itemstack.hasTagCompound()) {
+            return (renderPass == 0 ? EnumFlowerColor.GREEN : EnumFlowerColor.RED).getColor(false);
+        }
+
+        EnumFlowerChromosome chromosome = renderPass == 0 ? EnumFlowerChromosome.STEM
+                : renderPass == 1 ? EnumFlowerChromosome.PRIMARY : EnumFlowerChromosome.SECONDARY;
+        IAllele allele = getRenderAllele(itemstack, chromosome, true);
+        if (allele instanceof AlleleColor color) {
+            return color.getColor().getColor(itemstack.getTagCompound().getBoolean("Wilt"));
+        }
+
         IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
         if (flower == null || flower.getGenome() == null) {
             return 0xffffff;
@@ -177,19 +229,32 @@ public abstract class ItemBotany extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(ItemStack itemstack, int renderPass) {
-        IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
-        if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) {
-            return EnumFlowerType.ALLIUM.getBlank();
+        IAlleleFlowerSpecies species = FlowerSpecies.POPPY;
+        boolean flowered = false;
+
+        if (itemstack.hasTagCompound()) {
+            IAllele allele = getRenderAllele(itemstack, EnumFlowerChromosome.SPECIES, false);
+            if (allele instanceof IAlleleFlowerSpecies flowerSpecies) {
+                species = flowerSpecies;
+                flowered = itemstack.getTagCompound().getBoolean("Flowered");
+            } else {
+                IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
+                if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) {
+                    return EnumFlowerType.ALLIUM.getBlank();
+                }
+                species = flower.getGenome().getPrimary();
+                flowered = flower.hasFlowered();
+            }
         }
 
-        IFlowerType type = flower.getGenome().getPrimary().getType();
+        IFlowerType type = species.getType();
         if (renderPass == 0) {
-            return type.getStem(getStage(), flower.hasFlowered(), type.getSections() - 1);
+            return type.getStem(getStage(), flowered, type.getSections() - 1);
         }
         if (renderPass == 1) {
-            return type.getPetalIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
+            return type.getPetalIcon(getStage(), flowered, type.getSections() - 1);
         }
-        return type.getVariantIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
+        return type.getVariantIcon(getStage(), flowered, type.getSections() - 1);
     }
 
     @Override

src/main/java/binnie/botany/flower/ItemInsulatedTube.java

@@ -38,8 +38,8 @@ public class ItemInsulatedTube extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (Material mat : Material.values()) {
-            for (Insulate ins : Insulate.values()) {
+        for (Material mat : Material.VALUES) {
+            for (Insulate ins : Insulate.VALUES) {
                 list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128));
             }
         }
@@ -97,6 +97,8 @@ public class ItemInsulatedTube extends Item {
         Bronze(0xddc276, "bronze"),
         Iron(0xd8d8d8, "iron");
 
+        public static final Material[] VALUES = values();
+
         private final int color;
         private final String name;
 
@@ -106,7 +108,7 @@ public class ItemInsulatedTube extends Item {
         }
 
         public static Material get(int i) {
-            return values()[i % values().length];
+            return VALUES[i % VALUES.length];
         }
 
         public int getColor() {
@@ -127,6 +129,8 @@ public class ItemInsulatedTube extends Item {
         Stone(0x6d6d6d, "smoothStone"),
         Sandstone(0xc1b989, "sandstone");
 
+        public static final Insulate[] VALUES = values();
+
         private final int color;
         private final String name;
 
@@ -136,7 +140,7 @@ public class ItemInsulatedTube extends Item {
         }
 
         public static Insulate get(int i) {
-            return values()[i / 128 % values().length];
+            return VALUES[i / 128 % VALUES.length];
         }
 
         public int getColor() {

src/main/java/binnie/botany/gardening/BlockPlant.java

@@ -48,7 +48,7 @@ public class BlockPlant extends BlockBush {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        for (Type t : Type.values()) {
+        for (Type t : Type.VALUES) {
             t.icon = Botany.proxy.getIcon(register, t.name().toLowerCase());
         }
     }
@@ -61,7 +61,7 @@ public class BlockPlant extends BlockBush {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(int side, int meta) {
-        return Type.values()[meta % Type.values().length].icon;
+        return Type.VALUES[meta % Type.VALUES.length].icon;
     }
 
     @Override
@@ -72,7 +72,7 @@ public class BlockPlant extends BlockBush {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (Type type : Type.values()) {
+        for (Type type : Type.VALUES) {
             list.add(type.get());
         }
     }
@@ -135,6 +135,7 @@ public class BlockPlant extends BlockBush {
         DeadFlower("deadFlower"),
         DecayingFlower("decayingFlower");
 
+        public static final Type[] VALUES = values();
         public IIcon icon;
 
         private final String name;
@@ -144,7 +145,7 @@ public class BlockPlant extends BlockBush {
         }
 
         public static Type get(int id) {
-            return values()[id % values().length];
+            return VALUES[id % VALUES.length];
         }
 
         public ItemStack get() {

src/main/java/binnie/botany/gardening/ItemWeed.java

@@ -18,7 +18,7 @@ public class ItemWeed extends ItemBlock {
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return BlockPlant.Type.values()[stack.getItemDamage()].getName();
+        return BlockPlant.Type.VALUES[stack.getItemDamage()].getName();
     }
 
     @Override

src/main/java/binnie/botany/genetics/FlowerTemplates.java

@@ -8,7 +8,13 @@ import forestry.core.genetics.alleles.EnumAllele;
 
 public class FlowerTemplates {
 
+    private static IAllele[] defaultTemplate;
+
     public static IAllele[] getDefaultTemplate() {
+        if (defaultTemplate != null) {
+            return defaultTemplate.clone();
+        }
+
         IAllele[] alleles = new IAllele[EnumFlowerChromosome.VALUES.length];
         alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.POPPY;
         alleles[EnumFlowerChromosome.PRIMARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
@@ -22,6 +28,13 @@ public class FlowerTemplates {
         alleles[EnumFlowerChromosome.PH_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
         alleles[EnumFlowerChromosome.SAPPINESS.ordinal()] = AlleleHelper.getAllele(EnumAllele.Sappiness.AVERAGE);
         alleles[EnumFlowerChromosome.STEM.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.GREEN);
-        return alleles;
+
+        for (IAllele allele : alleles) {
+            // Do not cache a partial template during registry initialization.
+            if (allele == null) return alleles;
+        }
+
+        defaultTemplate = alleles;
+        return defaultTemplate.clone();
     }
 }

src/main/java/binnie/core/craftgui/TopLevelWidget.java

@@ -1,10 +1,7 @@
 package binnie.core.craftgui;
 
 import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Deque;
-import java.util.List;
 import java.util.ListIterator;
 
 import org.lwjgl.input.Mouse;
@@ -168,17 +165,14 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget {
     }
 
     public Deque<IWidget> calculateMousedOverWidgets() {
-        Deque<IWidget> list = new ArrayDeque<>();
-        for (IWidget widget : getQueuedWidgets(this)) {
-            if (widget.calculateIsMouseOver()) {
-                list.addLast(widget);
-            }
-        }
-        return list;
+        Deque<IWidget> widgets = new ArrayDeque<>();
+        addMousedOverWidgets(this, widgets);
+        return widgets;
     }
 
-    private Collection<IWidget> getQueuedWidgets(IWidget widget) {
-        List<IWidget> widgets = new ArrayList<>();
+    private void addMousedOverWidgets(IWidget widget, Deque<IWidget> widgets) {
+        if (!widget.isVisible()) return;
+
         boolean addChildren = true;
         if (widget.isCroppedWidget()) {
             addChildren = widget.getCroppedZone().contains(widget.getCropWidget().getRelativeMousePosition());
@@ -188,11 +182,12 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget {
             ListIterator<IWidget> li = widget.getWidgets().listIterator(widget.getWidgets().size());
             while (li.hasPrevious()) {
                 IWidget child = li.previous();
-                widgets.addAll(getQueuedWidgets(child));
+                addMousedOverWidgets(child, widgets);
             }
         }
-        widgets.add(widget);
-        return widgets;
+        if (widget.calculateIsMouseOver()) {
+            widgets.addLast(widget);
+        }
     }
 
     @Override

src/main/java/binnie/core/craftgui/Widget.java

@@ -194,7 +194,7 @@ public class Widget implements IWidget {
 
     @Override
     public void setOffset(IPoint offset) {
-        if (offset != this.offset) {
+        if (!offset.equals(this.offset)) {
             this.offset = new IPoint(offset);
             callEvent(new EventWidget.ChangeOffset(this));
         }
@@ -285,6 +285,10 @@ public class Widget implements IWidget {
         onRender(RenderStage.PreChildren);
 
         for (IWidget widget : getWidgets()) {
+            if (!widget.isVisible()) {
+                continue;
+            }
+
             widget.render();
             CraftGUI.render.preRender(widget);
             widget.onRender(RenderStage.PostSiblings);
@@ -306,17 +310,22 @@ public class Widget implements IWidget {
         }
 
         onUpdateClient();
-        List<IWidget> deletedWidgets = new ArrayList<>();
+        List<IWidget> deletedWidgets = null;
         for (IWidget widget : getWidgets()) {
             if (widget.hasAttribute(WidgetAttribute.NEEDS_DELETION)) {
+                if (deletedWidgets == null) {
+                    deletedWidgets = new ArrayList<>();
+                }
                 deletedWidgets.add(widget);
             } else {
                 widget.updateClient();
             }
         }
 
-        for (IWidget widget : deletedWidgets) {
-            deleteChild(widget);
+        if (deletedWidgets != null) {
+            for (IWidget widget : deletedWidgets) {
+                deleteChild(widget);
+            }
         }
     }
 
@@ -338,7 +347,7 @@ public class Widget implements IWidget {
 
     @Override
     public boolean isMouseOverWidget(IPoint relativeMouse) {
-        return getArea().contains(relativeMouse);
+        return contains(relativeMouse);
     }
 
     @Override
@@ -466,7 +475,8 @@ public class Widget implements IWidget {
 
     @Override
     public boolean contains(IPoint position) {
-        return getArea().contains(position);
+        IPoint size = size();
+        return position.x() >= 0.0f && position.y() >= 0.0f && position.x() <= size.x() && position.y() <= size.y();
     }
 
     @Override

src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java

@@ -1,5 +1,8 @@
 package binnie.core.craftgui.controls.tab;
 
+import java.util.IdentityHashMap;
+import java.util.Map;
+
 import binnie.core.craftgui.CraftGUI;
 import binnie.core.craftgui.ITooltip;
 import binnie.core.craftgui.Tooltip;
@@ -21,6 +24,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
     protected T value;
 
     private final ControlTabBar<T> tabBar;
+    private final Map<Texture, Texture> croppedTextures = new IdentityHashMap<>();
 
     public ControlTab(ControlTabBar<T> parent, float x, float y, float w, float h, T value) {
         super(parent, x, y, w, h);
@@ -45,9 +49,8 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
             texture = CraftGUITexture.Tab;
         }
 
-        Texture lTexture = CraftGUI.render.getTexture(texture);
         Position position = getTabPosition();
-        Texture iTexture = lTexture.crop(position, 8.0f);
+        Texture iTexture = getCroppedTexture(texture);
         IArea area = getArea();
         if (texture == CraftGUITexture.TabDisabled) {
             if (position == Position.TOP || position == Position.LEFT) {
@@ -68,14 +71,23 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
             }
 
             if (icon.hasOutline()) {
-                iTexture = CraftGUI.render.getTexture(CraftGUITexture.TabOutline);
-                iTexture = iTexture.crop(position, 8.0f);
+                iTexture = getCroppedTexture(CraftGUITexture.TabOutline);
                 CraftGUI.render.color(icon.getOutlineColor());
                 CraftGUI.render.texture(iTexture, area.inset(2));
             }
         }
     }
 
+    private Texture getCroppedTexture(Object key) {
+        Texture source = CraftGUI.render.getTexture(key);
+        Texture cropped = croppedTextures.get(source);
+        if (cropped == null) {
+            cropped = source.crop(getTabPosition(), 8.0f);
+            croppedTextures.put(source, cropped);
+        }
+        return cropped;
+    }
+
     @Override
     public void getTooltip(Tooltip tooltip) {
         String name = getName();

src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java

@@ -4,6 +4,7 @@ import static net.minecraftforge.common.util.Constants.NBT.TAG_COMPOUND;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,6 +38,8 @@ import binnie.core.machines.power.TankInfo;
 import binnie.core.machines.transfer.TransferRequest;
 import binnie.core.network.packet.MessageContainerUpdate;
 import cpw.mods.fml.relauncher.Side;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class ContainerCraftGUI extends Container {
 
@@ -80,6 +83,7 @@ public class ContainerCraftGUI extends Container {
     private final Map<String, NBTTagCompound> syncedNBT = new HashMap<>();
     private final Map<String, NBTTagCompound> sentNBT = new HashMap<>();
     private final Map<Integer, TankInfo> syncedTanks = new HashMap<>();
+    private final Map<IInventory, Int2ObjectMap<CustomSlot>> slotsByInventory = new IdentityHashMap<>();
     private PowerInfo syncedPower = new PowerInfo();
     private ProcessInfo syncedProcess = new ProcessInfo();
     private int errorType = 0;
@@ -109,9 +113,17 @@ public class ContainerCraftGUI extends Container {
 
     @Override
     protected Slot addSlotToContainer(Slot slot) {
+        indexSlot(slot);
         return super.addSlotToContainer(slot);
     }
 
+    private void indexSlot(Slot slot) {
+        if (slot instanceof CustomSlot customSlot) {
+            slotsByInventory.computeIfAbsent(customSlot.inventory, key -> new Int2ObjectOpenHashMap<>())
+                    .putIfAbsent(customSlot.getSlotIndex(), customSlot);
+        }
+    }
+
     private Side getSide() {
         return window.isServer() ? Side.SERVER : Side.CLIENT;
     }
@@ -201,22 +213,22 @@ public class ContainerCraftGUI extends Container {
         Slot shiftClickedSlot = inventorySlots.get(index);
         ItemStack itemstack = null;
         if (shiftClickedSlot.getHasStack()) {
-            itemstack = shiftClickedSlot.getStack().copy();
+            itemstack = shiftClickedSlot.getStack();
         }
 
         IInventory playerInventory = player.inventory;
         IInventory entityInventory = window.getInventory();
         IInventory windowInventory = window.getWindowInventory();
         IInventory fromPlayer = (entityInventory == null) ? windowInventory : entityInventory;
-        int[] target = new int[36];
-        for (int i = 0; i < target.length; ++i) {
-            target[i] = i;
-        }
 
         TransferRequest request;
         if (shiftClickedSlot.inventory == playerInventory) {
             request = new TransferRequest(itemstack, fromPlayer).setOrigin(shiftClickedSlot.inventory);
         } else {
+            int[] target = new int[36];
+            for (int i = 0; i < target.length; ++i) {
+                target[i] = i;
+            }
             request = new TransferRequest(itemstack, playerInventory).setOrigin(shiftClickedSlot.inventory)
                     .setTargetSlots(target);
         }
@@ -246,7 +258,14 @@ public class ContainerCraftGUI extends Container {
     }
 
     public void handleNBT(Side side, EntityPlayer player, NBTTagCompound action) {
+        if (handleNBTAction(side, player, action)) {
+            sendContainerContents();
+        }
+    }
+
+    private boolean handleNBTAction(Side side, EntityPlayer player, NBTTagCompound action) {
         final String actionType = action.getString(ACTION_TYPE);
+        boolean slotRegistered = false;
 
         if (side == Side.SERVER) {
             switch (actionType) {
@@ -256,11 +275,7 @@ public class ContainerCraftGUI extends Container {
                     final int slotIndex = action.getShort(SLOT_INDEX);
                     final int slotNumber = action.getShort(SLOT_NUMBER);
 
-                    createSlot(InventoryType.values()[slotType % 4], slotIndex, slotNumber);
-
-                    for (ICrafting crafterObject : crafters) {
-                        crafterObject.sendContainerAndContentsToPlayer(this, getInventory());
-                    }
+                    slotRegistered = createSlot(InventoryType.values()[slotType % 4], slotIndex, slotNumber);
                 }
             }
         }
@@ -275,6 +290,7 @@ public class ContainerCraftGUI extends Container {
                 if (actionType.contains(TANK_UPDATE)) onTankUpdate(action);
             }
         }
+        return slotRegistered;
     }
 
     @Override
@@ -307,8 +323,7 @@ public class ContainerCraftGUI extends Container {
 
         if (machineSync != null) machineSync.sendGuiNBT(syncedNBT);
 
-        Map<String, NBTTagCompound> sentThisTime = new HashMap<>();
-        NBTTagList actions = new NBTTagList();
+        NBTTagList actions = null;
 
         for (Map.Entry<String, NBTTagCompound> entry : syncedNBT.entrySet()) {
             final String actionType = entry.getKey();
@@ -317,12 +332,18 @@ public class ContainerCraftGUI extends Container {
 
             action.setString(ACTION_TYPE, actionType);
 
-            if (action.equals(actionPrev)) continue;
+            if (action == actionPrev || action.equals(actionPrev)) continue;
 
+            if (actions == null) {
+                actions = new NBTTagList();
+            }
             actions.appendTag(action);
-            sentThisTime.put(actionType, action);
+            sentNBT.put(actionType, action);
         }
 
+        syncedNBT.clear();
+        if (actions == null) return;
+
         NBTTagCompound actionsBatch = new NBTTagCompound();
         actionsBatch.setString(ACTION_TYPE, ACTION_BATCH);
         actionsBatch.setTag(ACTIONS, actions);
@@ -333,9 +354,6 @@ public class ContainerCraftGUI extends Container {
                 BinnieCore.proxy.sendToPlayer(packet, playerMP);
             }
         }
-
-        sentNBT.putAll(sentThisTime);
-        syncedNBT.clear();
     }
 
     private NBTTagCompound createErrorNBT(IErrorStateSource error) {
@@ -476,29 +494,39 @@ public class ContainerCraftGUI extends Container {
     }
 
     private CustomSlot getSlot(IInventory inventory, int id) {
-        for (Object o : inventorySlots) {
-            CustomSlot slot = (CustomSlot) o;
-            if (slot.inventory == inventory && slot.getSlotIndex() == id) {
-                return slot;
-            }
-        }
-        return null;
+        Int2ObjectMap<CustomSlot> slots = slotsByInventory.get(inventory);
+        return (slots == null) ? null : slots.get(id);
     }
 
     public void receiveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
+        if (receiveNBTAction(side, player, action)) {
+            sendContainerContents();
+        }
+    }
+
+    private boolean receiveNBTAction(Side side, EntityPlayer player, NBTTagCompound action) {
         String actionType = action.getString(ACTION_TYPE);
         if (actionType.equals(ACTION_BATCH)) {
+            boolean slotRegistered = false;
             NBTTagList actionsBatch = action.getTagList(ACTIONS, TAG_COMPOUND);
             for (int i = 0; i < actionsBatch.tagCount(); i++) {
-                receiveNBT(side, player, actionsBatch.getCompoundTagAt(i));
+                slotRegistered |= receiveNBTAction(side, player, actionsBatch.getCompoundTagAt(i));
             }
-            return;
+            return slotRegistered;
         }
-        handleNBT(side, player, action);
+        boolean slotRegistered = handleNBTAction(side, player, action);
         window.receiveGuiNBT(getSide(), player, actionType, action);
         INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, window.getInventory());
-        if (machine == null) return;
-        machine.receiveGuiNBT(getSide(), player, actionType, action);
+        if (machine != null) {
+            machine.receiveGuiNBT(getSide(), player, actionType, action);
+        }
+        return slotRegistered;
+    }
+
+    private void sendContainerContents() {
+        for (ICrafting crafter : crafters) {
+            crafter.sendContainerAndContentsToPlayer(this, getInventory());
+        }
     }
 
     public Slot getOrCreateSlot(InventoryType inventoryType, int slotIndex) {
@@ -522,13 +550,16 @@ public class ContainerCraftGUI extends Container {
         };
     }
 
-    private void createSlot(InventoryType type, int index, int slotNumber) {
-        if (inventorySlots.get(slotNumber) != null) return;
+    private boolean createSlot(InventoryType type, int index, int slotNumber) {
+        if (inventorySlots.get(slotNumber) != null) return false;
 
         IInventory inventory = getInventory(type);
         Slot slot = new CustomSlot(inventory, index);
         slot.slotNumber = slotNumber;
+        indexSlot(slot);
         inventorySlots.add(slotNumber, slot);
-        inventoryItemStacks.add(slotNumber, null);
+        ItemStack stack = slot.getStack();
+        inventoryItemStacks.add(slotNumber, stack == null ? null : stack.copy());
+        return true;
     }
 }

src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java

@@ -11,6 +11,9 @@ import binnie.core.machines.inventory.InventorySlot;
 
 public class CustomSlot extends Slot {
 
+    private InventorySlot inventorySlot;
+    private boolean inventorySlotResolved;
+
     public CustomSlot(IInventory inventory, int index) {
         super(inventory, index, 0, 0);
     }
@@ -21,11 +24,12 @@ public class CustomSlot extends Slot {
     }
 
     public InventorySlot getInventorySlot() {
-        IInventorySlots slots = Machine.getInterface(IInventorySlots.class, inventory);
-        if (slots != null) {
-            return slots.getSlot(getSlotIndex());
+        if (!inventorySlotResolved) {
+            IInventorySlots slots = Machine.getInterface(IInventorySlots.class, inventory);
+            inventorySlot = (slots == null) ? null : slots.getSlot(getSlotIndex());
+            inventorySlotResolved = true;
         }
-        return null;
+        return inventorySlot;
     }
 
     public boolean handleClick() {