From ffa5a02e44381983ffdbddad0debc4569c1a1994 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Fri, 5 Jun 2020 18:01:27 +0300 Subject: CottonInventoryController -> SyncedGuiDescription --- .../java/io/github/cottonmc/test/LibGuiTest.java | 2 +- .../io/github/cottonmc/test/TestController.java | 30 ---------------------- .../io/github/cottonmc/test/TestDescription.java | 29 +++++++++++++++++++++ .../cottonmc/test/client/LibGuiTestClient.java | 4 +-- 4 files changed, 32 insertions(+), 33 deletions(-) delete mode 100644 GuiTest/src/main/java/io/github/cottonmc/test/TestController.java create mode 100644 GuiTest/src/main/java/io/github/cottonmc/test/TestDescription.java (limited to 'GuiTest') diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/LibGuiTest.java b/GuiTest/src/main/java/io/github/cottonmc/test/LibGuiTest.java index 6d63688..90f3c92 100644 --- a/GuiTest/src/main/java/io/github/cottonmc/test/LibGuiTest.java +++ b/GuiTest/src/main/java/io/github/cottonmc/test/LibGuiTest.java @@ -38,7 +38,7 @@ public class LibGuiTest implements ModInitializer { ContainerProviderRegistry.INSTANCE.registerFactory(new Identifier(MODID, "gui"), (int syncId, Identifier identifier, PlayerEntity player, PacketByteBuf buf)->{ - return new TestController(syncId, player.inventory, ScreenHandlerContext.create(player.getEntityWorld(), buf.readBlockPos())); + return new TestDescription(syncId, player.inventory, ScreenHandlerContext.create(player.getEntityWorld(), buf.readBlockPos())); }); Optional containerOpt = FabricLoader.getInstance().getModContainer("jankson"); diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/TestController.java b/GuiTest/src/main/java/io/github/cottonmc/test/TestController.java deleted file mode 100644 index 68905ef..0000000 --- a/GuiTest/src/main/java/io/github/cottonmc/test/TestController.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.cottonmc.test; - -import io.github.cottonmc.cotton.gui.CottonInventoryController; -import io.github.cottonmc.cotton.gui.widget.*; -import io.github.cottonmc.cotton.gui.widget.data.Axis; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerContext; -import net.minecraft.text.LiteralText; - -public class TestController extends CottonInventoryController { - - public TestController(int syncId, PlayerInventory playerInventory, ScreenHandlerContext context) { - super(syncId, playerInventory, getBlockInventory(context), null); - - WGridPanel root = (WGridPanel)this.getRootPanel(); - - root.add(WItemSlot.of(blockInventory, 0, 4, 1), 0, 1); - - root.add(new WButton(new LiteralText("Button A")), 0, 3, 4, 1); - root.add(new WButton(new LiteralText("Button B")), 5, 3, 4, 1); - root.add(new WButton(new LiteralText("Button C")), 0, 5, 4, 1); - root.add(new WButton(new LiteralText("Button D")), 5, 5, 4, 1); - root.add(new WTextField(new LiteralText("Type something...")), 0, 7, 5, 1); - - root.add(createPlayerInventoryPanel(), 0, 9); - System.out.println(root.toString()); - - this.getRootPanel().validate(this); - } -} diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/TestDescription.java b/GuiTest/src/main/java/io/github/cottonmc/test/TestDescription.java new file mode 100644 index 0000000..3d5e48c --- /dev/null +++ b/GuiTest/src/main/java/io/github/cottonmc/test/TestDescription.java @@ -0,0 +1,29 @@ +package io.github.cottonmc.test; + +import io.github.cottonmc.cotton.gui.SyncedGuiDescription; +import io.github.cottonmc.cotton.gui.widget.*; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandlerContext; +import net.minecraft.text.LiteralText; + +public class TestDescription extends SyncedGuiDescription { + + public TestDescription(int syncId, PlayerInventory playerInventory, ScreenHandlerContext context) { + super(syncId, playerInventory, getBlockInventory(context), null); + + WGridPanel root = (WGridPanel)this.getRootPanel(); + + root.add(WItemSlot.of(blockInventory, 0, 4, 1), 0, 1); + + root.add(new WButton(new LiteralText("Button A")), 0, 3, 4, 1); + root.add(new WButton(new LiteralText("Button B")), 5, 3, 4, 1); + root.add(new WButton(new LiteralText("Button C")), 0, 5, 4, 1); + root.add(new WButton(new LiteralText("Button D")), 5, 5, 4, 1); + root.add(new WTextField(new LiteralText("Type something...")), 0, 7, 5, 1); + + root.add(createPlayerInventoryPanel(), 0, 9); + System.out.println(root.toString()); + + this.getRootPanel().validate(this); + } +} diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java b/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java index a2a23fb..f0d3f27 100644 --- a/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java +++ b/GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java @@ -2,7 +2,7 @@ package io.github.cottonmc.test.client; import io.github.cottonmc.cotton.gui.client.CottonInventoryScreen; import io.github.cottonmc.test.LibGuiTest; -import io.github.cottonmc.test.TestController; +import io.github.cottonmc.test.TestDescription; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.screen.ScreenProviderRegistry; import net.minecraft.screen.ScreenHandlerContext; @@ -12,7 +12,7 @@ public class LibGuiTestClient implements ClientModInitializer { @Override public void onInitializeClient() { - ScreenProviderRegistry.INSTANCE.registerFactory(new Identifier(LibGuiTest.MODID, "gui"), (syncId, identifier, player, buf)->new CottonInventoryScreen(new TestController(syncId, player.inventory, ScreenHandlerContext.create(player.getEntityWorld(), buf.readBlockPos())), player)); + ScreenProviderRegistry.INSTANCE.registerFactory(new Identifier(LibGuiTest.MODID, "gui"), (syncId, identifier, player, buf)->new CottonInventoryScreen(new TestDescription(syncId, player.inventory, ScreenHandlerContext.create(player.getEntityWorld(), buf.readBlockPos())), player)); } } -- cgit