From d76d013acba8d1893ce5b291f8f3e7e42523c6b2 Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Mon, 18 Dec 2023 19:20:26 +0100 Subject: [PATCH] 23w51b --- gradle.properties | 8 ++-- src/main/java/carpet/CarpetSettings.java | 2 +- .../java/carpet/helpers/HopperCounter.java | 3 +- ...actCauldronBlock_stackableSBoxesMixin.java | 11 +++-- .../java/carpet/mixins/Gui_tablistMixin.java | 2 +- .../ServerPlayerGameMode_antiCheatMixin.java | 43 +++++++++++-------- .../ServerPlayerGameMode_cactusMixin.java | 11 ++--- .../carpet/patches/EntityPlayerMPFake.java | 6 ++- .../java/carpet/script/value/EntityValue.java | 26 +++-------- 9 files changed, 57 insertions(+), 55 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1d83a3bfa4..09e006dbb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check https://fabricmc.net/develop/ - minecraft_version=1.20.3 - loader_version=0.14.24 + minecraft_version=23w51b + loader_version=0.15.3 jsr305_version=3.0.2 - fabric_version=0.90.11+1.20.3 + fabric_version=0.91.1+1.20.3 # Mod Properties mod_version = 1.4.128 @@ -17,7 +17,7 @@ org.gradle.jvmargs=-Xmx1G # 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.3 + release-curse-versions = Minecraft 1.20:1.20.5-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/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 0a636314e4..63971585b9 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -49,7 +49,7 @@ public class CarpetSettings { public static final String carpetVersion = FabricLoader.getInstance().getModContainer("carpet").orElseThrow().getMetadata().getVersion().toString(); - public static final String releaseTarget = "1.20.3"; + public static final String releaseTarget = "1.20.5"; public static final Logger LOG = LoggerFactory.getLogger("carpet"); public static final ThreadLocal skipGenerationChecks = ThreadLocal.withInitial(() -> false); public static final ThreadLocal impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false); diff --git a/src/main/java/carpet/helpers/HopperCounter.java b/src/main/java/carpet/helpers/HopperCounter.java index 5bcedeca45..3e419e8336 100644 --- a/src/main/java/carpet/helpers/HopperCounter.java +++ b/src/main/java/carpet/helpers/HopperCounter.java @@ -291,7 +291,8 @@ public static int appropriateColor(int color) entry(Items.POISONOUS_POTATO,Blocks.SLIME_BLOCK), entry(Items.SPIDER_EYE,Blocks.NETHERRACK), entry(Items.GUNPOWDER,Blocks.GRAY_WOOL), - entry(Items.SCUTE,Blocks.LIME_WOOL), + entry(Items.TURTLE_SCUTE,Blocks.LIME_WOOL), + entry(Items.ARMADILLO_SCUTE,Blocks.ANCIENT_DEBRIS), entry(Items.FEATHER,Blocks.WHITE_WOOL), entry(Items.FLINT,Blocks.BLACK_WOOL), entry(Items.LEATHER,Blocks.SPRUCE_PLANKS), diff --git a/src/main/java/carpet/mixins/AbstractCauldronBlock_stackableSBoxesMixin.java b/src/main/java/carpet/mixins/AbstractCauldronBlock_stackableSBoxesMixin.java index 47cd89967d..95cc0dbcfe 100644 --- a/src/main/java/carpet/mixins/AbstractCauldronBlock_stackableSBoxesMixin.java +++ b/src/main/java/carpet/mixins/AbstractCauldronBlock_stackableSBoxesMixin.java @@ -4,7 +4,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.cauldron.CauldronInteraction; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; @@ -19,13 +19,16 @@ @Mixin(AbstractCauldronBlock.class) public class AbstractCauldronBlock_stackableSBoxesMixin { - @Redirect(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/cauldron/CauldronInteraction;interact(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionResult;")) - private InteractionResult wrapInteractor(CauldronInteraction cauldronBehavior, BlockState blockState, Level world, BlockPos blockPos, Player playerEntity, InteractionHand hand, ItemStack itemStack) + @Redirect(method = "useItemOn", at = @At( + value = "INVOKE", + target = "Lnet/minecraft/core/cauldron/CauldronInteraction;interact(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult;" + )) + private ItemInteractionResult wrapInteractor(final CauldronInteraction cauldronBehavior, final BlockState blockState, final Level world, final BlockPos blockPos, final Player playerEntity, final InteractionHand hand, final ItemStack itemStack) { int count = -1; if (CarpetSettings.shulkerBoxStackSize > 1 && itemStack.getItem() instanceof BlockItem && ((BlockItem)itemStack.getItem()).getBlock() instanceof ShulkerBoxBlock) count = itemStack.getCount(); - InteractionResult result = cauldronBehavior.interact(blockState, world, blockPos, playerEntity, hand, itemStack); + ItemInteractionResult result = cauldronBehavior.interact(blockState, world, blockPos, playerEntity, hand, itemStack); if (count > 0 && result.consumesAction()) { ItemStack current = playerEntity.getItemInHand(hand); diff --git a/src/main/java/carpet/mixins/Gui_tablistMixin.java b/src/main/java/carpet/mixins/Gui_tablistMixin.java index f6ab98acb5..47235544d5 100644 --- a/src/main/java/carpet/mixins/Gui_tablistMixin.java +++ b/src/main/java/carpet/mixins/Gui_tablistMixin.java @@ -19,7 +19,7 @@ public abstract class Gui_tablistMixin @Shadow @Final private PlayerTabOverlay tabList; - @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;isLocalServer()Z")) + @Redirect(method = "renderTabList", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;isLocalServer()Z")) private boolean onDraw(Minecraft minecraftClient) { return this.minecraft.isLocalServer() && !((PlayerListHudInterface) tabList).hasFooterOrHeader(); diff --git a/src/main/java/carpet/mixins/ServerPlayerGameMode_antiCheatMixin.java b/src/main/java/carpet/mixins/ServerPlayerGameMode_antiCheatMixin.java index ac135780ef..002eaad0e5 100644 --- a/src/main/java/carpet/mixins/ServerPlayerGameMode_antiCheatMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerGameMode_antiCheatMixin.java @@ -1,32 +1,39 @@ package carpet.mixins; import carpet.CarpetSettings; +import com.mojang.authlib.GameProfile; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.level.ServerPlayerGameMode; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -@Mixin(value = ServerPlayerGameMode.class, priority = 69420) // not that important for carpet -public class ServerPlayerGameMode_antiCheatMixin +@Mixin(value = ServerPlayer.class) +public abstract class ServerPlayerGameMode_antiCheatMixin extends Player { - // that shoudn't've been a constant at the first place - // resolves problems with mobs using reach entity attributes. + public ServerPlayerGameMode_antiCheatMixin(final Level level, final BlockPos blockPos, final float f, final GameProfile gameProfile) + { + super(level, blockPos, f, gameProfile); + } + + @Inject(method = "canInteractWithBlock", at = @At("HEAD"), cancellable = true) + private void canInteractLongRangeBlock(BlockPos pos, CallbackInfoReturnable cir) + { + double maxRange = blockInteractionRange() + 1.0; + maxRange = maxRange * maxRange; + if (CarpetSettings.antiCheatDisabled && maxRange < 1024 && getEyePosition().distanceToSqr(Vec3.atCenterOf(pos)) < 1024) cir.setReturnValue(true); + } - @Redirect(method = "handleBlockBreakAction", at = @At( - value = "INVOKE", - target = "Lnet/minecraft/server/level/ServerPlayer;getEyePosition()Lnet/minecraft/world/phys/Vec3;" - )) - private Vec3 getEyePos(ServerPlayer instance, - final BlockPos pos, final ServerboundPlayerActionPacket.Action action, final Direction direction, final int maxBuildHeight, final int sequence) + @Inject(method = "canInteractWithEntity", at = @At("HEAD"), cancellable = true) + private void canInteractLongRangeEntity(AABB aabb, CallbackInfoReturnable cir) { - if (CarpetSettings.antiCheatDisabled && - instance.getEyePosition().distanceToSqr(Vec3.atCenterOf(pos)) < 1024 - ) return Vec3.atCenterOf(pos); - return instance.getEyePosition(); + double maxRange = entityInteractionRange() + 1.0; + maxRange = maxRange * maxRange; + if (CarpetSettings.antiCheatDisabled && maxRange < 1024 && aabb.distanceToSqr(getEyePosition()) < 1024) cir.setReturnValue(true); } } diff --git a/src/main/java/carpet/mixins/ServerPlayerGameMode_cactusMixin.java b/src/main/java/carpet/mixins/ServerPlayerGameMode_cactusMixin.java index 755270421a..d4cb57635c 100644 --- a/src/main/java/carpet/mixins/ServerPlayerGameMode_cactusMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerGameMode_cactusMixin.java @@ -3,8 +3,9 @@ import carpet.helpers.BlockRotator; import net.minecraft.server.level.ServerPlayerGameMode; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; @@ -18,14 +19,14 @@ public class ServerPlayerGameMode_cactusMixin @Redirect(method = "useItemOn", at = @At( value = "INVOKE", - target = "Lnet/minecraft/world/level/block/state/BlockState;use(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)Lnet/minecraft/world/InteractionResult;" + target = "Lnet/minecraft/world/level/block/state/BlockState;useItemOn(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)Lnet/minecraft/world/ItemInteractionResult;" )) - private InteractionResult activateWithOptionalCactus(BlockState blockState, Level world_1, Player playerEntity_1, InteractionHand hand_1, BlockHitResult blockHitResult_1) + private ItemInteractionResult activateWithOptionalCactus(final BlockState blockState, final ItemStack itemStack, final Level world_1, final Player playerEntity_1, final InteractionHand hand_1, final BlockHitResult blockHitResult_1) { boolean flipped = BlockRotator.flipBlockWithCactus(blockState, world_1, playerEntity_1, hand_1, blockHitResult_1); if (flipped) - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; - return blockState.use(world_1, playerEntity_1, hand_1, blockHitResult_1); + return blockState.useItemOn(itemStack, world_1, playerEntity_1, hand_1, blockHitResult_1); } } diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index abe09dd94e..51bf1ee3a5 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java @@ -22,6 +22,7 @@ import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.food.FoodData; import net.minecraft.world.item.ItemStack; @@ -77,7 +78,7 @@ public static boolean createFake(String username, MinecraftServer server, Vec3 p instance.teleportTo(worldIn, pos.x, pos.y, pos.z, (float) yaw, (float) pitch); instance.setHealth(20.0F); instance.unsetRemoved(); - instance.setMaxUpStep(0.6F); + instance.getAttribute(Attributes.STEP_HEIGHT).setBaseValue(0.6F); instance.gameMode.changeGameModeForPlayer(gamemode); server.getPlayerList().broadcastAll(new ClientboundRotateHeadPacket(instance, (byte) (instance.yHeadRot * 256 / 360)), dimensionId);//instance.dimension); server.getPlayerList().broadcastAll(new ClientboundTeleportEntityPacket(instance), dimensionId);//instance.dimension); @@ -106,7 +107,8 @@ public static EntityPlayerMPFake createShadow(MinecraftServer server, ServerPlay playerShadow.connection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot()); playerShadow.gameMode.changeGameModeForPlayer(player.gameMode.getGameModeForPlayer()); ((ServerPlayerInterface) playerShadow).getActionPack().copyFrom(((ServerPlayerInterface) player).getActionPack()); - playerShadow.setMaxUpStep(0.6F); + // this might create problems if a player logs back in... + playerShadow.getAttribute(Attributes.STEP_HEIGHT).setBaseValue(0.6F); playerShadow.entityData.set(DATA_PLAYER_MODE_CUSTOMISATION, player.getEntityData().get(DATA_PLAYER_MODE_CUSTOMISATION)); diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index ed997ee196..f2ac387504 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -490,8 +490,8 @@ public Value get(String what, @Nullable Value arg) put("invulnerable", (e, a) -> BooleanValue.of(e.isInvulnerable())); put("dimension", (e, a) -> nameFromRegistryId(e.level().dimension().location())); // getDimId - put("height", (e, a) -> new NumericValue(e.getDimensions(Pose.STANDING).height)); - put("width", (e, a) -> new NumericValue(e.getDimensions(Pose.STANDING).width)); + put("height", (e, a) -> new NumericValue(e.getDimensions(Pose.STANDING).height())); + put("width", (e, a) -> new NumericValue(e.getDimensions(Pose.STANDING).width())); put("eye_height", (e, a) -> new NumericValue(e.getEyeHeight())); put("age", (e, a) -> new NumericValue(e.tickCount)); put("breeding_age", (e, a) -> e instanceof final AgeableMob am ? new NumericValue(am.getAge()) : Value.NULL); @@ -657,11 +657,7 @@ public Value get(String what, @Nullable Value arg) return ListValue.wrap(effects); } String effectName = a.getString(); - MobEffect potion = BuiltInRegistries.MOB_EFFECT.get(InputValidator.identifierOf(effectName)); - if (potion == null) - { - throw new InternalExpressionException("No such an effect: " + effectName); - } + Holder potion = BuiltInRegistries.MOB_EFFECT.getHolder(ResourceKey.create(Registries.MOB_EFFECT, InputValidator.identifierOf(effectName))).orElseThrow( () -> new InternalExpressionException("No such an effect: " + effectName)); if (!le.hasEffect(potion)) { return Value.NULL; @@ -835,10 +831,10 @@ else if (entities) if (a == null) { AttributeMap container = el.getAttributes(); - return MapValue.wrap(attributes.stream().filter(container::hasAttribute).collect(Collectors.toMap(aa -> ValueConversions.of(attributes.getKey(aa)), aa -> NumericValue.of(container.getValue(aa))))); + return MapValue.wrap(attributes.holders().filter(container::hasAttribute).collect(Collectors.toMap(aa -> ValueConversions.of(aa.key()), aa -> NumericValue.of(container.getValue(aa))))); } ResourceLocation id = InputValidator.identifierOf(a.getString()); - Attribute attrib = attributes.getOptional(id).orElseThrow( + Holder attrib = attributes.getHolder(id).orElseThrow( () -> new InternalExpressionException("Unknown attribute: " + a.getString()) ); if (!el.getAttributes().hasAttribute(attrib)) @@ -1472,11 +1468,7 @@ else if (v instanceof final ListValue lv) if (list.size() >= 1 && list.size() <= 6) { String effectName = list.get(0).getString(); - MobEffect effect = BuiltInRegistries.MOB_EFFECT.get(InputValidator.identifierOf(effectName)); - if (effect == null) - { - throw new InternalExpressionException("Wrong effect name: " + effectName); - } + Holder effect = BuiltInRegistries.MOB_EFFECT.getHolder(InputValidator.identifierOf(effectName)).orElseThrow( () -> new InternalExpressionException("No such an effect: " + effectName)); if (list.size() == 1) { le.removeEffect(effect); @@ -1518,11 +1510,7 @@ else if (v instanceof final ListValue lv) else { String effectName = v.getString(); - MobEffect effect = BuiltInRegistries.MOB_EFFECT.get(InputValidator.identifierOf(effectName)); - if (effect == null) - { - throw new InternalExpressionException("Wrong effect name: " + effectName); - } + Holder effect = BuiltInRegistries.MOB_EFFECT.getHolder(InputValidator.identifierOf(effectName)).orElseThrow( () -> new InternalExpressionException("No such an effect: " + effectName)); le.removeEffect(effect); return; }