From 49840619f53fac864c65fc21d67deca429a3d213 Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 31 Jul 2025 01:43:45 +0200 Subject: [PATCH] encapsulating isClientSide() --- src/main/java/carpet/mixins/AbstractArrowMixin.java | 2 +- .../java/carpet/mixins/ArmorStand_scarpetMarkerMixin.java | 2 +- src/main/java/carpet/mixins/EntityMixin.java | 2 +- .../carpet/mixins/ExperienceOrb_xpNoCooldownMixin.java | 2 +- .../java/carpet/mixins/Explosion_optimizedTntMixin.java | 4 ++-- src/main/java/carpet/mixins/FallingBlockEntityMixin.java | 2 +- .../carpet/mixins/Guardian_renewableSpongesMixin.java | 2 +- .../java/carpet/mixins/LevelChunk_movableBEMixin.java | 2 +- .../mixins/PistonMovingBlockEntity_movableBEMixin.java | 2 +- src/main/java/carpet/mixins/Player_parrotMixin.java | 2 +- .../java/carpet/mixins/Player_scarpetEventsMixin.java | 6 +++--- src/main/java/carpet/mixins/PrimedTntMixin.java | 6 +++--- .../java/carpet/mixins/SummonCommand_lightningMixin.java | 2 +- src/main/java/carpet/mixins/ThrowableProjectileMixin.java | 2 +- .../java/carpet/mixins/WoolCarpetBlock_placeMixin.java | 2 +- src/main/java/carpet/utils/CarpetProfiler.java | 8 ++++---- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/carpet/mixins/AbstractArrowMixin.java b/src/main/java/carpet/mixins/AbstractArrowMixin.java index e3008597..8c3d5058 100644 --- a/src/main/java/carpet/mixins/AbstractArrowMixin.java +++ b/src/main/java/carpet/mixins/AbstractArrowMixin.java @@ -23,7 +23,7 @@ public abstract class AbstractArrowMixin extends Entity @Inject(method = "(Lnet/minecraft/world/entity/EntityType;DDDLnet/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 double x, final double y, final double z, final Level level, final ItemStack itemStack, final ItemStack weapon, final CallbackInfo ci) { - if (LoggerRegistry.__projectiles && !level.isClientSide) + if (LoggerRegistry.__projectiles && !level.isClientSide()) logHelper = new TrajectoryLogHelper("projectiles"); } diff --git a/src/main/java/carpet/mixins/ArmorStand_scarpetMarkerMixin.java b/src/main/java/carpet/mixins/ArmorStand_scarpetMarkerMixin.java index 1a944301..89339e32 100644 --- a/src/main/java/carpet/mixins/ArmorStand_scarpetMarkerMixin.java +++ b/src/main/java/carpet/mixins/ArmorStand_scarpetMarkerMixin.java @@ -29,7 +29,7 @@ public abstract class ArmorStand_scarpetMarkerMixin extends LivingEntity @Inject(method = "readAdditionalSaveData", at = @At("HEAD")) private void checkScarpetMarkerUnloaded(CallbackInfo ci) { - if (!level().isClientSide) + if (!level().isClientSide()) { if (getTags().contains(Auxiliary.MARKER_STRING)) { diff --git a/src/main/java/carpet/mixins/EntityMixin.java b/src/main/java/carpet/mixins/EntityMixin.java index 589f5111..42f09a9c 100644 --- a/src/main/java/carpet/mixins/EntityMixin.java +++ b/src/main/java/carpet/mixins/EntityMixin.java @@ -35,6 +35,6 @@ public abstract class EntityMixin implements EntityInterface @Inject(method = "isLocalInstanceAuthoritative", at = @At("HEAD"), cancellable = true) private void isFakePlayer(CallbackInfoReturnable cir) { - if (getControllingPassenger() instanceof EntityPlayerMPFake) cir.setReturnValue(!level.isClientSide); + if (getControllingPassenger() instanceof EntityPlayerMPFake) cir.setReturnValue(!level.isClientSide()); } } diff --git a/src/main/java/carpet/mixins/ExperienceOrb_xpNoCooldownMixin.java b/src/main/java/carpet/mixins/ExperienceOrb_xpNoCooldownMixin.java index 7c590b6e..9c87a95f 100644 --- a/src/main/java/carpet/mixins/ExperienceOrb_xpNoCooldownMixin.java +++ b/src/main/java/carpet/mixins/ExperienceOrb_xpNoCooldownMixin.java @@ -31,7 +31,7 @@ public abstract class ExperienceOrb_xpNoCooldownMixin extends Entity @Inject(method = "playerTouch", at = @At("HEAD")) private void addXP(Player player, CallbackInfo ci) { - if (CarpetSettings.xpNoCooldown && !level().isClientSide) { + if (CarpetSettings.xpNoCooldown && !level().isClientSide()) { player.takeXpDelay = 0; // reducing the count to 1 and leaving vanilla to deal with it while (this.count > 1) { diff --git a/src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java b/src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java index 43d38cb1..76effd11 100644 --- a/src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java +++ b/src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java @@ -45,7 +45,7 @@ public abstract class Explosion_optimizedTntMixin cancellable = true) private void calculateExplodedPositionsCM(final CallbackInfoReturnable> cir) { - if (CarpetSettings.optimizedTNT && !level.isClientSide && !(getIndirectSourceEntity() instanceof Breeze)) + if (CarpetSettings.optimizedTNT && !level.isClientSide() && !(getIndirectSourceEntity() instanceof Breeze)) { cir.setReturnValue(OptimizedExplosion.doExplosionA((Explosion) (Object) this, eLogger)); } @@ -79,7 +79,7 @@ public abstract class Explosion_optimizedTntMixin at = @At(value = "RETURN")) private void onExplostion(ServerLevel world, Entity entity, DamageSource damageSource, final ExplosionDamageCalculator explosionBehavior, final Vec3 vec3, final float power, final boolean createFire, final Explosion.BlockInteraction destructionType, final CallbackInfo ci) { - if (LoggerRegistry.__explosions && ! world.isClientSide) + if (LoggerRegistry.__explosions && ! world.isClientSide()) { eLogger = new ExplosionLogHelper(vec3.x, vec3.y, vec3.z, power, createFire, destructionType, level.registryAccess()); } diff --git a/src/main/java/carpet/mixins/FallingBlockEntityMixin.java b/src/main/java/carpet/mixins/FallingBlockEntityMixin.java index 2e86c9b2..aec30878 100644 --- a/src/main/java/carpet/mixins/FallingBlockEntityMixin.java +++ b/src/main/java/carpet/mixins/FallingBlockEntityMixin.java @@ -21,7 +21,7 @@ public abstract class FallingBlockEntityMixin extends Entity @Inject(method = "(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V", at = @At("RETURN")) private void addLogger(EntityType entityType_1, Level world_1, CallbackInfo ci) { - if (LoggerRegistry.__fallingBlocks && !world_1.isClientSide) + if (LoggerRegistry.__fallingBlocks && !world_1.isClientSide()) logHelper = new TrajectoryLogHelper("fallingBlocks"); } diff --git a/src/main/java/carpet/mixins/Guardian_renewableSpongesMixin.java b/src/main/java/carpet/mixins/Guardian_renewableSpongesMixin.java index d2fc84d3..492da31a 100644 --- a/src/main/java/carpet/mixins/Guardian_renewableSpongesMixin.java +++ b/src/main/java/carpet/mixins/Guardian_renewableSpongesMixin.java @@ -22,7 +22,7 @@ public abstract class Guardian_renewableSpongesMixin extends Monster @Override public void thunderHit(ServerLevel serverWorld, LightningBolt lightningEntity) { // isRemoved() - if (!this.level().isClientSide && !this.isRemoved() && CarpetSettings.renewableSponges && !((Object)this instanceof ElderGuardian)) + if (!this.level().isClientSide() && !this.isRemoved() && CarpetSettings.renewableSponges && !((Object)this instanceof ElderGuardian)) { ElderGuardian elderGuardian = new ElderGuardian(EntityType.ELDER_GUARDIAN ,this.level()); elderGuardian.snapTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot()); diff --git a/src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java b/src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java index 6aa9b979..5ef7502a 100644 --- a/src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java +++ b/src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java @@ -156,7 +156,7 @@ public abstract class LevelChunk_movableBEMixin extends ChunkAccess implements W return null; } - if (!level.isClientSide && sideEffects) { + if (!level.isClientSide() && sideEffects) { // this updates stuff, schedule ticks - do we want that since its only be called from MovingPistonBlock really? newBlockState.onPlace(level, blockPos_1, oldBlockState, boolean_1); } diff --git a/src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java b/src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java index 5323f670..8e021890 100644 --- a/src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java +++ b/src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java @@ -125,7 +125,7 @@ public abstract class PistonMovingBlockEntity_movableBEMixin extends BlockEntity //Handle TNT Explosions or other ways the moving Block is broken //Also /setblock will cause this to be called, and drop e.g. a moving chest's contents. // This is MC-40380 (BlockEntities that aren't Inventories drop stuff when setblock is called ) - if (CarpetSettings.movableBlockEntities && this.carriedBlockEntity != null && !this.level.isClientSide && this.level.getBlockState(this.worldPosition).getBlock() == Blocks.AIR) + if (CarpetSettings.movableBlockEntities && this.carriedBlockEntity != null && !this.level.isClientSide() && this.level.getBlockState(this.worldPosition).getBlock() == Blocks.AIR) { BlockState blockState_2; if (this.isSourcePiston) diff --git a/src/main/java/carpet/mixins/Player_parrotMixin.java b/src/main/java/carpet/mixins/Player_parrotMixin.java index b7d32283..ef01e4c6 100644 --- a/src/main/java/carpet/mixins/Player_parrotMixin.java +++ b/src/main/java/carpet/mixins/Player_parrotMixin.java @@ -52,7 +52,7 @@ public abstract class Player_parrotMixin extends LivingEntity private void onTickMovement(CallbackInfo ci) { boolean parrots_will_drop = !CarpetSettings.persistentParrots || this.abilities.invulnerable; - if (!this.level().isClientSide && ((parrots_will_drop && this.fallDistance > 0.5F) || this.isInWater() || this.abilities.flying || isSleeping())) + if (!this.level().isClientSide() && ((parrots_will_drop && this.fallDistance > 0.5F) || this.isInWater() || this.abilities.flying || isSleeping())) { this.removeEntitiesOnShoulder(); } diff --git a/src/main/java/carpet/mixins/Player_scarpetEventsMixin.java b/src/main/java/carpet/mixins/Player_scarpetEventsMixin.java index 44411d5a..9c8fa375 100644 --- a/src/main/java/carpet/mixins/Player_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/Player_scarpetEventsMixin.java @@ -58,7 +58,7 @@ public abstract class Player_scarpetEventsMixin extends LivingEntity @Inject(method = "touch", at = @At("HEAD")) private void onEntityCollision(Entity entity, CallbackInfo ci) { - if (PLAYER_COLLIDES_WITH_ENTITY.isNeeded() && !level().isClientSide) + if (PLAYER_COLLIDES_WITH_ENTITY.isNeeded() && !level().isClientSide()) { PLAYER_COLLIDES_WITH_ENTITY.onEntityHandAction((ServerPlayer)(Object)this, entity, null); } @@ -67,7 +67,7 @@ public abstract class Player_scarpetEventsMixin extends LivingEntity @Inject(method = "interactOn", cancellable = true, at = @At("HEAD")) private void doInteract(Entity entity, InteractionHand hand, CallbackInfoReturnable cir) { - if (!level().isClientSide && PLAYER_INTERACTS_WITH_ENTITY.isNeeded()) + if (!level().isClientSide() && PLAYER_INTERACTS_WITH_ENTITY.isNeeded()) { if(PLAYER_INTERACTS_WITH_ENTITY.onEntityHandAction((ServerPlayer) (Object)this, entity, hand)) { cir.setReturnValue(InteractionResult.PASS); @@ -79,7 +79,7 @@ public abstract class Player_scarpetEventsMixin extends LivingEntity @Inject(method = "attack", at = @At("HEAD"), cancellable = true) private void onAttack(Entity target, CallbackInfo ci) { - if (!level().isClientSide && PLAYER_ATTACKS_ENTITY.isNeeded() && target.isAttackable()) + if (!level().isClientSide() && PLAYER_ATTACKS_ENTITY.isNeeded() && target.isAttackable()) { if(PLAYER_ATTACKS_ENTITY.onEntityHandAction((ServerPlayer) (Object)this, target, null)) { ci.cancel(); diff --git a/src/main/java/carpet/mixins/PrimedTntMixin.java b/src/main/java/carpet/mixins/PrimedTntMixin.java index 0328ace3..67213f1f 100644 --- a/src/main/java/carpet/mixins/PrimedTntMixin.java +++ b/src/main/java/carpet/mixins/PrimedTntMixin.java @@ -43,7 +43,7 @@ public abstract class PrimedTntMixin extends Entity implements TntEntityInterfac @Inject(method = "(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V", at = @At("RETURN")) private void initTNTLoggerPrime(EntityType entityType_1, Level world_1, CallbackInfo ci) { - if (LoggerRegistry.__tnt && !world_1.isClientSide) + if (LoggerRegistry.__tnt && !world_1.isClientSide()) { logHelper = new TNTLogHelper(); } @@ -90,7 +90,7 @@ public abstract class PrimedTntMixin extends Entity implements TntEntityInterfac // Merge code for combining tnt into a single entity if they happen to exist in the same spot, same fuse, no motion CARPET-XCOM if(CarpetSettings.mergeTNT){ Vec3 velocity = getDeltaMovement(); - if(!level().isClientSide && mergeBool && velocity.x == 0 && velocity.y == 0 && velocity.z == 0){ + if(!level().isClientSide() && mergeBool && velocity.x == 0 && velocity.y == 0 && velocity.z == 0){ mergeBool = false; for(Entity entity : level().getEntities(this, this.getBoundingBox())){ if(entity instanceof PrimedTnt && !entity.isRemoved()){ @@ -113,7 +113,7 @@ public abstract class PrimedTntMixin extends Entity implements TntEntityInterfac { // Merge code, merge only tnt that have had a chance to move CARPET-XCOM Vec3 velocity = getDeltaMovement(); - if(!level().isClientSide && (velocity.y != 0 || velocity.x != 0 || velocity.z != 0)){ + if(!level().isClientSide() && (velocity.y != 0 || velocity.x != 0 || velocity.z != 0)){ mergeBool = true; } } diff --git a/src/main/java/carpet/mixins/SummonCommand_lightningMixin.java b/src/main/java/carpet/mixins/SummonCommand_lightningMixin.java index 9dee70b4..0fb72fa2 100644 --- a/src/main/java/carpet/mixins/SummonCommand_lightningMixin.java +++ b/src/main/java/carpet/mixins/SummonCommand_lightningMixin.java @@ -25,7 +25,7 @@ public class SummonCommand_lightningMixin private static BlockPos addRiders(Entity entity) { // [CM] SummonNaturalLightning - if statement around - if (CarpetSettings.summonNaturalLightning && entity instanceof LightningBolt && !entity.level().isClientSide) + if (CarpetSettings.summonNaturalLightning && entity instanceof LightningBolt && !entity.level().isClientSide()) { ServerLevel world = (ServerLevel) entity.level(); BlockPos at = entity.blockPosition(); diff --git a/src/main/java/carpet/mixins/ThrowableProjectileMixin.java b/src/main/java/carpet/mixins/ThrowableProjectileMixin.java index 20533e20..26bb1508 100644 --- a/src/main/java/carpet/mixins/ThrowableProjectileMixin.java +++ b/src/main/java/carpet/mixins/ThrowableProjectileMixin.java @@ -21,7 +21,7 @@ public abstract class ThrowableProjectileMixin extends Entity @Inject(method = "(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V", at = @At("RETURN")) private void addLogger(EntityType entityType_1, Level world_1, CallbackInfo ci) { - if (LoggerRegistry.__projectiles && !world_1.isClientSide) + if (LoggerRegistry.__projectiles && !world_1.isClientSide()) logHelper = new TrajectoryLogHelper("projectiles"); } diff --git a/src/main/java/carpet/mixins/WoolCarpetBlock_placeMixin.java b/src/main/java/carpet/mixins/WoolCarpetBlock_placeMixin.java index 0cbe55bf..fd2b72e9 100644 --- a/src/main/java/carpet/mixins/WoolCarpetBlock_placeMixin.java +++ b/src/main/java/carpet/mixins/WoolCarpetBlock_placeMixin.java @@ -22,7 +22,7 @@ public abstract class WoolCarpetBlock_placeMixin extends Block public BlockState getStateForPlacement(BlockPlaceContext context) { BlockState state = super.getStateForPlacement(context); - if (context.getPlayer() != null && !context.getLevel().isClientSide) + if (context.getPlayer() != null && !context.getLevel().isClientSide()) { // getColor() WoolTool.carpetPlacedAction(((WoolCarpetBlock)(Object)this).getColor(), (ServerPlayer) context.getPlayer(), context.getClickedPos(), (ServerLevel) context.getLevel()); } diff --git a/src/main/java/carpet/utils/CarpetProfiler.java b/src/main/java/carpet/utils/CarpetProfiler.java index dbd0cde2..9bcf3595 100644 --- a/src/main/java/carpet/utils/CarpetProfiler.java +++ b/src/main/java/carpet/utils/CarpetProfiler.java @@ -140,7 +140,7 @@ public class CarpetProfiler Level world = tok.world; String current_section = (world == null) ? (String) tok.section : - String.format("%s.%s%s", world.dimension().location(), tok.section, world.isClientSide ? " (Client)" : ""); + String.format("%s.%s%s", world.dimension().location(), tok.section, world.isClientSide() ? " (Client)" : ""); SECTION_STATS.addTo(current_section, end_time - tok.start); } } @@ -286,7 +286,7 @@ public class CarpetProfiler id = regs.lookupOrThrow(Registries.BLOCK_ENTITY_TYPE).getKey((BlockEntityType) section.getValue()); } String name = "minecraft".equals(id.getNamespace())?id.getPath():id.toString(); - if (section.getKey().isClientSide) + if (section.getKey().isClientSide()) { name += " (client)"; } @@ -311,7 +311,7 @@ public class CarpetProfiler { if (++total > 10) break; Pair section = sectionEntry.getKey(); - boolean cli = section.getKey().isClientSide; + boolean cli = section.getKey().isClientSide(); Messenger.m(currentRequester, String.format( "%s - %s: ", cli?"gi":"w", sectionName(section)), @@ -325,7 +325,7 @@ public class CarpetProfiler { if (++total > 10) break; Pair section = sectionEntry.getKey(); - boolean cli = section.getKey().isClientSide; + boolean cli = section.getKey().isClientSide(); Messenger.m(currentRequester, String.format( "%s - %s: ", cli?"gi":"w", sectionName(section)),