25w34b (#4821)

* 25w34b compiles

* Mixin fixes

* Disable a pair of rendering related mixins

* Bump version

Author: modmuss50

fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/world/TestWorldBuilderImpl.java

@@ -110,7 +110,7 @@ public TestDedicatedServerContext createServer(Properties serverProperties) {
 
 	private Path navigateCreateWorldScreen() {
 		Path saveDirectory = context.computeOnClient(client -> {
-			CreateWorldScreen.show(client, client.currentScreen);
+			CreateWorldScreen.show(client, null);
 
 			if (!(client.currentScreen instanceof CreateWorldScreen createWorldScreen)) {
 				throw new AssertionError("CreateWorldScreen.show did not set the current screen");

fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/sync/AttachmentSync.java

@@ -106,7 +106,7 @@ public void onInitialize() {
 			ServerPlayerEntity player = handler.player;
 			List<AttachmentChange> changes = new ArrayList<>();
 			// sync world attachments
-			((AttachmentTargetImpl) player.world()).fabric_computeInitialSyncChanges(player, changes::add);
+			((AttachmentTargetImpl) player.getEntityWorld()).fabric_computeInitialSyncChanges(player, changes::add);
 			// sync player's own persistent attachments that couldn't be synced earlier
 			((AttachmentTargetImpl) player).fabric_computeInitialSyncChanges(player, changes::add);
 

fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/EntityMixin.java

@@ -44,7 +44,7 @@ abstract class EntityMixin implements AttachmentTargetImpl {
 	private int id;
 
 	@Shadow
-	public abstract World world();
+	public abstract World getEntityWorld();
 
 	@Inject(
 			at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;readCustomData(Lnet/minecraft/storage/ReadView;)V"),
@@ -69,7 +69,7 @@ public AttachmentTargetInfo<?> fabric_getSyncTargetInfo() {
 
 	@Override
 	public void fabric_syncChange(AttachmentType<?> type, AttachmentSyncPayloadS2C payload) {
-		if (!this.world().isClient()) {
+		if (!this.getEntityWorld().isClient()) {
 			AttachmentSyncPredicate predicate = ((AttachmentTypeImpl<?>) type).syncPredicate();
 
 			if ((Object) this instanceof ServerPlayerEntity self && predicate.test(this, self)) {
@@ -88,11 +88,11 @@ public void fabric_syncChange(AttachmentType<?> type, AttachmentSyncPayloadS2C p
 
 	@Override
 	public boolean fabric_shouldTryToSync() {
-		return !this.world().isClient();
+		return !this.getEntityWorld().isClient();
 	}
 
 	@Override
 	public DynamicRegistryManager fabric_getDynamicRegistryManager() {
-		return this.world().getRegistryManager();
+		return this.getEntityWorld().getRegistryManager();
 	}
 }

fabric-data-attachment-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/attachment/client/gametest/SyncGametest.java

@@ -145,7 +145,7 @@ public void runTest(ClientGameTestContext context) {
 				LOGGER.info("Testing synced attachments (1/2)");
 				context.runOnClient(client -> {
 					ClientWorld world = Objects.requireNonNull(client.world);
-					Entity villager = world.getEntity(state.villagerId);
+					Entity villager = world.method_66347(state.villagerId);
 
 					assertHasSyncedWithAll(world.getBlockEntity(state.furnacePos));
 					assertHasSyncedWithAll(villager);

fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/EntityMixin.java

@@ -40,7 +40,7 @@ private Entity afterWorldChanged(Entity instance, ServerWorld sourceWorld, Serve
 		Entity ret = original.call(instance, sourceWorld, targetWorld, teleportTarget);
 
 		if (ret != null) {
-			ServerEntityWorldChangeEvents.AFTER_ENTITY_CHANGE_WORLD.invoker().afterChangeWorld((Entity) (Object) this, ret, (ServerWorld) this.world, (ServerWorld) ret.world());
+			ServerEntityWorldChangeEvents.AFTER_ENTITY_CHANGE_WORLD.invoker().afterChangeWorld((Entity) (Object) this, ret, (ServerWorld) this.world, (ServerWorld) ret.getEntityWorld());
 		}
 
 		return ret;

fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/LivingEntityMixin.java

@@ -109,7 +109,7 @@ private void onWakeUp(CallbackInfo info) {
 	@Dynamic("method_18405: Synthetic lambda body for Optional.map in isSleepingInBed")
 	@Inject(method = "method_18405", at = @At("RETURN"), cancellable = true)
 	private void onIsSleepingInBed(BlockPos sleepingPos, CallbackInfoReturnable<Boolean> info) {
-		BlockState bedState = ((LivingEntity) (Object) this).world().getBlockState(sleepingPos);
+		BlockState bedState = ((LivingEntity) (Object) this).getEntityWorld().getBlockState(sleepingPos);
 		ActionResult result = EntitySleepEvents.ALLOW_BED.invoker().allowBed((LivingEntity) (Object) this, sleepingPos, bedState, info.getReturnValueZ());
 
 		if (result != ActionResult.PASS) {

fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/PlayerManagerMixin.java

@@ -38,8 +38,8 @@ private void afterRespawn(ServerPlayerEntity oldPlayer, boolean alive, Entity.Re
 		ServerPlayerEntity newPlayer = cir.getReturnValue();
 		ServerPlayerEvents.AFTER_RESPAWN.invoker().afterRespawn(oldPlayer, newPlayer, alive);
 
-		if (oldPlayer.world() != newPlayer.world()) {
-			ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.invoker().afterChangeWorld(newPlayer, oldPlayer.world(), newPlayer.world());
+		if (oldPlayer.getEntityWorld() != newPlayer.getEntityWorld()) {
+			ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.invoker().afterChangeWorld(newPlayer, oldPlayer.getEntityWorld(), newPlayer.getEntityWorld());
 		}
 	}
 

fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/ServerPlayerEntityMixin.java

@@ -53,7 +53,7 @@
 @Mixin(ServerPlayerEntity.class)
 abstract class ServerPlayerEntityMixin extends LivingEntityMixin {
 	@Shadow
-	public abstract ServerWorld world();
+	public abstract ServerWorld getEntityWorld();
 
 	/**
 	 * Minecraft by default does not call Entity#onKilledOther for a ServerPlayerEntity being killed.
@@ -66,8 +66,8 @@ private void callOnKillForPlayer(DamageSource source, CallbackInfo ci) {
 
 		// If the damage source that killed the player was an entity, then fire the event.
 		if (attacker != null) {
-			attacker.onKilledOther(this.world(), (ServerPlayerEntity) (Object) this, source);
-			ServerEntityCombatEvents.AFTER_KILLED_OTHER_ENTITY.invoker().afterKilledOtherEntity(this.world(), attacker, (ServerPlayerEntity) (Object) this);
+			attacker.onKilledOther(this.getEntityWorld(), (ServerPlayerEntity) (Object) this, source);
+			ServerEntityCombatEvents.AFTER_KILLED_OTHER_ENTITY.invoker().afterKilledOtherEntity(this.getEntityWorld(), attacker, (ServerPlayerEntity) (Object) this);
 		}
 	}
 
@@ -81,7 +81,7 @@ private void notifyDeath(DamageSource source, CallbackInfo ci) {
 	 */
 	@Inject(method = "worldChanged(Lnet/minecraft/server/world/ServerWorld;)V", at = @At("TAIL"))
 	private void afterWorldChanged(ServerWorld origin, CallbackInfo ci) {
-		ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.invoker().afterChangeWorld((ServerPlayerEntity) (Object) this, origin, this.world());
+		ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.invoker().afterChangeWorld((ServerPlayerEntity) (Object) this, origin, this.getEntityWorld());
 	}
 
 	@Inject(method = "copyFrom", at = @At("TAIL"))

fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/LivingEntityMixin.java

@@ -47,7 +47,7 @@ void injectElytraTick(CallbackInfo info) {
 
 		if (!EntityElytraEvents.ALLOW.invoker().allowElytraFlight(self)) {
 			// The entity is already fall flying by now, we just need to stop it.
-			if (!world().isClient()) {
+			if (!getEntityWorld().isClient()) {
 				setFlag(Entity.GLIDING_FLAG_INDEX, false);
 			}
 

fabric-entity-events-v1/src/testmod/java/net/fabricmc/fabric/test/entity/event/EntityEventTests.java

@@ -87,7 +87,7 @@ public void onInitialize() {
 		});
 
 		ServerPlayerEvents.AFTER_RESPAWN.register((oldPlayer, newPlayer, alive) -> {
-			LOGGER.info("Respawned {}, [{}, {}]", oldPlayer.getGameProfile().getName(), oldPlayer.world().getRegistryKey().getValue(), newPlayer.world().getRegistryKey().getValue());
+			LOGGER.info("Respawned {}, [{}, {}]", oldPlayer.getGameProfile().getName(), oldPlayer.getEntityWorld().getRegistryKey().getValue(), newPlayer.getEntityWorld().getRegistryKey().getValue());
 		});
 
 		// No fall damage if holding a feather in the main hand
@@ -144,7 +144,7 @@ public void onInitialize() {
 
 		EntitySleepEvents.START_SLEEPING.register((entity, sleepingPos) -> {
 			LOGGER.info("Entity {} sleeping at {}", entity, sleepingPos);
-			BlockState bedState = entity.world().getBlockState(sleepingPos);
+			BlockState bedState = entity.getEntityWorld().getBlockState(sleepingPos);
 
 			if (bedState.isOf(TEST_BED)) {
 				boolean shouldBeOccupied = !entity.getStackInHand(Hand.MAIN_HAND).isOf(Items.ORANGE_WOOL);
@@ -164,12 +164,12 @@ public void onInitialize() {
 		});
 
 		EntitySleepEvents.MODIFY_SLEEPING_DIRECTION.register((entity, sleepingPos, sleepingDirection) -> {
-			return entity.world().getBlockState(sleepingPos).isOf(TEST_BED) ? Direction.NORTH : sleepingDirection;
+			return entity.getEntityWorld().getBlockState(sleepingPos).isOf(TEST_BED) ? Direction.NORTH : sleepingDirection;
 		});
 
 		EntitySleepEvents.ALLOW_SLEEP_TIME.register((player, sleepingPos, vanillaResult) -> {
 			// Yellow wool allows to sleep during the day
-			if (player.world().isDay() && player.getStackInHand(Hand.MAIN_HAND).isOf(Items.YELLOW_WOOL)) {
+			if (player.getEntityWorld().isDay() && player.getStackInHand(Hand.MAIN_HAND).isOf(Items.YELLOW_WOOL)) {
 				return ActionResult.SUCCESS;
 			}