From 28b30f771ba0100eff80616cb098a2882b0b3917 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Fri, 27 Aug 2021 15:33:50 +0800 Subject: [PATCH] Fix passenger add twice, simplify log pattern --- .../common/mixin/core/world/entity/EntityMixin.java | 8 ++++---- .../world/entity/monster/piglin/PiglinMixin.java | 3 ++- .../main/resources/META-INF/accesstransformer.cfg | 1 + .../src/main/resources/arclight-log4j2.xml | 12 ++++++------ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java index 8c1fda0e..0aa7a7a6 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/EntityMixin.java @@ -578,15 +578,15 @@ public abstract class EntityMixin implements InternalEntityBridge, EntityBridge, } } - @Inject(method = "startRiding(Lnet/minecraft/world/entity/Entity;Z)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;addPassenger(Lnet/minecraft/world/entity/Entity;)V")) - public void arclight$startRide(Entity entityIn, boolean force, CallbackInfoReturnable cir) { - if (!((EntityBridge) this.vehicle).bridge$addPassenger((Entity) (Object) this)) { + @Redirect(method = "startRiding(Lnet/minecraft/world/entity/Entity;Z)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;addPassenger(Lnet/minecraft/world/entity/Entity;)V")) + private void arclight$startRiding(Entity entity, Entity pPassenger) { + if (!((EntityBridge) entity).bridge$addPassenger(pPassenger)) { this.vehicle = null; } } @Redirect(method = "removeVehicle", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;removePassenger(Lnet/minecraft/world/entity/Entity;)V")) - public void arclight$stopRiding$CraftBukkitPatch(Entity entity, Entity passenger) { + private void arclight$stopRiding(Entity entity, Entity passenger) { if (!((EntityBridge) entity).bridge$removePassenger(passenger)) { this.vehicle = entity; } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinMixin.java index ecc3962e..39242135 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/monster/piglin/PiglinMixin.java @@ -9,6 +9,7 @@ import net.minecraft.nbt.StringTag; import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.monster.piglin.Piglin; +import net.minecraft.world.entity.monster.piglin.PiglinAi; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; @@ -61,6 +62,6 @@ public abstract class PiglinMixin extends PathfinderMobMixin implements PiglinBr @Redirect(method = "canReplaceCurrentItem(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/monster/piglin/PiglinAi;isLovedItem(Lnet/minecraft/world/item/ItemStack;)Z")) private boolean arclight$customLoved(ItemStack stack) { - return PiglinAiMixin.isLovedItem(stack) || interestItems.contains(stack.getItem()) || allowedBarterItems.contains(stack.getItem()); + return PiglinAi.isLovedItem(stack) || interestItems.contains(stack.getItem()) || allowedBarterItems.contains(stack.getItem()); } } diff --git a/arclight-common/src/main/resources/META-INF/accesstransformer.cfg b/arclight-common/src/main/resources/META-INF/accesstransformer.cfg index 19942aad..82fd3cea 100644 --- a/arclight-common/src/main/resources/META-INF/accesstransformer.cfg +++ b/arclight-common/src/main/resources/META-INF/accesstransformer.cfg @@ -8,6 +8,7 @@ public net.minecraft.server.network.ServerGamePacketListenerImpl$EntityInteracti public net.minecraft.server.MinecraftServer$TimeProfiler public net.minecraft.world.level.chunk.ChunkGenerator f_62140_ # strongholdSeed public net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator f_64318_ # settings +public net.minecraft.world.entity.monster.piglin.PiglinAi m_149965_(Lnet/minecraft/world/item/ItemStack;)Z # isLovedItem # Misc public net.minecraft.server.PlayerAdvancements f_135964_ public net.minecraft.server.level.PlayerRespawnLogic m_8264_(Lnet/minecraft/server/level/ServerLevel;IIZ)Lnet/minecraft/core/BlockPos; diff --git a/arclight-forge/src/main/resources/arclight-log4j2.xml b/arclight-forge/src/main/resources/arclight-log4j2.xml index 48a7c056..86113783 100644 --- a/arclight-forge/src/main/resources/arclight-log4j2.xml +++ b/arclight-forge/src/main/resources/arclight-log4j2.xml @@ -23,14 +23,14 @@ + defaultPattern="%highlight{[%d{HH:mm:ss} %level] [%c{1.}%notEmpty{/%markerSimpleName}]: %minecraftFormatting{%msg}%n%xEx}{INFO=normal}"> + pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}{INFO=normal}"/> + pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}{INFO=normal}"/> + pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}{INFO=normal}"/> @@ -44,7 +44,7 @@ - + @@ -52,7 +52,7 @@ - +