Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 23w40a port issues #3374

Merged
merged 3 commits into from
Oct 11, 2023
Merged

Fix 23w40a port issues #3374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
673bf0c
Fix testmod calling Text#translatable with non-primitive arg
apple502j Oct 8, 2023
44af70a
Fix javadoc in BlockPickInteractionAware
apple502j Oct 8, 2023
f4c4e18
Fix unload events not running during reconfiguration
apple502j Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...interaction-v0/src/main/java/net/fabricmc/fabric/api/block/BlockPickInteractionAware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@
import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockView;
import net.minecraft.world.WorldView;

/**
* Convenience interface for blocks that want more stack picking context than what
* {@link Block#getPickStack(BlockView, BlockPos, BlockState)} provides.
* {@link Block#getPickStack(WorldView, BlockPos, BlockState)} provides.
*
* <p>The hit result is guaranteed to be a {@link BlockHitResult} that did not miss.
*/
Expand Down
4 changes: 2 additions & 2 deletions .../java/net/fabricmc/fabric/mixin/event/lifecycle/client/ClientPlayNetworkHandlerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ private void onGameJoin(GameJoinS2CPacket packet, CallbackInfo ci) {
}
}

// Called when the client disconnects from a server.
@Inject(method = "clearWorld", at = @At("HEAD"))
// Called when the client disconnects from a server or enters reconfiguration.
@Inject(method = "method_54134", at = @At("HEAD"))
private void onClearWorld(CallbackInfo ci) {
// If a world already exists, we need to unload all (block)entities in the world.
if (this.world != null) {
Expand Down
2 changes: 1 addition & 1 deletion .../src/testmod/java/net/fabricmc/fabric/test/object/builder/BlockEntityTypeBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
}

Text posText = Text.translatable("chat.coordinates", pos.getX(), pos.getY(), pos.getZ());
Text message = Text.translatable("text.fabric-object-builder-api-v1-testmod.block_entity_type_success", posText, BLOCK_ENTITY_TYPE_ID);
Text message = Text.method_54159("text.fabric-object-builder-api-v1-testmod.block_entity_type_success", posText, BLOCK_ENTITY_TYPE_ID);

player.sendMessage(message, false);
}
Expand Down
Loading