diff options
Diffstat (limited to 'GuiTest')
-rw-r--r-- | GuiTest/build.gradle | 6 | ||||
-rw-r--r-- | GuiTest/gradle.properties | 8 | ||||
-rw-r--r-- | GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java | 4 | ||||
-rw-r--r-- | GuiTest/src/main/java/io/github/cottonmc/test/client/LibGuiTestClient.java | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/GuiTest/build.gradle b/GuiTest/build.gradle index ddd6891..1d08396 100644 --- a/GuiTest/build.gradle +++ b/GuiTest/build.gradle @@ -42,10 +42,10 @@ dependencies { compileOnly ("com.google.code.findbugs:jsr305:3.0.2") { transitive = false } - modApi "io.github.prospector:modmenu:1.7.9+build.118" + modApi ("io.github.prospector:modmenu:1.7.10-unstable.19w35a+build.2")// { transitive = false } //modApi ("io.github.cottonmc:LibGui:1.3.1-SNAPSHOT") { changing = true } - compile project(":LibGUI"); - runtime project(":LibGUI"); + compile (project(":LibGUI")) { transitive = false }; + runtime (project(":LibGUI")) { transitive = false }; } processResources { diff --git a/GuiTest/gradle.properties b/GuiTest/gradle.properties index a8080fa..8dea5d3 100644 --- a/GuiTest/gradle.properties +++ b/GuiTest/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.14.4 - yarn_mappings=1.14.4+build.3 - loader_version=0.4.8+build.158 + minecraft_version=19w35a + yarn_mappings=19w35a+build.1 + loader_version=0.6.1+build.164 # Mod Properties mod_version = 1.3.1 @@ -14,5 +14,5 @@ org.gradle.jvmargs=-Xmx1G # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric - fabric_version=0.3.0+build.206 + fabric_version=0.3.2+build.217-1.15 jankson_version=1.0.0+j1.1.2 diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java b/GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java index 906ad82..b777361 100644 --- a/GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java +++ b/GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java @@ -1,6 +1,6 @@ package io.github.cottonmc.test; -import io.github.cottonmc.cotton.gui.client.ClientCottonScreen; +import io.github.cottonmc.cotton.gui.client.CottonClientScreen; import io.github.cottonmc.test.client.TestClientGui; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.player.PlayerEntity; @@ -22,7 +22,7 @@ public class GuiItem extends Item { @Override public TypedActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) { if (world.isClient) { - MinecraftClient.getInstance().openScreen(new ClientCottonScreen(new TestClientGui())); + MinecraftClient.getInstance().openScreen(new CottonClientScreen(new TestClientGui())); } return new TypedActionResult<ItemStack>(ActionResult.SUCCESS, (hand==Hand.MAIN_HAND) ? player.getMainHandStack() : player.getOffHandStack()); 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 360fd73..6db6902 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 @@ -1,6 +1,6 @@ package io.github.cottonmc.test.client; -import io.github.cottonmc.cotton.gui.client.CottonScreen; +import io.github.cottonmc.cotton.gui.client.CottonInventoryScreen; import io.github.cottonmc.test.LibGuiTest; import io.github.cottonmc.test.TestContainer; import net.fabricmc.api.ClientModInitializer; @@ -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 CottonScreen<TestContainer>(new TestContainer(syncId, player.inventory, BlockContext.create(player.getEntityWorld(), buf.readBlockPos())), player)); + ScreenProviderRegistry.INSTANCE.registerFactory(new Identifier(LibGuiTest.MODID, "gui"), (syncId, identifier, player, buf)->new CottonInventoryScreen<TestContainer>(new TestContainer(syncId, player.inventory, BlockContext.create(player.getEntityWorld(), buf.readBlockPos())), player)); } } |