From db813ee29b9a21654941bdb73abdf4b758aae8cf Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 6 May 2020 15:10:45 -0300 Subject: [PATCH] 20w19a --- gradle.properties | 4 ++-- src/main/java/carpet/mixins/SpawnHelperInnerMixin.java | 3 ++- src/main/java/carpet/utils/Messenger.java | 2 ++ src/main/java/carpet/utils/SpawnReporter.java | 6 ++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 90013478..5027ae3b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=20w18a - yarn_mappings=20w18a+build.14 + minecraft_version=20w19a + yarn_mappings=20w19a+build.1 loader_version=0.8.2+build.194 # Mod Properties diff --git a/src/main/java/carpet/mixins/SpawnHelperInnerMixin.java b/src/main/java/carpet/mixins/SpawnHelperInnerMixin.java index 921dc7c3..6d620e2e 100644 --- a/src/main/java/carpet/mixins/SpawnHelperInnerMixin.java +++ b/src/main/java/carpet/mixins/SpawnHelperInnerMixin.java @@ -3,6 +3,7 @@ package carpet.mixins; import carpet.fakes.SpawnHelperInnerInterface; import carpet.utils.SpawnReporter; import it.unimi.dsi.fastutil.objects.Object2IntMap; +import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.minecraft.entity.EntityCategory; import net.minecraft.util.math.GravityField; import net.minecraft.world.SpawnHelper; @@ -26,7 +27,7 @@ public class SpawnHelperInnerMixin implements SpawnHelperInnerInterface @Shadow @Final private int spawningChunkCount; - @Shadow @Final private Object2IntMap categoryToCount; + @Shadow @Final private Object2IntOpenHashMap categoryToCount; @Shadow @Final private GravityField densityField; diff --git a/src/main/java/carpet/utils/Messenger.java b/src/main/java/carpet/utils/Messenger.java index 5d4d524b..59ea3b4a 100644 --- a/src/main/java/carpet/utils/Messenger.java +++ b/src/main/java/carpet/utils/Messenger.java @@ -112,6 +112,8 @@ public class Messenger return "f"; case WATER_CREATURE: return "v"; + case WATER_AMBIENT: + return "q"; } return "w"; } diff --git a/src/main/java/carpet/utils/SpawnReporter.java b/src/main/java/carpet/utils/SpawnReporter.java index 2b12f3f0..62c406d9 100644 --- a/src/main/java/carpet/utils/SpawnReporter.java +++ b/src/main/java/carpet/utils/SpawnReporter.java @@ -215,6 +215,8 @@ public class SpawnReporter return EntityCategory.WATER_CREATURE; case BROWN: return EntityCategory.AMBIENT; + case CYAN: + return EntityCategory.WATER_AMBIENT; } return null; } @@ -233,6 +235,10 @@ public class SpawnReporter { return EntityCategory.WATER_CREATURE; } + else if ("fish".equalsIgnoreCase(type_code)) + { + return EntityCategory.WATER_AMBIENT; + } else if ("ambient".equalsIgnoreCase(type_code)) { return EntityCategory.AMBIENT;