From 8e09d47cd6de9a4f5dc858326d02079635baec1a Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 7 Oct 2025 10:20:47 -0700 Subject: [PATCH] 1.21.10 --- gradle.properties | 6 +- .../server/MinecraftServer.java.patch | 28 +++++----- .../minecraft/world/entity/Entity.java.patch | 56 +++++++++---------- .../world/level/block/CropBlock.java.patch | 2 +- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/gradle.properties b/gradle.properties index efdf527e77..06385534d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ org.gradle.daemon=false org.gradle.parallel=true JAVA_VERSION=21 -MC_VERSION=1.21.9 +MC_VERSION=1.21.10 MC_NEXT_VERSION=1.22 -MCP_VERSION=20250930.103108 +MCP_VERSION=20251007.101210 MAPPING_CHANNEL=official -MAPPING_VERSION=1.21.9 +MAPPING_VERSION=1.21.10 # Set to true before the first build of a new MC version, so we don't do compatibility checks CHECK_COMPATIBILITY=false diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index 899eac188e..2fbdb483bd 100644 --- a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -53,7 +53,7 @@ while (this.running) { long i; -@@ -775,6 +_,8 @@ +@@ -778,6 +_,8 @@ this.isReady = true; JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis); } @@ -62,7 +62,7 @@ } catch (Throwable throwable2) { LOGGER.error("Encountered an unexpected exception", throwable2); CrashReport crashreport = constructOrExtractCrashReport(throwable2); -@@ -786,6 +_,7 @@ +@@ -789,6 +_,7 @@ LOGGER.error("We were unable to save this crash report to disk."); } @@ -70,7 +70,7 @@ this.onServerCrash(crashreport); } finally { try { -@@ -794,6 +_,7 @@ +@@ -797,6 +_,7 @@ } catch (Throwable throwable) { LOGGER.error("Exception stopping the server", throwable); } finally { @@ -78,7 +78,7 @@ this.onServerExit(); } } -@@ -991,12 +_,14 @@ +@@ -994,12 +_,14 @@ } } @@ -93,7 +93,7 @@ } this.ticksUntilAutosave--; -@@ -1014,6 +_,7 @@ +@@ -1017,6 +_,7 @@ this.smoothedTickTimeMillis = this.smoothedTickTimeMillis * 0.8F + (float)k / (float)TimeUtil.NANOSECONDS_PER_MILLISECOND * 0.19999999F; this.logTickMethodTime(i); profilerfiller.pop(); @@ -101,7 +101,7 @@ } private void autoSave() { -@@ -1063,7 +_,8 @@ +@@ -1066,7 +_,8 @@ Optional.of(serverstatus$players), Optional.of(ServerStatus.Version.current()), Optional.ofNullable(this.statusIcon), @@ -111,7 +111,7 @@ ); } -@@ -1095,7 +_,8 @@ +@@ -1098,7 +_,8 @@ profilerfiller.popPush("levels"); this.updateEffectiveRespawnData(); @@ -121,7 +121,7 @@ profilerfiller.push(() -> serverlevel + " " + serverlevel.dimension().location()); if (this.tickCount % 20 == 0) { profilerfiller.push("timeSync"); -@@ -1104,6 +_,7 @@ +@@ -1107,6 +_,7 @@ } profilerfiller.push("tick"); @@ -129,7 +129,7 @@ try { serverlevel.tick(p_129954_); -@@ -1112,9 +_,11 @@ +@@ -1115,9 +_,11 @@ serverlevel.fillReportDetails(crashreport); throw new ReportedException(crashreport); } @@ -141,7 +141,7 @@ } profilerfiller.popPush("connection"); -@@ -1123,7 +_,7 @@ +@@ -1126,7 +_,7 @@ this.playerList.tick(); profilerfiller.popPush("debugSubscribers"); this.debugSubscribers.tick(); @@ -150,7 +150,7 @@ profilerfiller.popPush("gameTests"); GameTestTicker.SINGLETON.tick(); } -@@ -1226,7 +_,7 @@ +@@ -1229,7 +_,7 @@ @DontObfuscate public String getServerModName() { @@ -159,7 +159,7 @@ } public SystemReport fillSystemReport(SystemReport p_177936_) { -@@ -1576,6 +_,7 @@ +@@ -1579,6 +_,7 @@ this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary()); this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager); this.fuelValues = FuelValues.vanillaBurnTimes(this.registries.compositeAccess(), this.worldData.enabledFeatures()); @@ -167,7 +167,7 @@ }, this); if (this.isSameThread()) { this.managedBlock(completablefuture::isDone); -@@ -1585,12 +_,15 @@ +@@ -1588,12 +_,15 @@ } public static WorldDataConfiguration configurePackRepository(PackRepository p_248681_, WorldDataConfiguration p_331931_, boolean p_249869_, boolean p_330480_) { @@ -184,7 +184,7 @@ } else { Set set = Sets.newLinkedHashSet(); -@@ -2155,6 +_,48 @@ +@@ -2158,6 +_,48 @@ public ServerLinks serverLinks() { return ServerLinks.EMPTY; diff --git a/patches/minecraft/net/minecraft/world/entity/Entity.java.patch b/patches/minecraft/net/minecraft/world/entity/Entity.java.patch index 2c642bb145..f0b104ab12 100644 --- a/patches/minecraft/net/minecraft/world/entity/Entity.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/Entity.java.patch @@ -62,7 +62,7 @@ } this.checkBelowWorld(); -@@ -955,9 +_,7 @@ +@@ -958,9 +_,7 @@ return blockpos; } else { BlockState blockstate = this.level().getBlockState(blockpos); @@ -73,7 +73,7 @@ ? blockpos.atY(Mth.floor(this.position.y - p_216987_)) : blockpos; } -@@ -1299,19 +_,19 @@ +@@ -1304,19 +_,19 @@ return !blockstate.is(BlockTags.INSIDE_STEP_SOUND_BLOCKS) && !blockstate.is(BlockTags.COMBINATION_STEP_SOUND_BLOCKS) ? p_278049_ : blockpos; } @@ -99,7 +99,7 @@ this.playSound(soundtype.getStepSound(), soundtype.getVolume() * 0.15F, soundtype.getPitch()); } -@@ -1444,6 +_,10 @@ +@@ -1449,6 +_,10 @@ return this.wasTouchingWater; } @@ -110,7 +110,7 @@ boolean isInRain() { BlockPos blockpos = this.blockPosition(); return this.level().isRainingAt(blockpos) -@@ -1483,24 +_,32 @@ +@@ -1488,24 +_,32 @@ public void updateSwimming() { if (this.isSwimming()) { @@ -150,7 +150,7 @@ if (!this.wasTouchingWater && !this.firstTick) { this.doWaterSplashEffect(); } -@@ -1515,6 +_,7 @@ +@@ -1520,6 +_,7 @@ private void updateFluidOnEyes() { this.wasEyeInWater = this.isEyeInFluid(FluidTags.WATER); this.fluidOnEyes.clear(); @@ -158,7 +158,7 @@ double d0 = this.getEyeY(); if (!( this.getVehicle() instanceof AbstractBoat abstractboat -@@ -1526,7 +_,7 @@ +@@ -1531,7 +_,7 @@ FluidState fluidstate = this.level().getFluidState(blockpos); double d1 = blockpos.getY() + fluidstate.getHeight(this.level(), blockpos); if (d1 > d0) { @@ -167,7 +167,7 @@ } } } -@@ -1580,12 +_,13 @@ +@@ -1585,12 +_,13 @@ } public boolean canSpawnSprintParticle() { @@ -182,7 +182,7 @@ if (blockstate.getRenderShape() != RenderShape.INVISIBLE) { Vec3 vec3 = this.getDeltaMovement(); BlockPos blockpos1 = this.blockPosition(); -@@ -1601,7 +_,7 @@ +@@ -1606,7 +_,7 @@ this.level() .addParticle( @@ -191,7 +191,7 @@ d0, this.getY() + 0.1, d1, -@@ -1612,12 +_,15 @@ +@@ -1617,12 +_,15 @@ } } @@ -208,7 +208,7 @@ } public void moveRelative(float p_19921_, Vec3 p_19922_) { -@@ -1982,6 +_,10 @@ +@@ -1987,6 +_,10 @@ p_409187_.putBoolean("HasVisualFire", this.hasVisualFire); } @@ -219,7 +219,7 @@ if (!this.tags.isEmpty()) { p_409187_.store("Tags", TAG_LIST_CODEC, List.copyOf(this.tags)); } -@@ -2057,6 +_,9 @@ +@@ -2062,6 +_,9 @@ this.setGlowingTag(p_408698_.getBooleanOr("Glowing", false)); this.setTicksFrozen(p_408698_.getIntOr("TicksFrozen", 0)); this.hasVisualFire = p_408698_.getBooleanOr("HasVisualFire", false); @@ -229,7 +229,7 @@ this.customData = p_408698_.read("data", CustomData.CODEC).orElse(CustomData.EMPTY); this.tags.clear(); p_408698_.read("Tags", TAG_LIST_CODEC).ifPresent(this.tags::addAll); -@@ -2109,6 +_,8 @@ +@@ -2114,6 +_,8 @@ p_409579_, this.getX() + p_408228_.x, this.getY() + p_408228_.y, this.getZ() + p_408228_.z, p_407826_ ); itementity.setDefaultPickUpDelay(); @@ -238,7 +238,7 @@ p_409579_.addFreshEntity(itementity); return itementity; } -@@ -2172,7 +_,7 @@ +@@ -2177,7 +_,7 @@ itemstack.hurtAndBreak(1, p_19978_, p_19979_); return InteractionResult.SUCCESS; } else if (this instanceof Mob mob @@ -247,7 +247,7 @@ && mob.canShearEquipment(p_19978_) && !p_19978_.isSecondaryUseActive() && this.attemptToShearEquipment(p_19978_, p_19979_, itemstack, mob)) { -@@ -2277,6 +_,7 @@ +@@ -2282,6 +_,7 @@ public void rideTick() { this.setDeltaMovement(Vec3.ZERO); @@ -255,7 +255,7 @@ this.tick(); if (this.isPassenger()) { this.getVehicle().positionRider(this); -@@ -2337,6 +_,7 @@ +@@ -2342,6 +_,7 @@ } } @@ -263,7 +263,7 @@ if (p_19967_ || this.canRide(p_19966_) && p_19966_.canAddPassenger(this)) { if (this.isPassenger()) { this.stopRiding(); -@@ -2372,6 +_,7 @@ +@@ -2377,6 +_,7 @@ public void removeVehicle() { if (this.vehicle != null) { Entity entity = this.vehicle; @@ -271,7 +271,7 @@ this.vehicle = null; entity.removePassenger(this); Entity.RemovalReason entity$removalreason = this.getRemovalReason(); -@@ -2422,6 +_,8 @@ +@@ -2427,6 +_,8 @@ return this.passengers.isEmpty(); } @@ -280,7 +280,7 @@ protected boolean couldAcceptPassenger() { return true; } -@@ -2618,7 +_,7 @@ +@@ -2623,7 +_,7 @@ } public boolean isVisuallyCrawling() { @@ -289,7 +289,7 @@ } public void setSwimming(boolean p_20283_) { -@@ -2735,7 +_,7 @@ +@@ -2740,7 +_,7 @@ this.igniteForSeconds(8.0F); } @@ -298,7 +298,7 @@ } public void onAboveBubbleColumn(boolean p_392709_, BlockPos p_391902_) { -@@ -2868,7 +_,7 @@ +@@ -2873,7 +_,7 @@ } protected Component getTypeName() { @@ -307,7 +307,7 @@ } public boolean is(Entity p_20356_) { -@@ -3181,6 +_,7 @@ +@@ -3186,6 +_,7 @@ return this.stringUUID; } @@ -315,7 +315,7 @@ public boolean isPushedByFluid() { return true; } -@@ -3565,9 +_,17 @@ +@@ -3570,9 +_,17 @@ return Mth.lerp(p_344421_, this.yRotO, this.yRot); } @@ -334,7 +334,7 @@ } else { AABB aabb = this.getBoundingBox().deflate(0.001); int i = Mth.floor(aabb.minX); -@@ -3582,25 +_,28 @@ +@@ -3587,25 +_,28 @@ Vec3 vec3 = Vec3.ZERO; int k1 = 0; BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(); @@ -370,7 +370,7 @@ } } } -@@ -3608,27 +_,28 @@ +@@ -3613,27 +_,28 @@ } } @@ -409,7 +409,7 @@ } } -@@ -3641,7 +_,10 @@ +@@ -3646,7 +_,10 @@ return !this.level().hasChunksAt(i, k, j, l); } @@ -420,7 +420,7 @@ return this.fluidHeight.getDouble(p_204037_); } -@@ -3657,7 +_,9 @@ +@@ -3662,7 +_,9 @@ return this.dimensions.height(); } @@ -430,7 +430,7 @@ return new ClientboundAddEntityPacket(this, p_344981_); } -@@ -3788,6 +_,11 @@ +@@ -3793,6 +_,11 @@ } } } @@ -442,7 +442,7 @@ } public void checkDespawn() { -@@ -3962,6 +_,100 @@ +@@ -3967,6 +_,100 @@ float f1 = (float)Mth.lerp(d0, this.getXRot(), p_298926_); this.setPos(d1, d2, d3); this.setRot(f, f1); diff --git a/patches/minecraft/net/minecraft/world/level/block/CropBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/CropBlock.java.patch index a840561f75..465dfa460c 100644 --- a/patches/minecraft/net/minecraft/world/level/block/CropBlock.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/CropBlock.java.patch @@ -35,7 +35,7 @@ @@ -151,7 +_,7 @@ @Override - protected void entityInside(BlockState p_52277_, Level p_52278_, BlockPos p_52279_, Entity p_52280_, InsideBlockEffectApplier p_391246_) { + protected void entityInside(BlockState p_52277_, Level p_52278_, BlockPos p_52279_, Entity p_52280_, InsideBlockEffectApplier p_391246_, boolean p_432051_) { - if (p_52278_ instanceof ServerLevel serverlevel && p_52280_ instanceof Ravager && serverlevel.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) { + if (p_52278_ instanceof ServerLevel serverlevel && p_52280_ instanceof Ravager && net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(serverlevel, p_52280_)) { serverlevel.destroyBlock(p_52279_, true, p_52280_);