diff --git a/common/build.gradle b/common/build.gradle index 1454197..d453e10 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,7 +3,7 @@ plugins { id 'java' id 'maven-publish' //id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' } diff --git a/common/src/main/java/com/adamcalculator/dynamicpack/client/Compat.java b/common/src/main/java/com/adamcalculator/dynamicpack/client/Compat.java index 3341c13..dbc2fa5 100644 --- a/common/src/main/java/com/adamcalculator/dynamicpack/client/Compat.java +++ b/common/src/main/java/com/adamcalculator/dynamicpack/client/Compat.java @@ -60,7 +60,7 @@ public static void runAtUI(Runnable o) { } public static void drawTexture(GuiGraphics context, ResourceLocation texture, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) { - RenderSystem.setShaderTexture(0, texture); + RenderSystem.setShaderTexture(0, Minecraft.getInstance().getTextureManager().getTexture(texture).getTexture()); context.blit(RenderType::guiTextured, texture, x, y, u, v, width, height, textureWidth, textureHeight); } diff --git a/common/src/main/java/com/adamcalculator/dynamicpack/client/DynamicPackModBase.java b/common/src/main/java/com/adamcalculator/dynamicpack/client/DynamicPackModBase.java index c7a9444..a08708c 100644 --- a/common/src/main/java/com/adamcalculator/dynamicpack/client/DynamicPackModBase.java +++ b/common/src/main/java/com/adamcalculator/dynamicpack/client/DynamicPackModBase.java @@ -21,6 +21,8 @@ import net.minecraft.network.chat.Style; import net.minecraft.util.GsonHelper; +import java.net.URI; + /** * Base impl for DynamicPack mod (minecraft logic) @@ -54,9 +56,9 @@ public void setToastContent(Component title, Component text) { private Component createDownloadComponent() { return Component.translatable("dynamicpack.status_checker.download") .withStyle(Style.EMPTY - .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.translatable("dynamicpack.status_checker.download.hover", + .withHoverEvent(new HoverEvent.ShowText(Component.translatable("dynamicpack.status_checker.download.hover", Component.literal(SharedConstrains.MODRINTH_URL).withStyle(ChatFormatting.UNDERLINE, ChatFormatting.AQUA)))) - .withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, SharedConstrains.MODRINTH_URL)) + .withClickEvent(new ClickEvent.OpenUrl(URI.create(SharedConstrains.MODRINTH_URL))) ) .withStyle(ChatFormatting.YELLOW, ChatFormatting.UNDERLINE); } diff --git a/common/src/main/java/com/adamcalculator/dynamicpack/client/mixin/PackRepositoryMixin.java b/common/src/main/java/com/adamcalculator/dynamicpack/client/mixin/PackRepositoryMixin.java index c488efa..4f3cdbf 100644 --- a/common/src/main/java/com/adamcalculator/dynamicpack/client/mixin/PackRepositoryMixin.java +++ b/common/src/main/java/com/adamcalculator/dynamicpack/client/mixin/PackRepositoryMixin.java @@ -3,10 +3,12 @@ import com.adamcalculator.dynamicpack.DynamicPackMod; import com.adamcalculator.dynamicpack.client.GameStartSyncing; import com.adamcalculator.dynamicpack.util.Out; +import com.mojang.blaze3d.opengl.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.server.packs.repository.PackRepository; import org.lwjgl.glfw.GLFW; +import org.lwjgl.opengl.GL11; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -42,8 +44,8 @@ public class PackRepositoryMixin { try { // RenderSystem.applyModelViewMatrix(); - RenderSystem.clearColor(0.074f + (((float)syncing.getPercentage() / 100f)), 0.04f, (float) (0.24f + (Math.sin(System.currentTimeMillis() / 300f) / 2)), 1f); - RenderSystem.clear(16640); + GL11.glClearColor(0.074f + (((float)syncing.getPercentage() / 100f)), 0.04f, (float) (0.24f + (Math.sin(System.currentTimeMillis() / 300f) / 2)), 1f); + GlStateManager._clear(16640); GLFW.glfwSwapBuffers(client.getWindow().getWindow()); } catch (Exception e) { diff --git a/fabric/build.gradle b/fabric/build.gradle index d918249..80f85e5 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'idea' id 'maven-publish' - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' } base { @@ -11,9 +11,9 @@ base { dependencies { - modImplementation "com.terraformersmc:modmenu:13.0.0-beta.1" - modImplementation("dev.isxander:yet-another-config-lib:3.6.2+1.21.4-fabric") - include(modImplementation("io.gitlab.jfronny.libjf:libjf-resource-pack-entry-widgets-v0:3.18.3")) + modImplementation "com.terraformersmc:modmenu:14.0.0-rc.2" + modImplementation("dev.isxander:yet-another-config-lib:3.6.6+1.21.5-fabric") + include(modImplementation("io.gitlab.jfronny.libjf:libjf-resource-pack-entry-widgets-v0:3.18.5")) minecraft "com.mojang:minecraft:${minecraft_version}" mappings loom.officialMojangMappings() diff --git a/gradle.properties b/gradle.properties index bcade00..ecf5c64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,22 +7,22 @@ version=1.1 group=com.adamcalculator.dynamicpack # Common -minecraft_version=1.21.4 +minecraft_version=1.21.5 mod_name=DynamicPack mod_author=AdamCalculator mod_id=dynamicpack license=MIT credits= description=Adds auto-update support for resource packs -minecraft_version_range=[1.21.4, 1.22) +minecraft_version_range=[1.21.5, 1.22) # Fabric -fabric_version=0.110.5+1.21.4 -fabric_loader_version=0.16.9 -fabric_minecraft_version=>=1.21.4 +fabric_version=0.119.5+1.21.5 +fabric_loader_version=0.16.14 +fabric_minecraft_version=>=1.21.5 # NeoForge -neoforge_version=20.4.83-beta +neoforge_version=20.5.86 neoforge_loader_version_range=[2,) # Gradle diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..ca025c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ##########################################################################