clean up some stuff, update required thermoo version to 2.2

TheDeathlyCow · Mar 27, 2024 · c66779d · c66779d
1 parent 84e3b20
commit c66779d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -22,7 +22,7 @@ cloth_config_version=11.0.99
 fabric_asm_version=2.3
 
 # Thermoo
-thermoo_version=v2.1.2
+thermoo_version=v2.2
 
 # Colorful Hearts
 # https://modrinth.com/mod/colorful-hearts

diff --git a/...m/github/thedeathlycow/frostiful/mixins/entity/ice_skating/LivingEntityMovementMixin.java b/...m/github/thedeathlycow/frostiful/mixins/entity/ice_skating/LivingEntityMovementMixin.java
@@ -41,8 +41,6 @@ public abstract class LivingEntityMovementMixin extends Entity implements IceSka
     @Shadow
     protected abstract float getVelocityMultiplier();
 
-    @Shadow protected abstract void attackLivingEntity(LivingEntity target);
-
     public LivingEntityMovementMixin(EntityType<?> type, World world) {
         super(type, world);
     }
@@ -53,13 +51,16 @@ public LivingEntityMovementMixin(EntityType<?> type, World world) {
     @Unique
     private static final int FROSTIFUL_IS_GLIDING_INDEX = 1;
 
+    @Unique
     private boolean frostiful$wasSlowed = false;
 
+    @Unique
     private boolean frostiful$getSkateFlag(int index) {
         byte flags = FComponents.ENTITY_COMPONENTS.get(this).getSkateFlags();
         return (flags & 1 << index) != 0;
     }
 
+    @Unique
     private void frostiful$setSkateFlag(int index, boolean value) {
         LivingEntityComponents component = FComponents.ENTITY_COMPONENTS.get(this);
         byte data = component.getSkateFlags();

diff --git a/src/main/java/com/github/thedeathlycow/frostiful/survival/ModifyTemperatureController.java b/src/main/java/com/github/thedeathlycow/frostiful/survival/ModifyTemperatureController.java
@@ -32,7 +32,7 @@ public double getBaseValueForAttribute(EntityAttribute attribute, LivingEntity e
     public int getTemperatureEffectsChange(LivingEntity entity) {
         int warmth = controller.getTemperatureEffectsChange(entity);
         if (entity.thermoo$getTemperature() > 0) {
-            return controller.getTemperatureEffectsChange(entity);
+            return warmth;
         }
 
         FrostifulConfig config = Frostiful.getConfig();

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -46,7 +46,7 @@
         "fabricloader": ">=0.15.7",
         "fabric-api": ">=0.91.0",
         "minecraft": "~1.20.1",
-        "thermoo": ">=2.1.2",
+        "thermoo": ">=2.2",
         "mm": ">=2.3",
         "java": ">=17"
     },