Fix FoodStats crash with Thermos

dependencies.gradle

@@ -1,11 +1,13 @@
 // Add your dependencies here
 
 dependencies {
-    compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.7:dev") 
-    compileOnly("com.github.GTNewHorizons:Natura:2.5.5:dev") {
+    compileOnly("com.github.GTNewHorizons:CodeChickenLib:1.1.8:dev")
+    compileOnly("com.github.GTNewHorizons:Natura:2.5.7:dev") {
         transitive = false
     }
     compileOnly("curse.maven:pams-harvestcraft-221857:2270206") {
         transitive = false
     }
+
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.3.83-GTNH:dev")
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

repositories.gradle

@@ -1,15 +1,4 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    maven {
-        name = "GTNH Maven"
-        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-    }
-    maven {
-        url "https://cursemaven.com"
-    }
-    maven {
-        name = "jitpack.io"
-        url = "https://jitpack.io"
-    }
 }

src/main/java/squeek/applecore/AppleCore.java

@@ -12,16 +12,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import squeek.applecore.api_impl.AppleCoreAccessorMutatorImpl;
-import squeek.applecore.api_impl.AppleCoreDispatcherImpl;
-import squeek.applecore.api_impl.AppleCoreRegistryImpl;
-import squeek.applecore.client.DebugInfoHandler;
-import squeek.applecore.client.HUDOverlayHandler;
-import squeek.applecore.client.TooltipOverlayHandler;
-import squeek.applecore.commands.Commands;
-import squeek.applecore.mixinplugin.Mixins;
-import squeek.applecore.network.SyncHandler;
-
 import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;
 
 import cpw.mods.fml.client.event.ConfigChangedEvent;
@@ -34,6 +24,15 @@
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import cpw.mods.fml.relauncher.Side;
+import squeek.applecore.api_impl.AppleCoreAccessorMutatorImpl;
+import squeek.applecore.api_impl.AppleCoreDispatcherImpl;
+import squeek.applecore.api_impl.AppleCoreRegistryImpl;
+import squeek.applecore.client.DebugInfoHandler;
+import squeek.applecore.client.HUDOverlayHandler;
+import squeek.applecore.client.TooltipOverlayHandler;
+import squeek.applecore.commands.Commands;
+import squeek.applecore.mixinplugin.Mixins;
+import squeek.applecore.network.SyncHandler;
 
 @IFMLLoadingPlugin.SortingIndex(1100)
 @IFMLLoadingPlugin.MCVersion("1.7.10")

src/main/java/squeek/applecore/api/food/FoodEvent.java

@@ -8,9 +8,9 @@
 import net.minecraft.util.FoodStats;
 import net.minecraftforge.common.MinecraftForge;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Cancelable;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 /**
  * Base class for all FoodEvent events.<br>

src/main/java/squeek/applecore/api/hunger/ExhaustionEvent.java

@@ -8,9 +8,9 @@
 import net.minecraft.world.EnumDifficulty;
 import net.minecraftforge.common.MinecraftForge;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Cancelable;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 /**
  * Base class for all ExhaustionEvent events.<br>

src/main/java/squeek/applecore/api/hunger/HealthRegenEvent.java

@@ -7,9 +7,9 @@
 import net.minecraft.util.FoodStats;
 import net.minecraftforge.common.MinecraftForge;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Cancelable;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 /**
  * Base class for all HealthRegenEvent events.<br>

src/main/java/squeek/applecore/api/hunger/StarvationEvent.java

@@ -8,9 +8,9 @@
 import net.minecraft.world.EnumDifficulty;
 import net.minecraftforge.common.MinecraftForge;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Cancelable;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 /**
  * Base class for all StarvationEvent events.<br>

src/main/java/squeek/applecore/api/package-info.java

@@ -1,5 +1,5 @@
 @API(apiVersion = ModInfo.APIVERSION, owner = ModInfo.MODID, provides = ModInfo.MODAPI)
 package squeek.applecore.api;
 
-import squeek.applecore.ModInfo;
 import cpw.mods.fml.common.API;
+import squeek.applecore.ModInfo;

src/main/java/squeek/applecore/api_impl/AppleCoreDispatcherImpl.java

@@ -6,10 +6,10 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 
+import cpw.mods.fml.common.eventhandler.Event;
 import squeek.applecore.api.AppleCoreAPI;
 import squeek.applecore.api.IAppleCoreDispatcher;
 import squeek.applecore.api.plants.PlantGrowthEvent;
-import cpw.mods.fml.common.eventhandler.Event;
 
 public enum AppleCoreDispatcherImpl implements IAppleCoreDispatcher {
 

src/main/java/squeek/applecore/client/DebugInfoHandler.java

@@ -7,11 +7,11 @@
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.common.MinecraftForge;
 
-import squeek.applecore.ModConfig;
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import squeek.applecore.ModConfig;
+import squeek.applecore.api.AppleCoreAPI;
 
 @SideOnly(Side.CLIENT)
 public class DebugInfoHandler {

src/main/java/squeek/applecore/client/HUDOverlayHandler.java

@@ -14,17 +14,17 @@
 
 import org.lwjgl.opengl.GL11;
 
-import squeek.applecore.ModConfig;
-import squeek.applecore.ModInfo;
-import squeek.applecore.api.AppleCoreAPI;
-import squeek.applecore.api.food.FoodValues;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import squeek.applecore.ModConfig;
+import squeek.applecore.ModInfo;
+import squeek.applecore.api.AppleCoreAPI;
+import squeek.applecore.api.food.FoodValues;
 
 @SideOnly(Side.CLIENT)
 public class HUDOverlayHandler {

src/main/java/squeek/applecore/client/TooltipOverlayHandler.java

@@ -16,12 +16,6 @@
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
-import squeek.applecore.AppleCore;
-import squeek.applecore.ModConfig;
-import squeek.applecore.ModInfo;
-import squeek.applecore.api.AppleCoreAPI;
-import squeek.applecore.api.food.FoodValues;
-import squeek.applecore.helpers.KeyHelper;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -30,6 +24,12 @@
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import squeek.applecore.AppleCore;
+import squeek.applecore.ModConfig;
+import squeek.applecore.ModInfo;
+import squeek.applecore.api.AppleCoreAPI;
+import squeek.applecore.api.food.FoodValues;
+import squeek.applecore.helpers.KeyHelper;
 
 @SideOnly(Side.CLIENT)
 public class TooltipOverlayHandler {

src/main/java/squeek/applecore/client/gui/GuiAppleCoreConfig.java

@@ -5,10 +5,10 @@
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraftforge.common.config.ConfigElement;
 
-import squeek.applecore.ModConfig;
-import squeek.applecore.ModInfo;
 import cpw.mods.fml.client.config.GuiConfig;
 import cpw.mods.fml.client.config.IConfigElement;
+import squeek.applecore.ModConfig;
+import squeek.applecore.ModInfo;
 
 public class GuiAppleCoreConfig extends GuiConfig {
 

src/main/java/squeek/applecore/mixinplugin/AppleCoreLateMixins.java

@@ -5,11 +5,11 @@
 import java.util.List;
 import java.util.Set;
 
-import squeek.applecore.AppleCore;
-
 import com.gtnewhorizon.gtnhmixins.ILateMixinLoader;
 import com.gtnewhorizon.gtnhmixins.LateMixin;
 
+import squeek.applecore.AppleCore;
+
 @LateMixin
 public class AppleCoreLateMixins implements ILateMixinLoader {
 

src/main/java/squeek/applecore/mixins/early/codechickenlib/GuiDrawMixin.java

@@ -5,8 +5,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import squeek.applecore.client.TooltipOverlayHandler;
 import codechicken.lib.gui.GuiDraw;
+import squeek.applecore.client.TooltipOverlayHandler;
 
 @Mixin(GuiDraw.class)
 public class GuiDrawMixin {

src/main/java/squeek/applecore/mixins/early/minecraft/BlockCactusMixin.java

@@ -10,8 +10,8 @@
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 @Mixin(BlockCactus.class)
 public abstract class BlockCactusMixin extends Block {

src/main/java/squeek/applecore/mixins/early/minecraft/BlockCocoaMixin.java

@@ -9,8 +9,8 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 @Mixin(BlockCocoa.class)
 public abstract class BlockCocoaMixin extends BlockDirectional {

src/main/java/squeek/applecore/mixins/early/minecraft/BlockCropsMixin.java

@@ -10,8 +10,8 @@
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 @Mixin(BlockCrops.class)
 public class BlockCropsMixin extends BlockBush {

src/main/java/squeek/applecore/mixins/early/minecraft/BlockMushroomMixin.java

@@ -13,8 +13,8 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 @Mixin(BlockMushroom.class)
 public class BlockMushroomMixin extends BlockBush {

src/main/java/squeek/applecore/mixins/early/minecraft/BlockNetherWartMixin.java

@@ -9,8 +9,8 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 @Mixin(BlockNetherWart.class)
 public class BlockNetherWartMixin extends BlockBush {

src/main/java/squeek/applecore/mixins/early/minecraft/BlockReedMixin.java

@@ -12,8 +12,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 @Mixin(BlockReed.class)
 public class BlockReedMixin extends Block {

src/main/java/squeek/applecore/mixins/early/minecraft/BlockSaplingMixin.java

@@ -12,8 +12,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 @Mixin(BlockSapling.class)
 public abstract class BlockSaplingMixin extends BlockBush {

src/main/java/squeek/applecore/mixins/early/minecraft/BlockStemMixin.java

@@ -13,8 +13,8 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import squeek.applecore.api.AppleCoreAPI;
 import cpw.mods.fml.common.eventhandler.Event;
+import squeek.applecore.api.AppleCoreAPI;
 
 @Mixin(BlockStem.class)
 public class BlockStemMixin extends BlockBush {

src/main/java/squeek/applecore/mixins/early/minecraft/EntityPlayerMixin.java

@@ -16,14 +16,13 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import squeek.applecore.api.hunger.HealthRegenEvent;
-import squeek.applecore.mixinplugin.ducks.EntityPlayerExt;
-import squeek.applecore.mixinplugin.ducks.FoodStatsExt;
-
 import com.mojang.authlib.GameProfile;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import squeek.applecore.api.hunger.HealthRegenEvent;
+import squeek.applecore.mixinplugin.ducks.EntityPlayerExt;
+import squeek.applecore.mixinplugin.ducks.FoodStatsExt;
 
 @Mixin(EntityPlayer.class)
 public abstract class EntityPlayerMixin extends EntityLivingBase implements EntityPlayerExt {