Merge branch 'master' of https://github.com/gnembon/fabric-carpet into cleanup

extclp · extclp · commit 7dd87649ca91 · 2024-05-05T23:58:42.000+08:00
diff --git a/gradle.properties b/gradle.properties
@@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check https://fabricmc.net/develop/
-	minecraft_version=1.20.5
-	loader_version=0.15.10
+	minecraft_version=24w18a
+	loader_version=0.15.11
 	jsr305_version=3.0.2
-	fabric_version=0.97.5+1.20.5
+	fabric_version=0.97.8+1.20.6
 
 # Mod Properties
-	mod_version = 1.4.140
+	mod_version = 1.4.142
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 
 # Release Action properties for Curseforge and Snapshots
 	# The Curseforge versions "names" or ids for the main branch (comma separated: 1.16.4,1.16.5)
 	# This is needed because CF uses too vague names for prereleases and release candidates
 	# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]
-	release-curse-versions = Minecraft 1.20:1.20.5
+	release-curse-versions = Minecraft 1.21:1.21-Snapshot
 	# Whether or not to build another branch on release
 	release-extra-branch = false
 	# The name of the second branch to release
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,3 +1,3 @@
 before_install:
-- sdk install java 17.0.1-open
-- sdk use java 17.0.1-open
+- sdk install java 21.0.2-open
+- sdk use java 21.0.2-open
diff --git a/src/main/java/carpet/helpers/OptimizedExplosion.java b/src/main/java/carpet/helpers/OptimizedExplosion.java
@@ -16,11 +16,11 @@
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.item.PrimedTnt;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.enchantment.ProtectionEnchantment;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
@@ -172,8 +172,8 @@ public static void doExplosionA(Explosion e, ExplosionLogHelper eLogger) {
                         }
                         double d11 = d10;
 
-                        if (entity instanceof LivingEntity) {
-                            d11 = ProtectionEnchantment.getExplosionKnockbackAfterDampener((LivingEntity) entity, d10);
+                        if (entity instanceof LivingEntity lev) {
+                            d11 = d10 * Mth.clamp(1.0 - lev.getAttributeValue(Attributes.EXPLOSION_KNOCKBACK_RESISTANCE), 0.0, 1.0);
                         }
 
                         if (eLogger != null) {
diff --git a/src/main/java/carpet/mixins/AbstractArrowMixin.java b/src/main/java/carpet/mixins/AbstractArrowMixin.java
@@ -20,8 +20,8 @@ public abstract class AbstractArrowMixin extends Entity
     private TrajectoryLogHelper logHelper;
     public AbstractArrowMixin(EntityType<?> entityType_1, Level world_1) { super(entityType_1, world_1); }
 
-    @Inject(method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;)V", at = @At("RETURN"))
-    private void addLogger(final EntityType entityType, final Level level, final ItemStack itemStack, final CallbackInfo ci)
+    @Inject(method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)V", at = @At("RETURN"))
+    private void addLogger(final EntityType entityType, final Level level, final ItemStack itemStack, final ItemStack weapon, final CallbackInfo ci)
     {
         if (LoggerRegistry.__projectiles && !level.isClientSide)
             logHelper = new TrajectoryLogHelper("projectiles");
diff --git a/src/main/java/carpet/mixins/BuddingAmethystBlock_movableAmethystMixin.java b/src/main/java/carpet/mixins/BuddingAmethystBlock_movableAmethystMixin.java
@@ -2,6 +2,7 @@
 
 import carpet.CarpetSettings;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -33,7 +34,7 @@ public void playerDestroy(Level world, Player player, BlockPos pos, BlockState s
         // drawback - not controlled via loottables, but hey
         if (CarpetSettings.movableAmethyst &&
                 stack.getItem() instanceof PickaxeItem &&
-                EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0
+                EnchantmentHelper.getItemEnchantmentLevel(world.registryAccess().registryOrThrow(Registries.ENCHANTMENT).getHolderOrThrow(Enchantments.SILK_TOUCH), stack) > 0
         )
             popResource(world, pos, Items.BUDDING_AMETHYST.getDefaultInstance());
     }
diff --git a/src/main/java/carpet/mixins/ExperienceOrb_xpNoCooldownMixin.java b/src/main/java/carpet/mixins/ExperienceOrb_xpNoCooldownMixin.java
@@ -1,6 +1,7 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.ExperienceOrb;
@@ -27,15 +28,15 @@ public ExperienceOrb_xpNoCooldownMixin(EntityType<?> type, Level world)
     }
 
     @Shadow
-    protected abstract int repairPlayerItems(Player player, int amount);
+    protected abstract int repairPlayerItems(ServerPlayer player, int amount);
 
     @Inject(method = "playerTouch", at = @At("HEAD"))
     private void addXP(Player player, CallbackInfo ci) {
         if (CarpetSettings.xpNoCooldown && !level().isClientSide) {
             player.takeXpDelay = 0;
             // reducing the count to 1 and leaving vanilla to deal with it
             while (this.count > 1) {
-                int remainder = this.repairPlayerItems(player, this.value);
+                int remainder = this.repairPlayerItems((ServerPlayer) player, this.value);
                 if (remainder > 0) {
                     player.giveExperiencePoints(remainder);
                 }
diff --git a/src/main/java/carpet/mixins/HangingEntity_scarpetEventsMixin.java b/src/main/java/carpet/mixins/HangingEntity_scarpetEventsMixin.java
@@ -4,14 +4,15 @@
 import carpet.script.EntityEventsGroup;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.decoration.BlockAttachedEntity;
 import net.minecraft.world.entity.decoration.HangingEntity;
 import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(HangingEntity.class)
+@Mixin(BlockAttachedEntity.class)
 public abstract class HangingEntity_scarpetEventsMixin extends Entity
 {
     public HangingEntity_scarpetEventsMixin(EntityType<?> type, Level world)
diff --git a/src/main/java/carpet/mixins/ServerGamePacketListenerimpl_connectionMixin.java b/src/main/java/carpet/mixins/ServerGamePacketListenerimpl_connectionMixin.java
@@ -5,26 +5,29 @@
 import net.minecraft.network.protocol.PacketUtils;
 import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
 import net.minecraft.network.protocol.game.ServerGamePacketListener;
-import net.minecraft.server.network.ServerCommonPacketListenerImpl;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ServerCommonPacketListenerImpl.class)
-public class ServerCommonPacketListenerimpl_connectionMixin
+@Mixin(ServerGamePacketListenerImpl.class)
+public class ServerGamePacketListenerimpl_connectionMixin
 {
+    @Shadow
+    public ServerPlayer player;
+
     @Inject(method = "handleCustomPayload", at = @At("HEAD"), cancellable = true)
     private void onCustomCarpetPayload(ServerboundCustomPayloadPacket serverboundCustomPayloadPacket, CallbackInfo ci)
     {
-        Object thiss = this;
-        if (thiss instanceof ServerGamePacketListenerImpl impl && serverboundCustomPayloadPacket.payload() instanceof CarpetClient.CarpetPayload cpp) {
+        if (serverboundCustomPayloadPacket.payload() instanceof CarpetClient.CarpetPayload cpp) {
             // We should force onto the main thread here
             // ServerNetworkHandler.handleData can possibly mutate data that isn't
             // thread safe, and also allows for client commands to be executed
-            PacketUtils.ensureRunningOnSameThread(serverboundCustomPayloadPacket, (ServerGamePacketListener) this, impl.player.serverLevel());
-            ServerNetworkHandler.onClientData(impl.player, cpp.data());
+            PacketUtils.ensureRunningOnSameThread(serverboundCustomPayloadPacket, (ServerGamePacketListener) this, player.serverLevel());
+            ServerNetworkHandler.onClientData(player, cpp.data());
             ci.cancel();
         }
     }
diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java
@@ -918,7 +918,7 @@ else if (item instanceof TridentItem || item instanceof SwordItem)
                     damageAmount = 2;
                 }
                 final int finalDamageAmount = damageAmount;
-                tool.hurtAndBreak(damageAmount, world.getRandom(), null, () ->  { if (finalDamageAmount > 0) toolBroke.setTrue(); } );
+                tool.hurtAndBreak(damageAmount, world, null, () ->  { if (finalDamageAmount > 0) toolBroke.setTrue(); } );
                 if (!isUsingEffectiveTool)
                 {
                     dropLoot = false;
@@ -927,15 +927,15 @@ else if (item instanceof TridentItem || item instanceof SwordItem)
 
             if (dropLoot)
             {
-                if (how < 0 || (tag != null && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0))
+                if (how < 0 || (tag != null && EnchantmentHelper.getItemEnchantmentLevel(world.registryAccess().registryOrThrow(Registries.ENCHANTMENT).getHolderOrThrow(Enchantments.SILK_TOUCH), tool) > 0))
                 {
                     Block.popResource(world, where, new ItemStack(state.getBlock()));
                 }
                 else
                 {
                     if (how > 0)
                     {
-                        tool.enchant(Enchantments.FORTUNE, (int) how);
+                        tool.enchant(world.registryAccess().registryOrThrow(Registries.ENCHANTMENT).getHolderOrThrow(Enchantments.FORTUNE), (int) how);
                     }
                     if (DUMMY_ENTITY == null)
                     {
diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
@@ -178,7 +178,7 @@
     "PistonStructureResolver_customStickyMixin",
 
     "CustomPacketPayload_networkStuffMixin",
-    "ServerCommonPacketListenerimpl_connectionMixin"
+    "ServerGamePacketListenerimpl_connectionMixin"
 
   ],
   "client": [

Original file line number	Diff line number	Diff line change
`@@ -918,7 +918,7 @@ else if (item instanceof TridentItem \|\| item instanceof SwordItem)`
`918`	`918`	`damageAmount = 2;`
`919`	`919`	`}`
`920`	`920`	`final int finalDamageAmount = damageAmount;`
`921`		`- tool.hurtAndBreak(damageAmount, world.getRandom(), null, () -> { if (finalDamageAmount > 0) toolBroke.setTrue(); } );`
	`921`	`+ tool.hurtAndBreak(damageAmount, world, null, () -> { if (finalDamageAmount > 0) toolBroke.setTrue(); } );`
`922`	`922`	`if (!isUsingEffectiveTool)`
`923`	`923`	`{`
`924`	`924`	`dropLoot = false;`
`@@ -927,15 +927,15 @@ else if (item instanceof TridentItem \|\| item instanceof SwordItem)`
`927`	`927`
`928`	`928`	`if (dropLoot)`
`929`	`929`	`{`
`930`		`- if (how < 0 \|\| (tag != null && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0))`
	`930`	`+ if (how < 0 \|\| (tag != null && EnchantmentHelper.getItemEnchantmentLevel(world.registryAccess().registryOrThrow(Registries.ENCHANTMENT).getHolderOrThrow(Enchantments.SILK_TOUCH), tool) > 0))`
`931`	`931`	`{`
`932`	`932`	`Block.popResource(world, where, new ItemStack(state.getBlock()));`
`933`	`933`	`}`
`934`	`934`	`else`
`935`	`935`	`{`
`936`	`936`	`if (how > 0)`
`937`	`937`	`{`
`938`		`- tool.enchant(Enchantments.FORTUNE, (int) how);`
	`938`	`+ tool.enchant(world.registryAccess().registryOrThrow(Registries.ENCHANTMENT).getHolderOrThrow(Enchantments.FORTUNE), (int) how);`
`939`	`939`	`}`
`940`	`940`	`if (DUMMY_ENTITY == null)`
`941`	`941`	`{`