feat: 拴绳修复与bot在线时长限制
This commit is contained in:
1 parent
abb25c0d48
commit
57d2058a6b
18 files changed
+236
-16
No files matched your search
+90
@@ -0,0 +1,90 @@
|
||||
package com.github.zly2006.carpetslsaddition.mixin.carpet;
|
||||
|
||||
import carpet.patches.EntityPlayerMPFake;
|
||||
import com.github.zly2006.carpetslsaddition.SLSCarpetSettings;
|
||||
import com.github.zly2006.carpetslsaddition.ServerMain;
|
||||
import com.github.zly2006.carpetslsaddition.util.access.SLSBotAccessor;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
import net.minecraft.text.Style;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Formatting;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(EntityPlayerMPFake.class)
|
||||
public abstract class MixinEntityPlayerMPFake extends ServerPlayerEntity implements SLSBotAccessor {
|
||||
@Shadow public abstract void kill();
|
||||
|
||||
@Unique
|
||||
private boolean bot = false;
|
||||
@Unique
|
||||
private long spawnTime = -1;
|
||||
|
||||
public MixinEntityPlayerMPFake(MinecraftServer server, ServerWorld world, GameProfile profile, SyncedClientOptions clientOptions) {
|
||||
super(server, world, profile, clientOptions);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean carpet_SLS_Addition$isBot() {
|
||||
return bot;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void carpet_SLS_Addition$setBot(boolean isBot) {
|
||||
this.bot = isBot;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long carpet_SLS_Addition$getSpawnTime() {
|
||||
if (spawnTime == -1) spawnTime = System.currentTimeMillis();
|
||||
return spawnTime;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void carpet_SLS_Addition$setSpawnTime(long spawnTime) {
|
||||
this.spawnTime = spawnTime;
|
||||
}
|
||||
|
||||
@Inject(method = "tick", at = @At("HEAD"))
|
||||
public void onTick(CallbackInfo ci) {
|
||||
if (!this.bot || SLSCarpetSettings.botMaxOnlineTime < 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
long currentTime = System.currentTimeMillis();
|
||||
long liveTime = currentTime - spawnTime;
|
||||
|
||||
if (liveTime > SLSCarpetSettings.botMaxOnlineTime * 1000) {
|
||||
ServerMain.server.getPlayerManager().broadcast(
|
||||
Text.translatable("carpet.slsa.bot.bot_timeout", this.getNameForScoreboard(), getFormattedTime(SLSCarpetSettings.botMaxOnlineTime))
|
||||
.setStyle(
|
||||
Style.EMPTY.withColor(Formatting.RED)
|
||||
),
|
||||
false
|
||||
);
|
||||
|
||||
this.kill();
|
||||
}
|
||||
}
|
||||
|
||||
@Unique
|
||||
private static String getFormattedTime(long time) {
|
||||
if (time > 120 * 60) {
|
||||
return String.format("%02dh%02dm%02ds", time / 3600, (time % 3600) / 60, time % 60);
|
||||
}
|
||||
else if (time > 120) {
|
||||
return String.format("%02dm%02ds", time / 60, time % 60);
|
||||
}
|
||||
else {
|
||||
return String.format("%02ds", time);
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -20,7 +20,7 @@ public abstract class MixinSettingsManager implements SettingsManagerAccessor {
|
||||
@Shadow protected abstract void loadConfigurationFromConf();
|
||||
|
||||
@Override
|
||||
public void loadSettings() {
|
||||
public void carpet_SLS_Addition$loadSettings() {
|
||||
this.loadConfigurationFromConf();
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.github.zly2006.carpetslsaddition.mixin.entity;
|
||||
|
||||
import com.github.zly2006.carpetslsaddition.SLSCarpetSettings;
|
||||
import net.minecraft.entity.Leashable;
|
||||
import net.minecraft.entity.vehicle.BoatEntity;
|
||||
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(BoatEntity.class)
|
||||
public abstract class MixinBoatEntity implements Leashable {
|
||||
@Inject(method = "tick", at = @At("HEAD"))
|
||||
private void onTick(CallbackInfo ci) {
|
||||
if (!SLSCarpetSettings.spectatorCannotUseLeash ||
|
||||
this.getLeashHolder() == null ||
|
||||
!this.getLeashHolder().isSpectator()
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.detachLeash();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.github.zly2006.carpetslsaddition.mixin.entity;
|
||||
|
||||
import com.github.zly2006.carpetslsaddition.SLSCarpetSettings;
|
||||
import net.minecraft.entity.Leashable;
|
||||
import net.minecraft.entity.mob.MobEntity;
|
||||
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(MobEntity.class)
|
||||
public abstract class MixinMobEntity implements Leashable {
|
||||
@Shadow public abstract void detachLeash();
|
||||
|
||||
@Inject(method = "tick", at = @At("HEAD"))
|
||||
private void onTick(CallbackInfo ci) {
|
||||
if (!SLSCarpetSettings.spectatorCannotUseLeash ||
|
||||
this.getLeashHolder() == null ||
|
||||
!this.getLeashHolder().isSpectator()
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.detachLeash();
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.github.zly2006.carpetslsaddition.mixin.entity;
|
||||
|
||||
import com.github.zly2006.carpetslsaddition.util.access.PlayerAccess;
|
||||
import com.github.zly2006.carpetslsaddition.util.access.PlayerAccessor;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(PlayerEntity.class)
|
||||
public abstract class MixinPlayerEntity implements PlayerAccess {
|
||||
public abstract class MixinPlayerEntity implements PlayerAccessor {
|
||||
@Unique
|
||||
private Text displayName = null;
|
||||
|
||||
|
||||
+14
@@ -3,8 +3,11 @@ package com.github.zly2006.carpetslsaddition.mixin.entity;
|
||||
import com.github.zly2006.carpetslsaddition.SLSCarpetSettings;
|
||||
import com.github.zly2006.carpetslsaddition.util.SitEntity;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.Leashable;
|
||||
import net.minecraft.entity.decoration.ArmorStandEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.LeadItem;
|
||||
import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket;
|
||||
import net.minecraft.server.network.ServerPlayNetworkHandler;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
@@ -12,12 +15,23 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mixin(ServerPlayerEntity.class)
|
||||
public abstract class MixinServerPlayerEntity extends PlayerEntity {
|
||||
@Shadow
|
||||
public ServerPlayNetworkHandler networkHandler;
|
||||
|
||||
@Shadow public abstract boolean isSpectator();
|
||||
|
||||
@Unique
|
||||
private int sneakTimes = 0;
|
||||
@Unique
|
||||
private long lastSneakTime = 0;
|
||||
|
||||
public MixinServerPlayerEntity(World world, BlockPos pos, float yaw, GameProfile gameProfile) {
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.github.zly2006.carpetslsaddition.mixin.server;
|
||||
|
||||
import com.github.zly2006.carpetslsaddition.util.access.ServerAccess;
|
||||
import com.github.zly2006.carpetslsaddition.util.access.ServerAccessor;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.minecraft.server.dedicated.MinecraftDedicatedServer;
|
||||
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
@Environment(EnvType.SERVER)
|
||||
@Mixin(MinecraftDedicatedServer.class)
|
||||
public class MixinMinecraftDedicatedServer implements ServerAccess {
|
||||
public class MixinMinecraftDedicatedServer implements ServerAccessor {
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.github.zly2006.carpetslsaddition.mixin.world;
|
||||
import com.github.zly2006.carpetslsaddition.ServerMain;
|
||||
import com.github.zly2006.carpetslsaddition.block.RewriteChainRestrictedNeighborUpdater;
|
||||
import com.github.zly2006.carpetslsaddition.util.NeighborUpdaterChanger;
|
||||
import com.github.zly2006.carpetslsaddition.util.access.ServerAccess;
|
||||
import com.github.zly2006.carpetslsaddition.util.access.ServerAccessor;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.minecraft.world.World;
|
||||
@@ -27,7 +27,7 @@ public abstract class MixinWorld implements NeighborUpdaterChanger {
|
||||
int maxDepth;
|
||||
|
||||
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER) {
|
||||
maxDepth = ((ServerAccess) ServerMain.server).getPropertiesLoader().getPropertiesHandler().maxChainedNeighborUpdates;
|
||||
maxDepth = ((ServerAccessor) ServerMain.server).getPropertiesLoader().getPropertiesHandler().maxChainedNeighborUpdates;
|
||||
}
|
||||
else {
|
||||
maxDepth = 1000000;
|
||||
|
||||
Reference in new issue
Block a user