diff options
| -rw-r--r-- | GuiTest/gradle.properties | 11 | ||||
| -rw-r--r-- | GuiTest/src/main/java/io/github/cottonmc/test/GuiBlock.java | 6 | ||||
| -rw-r--r-- | GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java | 2 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | gradle.properties | 11 |
5 files changed, 16 insertions, 18 deletions
diff --git a/GuiTest/gradle.properties b/GuiTest/gradle.properties index 921cf11..fef99be 100644 --- a/GuiTest/gradle.properties +++ b/GuiTest/gradle.properties @@ -3,16 +3,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=19w37a - yarn_mappings=19w37a+build.9 - loader_version=0.6.1+build.165 + minecraft_version=19w42a + yarn_mappings=19w42a+build.1 + loader_version=0.6.3+build.167 # Mod Properties - mod_version = 1.3.1 + mod_version = 1.3.3-beta.7 maven_group = io.github.cottonmc archives_base_name = LibGui # Dependencies - # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric - fabric_version=0.3.2+build.230-1.15 + fabric_version=0.4.8+build.255-1.15 jankson_version=2.0.0+j1.2.0 diff --git a/GuiTest/src/main/java/io/github/cottonmc/test/GuiBlock.java b/GuiTest/src/main/java/io/github/cottonmc/test/GuiBlock.java index ec37c55..ded6fcb 100644 --- a/GuiTest/src/main/java/io/github/cottonmc/test/GuiBlock.java +++ b/GuiTest/src/main/java/io/github/cottonmc/test/GuiBlock.java @@ -8,6 +8,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; @@ -21,13 +22,12 @@ public class GuiBlock extends Block implements BlockEntityProvider { super(FabricBlockSettings.copy(Blocks.IRON_BLOCK).build()); } - @Override - public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hitResult) { + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hitResult) { if (!world.isClient) { ContainerProviderRegistry.INSTANCE.openContainer(new Identifier(LibGuiTest.MODID, "gui"), player, (buf)->buf.writeBlockPos(pos)); } - return true; + return ActionResult.SUCCESS; } 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 37b98f6..b777361 100644 --- a/GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java +++ b/GuiTest/src/main/java/io/github/cottonmc/test/GuiItem.java @@ -25,6 +25,6 @@ public class GuiItem extends Item { MinecraftClient.getInstance().openScreen(new CottonClientScreen(new TestClientGui())); } - return new TypedActionResult<ItemStack>(ActionResult.SUCCESS, (hand==Hand.MAIN_HAND) ? player.getMainHandStack() : player.getOffHandStack(), false); + return new TypedActionResult<ItemStack>(ActionResult.SUCCESS, (hand==Hand.MAIN_HAND) ? player.getMainHandStack() : player.getOffHandStack()); } } diff --git a/build.gradle b/build.gradle index 39a32c0..fa05814 100644 --- a/build.gradle +++ b/build.gradle @@ -60,8 +60,8 @@ dependencies { compileOnly ("com.google.code.findbugs:jsr305:3.0.2") { transitive = false } - modCompileOnly "io.github.prospector:modmenu:1.7.13-unstable.19w38b+build.5" - modRuntime "io.github.prospector:modmenu:1.7.13-unstable.19w38b+build.5" // for testing + modCompileOnly "io.github.prospector:modmenu:1.7.15-unstable.19w42a+build.11" + //modRuntime "io.github.prospector:modmenu:1.7.15-unstable.19w42a+build.11" // for testing } processResources { diff --git a/gradle.properties b/gradle.properties index bb87be7..fef99be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,16 +3,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=19w38b - yarn_mappings=19w38b+build.9 - loader_version=0.6.2+build.166 + minecraft_version=19w42a + yarn_mappings=19w42a+build.1 + loader_version=0.6.3+build.167 # Mod Properties - mod_version = 1.3.3-beta.6 + mod_version = 1.3.3-beta.7 maven_group = io.github.cottonmc archives_base_name = LibGui # Dependencies - # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric - fabric_version=0.3.3+build.235-1.15 + fabric_version=0.4.8+build.255-1.15 jankson_version=2.0.0+j1.2.0 |