Update for new NeoForge

Glitchfiend · Jan 4, 2024 · 3ed674a · 3ed674a
1 parent e5cb080
commit 3ed674a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 45 deletions.
diff --git a/common/src/main/java/toughasnails/network/DrinkInWorldPacket.java b/common/src/main/java/toughasnails/network/DrinkInWorldPacket.java
@@ -11,6 +11,7 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
 import toughasnails.api.potion.TANEffects;
@@ -45,21 +46,22 @@ public DrinkInWorldPacket decode(FriendlyByteBuf buf)
     @Override
     public void handle(DrinkInWorldPacket packet, Context context)
     {
-        ServerPlayer player = context.getSender();
-        Level level = player.level();
-        IThirst thirst = ThirstHelper.getThirst(player);
+        context.getPlayer().ifPresent(player -> {
+            Level level = player.level();
+            IThirst thirst = ThirstHelper.getThirst(player);
 
-        // Whilst we already checked on the client, check again to be sure
-        if (level.mayInteract(player, packet.pos) && level.getFluidState(packet.pos).is(FluidTags.WATER))
-        {
-            thirst.drink(ModConfig.thirst.handDrinkingThirst, (float)ModConfig.thirst.handDrinkingHydration);
+            // Whilst we already checked on the client, check again to be sure
+            if (level.mayInteract(player, packet.pos) && level.getFluidState(packet.pos).is(FluidTags.WATER))
+            {
+                thirst.drink(ModConfig.thirst.handDrinkingThirst, (float)ModConfig.thirst.handDrinkingHydration);
 
-            Holder<Biome> biome = level.getBiome(packet.pos);
+                Holder<Biome> biome = level.getBiome(packet.pos);
 
-            if (level.random.nextFloat() < ModTags.Biomes.getBiomeWaterType(biome).getPoisonChance())
-            {
-                player.addEffect(new MobEffectInstance(TANEffects.THIRST, 600));
+                if (level.random.nextFloat() < ModTags.Biomes.getBiomeWaterType(biome).getPoisonChance())
+                {
+                    player.addEffect(new MobEffectInstance(TANEffects.THIRST, 600));
+                }
             }
-        }
+        });
     }
 }
diff --git a/common/src/main/java/toughasnails/network/UpdateTemperaturePacket.java b/common/src/main/java/toughasnails/network/UpdateTemperaturePacket.java
@@ -44,19 +44,11 @@ public void handle(UpdateTemperaturePacket packet, Context context)
         if (context.isServerSide())
             return;
 
-        Detail.setTemperatureClient(packet.temperatureLevel, packet.hyperthermiaTicks);
-    }
-
-    // Used to isolate client code from the server
-    private static class Detail
-    {
-        private static void setTemperatureClient(TemperatureLevel level, int hyperthermiaTicks)
-        {
-            Player player = Minecraft.getInstance().player;
+        context.getPlayer().ifPresent(player -> {
             ITemperature temperature = TemperatureHelper.getTemperatureData(player);
 
-            temperature.setLevel(level);
-            temperature.setHyperthermiaTicks(hyperthermiaTicks);
-        }
+            temperature.setLevel(packet.temperatureLevel);
+            temperature.setHyperthermiaTicks(packet.hyperthermiaTicks);
+        });
     }
 }
diff --git a/common/src/main/java/toughasnails/network/UpdateThirstPacket.java b/common/src/main/java/toughasnails/network/UpdateThirstPacket.java
@@ -5,12 +5,7 @@
 package toughasnails.network;
 
 import glitchcore.network.CustomPacket;
-import net.minecraft.client.Minecraft;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.entity.player.Player;
-import toughasnails.api.temperature.ITemperature;
-import toughasnails.api.temperature.TemperatureHelper;
-import toughasnails.api.temperature.TemperatureLevel;
 import toughasnails.api.thirst.IThirst;
 import toughasnails.api.thirst.ThirstHelper;
 
@@ -46,19 +41,11 @@ public void handle(UpdateThirstPacket packet, Context context)
         if (context.isServerSide())
             return;
 
-        Detail.setThirstClient(packet.thirstLevel, packet.hydrationLevel);
-    }
-
-    // Used to isolate client code from the server
-    private static class Detail
-    {
-        private static void setThirstClient(int thirstLevel, float hydrationLevel)
-        {
-            Player player = Minecraft.getInstance().player;
+        context.getPlayer().ifPresent(player -> {
             IThirst thirst = ThirstHelper.getThirst(player);
 
-            thirst.setThirst(thirstLevel);
-            thirst.setHydration(hydrationLevel);
-        }
+            thirst.setThirst(packet.thirstLevel);
+            thirst.setHydration(packet.hydrationLevel);
+        });
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ forge_version_range=[49.0.3,)
 forge_loader_version_range=[49,)
 
 # NeoForge
-neoforge_version=20.4.3-beta
+neoforge_version=20.4.75-beta
 neoforge_version_range=[20.4,)
 neoforge_loader_version_range=[1,)
 
@@ -40,5 +40,5 @@ org.gradle.daemon=false
 
 # Dependencies
 nightconfig_version=3.6.7
-glitchcore_version=1.0.0.33
+glitchcore_version=1.0.0.34
 serene_seasons_version=9.3.0.0
diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
@@ -14,14 +14,14 @@ logoFile="${mod_id}_logo.png"
 
 [[dependencies.${mod_id}]]
     modId="neoforge"
-    mandatory=true
+    required=true
     versionRange="${neoforge_version_range}"
     ordering="NONE"
     side="BOTH"
 
 [[dependencies.${mod_id}]]
     modId="glitchcore"
-    mandatory=true
+    required=true
     versionRange="[${glitchcore_version},)"
     ordering="NONE"
     side="BOTH"