Update to MC 1.20.1

CyclopsMC · Jun 17, 2023 · af56f46 · af56f46
1 parent ee3e239
commit af56f46
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 42 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,5 @@
-// For those who want the bleeding edge
-buildscript {
-    repositories {
-        mavenCentral()
-        maven { url = 'https://maven.minecraftforge.net' }
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-    }
-}
-
 plugins {
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
     id 'com.matthewprenger.cursegradle' version '1.4.0'
     id 'com.diffplug.spotless' version '5.14.3'
 	id 'com.modrinth.minotaur' version '2.+'
@@ -171,7 +161,7 @@ build.dependsOn signJar
 
 task deobfJar(type: Jar) {
     from sourceSets.main.output
-    classifier = 'deobf'
+    archiveClassifier.set('deobf')
     manifest {
         attributes([
                 "FMLAT": "accesstransformer.cfg",
@@ -189,7 +179,7 @@ task deobfJar(type: Jar) {
 task apiJar(type: Jar) {
     from sourceSets.main.output
     from sourceSets.main.java
-    classifier = 'api'
+    archiveClassifier.set('api')
     include 'iconexporter/api/**'
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 mod_version=1.2.4
-minecraft_version=1.19.4
-forge_version=45.0.50
-cyclopscore_version=1.18.2-309
+minecraft_version=1.20.1
+forge_version=47.0.1
+cyclopscore_version=1.18.4-340
 release_type=release
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1,13 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = 'MinecraftForge'
+            url = 'https://maven.minecraftforge.net/'
+        }
+    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+}
diff --git a/src/main/java/org/cyclops/iconexporter/client/gui/IExportTask.java b/src/main/java/org/cyclops/iconexporter/client/gui/IExportTask.java
@@ -1,6 +1,6 @@
 package org.cyclops.iconexporter.client.gui;
 
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
 
 import java.io.IOException;
 
@@ -9,6 +9,6 @@
  */
 public interface IExportTask {
 
-    public void run(PoseStack matrixStack) throws IOException;
+    public void run(GuiGraphics guiGraphics) throws IOException;
 
 }
diff --git a/src/main/java/org/cyclops/iconexporter/client/gui/ItemRenderUtil.java b/src/main/java/org/cyclops/iconexporter/client/gui/ItemRenderUtil.java
@@ -4,7 +4,7 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.client.resources.model.BakedModel;
@@ -24,15 +24,15 @@
  */
 public class ItemRenderUtil {
 
-    public static void renderItem(PoseStack poseStack, ItemStack itemStack, float scale) {
+    public static void renderItem(GuiGraphics gui, ItemStack itemStack, float scale) {
         // Based on Integrated Dynamics's ItemValueTypeWorldRenderer
-        renderGuiItem(poseStack, itemStack, 0, 0, scale);
+        renderGuiItem(gui.pose(), itemStack, 0, 0, scale);
         Lighting.setupFor3DItems();
     }
 
-    public static void renderFluid(GuiComponent gui, PoseStack matrixStack, Fluid fluid, float scale) {
-        matrixStack.scale(scale / 16, scale / 16, scale / 16);
-        GuiHelpers.renderFluidSlot(gui, matrixStack, new FluidStack(fluid, FluidHelpers.BUCKET_VOLUME), 0, 0);
+    public static void renderFluid(GuiGraphics gui, Fluid fluid, float scale) {
+        gui.pose().scale(scale / 16, scale / 16, scale / 16);
+        GuiHelpers.renderFluidSlot(gui, new FluidStack(fluid, FluidHelpers.BUCKET_VOLUME), 0, 0);
     }
 
     // ----- Everything below is modified from ItemRenderer#renderGuiItem (scale param was added) -----

diff --git a/src/main/java/org/cyclops/iconexporter/client/gui/ScreenIconExporter.java b/src/main/java/org/cyclops/iconexporter/client/gui/ScreenIconExporter.java
@@ -1,8 +1,8 @@
 package org.cyclops.iconexporter.client.gui;
 
 import com.google.common.collect.Queues;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
@@ -50,16 +50,16 @@ public ScreenIconExporter(int scaleImage, double scaleGui) {
     }
 
     @Override
-    public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) {
-        super.render(matrixStack, mouseX, mouseY, partialTicks);
+    public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+        super.render(guiGraphics, mouseX, mouseY, partialTicks);
 
         if (exportTasks.isEmpty()) {
             Minecraft.getInstance().setScreen(null);
             Minecraft.getInstance().player.sendSystemMessage(Component.translatable("gui.itemexporter.finished"));
         } else {
             IExportTask task = exportTasks.poll();
             try {
-                task.run(matrixStack);
+                task.run(guiGraphics);
             } catch (IOException e) {
                 Minecraft.getInstance().player.sendSystemMessage(Component.translatable("gui.itemexporter.error"));
                 e.printStackTrace();
@@ -92,11 +92,11 @@ public Queue<IExportTask> createExportTasks() {
         for (Map.Entry<ResourceKey<Fluid>, Fluid> fluidEntry : ForgeRegistries.FLUIDS.getEntries()) {
             tasks.set(tasks.get() + 1);
             String subKey = "fluid:" + fluidEntry.getKey().location();
-            exportTasks.add((matrixStack) -> {
+            exportTasks.add((guiGraphics) -> {
                 taskProcessed.set(taskProcessed.get() + 1);
                 signalStatus(tasks, taskProcessed);
-                fill(matrixStack, 0, 0, scaleModifiedRounded, scaleModifiedRounded, BACKGROUND_COLOR);
-                ItemRenderUtil.renderFluid(this, matrixStack, fluidEntry.getValue(), scaleModified);
+                guiGraphics.fill(0, 0, scaleModifiedRounded, scaleModifiedRounded, BACKGROUND_COLOR);
+                ItemRenderUtil.renderFluid(guiGraphics, fluidEntry.getValue(), scaleModified);
                 ImageExportUtil.exportImageFromScreenshot(baseDir, subKey, this.scaleImage, BACKGROUND_COLOR_SHIFTED);
             });
         }
@@ -112,11 +112,11 @@ public Queue<IExportTask> createExportTasks() {
                 ResourceLocation key = ForgeRegistries.ITEMS.getKey(itemStack.getItem());
                 tasks.set(tasks.get() + 1);
                 String subKey = key + (itemStack.hasTag() ? "__" + serializeNbtTag(itemStack.getTag()) : "");
-                exportTasks.add((matrixStack) -> {
+                exportTasks.add((guiGraphics) -> {
                     taskProcessed.set(taskProcessed.get() + 1);
                     signalStatus(tasks, taskProcessed);
-                    fill(matrixStack, 0, 0, scaleModifiedRounded, scaleModifiedRounded, BACKGROUND_COLOR);
-                    ItemRenderUtil.renderItem(matrixStack, itemStack, scaleModified);
+                    guiGraphics.fill(0, 0, scaleModifiedRounded, scaleModifiedRounded, BACKGROUND_COLOR);
+                    ItemRenderUtil.renderItem(guiGraphics, itemStack, scaleModified);
                     ImageExportUtil.exportImageFromScreenshot(baseDir, subKey, this.scaleImage, BACKGROUND_COLOR_SHIFTED);
                     if (itemStack.hasTag() && GeneralConfig.fileNameHashTag) {
                         ImageExportUtil.exportNbtFile(baseDir, subKey, itemStack.getTag());

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[45,)"
+loaderVersion="[47,)"
 issueTrackerURL="https://github.com/CyclopsMC/IconExporter/issues"
 displayURL="https://www.curseforge.com/minecraft/mc-mods/iconexporter"
 license="MIT"
@@ -17,18 +17,18 @@ Exports item and block icons to files.
 [[dependencies.iconexporter]]
     modId="cyclopscore"
     mandatory=true
-    versionRange="[1.18.2,)"
+    versionRange="[1.18.4,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.iconexporter]]
     modId="forge"
     mandatory=true
-    versionRange="[45.0.50,)"
+    versionRange="[47.0.1,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.iconexporter]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.19.4,]"
+    versionRange="[1.20.1,]"
     ordering="NONE"
     side="BOTH"
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
@@ -1,8 +1,8 @@
 {
     "pack": {
         "description": "iconexporter resources",
-        "pack_format": 12,
-        "forge:resource_pack_format": 12,
-        "forge:data_pack_format": 10
+        "pack_format": 15,
+        "forge:resource_pack_format": 15,
+        "forge:data_pack_format": 15
     }
 }