1.20.1

Ivan-1F · Ivan-1F · commit e642fc92670a · 2024-03-30T05:22:36.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 	include "com.github.Fallen-Breath:conditional-mixin:v0.3.2"
 
 	// mods
-	modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
+	modImplementation "carpet:fabric-carpet:1.20-${project.carpet_core_version}"
 
 	// runtime mods
 	modRuntimeOnly "com.github.Fallen-Breath:lazydfu:a7cfc44c0c"  // faster startup
diff --git a/gradle.properties b/gradle.properties
@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.19.4
-	yarn_mappings=1.19.4+build.2
+	minecraft_version=1.20.1
+	yarn_mappings=1.20.1+build.2
 	loader_version=0.14.9
 	# check available versions on maven for the given minecraft version you are using
 	# https://masa.dy.fi/maven/carpet/fabric-carpet/
-	carpet_core_version=1.4.100+v230314
+	carpet_core_version=1.4.112+v230608
 
 # Mod Properties
 	mod_version = 2.2.2
diff --git a/src/main/java/me/ivan/ivancarpetaddition/IvanCarpetAdditionSettings.java b/src/main/java/me/ivan/ivancarpetaddition/IvanCarpetAdditionSettings.java
@@ -26,9 +26,6 @@ public class IvanCarpetAdditionSettings {
     @Rule(categories = {ICA, CREATIVE, SURVIVAL})
     public static boolean flippinCactusSound = false;
 
-    @Rule(categories = {ICA, EXPERIMENTAL, SURVIVAL})
-    public static boolean editableSign = false;
-
     @Rule(options = {"_", "zombie", "skeleton", "zombie,skeleton"}, strict = false, categories = {ICA, CREATIVE})
     public static String mobBlackList = "_";
 
diff --git a/src/main/java/me/ivan/ivancarpetaddition/mixins/command/xpcounter/spawning/breeding/AnimalEntityMixin.java b/src/main/java/me/ivan/ivancarpetaddition/mixins/command/xpcounter/spawning/breeding/AnimalEntityMixin.java
@@ -10,7 +10,7 @@
 
 @Mixin(AnimalEntity.class)
 public class AnimalEntityMixin {
-    @ModifyArg(method = "breed", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;spawnEntity(Lnet/minecraft/entity/Entity;)Z"))
+    @ModifyArg(method = "breed(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/AnimalEntity;Lnet/minecraft/entity/passive/PassiveEntity;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;spawnEntity(Lnet/minecraft/entity/Entity;)Z"))
     private Entity onAnimalBreedingDropExperience(Entity experienceOrbEntity) {
         ((IExperienceOrbEntity) experienceOrbEntity).setSpawnReason(SpawnReason.BREEDING);
         return experienceOrbEntity;
diff --git a/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/creeperDropCompletely/CreeperEntityMixin.java b/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/creeperDropCompletely/CreeperEntityMixin.java
@@ -18,6 +18,6 @@ protected CreeperEntityMixin(EntityType<? extends HostileEntity> type, World wor
 
     @ModifyArg(method = "explode", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;createExplosion(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/world/World$ExplosionSourceType;)Lnet/minecraft/world/explosion/Explosion;"))
     private World.ExplosionSourceType setDestructionType(World.ExplosionSourceType explosionSourceType) {
-        return this.world.getGameRules().getBoolean(GameRules.DO_MOB_GRIEFING) ? IvanCarpetAdditionSettings.creeperDropCompletely ? World.ExplosionSourceType.TNT : World.ExplosionSourceType.MOB : World.ExplosionSourceType.NONE;
+        return this.getWorld().getGameRules().getBoolean(GameRules.DO_MOB_GRIEFING) ? IvanCarpetAdditionSettings.creeperDropCompletely ? World.ExplosionSourceType.TNT : World.ExplosionSourceType.MOB : World.ExplosionSourceType.NONE;
     }
 }
diff --git a/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/editableSign/SignBlockEntityMixin.java b/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/editableSign/SignBlockEntityMixin.java
diff --git a/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/fakePlayerNameSuggestions/PlayerCommandMixin.java b/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/fakePlayerNameSuggestions/PlayerCommandMixin.java
@@ -15,7 +15,7 @@
 
 @Mixin(PlayerCommand.class)
 public class PlayerCommandMixin {
-    @Inject(method = "getPlayers", at = @At("HEAD"), remap = false, cancellable = true)
+    @Inject(method = "getPlayerSuggestions", at = @At("HEAD"), remap = false, cancellable = true)
     private static void overwriteSuggestsPlayerList(ServerCommandSource source, CallbackInfoReturnable<Collection<String>> cir) {
         Set<String> players = Sets.newLinkedHashSet(Arrays.asList(IvanCarpetAdditionSettings.fakePlayerNameSuggestions.split(",")));
         players.addAll(source.getPlayerNames());
diff --git a/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/functionalSpongeItem/ItemEntityMixin.java b/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/functionalSpongeItem/ItemEntityMixin.java
@@ -21,19 +21,19 @@ private void tick(CallbackInfo ci) {
 
         ItemEntity self = (ItemEntity)(Object) this;
         if (self.getStack().getItem() == Items.SPONGE) {
-            if (((SpongeBlockInvoker) Blocks.SPONGE).invokeAbsorbWater(self.world, BlockPos.ofFloored(self.getPos()))) {
-                ItemEntity wetSponge = new ItemEntity(self.world, self.getX(), self.getY(), self.getZ(), new ItemStack(Items.WET_SPONGE, self.getStack().getCount()));
+            if (((SpongeBlockInvoker) Blocks.SPONGE).invokeAbsorbWater(self.getWorld(), BlockPos.ofFloored(self.getPos()))) {
+                ItemEntity wetSponge = new ItemEntity(self.getWorld(), self.getX(), self.getY(), self.getZ(), new ItemStack(Items.WET_SPONGE, self.getStack().getCount()));
                 wetSponge.setVelocity(self.getVelocity());
-                self.world.spawnEntity(wetSponge);
+                self.getWorld().spawnEntity(wetSponge);
                 self.discard();
             }
         }
 
-        if (self.getStack().getItem() == Items.WET_SPONGE && self.world.getDimension().ultrawarm() && ((ItemEntityAccessor) self).getAge() > 60) {
-            ItemEntity sponge = new ItemEntity(self.world, self.getX(), self.getY(), self.getZ(), new ItemStack(Items.SPONGE, self.getStack().getCount()));
+        if (self.getStack().getItem() == Items.WET_SPONGE && self.getWorld().getDimension().ultrawarm() && ((ItemEntityAccessor) self).getAge() > 60) {
+            ItemEntity sponge = new ItemEntity(self.getWorld(), self.getX(), self.getY(), self.getZ(), new ItemStack(Items.SPONGE, self.getStack().getCount()));
             sponge.setVelocity(self.getVelocity());
-            self.world.spawnEntity(sponge);
-            self.world.playSound(null, BlockPos.ofFloored(self.getPos()), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 1.0F, (1.0F + self.world.getRandom().nextFloat() * 0.2F) * 0.7F);
+            self.getWorld().spawnEntity(sponge);
+            self.getWorld().playSound(null, BlockPos.ofFloored(self.getPos()), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 1.0F, (1.0F + self.getWorld().getRandom().nextFloat() * 0.2F) * 0.7F);
             self.discard();
         }
     }
diff --git a/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/mendableSnowGolem/SnowGolemEntityMixin.java b/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/mendableSnowGolem/SnowGolemEntityMixin.java
@@ -33,7 +33,7 @@ private void mendSnowGolem(PlayerEntity player, Hand hand, CallbackInfoReturnabl
                     SoundEvents.BLOCK_SNOW_PLACE,
                     player,
                     itemStack
-            ) ? ActionResult.success(this.world.isClient) : ActionResult.PASS);
+            ) ? ActionResult.success(this.getWorld().isClient) : ActionResult.PASS);
         }
     }
 }
diff --git a/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/mendableSnowGolem/SnowballEntityMixin.java b/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/mendableSnowGolem/SnowballEntityMixin.java
@@ -25,8 +25,8 @@ private void onCollision(EntityHitResult hitResult, CallbackInfo ci) {
                     1.0F,
                     SoundEvents.BLOCK_SNOW_PLACE
             );
-            if (!snowball.world.isClient) {
-                snowball.world.sendEntityStatus(snowball, (byte) 3);
+            if (!snowball.getWorld().isClient) {
+                snowball.getWorld().sendEntityStatus(snowball, (byte) 3);
                 snowball.discard();
             }
             ci.cancel();
diff --git a/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/playerCommandNoControlSelf/PlayerCommandMixin.java b/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/playerCommandNoControlSelf/PlayerCommandMixin.java
@@ -27,7 +27,7 @@ public class PlayerCommandMixin {
             remap = false,
             locals = LocalCapture.CAPTURE_FAILHARD
     )
-    private static void stopControllingSelf(CommandContext<ServerCommandSource> context, CallbackInfoReturnable<Boolean> cir, PlayerEntity player, PlayerEntity sendingPlayer) {
+    private static void stopControllingSelf(CommandContext<ServerCommandSource> context, CallbackInfoReturnable<Boolean> cir, PlayerEntity player, ServerCommandSource source, PlayerEntity sendingPlayer) {
         Translator translator = new Translator("rule.playerCommandNoControlSelf");
         if (IvanCarpetAdditionSettings.playerCommandNoControlSelf && sendingPlayer == player) {
             Messenger.tell(context.getSource(), Messenger.formatting(translator.tr("warning"), "r"));
diff --git a/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/renewableSoulSand/LivingEntityMixin.java b/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/renewableSoulSand/LivingEntityMixin.java
@@ -15,9 +15,9 @@ public class LivingEntityMixin {
     private void convertSandToSoulSand(DamageSource source, CallbackInfo ci) {
         if (!IvanCarpetAdditionSettings.renewableSoulSand) return;
         LivingEntity livingEntity = (LivingEntity)(Object) this;
-        if (source == livingEntity.world.getDamageSources().inWall()) {
-            if (livingEntity.world.getBlockState(livingEntity.getBlockPos()).getBlock() == Blocks.SAND) {
-                livingEntity.world.setBlockState(livingEntity.getBlockPos(), Blocks.SOUL_SAND.getDefaultState());
+        if (source == livingEntity.getWorld().getDamageSources().inWall()) {
+            if (livingEntity.getWorld().getBlockState(livingEntity.getBlockPos()).getBlock() == Blocks.SAND) {
+                livingEntity.getWorld().setBlockState(livingEntity.getBlockPos(), Blocks.SOUL_SAND.getDefaultState());
             }
         }
     }
diff --git a/src/main/java/me/ivan/ivancarpetaddition/utils/Messenger.java b/src/main/java/me/ivan/ivancarpetaddition/utils/Messenger.java
@@ -76,7 +76,8 @@ public static void tell(ServerCommandSource source, MutableText text) {
         text = entity instanceof ServerPlayerEntity ?
                 ICATranslations.translate(text, (ServerPlayerEntity) entity) :
                 ICATranslations.translate(text);
-        source.sendFeedback(text, false);
+        MutableText finalText = text;
+        source.sendFeedback(() -> finalText, false);
     }
 
     public static MutableText formatting(MutableText text, Formatting... formattings) {
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -29,7 +29,7 @@
   "depends": {
     "fabricloader": ">=0.7.4",
     "carpet": ">=1.4.16",
-    "minecraft": "1.19.x"
+    "minecraft": "1.20.x"
   },
   "suggests": {
     "another-mod": "*"
diff --git a/src/main/resources/ivan-carpet-addition.mixins.json b/src/main/resources/ivan-carpet-addition.mixins.json
@@ -26,7 +26,6 @@
     "rule.customVersion.ServerMetadataAccessor",
     "rule.customVersion.ServerMetadataMixin",
     "rule.dispensersNotAffectPlayers.ArmorItemMixin",
-    "rule.editableSign.SignBlockEntityMixin",
     "rule.endLightningRod.EndRodBlockMixin",
     "rule.endLightningRod.TridentEntityAccessor",
     "rule.fakePlayerNameRestriction.PlayerCommandMixin",

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ protected CreeperEntityMixin(EntityType<? extends HostileEntity> type, World wor`
`18`	`18`
`19`	`19`	`@ModifyArg(method = "explode", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;createExplosion(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/world/World$ExplosionSourceType;)Lnet/minecraft/world/explosion/Explosion;"))`
`20`	`20`	`private World.ExplosionSourceType setDestructionType(World.ExplosionSourceType explosionSourceType) {`
`21`		`- return this.world.getGameRules().getBoolean(GameRules.DO_MOB_GRIEFING) ? IvanCarpetAdditionSettings.creeperDropCompletely ? World.ExplosionSourceType.TNT : World.ExplosionSourceType.MOB : World.ExplosionSourceType.NONE;`
	`21`	`+ return this.getWorld().getGameRules().getBoolean(GameRules.DO_MOB_GRIEFING) ? IvanCarpetAdditionSettings.creeperDropCompletely ? World.ExplosionSourceType.TNT : World.ExplosionSourceType.MOB : World.ExplosionSourceType.NONE;`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private void mendSnowGolem(PlayerEntity player, Hand hand, CallbackInfoReturnabl`
`33`	`33`	`SoundEvents.BLOCK_SNOW_PLACE,`
`34`	`34`	`player,`
`35`	`35`	`itemStack`
`36`		`- ) ? ActionResult.success(this.world.isClient) : ActionResult.PASS);`
	`36`	`+ ) ? ActionResult.success(this.getWorld().isClient) : ActionResult.PASS);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class PlayerCommandMixin {`
`27`	`27`	`remap = false,`
`28`	`28`	`locals = LocalCapture.CAPTURE_FAILHARD`
`29`	`29`	`)`
`30`		`- private static void stopControllingSelf(CommandContext<ServerCommandSource> context, CallbackInfoReturnable<Boolean> cir, PlayerEntity player, PlayerEntity sendingPlayer) {`
	`30`	`+ private static void stopControllingSelf(CommandContext<ServerCommandSource> context, CallbackInfoReturnable<Boolean> cir, PlayerEntity player, ServerCommandSource source, PlayerEntity sendingPlayer) {`
`31`	`31`	`Translator translator = new Translator("rule.playerCommandNoControlSelf");`
`32`	`32`	`if (IvanCarpetAdditionSettings.playerCommandNoControlSelf && sendingPlayer == player) {`
`33`	`33`	`Messenger.tell(context.getSource(), Messenger.formatting(translator.tr("warning"), "r"));`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ public class LivingEntityMixin {`
`15`	`15`	`private void convertSandToSoulSand(DamageSource source, CallbackInfo ci) {`
`16`	`16`	`if (!IvanCarpetAdditionSettings.renewableSoulSand) return;`
`17`	`17`	`LivingEntity livingEntity = (LivingEntity)(Object) this;`
`18`		`- if (source == livingEntity.world.getDamageSources().inWall()) {`
`19`		`- if (livingEntity.world.getBlockState(livingEntity.getBlockPos()).getBlock() == Blocks.SAND) {`
`20`		`- livingEntity.world.setBlockState(livingEntity.getBlockPos(), Blocks.SOUL_SAND.getDefaultState());`
	`18`	`+ if (source == livingEntity.getWorld().getDamageSources().inWall()) {`
	`19`	`+ if (livingEntity.getWorld().getBlockState(livingEntity.getBlockPos()).getBlock() == Blocks.SAND) {`
	`20`	`+ livingEntity.getWorld().setBlockState(livingEntity.getBlockPos(), Blocks.SOUL_SAND.getDefaultState());`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ public static void tell(ServerCommandSource source, MutableText text) {`
`76`	`76`	`text = entity instanceof ServerPlayerEntity ?`
`77`	`77`	`ICATranslations.translate(text, (ServerPlayerEntity) entity) :`
`78`	`78`	`ICATranslations.translate(text);`
`79`		`- source.sendFeedback(text, false);`
	`79`	`+ MutableText finalText = text;`
	`80`	`+ source.sendFeedback(() -> finalText, false);`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`public static MutableText formatting(MutableText text, Formatting... formattings) {`