mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-31 09:37:56 +00:00
Code Issues Releases Wiki Activity

Clean up container data interface

Browse Source 
- Remove ContainerData.open.

 - Change PlatformHelper.openMenu to take a separate display name and
   MenuConstructor, rather than a MenuProvider. This makes the interface
   slightly easier to use in the common case, where we want to use
   lambdas instead.
This commit is contained in:
Jonathan Coates
2025-01-26 14:56:09 +00:00
parent 03388149b1
commit fa2140d00b
10 changed files with 45 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java
View File

@@ -59,12 +59,12 @@ import net.minecraft.util.GsonHelper;
import net.minecraft.world.Container;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.MenuProvider;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.CraftingContainer;
import net.minecraft.world.inventory.MenuConstructor;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.*;
import net.minecraft.world.item.crafting.Ingredient;
@@ -170,8 +170,8 @@ public class PlatformHelperImpl implements PlatformHelper {
}
@Override
public void openMenu(Player player, MenuProvider owner, ContainerData menu) {
player.openMenu(new WrappedMenuProvider(owner, menu));
public void openMenu(Player player, Component title, MenuConstructor menu, ContainerData data) {
player.openMenu(new WrappedMenuProvider(title, menu, data));
}
@Override
@@ -408,21 +408,22 @@ public class PlatformHelperImpl implements PlatformHelper {
}
}
private record WrappedMenuProvider(MenuProvider owner, ContainerData menu) implements ExtendedScreenHandlerFactory {
private record WrappedMenuProvider(Component title, MenuConstructor menu,
ContainerData data) implements ExtendedScreenHandlerFactory {
@Nullable
@Override
public AbstractContainerMenu createMenu(int id, Inventory inventory, Player player) {
return owner.createMenu(id, inventory, player);
return menu.createMenu(id, inventory, player);
}
@Override
public Component getDisplayName() {
return owner.getDisplayName();
return title;
}
@Override
public void writeScreenOpeningData(ServerPlayer player, FriendlyByteBuf buf) {
menu.toBytes(buf);
data.toBytes(buf);
}
}