From 9af492a4658568d02c4b69d74f125f9de936756c Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Mon, 30 May 2022 00:49:39 +1000 Subject: [PATCH] 1.19 --- build.gradle | 5 ++++- gradle.properties | 17 ++++++++++------- .../piglib/rei/category/BarteringCategory.java | 3 +-- .../rei/category/PiglinLovedCategory.java | 3 +-- .../rei/category/PiglinRepellentsCategory.java | 3 +-- .../rei/category/PiglinSafeArmorCategory.java | 3 +-- src/main/resources/fabric.mod.json | 6 ++++-- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 75da739..ec92681 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.11-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' id 'maven-publish' } @@ -33,6 +33,9 @@ dependencies { // RoughlyEnoughItems modApi "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" + + // Architectury Fabric + modRuntimeOnly "dev.architectury:architectury-fabric:${project.arch_version}" } java { diff --git a/gradle.properties b/gradle.properties index bc7faf0..5cec189 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop/ - minecraft_version=1.18.2 - yarn_mappings=2 + minecraft_version=1.19-pre3 + yarn_mappings=4 tiny_version=2 loader_version=0.13.3 @@ -12,15 +12,18 @@ org.gradle.jvmargs=-Xmx1G mod_version = 1.1.1 maven_group = com.shnupbups mod_name = piglib - version_meta = fabric-mc1.18.2 + version_meta = fabric-mc1.19 # Dependencies # check on https://fabricmc.net/develop/ - fapi_version=0.47.10+1.18.2 + fapi_version=0.53.4+1.19 # Other Stuff # check on maven at https://maven.shedaniel.me/me/shedaniel/RoughlyEnoughItems-fabric/ - rei_version = 8.0.442 - + rei_version = 9.0.466 + + # check on maven at https://maven.shedaniel.me/dev/architectury/architectury-fabric/ + arch_version = 5.4.14 + # check on maven at https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/ - modmenu_version = 3.1.0 + modmenu_version = 4.0.0-beta.4 diff --git a/src/main/java/com/shnupbups/piglib/rei/category/BarteringCategory.java b/src/main/java/com/shnupbups/piglib/rei/category/BarteringCategory.java index c714c60..a1d747f 100644 --- a/src/main/java/com/shnupbups/piglib/rei/category/BarteringCategory.java +++ b/src/main/java/com/shnupbups/piglib/rei/category/BarteringCategory.java @@ -25,7 +25,6 @@ import net.minecraft.item.Items; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import me.shedaniel.rei.api.client.gui.Renderer; import me.shedaniel.rei.api.common.category.CategoryIdentifier; @@ -42,7 +41,7 @@ public CategoryIdentifier getCategoryIdentifier() { @Override public Text getTitle() { - return new TranslatableText("category.piglib.bartering"); + return Text.translatable("category.piglib.bartering"); } @Override diff --git a/src/main/java/com/shnupbups/piglib/rei/category/PiglinLovedCategory.java b/src/main/java/com/shnupbups/piglib/rei/category/PiglinLovedCategory.java index 2bd96c9..0ffc621 100644 --- a/src/main/java/com/shnupbups/piglib/rei/category/PiglinLovedCategory.java +++ b/src/main/java/com/shnupbups/piglib/rei/category/PiglinLovedCategory.java @@ -25,7 +25,6 @@ import net.minecraft.item.Items; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import me.shedaniel.rei.api.client.gui.Renderer; import me.shedaniel.rei.api.common.category.CategoryIdentifier; @@ -42,7 +41,7 @@ public CategoryIdentifier getCategoryIdentifier() @Override public Text getTitle() { - return new TranslatableText("category.piglib.piglin_loved"); + return Text.translatable("category.piglib.piglin_loved"); } @Override diff --git a/src/main/java/com/shnupbups/piglib/rei/category/PiglinRepellentsCategory.java b/src/main/java/com/shnupbups/piglib/rei/category/PiglinRepellentsCategory.java index 798d7bd..d95130b 100644 --- a/src/main/java/com/shnupbups/piglib/rei/category/PiglinRepellentsCategory.java +++ b/src/main/java/com/shnupbups/piglib/rei/category/PiglinRepellentsCategory.java @@ -25,7 +25,6 @@ import net.minecraft.item.Items; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import me.shedaniel.rei.api.client.gui.Renderer; import me.shedaniel.rei.api.common.category.CategoryIdentifier; @@ -42,7 +41,7 @@ public CategoryIdentifier getCategoryIdentifi @Override public Text getTitle() { - return new TranslatableText("category.piglib.piglin_repellents"); + return Text.translatable("category.piglib.piglin_repellents"); } @Override diff --git a/src/main/java/com/shnupbups/piglib/rei/category/PiglinSafeArmorCategory.java b/src/main/java/com/shnupbups/piglib/rei/category/PiglinSafeArmorCategory.java index 3cf5a32..427f687 100644 --- a/src/main/java/com/shnupbups/piglib/rei/category/PiglinSafeArmorCategory.java +++ b/src/main/java/com/shnupbups/piglib/rei/category/PiglinSafeArmorCategory.java @@ -25,7 +25,6 @@ import net.minecraft.item.Items; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import me.shedaniel.rei.api.client.gui.Renderer; import me.shedaniel.rei.api.common.category.CategoryIdentifier; @@ -42,7 +41,7 @@ public CategoryIdentifier getCategoryIdentifie @Override public Text getTitle() { - return new TranslatableText("category.piglib.piglin_safe_armor"); + return Text.translatable("category.piglib.piglin_safe_armor"); } @Override diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index de570fd..0448afe 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -22,9 +22,11 @@ "main": [ "com.shnupbups.piglib.Piglib" ], - "rei": [ - "com.shnupbups.piglib.rei.PiglibPlugin", + "rei_client": [ "com.shnupbups.piglib.rei.PiglibClientPlugin" + ], + "rei_server": [ + "com.shnupbups.piglib.rei.PiglibPlugin" ] }, "mixins": ["piglib.mixins.json"],