Merge branch '1.20.2' into 1.20.4

Sollace · Mar 16, 2024 · d0c0f0f · d0c0f0f
2 parents 85e4ae7 + f24cff2
commit d0c0f0f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/src/main/java/eu/ha3/presencefootsteps/PFConfig.java b/src/main/java/eu/ha3/presencefootsteps/PFConfig.java
@@ -23,7 +23,7 @@ public class PFConfig extends JsonFile {
 
     private int maxSteppingEntities = 50;
 
-    private boolean disabled;
+    private boolean disabled = false;
     private boolean firstRun = true;
     private boolean multiplayer = true;
     private boolean global = true;
@@ -47,7 +47,7 @@ public boolean toggleMultiplayer() {
     }
 
     public EntitySelector cycleTargetSelector() {
-        targetEntities = EntitySelector.VALUES[(targetEntities.ordinal() + 1) % EntitySelector.VALUES.length];
+        targetEntities = EntitySelector.VALUES[(getEntitySelector().ordinal() + 1) % EntitySelector.VALUES.length];
 
         save();
 
@@ -75,11 +75,11 @@ public void setNotFirstRun() {
     }
 
     public Locomotion getLocomotion() {
-        return stance;
+        return stance == null ? Locomotion.NONE : stance;
     }
 
     public EntitySelector getEntitySelector() {
-        return targetEntities;
+        return targetEntities == null ? EntitySelector.ALL : targetEntities;
     }
 
     public boolean getEnabledFootwear() {
@@ -154,8 +154,10 @@ public float setRunningVolumeIncrease(float volume) {
     }
 
     public void populateCrashReport(CrashReportSection section) {
-        section.add("PF Global Volume", volume);
-        section.add("PF User's Selected Stance", stance);
+        section.add("Disabled", getDisabled());
+        section.add("Global Volume", volume);
+        section.add("User's Selected Stance", getLocomotion());
+        section.add("Target Selector", getEntitySelector());
         section.add("Enabled Global", global);
         section.add("Enabled Multiplayer", multiplayer);
     }

diff --git a/src/main/java/eu/ha3/presencefootsteps/sound/generator/Locomotion.java b/src/main/java/eu/ha3/presencefootsteps/sound/generator/Locomotion.java
@@ -1,5 +1,6 @@
 package eu.ha3.presencefootsteps.sound.generator;
 
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.BiFunction;
@@ -30,7 +31,7 @@ public enum Locomotion {
     private final BiFunction<LivingEntity, SoundEngine, Optional<StepSoundGenerator>> constructor;
 
     private static final String AUTO_TRANSLATION_KEY = "menu.pf.stance.auto";
-    private final String translationKey = "menu.pf.stance." + name().toLowerCase();
+    private final String translationKey = "menu.pf.stance." + name().toLowerCase(Locale.ROOT);
 
     Locomotion() {
         constructor = (entity, engine) -> Optional.empty();

diff --git a/src/main/java/eu/ha3/presencefootsteps/world/LocomotionLookup.java b/src/main/java/eu/ha3/presencefootsteps/world/LocomotionLookup.java
@@ -56,9 +56,9 @@ public void writeToReport(boolean full, JsonObjectWriter writer, Map<String, Blo
             Identifier id = EntityType.getId(type);
             if (full || !contains(id)) {
                 if (type.create(MinecraftClient.getInstance().world) instanceof LivingEntity) {
-                    writer.field(id.toString(), values.get(id).name());
+                    writer.field(id.toString(), values.getOrDefault(id, Locomotion.NONE).name());
                 }
             }
         });
     }
-}
+}
diff --git a/src/main/java/eu/ha3/presencefootsteps/world/PFSolver.java b/src/main/java/eu/ha3/presencefootsteps/world/PFSolver.java
@@ -206,8 +206,8 @@ private Association findAssociation(AssociationPool associations, LivingEntity e
         pos.move(Direction.UP);
         final boolean hasRain = entity.getWorld().hasRain(pos);
         BlockState carpet = getBlockStateAt(entity, pos);
-        VoxelShape shape = carpet.getCollisionShape(entity.getWorld(), pos);
-        boolean isValidCarpet = !shape.isEmpty() && (shape.getMax(Axis.Y) < 0.2F && shape.getMax(Axis.Y) < collider.getMin(Axis.Y) + 0.1F);
+        VoxelShape shape = carpet.getOutlineShape(entity.getWorld(), pos);
+        boolean isValidCarpet = !shape.isEmpty() && shape.getMax(Axis.Y) < 0.3F;
         SoundsKey association = SoundsKey.UNASSIGNED;
         SoundsKey foliage = SoundsKey.UNASSIGNED;
         SoundsKey wetAssociation = SoundsKey.UNASSIGNED;