diff --git a/gradle.properties b/gradle.properties index 4f784ccb..e408e70e 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=21w15a - yarn_mappings=21w15a+build.16 + minecraft_version=21w16a + yarn_mappings=21w16a+build.1 loader_version=0.11.3 fabric_version=0.33.0+1.17 diff --git a/src/main/java/carpet/mixins/BiomeArray_cleanLogsMixin.java b/src/main/java/carpet/mixins/BiomeArray_cleanLogsMixin.java index 3b76571d..7c703e6e 100644 --- a/src/main/java/carpet/mixins/BiomeArray_cleanLogsMixin.java +++ b/src/main/java/carpet/mixins/BiomeArray_cleanLogsMixin.java @@ -10,6 +10,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(BiomeArray.class) public class BiomeArray_cleanLogsMixin { + @SuppressWarnings("UnresolvedMixinReference") @Redirect(method = "(Lnet/minecraft/util/collection/IndexedIterable;Lnet/minecraft/world/HeightLimitView;[I)V", at = @At( value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V") diff --git a/src/main/java/carpet/mixins/TrapezoidHeightProvider_cleanLogsMixin.java b/src/main/java/carpet/mixins/TrapezoidHeightProvider_cleanLogsMixin.java index 34030c74..4c024ba4 100644 --- a/src/main/java/carpet/mixins/TrapezoidHeightProvider_cleanLogsMixin.java +++ b/src/main/java/carpet/mixins/TrapezoidHeightProvider_cleanLogsMixin.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(TrapezoidHeightProvider.class) public class TrapezoidHeightProvider_cleanLogsMixin { - //@SuppressWarnings("UnresolvedMixinReference") + @SuppressWarnings("UnresolvedMixinReference") @Redirect(method = "get", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V") ) diff --git a/src/main/java/carpet/mixins/WitherEntity_extremeMixin.java b/src/main/java/carpet/mixins/WitherEntity_extremeMixin.java index e6b5aca4..07bacb52 100644 --- a/src/main/java/carpet/mixins/WitherEntity_extremeMixin.java +++ b/src/main/java/carpet/mixins/WitherEntity_extremeMixin.java @@ -12,7 +12,10 @@ import java.util.Random; @Mixin(WitherEntity.class) public class WitherEntity_extremeMixin { - @Redirect(method = "method_6878", at = @At(value = "INVOKE", target = "Ljava/util/Random;nextFloat()F")) + @Redirect(method = "shootSkullAt(ILnet/minecraft/entity/LivingEntity;)V", at = @At( + value = "INVOKE", + target = "Ljava/util/Random;nextFloat()F") + ) private float nextFloatAmplfied(Random random) { if (CarpetSettings.extremeBehaviours) return random.nextFloat()/100; diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java index 4534d667..194207ad 100644 --- a/src/main/java/carpet/script/CarpetEventServer.java +++ b/src/main/java/carpet/script/CarpetEventServer.java @@ -824,7 +824,9 @@ public class CarpetEventServer private final Set skippedStats = new HashSet(){{ add(Stats.TIME_SINCE_DEATH); add(Stats.TIME_SINCE_REST); - add(Stats.PLAY_ONE_MINUTE); + //add(Stats.PLAY_ONE_MINUTE); + add(Stats.PLAY_TIME); + add(Stats.TOTAL_WORLD_TIME); }}; @Override public void onPlayerStatistic(ServerPlayerEntity player, Stat stat, int amount)