Port to 1.20/1.20.1

common/src/main/java/dev/the_fireplace/lib/teleport/TeleporterImpl.java

@@ -27,7 +27,7 @@ public Entity teleport(Entity entity, ServerLevel targetWorld, double targetX, d
             return entity;
         }
         DimensionType targetDimensionType = targetWorld.dimensionType();
-        Entity entityInTargetWorld = targetDimensionType.equals(entity.level.dimensionType()) ? entity : entity.changeDimension(targetWorld);
+        Entity entityInTargetWorld = targetDimensionType.equals(entity.level().dimensionType()) ? entity : entity.changeDimension(targetWorld);
         if (entityInTargetWorld != null) {
             entityInTargetWorld.teleportTo(targetX, targetY, targetZ);
             return entityInTargetWorld;

common/src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${readable_name}",
-    "pack_format": 9
+    "pack_format": 15
   }
 }

fabric/build.gradle

@@ -9,7 +9,7 @@ plugins {
 archivesBaseName = "${archives_base_name}-Fabric"
 def mainArtifactFile = layout.buildDirectory.file("libs/${archivesBaseName}-${version}.jar").get().asFile
 def changelogFile = file('../changelog.txt')
-def supportedMinecraftVersions = [project.minecraft_version]
+def supportedMinecraftVersions = [project.minecraft_version, '1.20']
 
 sourceSets {
     api {

fabric/src/main/java/dev/the_fireplace/lib/config/cloth/custombutton/CustomButtonEntry.java

@@ -2,7 +2,6 @@
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.platform.Window;
-import com.mojang.blaze3d.vertex.PoseStack;
 import dev.the_fireplace.lib.FireplaceLibConstants;
 import dev.the_fireplace.lib.api.client.interfaces.CustomButtonScreen;
 import dev.the_fireplace.lib.api.client.interfaces.CustomButtonScreenFactory;
@@ -13,6 +12,8 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -113,11 +114,11 @@ public Optional<String> getDefaultValue() {
     }
 
     @Override
-    public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isHovered, float delta) {
+    public void render(GuiGraphics guiGraphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isHovered, float delta) {
         if (ClothConfigDependencyHandler.DISABLED_ENTRIES.contains(this)) {
             return;
         }
-        super.render(matrices, index, y, x, entryWidth, entryHeight, mouseX, mouseY, isHovered, delta);
+        super.render(guiGraphics, index, y, x, entryWidth, entryHeight, mouseX, mouseY, isHovered, delta);
         Window window = Minecraft.getInstance().getWindow();
         this.resetButton.active = this.isEditable() && this.getDefaultValue().isPresent() && !Objects.equals(this.defaultValue.get(), this.value.get());
         this.resetButton.setY(y);
@@ -126,19 +127,20 @@ public void render(PoseStack matrices, int index, int y, int x, int entryWidth,
         Component buttonText = getDisplayText != null ? getDisplayText.apply(this.value.get()) : Component.nullToEmpty(this.value.get());
         this.buttonWidget.setMessage(buttonText);
         Component displayedFieldName = this.getDisplayedFieldName();
-        if (Minecraft.getInstance().font.isBidirectional()) {
-            Minecraft.getInstance().font.drawShadow(matrices, displayedFieldName.getVisualOrderText(), (float) (window.getGuiScaledWidth() - x - Minecraft.getInstance().font.width(displayedFieldName)), (float) (y + 6), 0xFFFFFF);
+        Font font = Minecraft.getInstance().font;
+        if (font.isBidirectional()) {
+            guiGraphics.drawString(font, displayedFieldName.getVisualOrderText(), window.getGuiScaledWidth() - x - font.width(displayedFieldName), y + 6, this.getPreferredTextColor());
             this.resetButton.setX(x);
             this.buttonWidget.setX(x + this.resetButton.getWidth() + 2);
         } else {
-            Minecraft.getInstance().font.drawShadow(matrices, displayedFieldName.getVisualOrderText(), (float) x, (float) (y + 6), this.getPreferredTextColor());
+            guiGraphics.drawString(font, displayedFieldName.getVisualOrderText(), x, y + 6, this.getPreferredTextColor());
             this.resetButton.setX(x + entryWidth - this.resetButton.getWidth());
             this.buttonWidget.setX(x + entryWidth - 150);
         }
 
         this.buttonWidget.setWidth(150 - this.resetButton.getWidth() - 2);
-        this.resetButton.render(matrices, mouseX, mouseY, delta);
-        this.buttonWidget.render(matrices, mouseX, mouseY, delta);
+        this.resetButton.render(guiGraphics, mouseX, mouseY, delta);
+        this.buttonWidget.render(guiGraphics, mouseX, mouseY, delta);
     }
 
     @Override

fabric/src/main/java/dev/the_fireplace/lib/mixin/clothconfig/DynamicEntryListWidgetMixin.java

@@ -1,12 +1,12 @@
 package dev.the_fireplace.lib.mixin.clothconfig;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import dev.the_fireplace.lib.config.cloth.ClothConfigDependencyHandler;
 import me.shedaniel.clothconfig2.api.AbstractConfigEntry;
 import me.shedaniel.clothconfig2.gui.ClothConfigScreen;
 import me.shedaniel.clothconfig2.gui.widget.DynamicEntryListWidget;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
@@ -34,7 +34,7 @@ public abstract class DynamicEntryListWidgetMixin<E extends DynamicEntryListWidg
     private final Map<Integer, AbstractConfigEntry<?>> disabledEntries = new HashMap<>();
 
     @Inject(method = "render", at = @At("HEAD"))
-    private void swapEntriesBeforeRender(PoseStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+    private void swapEntriesBeforeRender(GuiGraphics graphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (!((Object) this instanceof ClothConfigScreen.ListWidget)) {
             return;
         }
@@ -62,7 +62,7 @@ public List<? extends GuiEventListener> children() {
             }
 
             @Override
-            public void render(PoseStack matrixStack, int i, int i1, int i2, int i3, int i4, int i5, int i6, boolean b, float v) {
+            public void render(GuiGraphics guiGraphics, int i, int i1, int i2, int i3, int i4, int i5, int i6, boolean b, float v) {
 
             }
 

fabric/src/main/resources/fabric.mod.json

@@ -39,13 +39,13 @@
   "depends": {
       "fabricloader": ">=0.12.0",
       "fabric": "*",
-      "minecraft": ">=1.19.4",
+      "minecraft": ">=1.20",
       "annotateddi": ">=4 <5"
   },
 
   "suggests": {
     "modmenu": "*",
-      "cloth-config": ">=8"
+      "cloth-config": ">=11"
   },
 
   "custom": {

forge/build.gradle

@@ -24,7 +24,7 @@ apply plugin: 'org.spongepowered.mixin'
 archivesBaseName = "${archives_base_name}-Forge"
 def mainArtifactFile = layout.buildDirectory.file("libs/${archivesBaseName}-${version}.jar").get().asFile
 def changelogFile = file('../changelog.txt')
-def supportedMinecraftVersions = [project.minecraft_version]
+def supportedMinecraftVersions = [project.minecraft_version, '1.20']
 jarJar.enable()
 
 sourceSets {

forge/src/main/java/dev/the_fireplace/lib/config/cloth/custombutton/CustomButtonEntry.java

@@ -2,7 +2,6 @@
 
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.platform.Window;
-import com.mojang.blaze3d.vertex.PoseStack;
 import dev.the_fireplace.lib.FireplaceLibConstants;
 import dev.the_fireplace.lib.api.client.interfaces.CustomButtonScreen;
 import dev.the_fireplace.lib.api.client.interfaces.CustomButtonScreenFactory;
@@ -11,6 +10,8 @@
 import io.netty.util.concurrent.Promise;
 import me.shedaniel.clothconfig2.gui.entries.TooltipListEntry;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -110,11 +111,11 @@ public Optional<String> getDefaultValue() {
     }
 
     @Override
-    public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isHovered, float delta) {
+    public void render(GuiGraphics guiGraphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isHovered, float delta) {
         if (ClothConfigDependencyHandler.DISABLED_ENTRIES.contains(this)) {
             return;
         }
-        super.render(matrices, index, y, x, entryWidth, entryHeight, mouseX, mouseY, isHovered, delta);
+        super.render(guiGraphics, index, y, x, entryWidth, entryHeight, mouseX, mouseY, isHovered, delta);
         Window window = Minecraft.getInstance().getWindow();
         this.resetButton.active = this.isEditable() && this.getDefaultValue().isPresent() && !Objects.equals(this.defaultValue.get(), this.value.get());
         this.resetButton.setY(y);
@@ -123,19 +124,20 @@ public void render(PoseStack matrices, int index, int y, int x, int entryWidth,
         Component buttonText = getDisplayText != null ? getDisplayText.apply(this.value.get()) : Component.nullToEmpty(this.value.get());
         this.buttonWidget.setMessage(buttonText);
         Component displayedFieldName = this.getDisplayedFieldName();
-        if (Minecraft.getInstance().font.isBidirectional()) {
-            Minecraft.getInstance().font.drawShadow(matrices, displayedFieldName.getVisualOrderText(), (float) (window.getGuiScaledWidth() - x - Minecraft.getInstance().font.width(displayedFieldName)), (float) (y + 6), 0xFFFFFF);
+        Font font = Minecraft.getInstance().font;
+        if (font.isBidirectional()) {
+            guiGraphics.drawString(font, displayedFieldName.getVisualOrderText(), window.getGuiScaledWidth() - x - font.width(displayedFieldName), y + 6, this.getPreferredTextColor());
             this.resetButton.setX(x);
             this.buttonWidget.setX(x + this.resetButton.getWidth() + 2);
         } else {
-            Minecraft.getInstance().font.drawShadow(matrices, displayedFieldName.getVisualOrderText(), (float) x, (float) (y + 6), this.getPreferredTextColor());
+            guiGraphics.drawString(font, displayedFieldName.getVisualOrderText(), x, y + 6, this.getPreferredTextColor());
             this.resetButton.setX(x + entryWidth - this.resetButton.getWidth());
             this.buttonWidget.setX(x + entryWidth - 150);
         }
 
         this.buttonWidget.setWidth(150 - this.resetButton.getWidth() - 2);
-        this.resetButton.render(matrices, mouseX, mouseY, delta);
-        this.buttonWidget.render(matrices, mouseX, mouseY, delta);
+        this.resetButton.render(guiGraphics, mouseX, mouseY, delta);
+        this.buttonWidget.render(guiGraphics, mouseX, mouseY, delta);
     }
 
     @Override

forge/src/main/java/dev/the_fireplace/lib/mixin/clothconfig/DynamicEntryListWidgetMixin.java

@@ -1,10 +1,10 @@
 package dev.the_fireplace.lib.mixin.clothconfig;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import dev.the_fireplace.lib.config.cloth.ClothConfigDependencyHandler;
 import me.shedaniel.clothconfig2.api.AbstractConfigEntry;
 import me.shedaniel.clothconfig2.gui.ClothConfigScreen;
 import me.shedaniel.clothconfig2.gui.widget.DynamicEntryListWidget;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
@@ -31,7 +31,7 @@ public abstract class DynamicEntryListWidgetMixin<E extends DynamicEntryListWidg
     private final Map<Integer, AbstractConfigEntry<?>> disabledEntries = new HashMap<>();
 
     @Inject(method = "render", at = @At("HEAD"))
-    private void swapEntriesBeforeRender(PoseStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+    private void swapEntriesBeforeRender(GuiGraphics graphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (!((Object) this instanceof ClothConfigScreen.ListWidget)) {
             return;
         }
@@ -59,7 +59,7 @@ public List<? extends GuiEventListener> children() {
             }
 
             @Override
-            public void render(PoseStack matrixStack, int i, int i1, int i2, int i3, int i4, int i5, int i6, boolean b, float v) {
+            public void render(GuiGraphics guiGraphics, int i, int i1, int i2, int i3, int i4, int i5, int i6, boolean b, float v) {
 
             }
 

forge/src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[45,)"
+loaderVersion = "[46,)"
 license = "${license_name}"
 issueTrackerURL = "${github_url}/issues"
 showAsResourcePack = false
@@ -18,14 +18,14 @@ description = "${mod_description}"
 [[dependencies.fireplacelib]]
 modId = "forge"
 mandatory = true
-versionRange = "[45,)"
+versionRange = "[46,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.fireplacelib]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.4,)"
+versionRange = "[1.20,)"
 ordering = "NONE"
 side = "BOTH"
 
@@ -39,6 +39,6 @@ side = "BOTH"
 [[dependencies.fireplacelib]]
 modId = "cloth_config"
 mandatory = false
-versionRange = "[8,)"
+versionRange = "[11,)"
 ordering = "NONE"
 side = "CLIENT"

gradle.properties

@@ -3,23 +3,23 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 # Common
-minecraft_version=1.19.4
+minecraft_version=1.20.1
 # Common Dependencies
-annotateddi_version=4.0.4+1.19.4
+annotateddi_version=4.0.4+1.20.4
 # Fabric
 fabric_loader_version=0.15.11
 fabric_curseforge_url=https://www.curseforge.com/minecraft/mc-mods/fireplace-lib
 # Fabric Dependencies
-fabric_api_version=0.87.2+1.19.4
-fabric_clothconfig_version=10.1.117
-modmenu_version=6.3.1
+fabric_api_version=0.92.2+1.20.1
+fabric_clothconfig_version=11.1.118
+modmenu_version=7.2.2
 # Forge
-forge_version=45.3.3
+forge_version=47.3.5
 forge_mixin_version=0.8.5
 forge_curseforge_url=https://www.curseforge.com/minecraft/mc-mods/fireplace-lib-forge
 forge_update_json_url=https://api.modrinth.com/updates/fireplace-lib/forge_updates.json
 # Forge Dependencies
-forge_clothconfig_version=10.1.117
+forge_clothconfig_version=11.1.118
 # Mod Properties
 maven_group=dev.the-fireplace
 archives_base_name=Fireplace-Lib