Fix passenger add twice, simplify log pattern
This commit is contained in:
parent
9e7575a95b
commit
28b30f771b
|
@ -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"))
|
@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"))
|
||||||
public void arclight$startRide(Entity entityIn, boolean force, CallbackInfoReturnable<Boolean> cir) {
|
private void arclight$startRiding(Entity entity, Entity pPassenger) {
|
||||||
if (!((EntityBridge) this.vehicle).bridge$addPassenger((Entity) (Object) this)) {
|
if (!((EntityBridge) entity).bridge$addPassenger(pPassenger)) {
|
||||||
this.vehicle = null;
|
this.vehicle = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Redirect(method = "removeVehicle", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;removePassenger(Lnet/minecraft/world/entity/Entity;)V"))
|
@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)) {
|
if (!((EntityBridge) entity).bridge$removePassenger(passenger)) {
|
||||||
this.vehicle = entity;
|
this.vehicle = entity;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import net.minecraft.nbt.StringTag;
|
||||||
import net.minecraft.nbt.Tag;
|
import net.minecraft.nbt.Tag;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.world.entity.monster.piglin.Piglin;
|
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.Item;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
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",
|
@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"))
|
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) {
|
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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ public net.minecraft.server.network.ServerGamePacketListenerImpl$EntityInteracti
|
||||||
public net.minecraft.server.MinecraftServer$TimeProfiler
|
public net.minecraft.server.MinecraftServer$TimeProfiler
|
||||||
public net.minecraft.world.level.chunk.ChunkGenerator f_62140_ # strongholdSeed
|
public net.minecraft.world.level.chunk.ChunkGenerator f_62140_ # strongholdSeed
|
||||||
public net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator f_64318_ # settings
|
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
|
# Misc
|
||||||
public net.minecraft.server.PlayerAdvancements f_135964_
|
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;
|
public net.minecraft.server.level.PlayerRespawnLogic m_8264_(Lnet/minecraft/server/level/ServerLevel;IIZ)Lnet/minecraft/core/BlockPos;
|
||||||
|
|
|
@ -23,14 +23,14 @@
|
||||||
<PatternLayout>
|
<PatternLayout>
|
||||||
<!-- use white for info output -->
|
<!-- use white for info output -->
|
||||||
<LoggerNamePatternSelector
|
<LoggerNamePatternSelector
|
||||||
defaultPattern="%highlight{[%d{HH:mm:ss} %level] [%c{1.}%notEmpty{/%markerSimpleName}]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}">
|
defaultPattern="%highlight{[%d{HH:mm:ss} %level] [%c{1.}%notEmpty{/%markerSimpleName}]: %minecraftFormatting{%msg}%n%xEx}{INFO=normal}">
|
||||||
<!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose -->
|
<!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose -->
|
||||||
<PatternMatch key="net.minecraft."
|
<PatternMatch key="net.minecraft."
|
||||||
pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}"/>
|
pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}{INFO=normal}"/>
|
||||||
<PatternMatch key="com.mojang."
|
<PatternMatch key="com.mojang."
|
||||||
pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}"/>
|
pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}{INFO=normal}"/>
|
||||||
<PatternMatch key="net.minecraftforge."
|
<PatternMatch key="net.minecraftforge."
|
||||||
pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}"/>
|
pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}{INFO=normal}"/>
|
||||||
</LoggerNamePatternSelector>
|
</LoggerNamePatternSelector>
|
||||||
</PatternLayout>
|
</PatternLayout>
|
||||||
</TerminalConsole>
|
</TerminalConsole>
|
||||||
|
@ -44,7 +44,7 @@
|
||||||
</PatternLayout>
|
</PatternLayout>
|
||||||
</Queue>
|
</Queue>
|
||||||
<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
|
<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
|
||||||
<PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n%xEx"/>
|
<PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n%tEx"/>
|
||||||
<Policies>
|
<Policies>
|
||||||
<TimeBasedTriggeringPolicy/>
|
<TimeBasedTriggeringPolicy/>
|
||||||
<OnStartupTriggeringPolicy/>
|
<OnStartupTriggeringPolicy/>
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
<DefaultRolloverStrategy max="99" fileIndex="min"/>
|
<DefaultRolloverStrategy max="99" fileIndex="min"/>
|
||||||
</RollingRandomAccessFile>
|
</RollingRandomAccessFile>
|
||||||
<RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%i.log.gz">
|
<RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%i.log.gz">
|
||||||
<PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n%xEx"/>
|
<PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n%tEx"/>
|
||||||
<Policies>
|
<Policies>
|
||||||
<OnStartupTriggeringPolicy/>
|
<OnStartupTriggeringPolicy/>
|
||||||
<SizeBasedTriggeringPolicy size="200MB"/>
|
<SizeBasedTriggeringPolicy size="200MB"/>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user