feat: update to 1.20

JamCoreModding · Jun 7, 2023 · 90b10a3 · 90b10a3
1 parent 9796eb0
commit 90b10a3
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,9 @@
 ## Changelog
 
-### Features
+JamLib has been updated to 1.20-rc1. This release will most likely work on
+the 1.20 release when it comes.
 
-### Fixes
+## Breaking Changes
 
-Closed issues: None.
-
-[Full Changelog](https://github.com/JamCoreModding/jam-lib/compare/...)
+- `JamLibContentRegistry` now uses `RegistryKey<ItemGroup>` rather than
+  `ItemGroup`, in line with Minecraft and Fabric API changes.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.1-SNAPSHOT"
+    id("fabric-loom") version "1.2-SNAPSHOT"
     id("io.github.juuxel.loom-quiltflower") version "1.+"
     id("io.github.p03w.machete") version "1.+"
     id("org.cadixdev.licenser") version "0.6.+"

diff --git a/gradle.properties b/gradle.properties
@@ -2,12 +2,12 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 
 archive_base_name=jamlib
-mod_version=0.6.0+1.19.4
-release_name=V0.6.0 [1.19.4]
-supported_versions=1.19.4
+mod_version=0.6.0+1.20
+release_name=V0.6.0 [1.20]
+supported_versions=1.20
 github_user=JamCoreModding
 github_repo=jam-lib
-release_branch=1.19.4
+release_branch=1.20
 curseforge_project_id=623764
 modrinth_project_id=jamlib
 publish_to_maven=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -15,8 +15,6 @@ pluginManagement {
     }
 }
 
-enableFeaturePreview("VERSION_CATALOGS")
-
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {

diff --git a/src/main/java/io/github/jamalam360/jamlib/JamLib.java b/src/main/java/io/github/jamalam360/jamlib/JamLib.java
@@ -47,7 +47,7 @@ public void onInitialize() {
                   literal("jamlib").then(
                         literal("version").executes(context -> {
                             //noinspection OptionalGetWithoutIsPresent
-                            context.getSource().sendFeedback(Text.literal("JamLib " + FabricLoader.getInstance().getModContainer("jamlib").get().getMetadata().getVersion()), false);
+                            context.getSource().sendFeedback(() -> Text.literal("JamLib " + FabricLoader.getInstance().getModContainer("jamlib").get().getMetadata().getVersion()), false);
                             return 1;
                         })
                   )

diff --git a/src/main/java/io/github/jamalam360/jamlib/config/JamLibConfig.java b/src/main/java/io/github/jamalam360/jamlib/config/JamLibConfig.java
@@ -55,8 +55,8 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -65,7 +65,7 @@
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.ScreenTexts;
+import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
@@ -378,12 +378,12 @@ protected void init() {
                 loadValues();
             }
 
-            this.addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> {
+            this.addDrawableChild(ButtonWidget.builder(CommonTexts.CANCEL, button -> {
                 loadValues();
                 Objects.requireNonNull(client).setScreen(parent);
             }).position(this.width / 2 - 154, this.height - 28).size(150, 20).build());
 
-            ButtonWidget done = this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, button -> {
+            ButtonWidget done = this.addDrawableChild(ButtonWidget.builder(CommonTexts.DONE, button -> {
                 for (EntryInfo info : entries) {
                     if (info.id.equals(modid)) {
                         try {
@@ -490,10 +490,10 @@ protected void init() {
         }
 
         @Override
-        public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-            this.renderBackground(matrices);
-            this.list.render(matrices, mouseX, mouseY, delta);
-            drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
+        public void render(GuiGraphics ctx, int mouseX, int mouseY, float delta) {
+            this.renderBackground(ctx);
+            this.list.render(ctx, mouseX, mouseY, delta);
+            ctx.drawCenteredShadowedText(textRenderer, title, width / 2, 15, 0xFFFFFF);
 
             for (EntryInfo info : entries) {
                 if (info.id.equals(modid)) {
@@ -504,20 +504,20 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
                         String key = translationPrefix + info.field.getName() + ".tooltip";
 
                         if (info.error != null && text.equals(name)) {
-                            renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
+                            ctx.drawTooltip(MinecraftClient.getInstance().textRenderer, info.error.getValue(), mouseX, mouseY);
                         } else if (I18n.hasTranslation(key) && text.equals(name)) {
                             List<Text> list = new ArrayList<>();
                             for (String str : I18n.translate(key).split("\n")) {
                                 list.add(Text.literal(str));
                             }
 
-                            renderTooltip(matrices, list, mouseX, mouseY);
+                            ctx.drawTooltip(MinecraftClient.getInstance().textRenderer, list, mouseX, mouseY);
                         }
                     }
                 }
             }
 
-            super.render(matrices, mouseX, mouseY, delta);
+            super.render(ctx, mouseX, mouseY, delta);
         }
     }
 
@@ -579,14 +579,14 @@ public static ButtonEntry create(List<ClickableWidget> buttons, Text text) {
             return new ButtonEntry(buttons, text);
         }
 
-        public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
+        public void render(GuiGraphics ctx, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
             buttons.forEach(b -> {
                 b.setY(y);
-                b.render(matrices, mouseX, mouseY, tickDelta);
+                b.render(ctx, mouseX, mouseY, tickDelta);
             });
 
             if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) {
-                DrawableHelper.drawTextWithShadow(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
+                ctx.drawShadowedText(textRenderer, text, 12, y + 5, 0xFFFFFF);
             }
         }
 

diff --git a/src/main/java/io/github/jamalam360/jamlib/registry/JamLibContentRegistry.java b/src/main/java/io/github/jamalam360/jamlib/registry/JamLibContentRegistry.java
@@ -28,6 +28,7 @@
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.registry.RegistryKey;
 
 /**
  * <p>Used to provide additional functionality for {@link io.github.jamalam360.jamlib.registry.annotation.ContentRegistry} classes.</p>
@@ -48,9 +49,9 @@ default Item createBlockItem(Block block) {
     /**
      * @param item The {@link Item}.
      *
-     * @return The {@link ItemGroup} to use.
+     * @return The {@link RegistryKey} of the {@link ItemGroup} to use.
      */
-    default ItemGroup getItemGroup(Item item) {
+    default RegistryKey<ItemGroup> getItemGroup(Item item) {
         return null;
     }
 }
diff --git a/src/main/java/io/github/jamalam360/jamlib/registry/JamLibRegistry.java b/src/main/java/io/github/jamalam360/jamlib/registry/JamLibRegistry.java
@@ -72,6 +72,7 @@
 import net.minecraft.recipe.RecipeType;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.stat.StatType;
@@ -82,8 +83,8 @@
 import net.minecraft.structure.rule.PosRuleTest;
 import net.minecraft.structure.rule.RuleTest;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.floatprovider.FloatProviderType;
-import net.minecraft.util.math.intprovider.IntProviderType;
+import net.minecraft.util.math.float_provider.FloatProviderType;
+import net.minecraft.util.math.int_provider.IntProviderType;
 import net.minecraft.village.VillagerProfession;
 import net.minecraft.village.VillagerType;
 import net.minecraft.world.chunk.ChunkStatus;
@@ -110,7 +111,7 @@
 public class JamLibRegistry {
 
     private static final Map<Class<?>, Registry<?>> REGISTRIES = new HashMap<>();
-    private static final Map<ItemGroup, List<Item>> ITEM_GROUP_REGISTRATION_QUEUE = new HashMap<>();
+    private static final Map<RegistryKey<ItemGroup>, List<Item>> ITEM_GROUP_REGISTRATION_QUEUE = new HashMap<>();
 
     static {
         addRegistry(GameEvent.class, Registries.GAME_EVENT);
@@ -244,7 +245,7 @@ public static void register(Class<?> registry) {
             }
 
             if (jlcr != null && Item.class.isAssignableFrom(fClass)) {
-                ItemGroup group = jlcr.getItemGroup((Item) fObj);
+                RegistryKey<ItemGroup> group = jlcr.getItemGroup((Item) fObj);
                 if (group == null) {
                     continue;
                 }
@@ -263,7 +264,7 @@ public static void register(Class<?> registry) {
 
                     Registry.register(Registries.ITEM, fId, item);
 
-                    ItemGroup group = jlcr.getItemGroup(item);
+                    RegistryKey<ItemGroup> group = jlcr.getItemGroup(item);
                     if (group == null) {
                         continue;
                     }
@@ -302,7 +303,7 @@ public static void register(Class<?> registry) {
             }
         }
 
-        for (ItemGroup group : ITEM_GROUP_REGISTRATION_QUEUE.keySet()) {
+        for (RegistryKey<ItemGroup> group : ITEM_GROUP_REGISTRATION_QUEUE.keySet()) {
             ItemGroupEvents.modifyEntriesEvent(group).register((content) -> {
                 for (Item item : ITEM_GROUP_REGISTRATION_QUEUE.get(group)) {
                     content.addStack(item.getDefaultStack());

diff --git a/src/testmod/java/io/github/jamalam360/jamlib/test/JamLibTest.java b/src/testmod/java/io/github/jamalam360/jamlib/test/JamLibTest.java
@@ -49,14 +49,14 @@ public void onInitialize() {
 
         JamLibTestNetwork.NETWORK_KEYBIND_PRESS.setHandler(((server, player, handler, buf, responseSender) -> {
             int i = buf.readInt();
-            player.sendMessage(Text.literal("Random number: " + i + "; Client: " + player.world.isClient()), false);
+            player.sendMessage(Text.literal("Random number: " + i + "; Client: " + player.getWorld().isClient()), false);
             JamLibTestNetwork.NETWORK_KEYBIND_PRESS_RESPONSE.send(player, (resBuf) -> resBuf.writeInt(i + 1));
         }));
 
         JamLibServerNetworking.registerHandlers("jamlib-test");
 
         CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> dispatcher.register(literal("jamlib-test").then(literal("config").executes(context -> {
-            context.getSource().sendFeedback(Text.literal(String.valueOf(Config.testInt)), false);
+            context.getSource().sendFeedback(() -> Text.literal(String.valueOf(Config.testInt)), false);
             return 1;
         }))));
 

diff --git a/src/testmod/java/io/github/jamalam360/jamlib/test/registry/TestBlocks.java b/src/testmod/java/io/github/jamalam360/jamlib/test/registry/TestBlocks.java
@@ -28,10 +28,11 @@
 import io.github.jamalam360.jamlib.registry.annotation.ContentRegistry;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Block;
-import net.minecraft.block.Material;
+import net.minecraft.block.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemGroups;
+import net.minecraft.registry.RegistryKey;
 
 /**
  * @author Jamalam
@@ -40,10 +41,10 @@
 @ContentRegistry("jamlib-test")
 public class TestBlocks implements JamLibContentRegistry {
 
-    public static final Block TEST_BLOCK = new Block(FabricBlockSettings.of(Material.STONE));
+    public static final Block TEST_BLOCK = new Block(FabricBlockSettings.copy(Blocks.STONE));
 
     @Override
-    public ItemGroup getItemGroup(Item item) {
+    public RegistryKey<ItemGroup> getItemGroup(Item item) {
         return ItemGroups.COMBAT;
     }
 }
diff --git a/src/testmod/java/io/github/jamalam360/jamlib/test/registry/TestItems.java b/src/testmod/java/io/github/jamalam360/jamlib/test/registry/TestItems.java
@@ -30,6 +30,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemGroups;
+import net.minecraft.registry.RegistryKey;
 
 /**
  * @author Jamalam
@@ -41,7 +42,7 @@ public class TestItems implements JamLibContentRegistry {
     public static final Item TEST_ITEM = new Item(new FabricItemSettings());
 
     @Override
-    public ItemGroup getItemGroup(Item item) {
+    public RegistryKey<ItemGroup> getItemGroup(Item item) {
         return ItemGroups.COMBAT;
     }
 }
diff --git a/versions.toml b/versions.toml
@@ -1,9 +1,9 @@
 [versions]
-minecraft = "1.19.4"
-quilt-mappings = "1.19.4+build.3"
-fabric-loader = "0.14.17"
-fabric-api = "0.76.0+1.19.4"
-mod-menu = "6.1.0-rc.1"
+minecraft = "1.20-rc1"
+quilt-mappings = "1.20-rc1+build.6"
+fabric-loader = "0.14.21"
+fabric-api = "0.83.0+1.20"
+mod-menu = "7.0.0-beta.2"
 lazy-dfu = "0.1.3"
 
 [libraries]
@@ -13,12 +13,12 @@ mappings = { module = "org.quiltmc:quilt-mappings", version.ref= "quilt-mappings
 fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
 fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
 
-optional-mod-menu = { module = "com.terraformersmc:modmenu", version.ref = "mod-menu" }
+mod-menu = { module = "com.terraformersmc:modmenu", version.ref = "mod-menu" }
 
-runtime-lazy-dfu = { module = "maven.modrinth:lazydfu", version.ref = "lazy-dfu" }
+lazy-dfu = { module = "maven.modrinth:lazydfu", version.ref = "lazy-dfu" }
 
 [bundles]
 fabric = ["fabric-loader", "fabric-api"]
 required = []
-optional = ["optional-mod-menu"]
-runtime = ["runtime-lazy-dfu"]
+optional = ["mod-menu"]
+runtime = ["lazy-dfu"]