From b46a4d9668d7d38677f2507e2d90d73769077b18 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 12 Jan 2022 23:24:23 +0100 Subject: [PATCH] update new loader issues --- src/main/java/carpet/CarpetSettings.java | 6 +++--- .../java/carpet/mixins/PlayerManager_fakePlayersMixin.java | 2 +- src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 88e8619a..372b0986 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -217,11 +217,11 @@ public class CarpetSettings return newValue; } } - if (newValue.equals("false")) { + if (newValue.equalsIgnoreCase("false")) { shulkerBoxStackSize = 1; return newValue; } - if (newValue.equals("true")) { + if (newValue.equalsIgnoreCase("true")) { shulkerBoxStackSize = 64; return newValue; } @@ -236,7 +236,7 @@ public class CarpetSettings } @Rule( - desc = "Empty shulker boxes can stack to 64 or a custom value when thrown on the ground.", + desc = "Empty shulker boxes can stack when thrown on the ground.", extra = ".. or when manipulated inside the inventories", validate = StackableShulkerBoxValidator.class, options = {"false", "true", "16"}, diff --git a/src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java b/src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java index bd1f3733..9f6136dc 100644 --- a/src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java +++ b/src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java @@ -62,7 +62,7 @@ public abstract class PlayerManager_fakePlayersMixin @Inject(method = "createPlayer", at = @At(value = "INVOKE", shift = At.Shift.BEFORE, target = "Ljava/util/Iterator;hasNext()Z"), locals = LocalCapture.CAPTURE_FAILHARD) private void newWhileLoop(GameProfile gameProfile_1, CallbackInfoReturnable cir, UUID uUID_1, - List list_1, Iterator var5) + List list_1, ServerPlayerEntity serverPlayerEntity, Iterator var5) { while (var5.hasNext()) { diff --git a/src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java b/src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java index cb5277ed..7a5ad342 100644 --- a/src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java +++ b/src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java @@ -4,6 +4,7 @@ import carpet.CarpetSettings; import carpet.fakes.ServerWorldInterface; import carpet.script.CarpetEventServer; import net.minecraft.entity.Entity; +import net.minecraft.world.LocalDifficulty; import net.minecraft.world.entity.EntityLike; import net.minecraft.entity.LightningEntity; import net.minecraft.entity.damage.DamageSource; @@ -41,7 +42,7 @@ public class ServerWorld_scarpetMixin implements ServerWorldInterface )) private void onNaturalLightinig(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci, //ChunkPos chunkPos, boolean bl, int i, int j, Profiler profiler, BlockPos blockPos, boolean bl2) - ChunkPos chunkPos, boolean bl, int i, int j, Profiler profiler, BlockPos blockPos, boolean bl2, LightningEntity lightningEntity) + ChunkPos chunkPos, boolean bl, int i, int j, Profiler profiler, BlockPos blockPos, LocalDifficulty localDifficulty, boolean bl2, LightningEntity lightningEntity) { if (LIGHTNING.isNeeded()) LIGHTNING.onWorldEventFlag((ServerWorld) (Object)this, blockPos, bl2?1:0); }