1.21.1 port

Fuzss · Sep 18, 2024 · 2bbc247 · 2bbc247
1 parent 5a30660
commit 2bbc247
Show file tree

Hide file tree

Showing 57 changed files with 12 additions and 274 deletions.
diff --git a/1.21/CHANGELOG.md → 1.21.1/CHANGELOG.md b/1.21/CHANGELOG.md → 1.21.1/CHANGELOG.md
@@ -4,5 +4,5 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v21.0.0-1.20.6] - 2024-07-01
-- Port to Minecraft 1.21
+## [v21.1.0-1.21.1] - 2024-09-18
+- Port to Minecraft 1.21.1
diff --git a/1.21/Common/build.gradle → 1.21.1/Common/build.gradle b/1.21/Common/build.gradle → 1.21.1/Common/build.gradle
@@ -1,4 +1,4 @@
-apply from: "https://raw.githubusercontent.com/Fuzss/modresources/main/gradle/v2/common.gradle"
+apply from: "https://raw.githubusercontent.com/Fuzss/modresources/main/gradle/${libs.versions.minecraft.get()}/common.gradle"
 
 dependencies {
     // Puzzles Lib

diff --git a/.../77ee2423543864030391b63ff224c14e59fb823b → .../77ee2423543864030391b63ff224c14e59fb823b b/.../77ee2423543864030391b63ff224c14e59fb823b → .../77ee2423543864030391b63ff224c14e59fb823b
@@ -1,2 +1,2 @@
-// 1.21	2024-07-01T10:10:54.930933	Languages: en_us for mod: resourcepackoverrides
+// 1.21.1	2024-09-18T12:16:39.103583	Languages: en_us for mod: resourcepackoverrides
 13181ef5b11dce7dd5323f94a6458effc1e7793c assets/resourcepackoverrides/lang/en_us.json
diff --git a/...ets/resourcepackoverrides/lang/en_us.json → ...ets/resourcepackoverrides/lang/en_us.json b/...ets/resourcepackoverrides/lang/en_us.json → ...ets/resourcepackoverrides/lang/en_us.json
diff --git a/...epackoverrides/ResourcePackOverrides.java → ...epackoverrides/ResourcePackOverrides.java b/...epackoverrides/ResourcePackOverrides.java → ...epackoverrides/ResourcePackOverrides.java
diff --git a/...s/client/ResourcePackOverridesClient.java → ...s/client/ResourcePackOverridesClient.java b/...s/client/ResourcePackOverridesClient.java → ...s/client/ResourcePackOverridesClient.java
diff --git a/...rides/client/data/JsonConfigFileUtil.java → ...rides/client/data/JsonConfigFileUtil.java b/...rides/client/data/JsonConfigFileUtil.java → ...rides/client/data/JsonConfigFileUtil.java
diff --git a/...es/client/data/PackSelectionOverride.java → ...es/client/data/PackSelectionOverride.java b/...es/client/data/PackSelectionOverride.java → ...es/client/data/PackSelectionOverride.java
diff --git a/...client/data/ResourceOverridesManager.java → ...client/data/ResourceOverridesManager.java b/...client/data/ResourceOverridesManager.java → ...client/data/ResourceOverridesManager.java
diff --git a/...es/client/handler/PackActionsHandler.java → ...es/client/handler/PackActionsHandler.java b/...es/client/handler/PackActionsHandler.java → ...es/client/handler/PackActionsHandler.java
diff --git a/...verrides/mixin/client/MinecraftMixin.java → ...verrides/mixin/client/MinecraftMixin.java b/...verrides/mixin/client/MinecraftMixin.java → ...verrides/mixin/client/MinecraftMixin.java
diff --git a/...des/mixin/client/PackRepositoryMixin.java → ...des/mixin/client/PackRepositoryMixin.java b/...des/mixin/client/PackRepositoryMixin.java → ...des/mixin/client/PackRepositoryMixin.java
diff --git a/...ixin/client/PackSelectionScreenMixin.java → ...ixin/client/PackSelectionScreenMixin.java b/...ixin/client/PackSelectionScreenMixin.java → ...ixin/client/PackSelectionScreenMixin.java
diff --git a/...verrides/services/ClientAbstractions.java → ...verrides/services/ClientAbstractions.java b/...verrides/services/ClientAbstractions.java → ...verrides/services/ClientAbstractions.java
diff --git a/...rides/services/ServiceProviderLoader.java → ...rides/services/ServiceProviderLoader.java b/...rides/services/ServiceProviderLoader.java → ...rides/services/ServiceProviderLoader.java
diff --git a/...c/main/resources/architectury.common.json → ...c/main/resources/architectury.common.json b/...c/main/resources/architectury.common.json → ...c/main/resources/architectury.common.json
diff --git a/...ets/resourcepackoverrides/lang/ru_ru.json → ...ets/resourcepackoverrides/lang/ru_ru.json b/...ets/resourcepackoverrides/lang/ru_ru.json → ...ets/resourcepackoverrides/lang/ru_ru.json
diff --git a/.../Common/src/main/resources/mod_banner.png → .../Common/src/main/resources/mod_banner.png b/.../Common/src/main/resources/mod_banner.png → .../Common/src/main/resources/mod_banner.png
diff --git a/1.21/Common/src/main/resources/mod_logo.png → ....1/Common/src/main/resources/mod_logo.png b/1.21/Common/src/main/resources/mod_logo.png → ....1/Common/src/main/resources/mod_logo.png
diff --git a/1.21/Common/src/main/resources/pack.mcmeta → 1.21.1/Common/src/main/resources/pack.mcmeta b/1.21/Common/src/main/resources/pack.mcmeta → 1.21.1/Common/src/main/resources/pack.mcmeta
diff --git a/...urces/resourcepackoverrides.accesswidener → ...urces/resourcepackoverrides.accesswidener b/...urces/resourcepackoverrides.accesswidener → ...urces/resourcepackoverrides.accesswidener
diff --git a/.../resourcepackoverrides.common.mixins.json → .../resourcepackoverrides.common.mixins.json b/.../resourcepackoverrides.common.mixins.json → .../resourcepackoverrides.common.mixins.json
diff --git a/1.21/Fabric/build.gradle → 1.21.1/Fabric/build.gradle b/1.21/Fabric/build.gradle → 1.21.1/Fabric/build.gradle
@@ -1,4 +1,4 @@
-apply from: "https://raw.githubusercontent.com/Fuzss/modresources/main/gradle/v2/fabric.gradle"
+apply from: "https://raw.githubusercontent.com/Fuzss/modresources/main/gradle/${libs.versions.minecraft.get()}/fabric.gradle"
 
 dependencies {
     // Fabric Api

diff --git a/...s/fabric/ResourcePackOverridesFabric.java → ...s/fabric/ResourcePackOverridesFabric.java b/...s/fabric/ResourcePackOverridesFabric.java → ...s/fabric/ResourcePackOverridesFabric.java
diff --git a/...nt/ResourcePackOverridesFabricClient.java → ...nt/ResourcePackOverridesFabricClient.java b/...nt/ResourcePackOverridesFabricClient.java → ...nt/ResourcePackOverridesFabricClient.java
diff --git a/...bric/mixin/client/OptionsFabricMixin.java → ...bric/mixin/client/OptionsFabricMixin.java b/...bric/mixin/client/OptionsFabricMixin.java → ...bric/mixin/client/OptionsFabricMixin.java
diff --git a/...ic/services/FabricClientAbstractions.java → ...ic/services/FabricClientAbstractions.java b/...ic/services/FabricClientAbstractions.java → ...ic/services/FabricClientAbstractions.java
diff --git a/...packoverrides.services.ClientAbstractions → ...packoverrides.services.ClientAbstractions b/...packoverrides.services.ClientAbstractions → ...packoverrides.services.ClientAbstractions
diff --git a/...Fabric/src/main/resources/fabric.mod.json → ...Fabric/src/main/resources/fabric.mod.json b/...Fabric/src/main/resources/fabric.mod.json → ...Fabric/src/main/resources/fabric.mod.json
diff --git a/.../resourcepackoverrides.fabric.mixins.json → .../resourcepackoverrides.fabric.mixins.json b/.../resourcepackoverrides.fabric.mixins.json → .../resourcepackoverrides.fabric.mixins.json
diff --git a/1.21/NeoForge/build.gradle → 1.21.1/NeoForge/build.gradle b/1.21/NeoForge/build.gradle → 1.21.1/NeoForge/build.gradle
@@ -1,4 +1,4 @@
-apply from: "https://raw.githubusercontent.com/Fuzss/modresources/main/gradle/v2/neoforge.gradle"
+apply from: "https://raw.githubusercontent.com/Fuzss/modresources/main/gradle/${libs.versions.minecraft.get()}/neoforge.gradle"
 
 dependencies {
     // Puzzles Lib

diff --git a/1.21/NeoForge/gradle.properties → 1.21.1/NeoForge/gradle.properties b/1.21/NeoForge/gradle.properties → 1.21.1/NeoForge/gradle.properties
diff --git a/...oforge/ResourcePackOverridesNeoForge.java → ...oforge/ResourcePackOverridesNeoForge.java b/...oforge/ResourcePackOverridesNeoForge.java → ...oforge/ResourcePackOverridesNeoForge.java
diff --git a/.../ResourcePackOverridesNeoForgeClient.java → .../ResourcePackOverridesNeoForgeClient.java b/.../ResourcePackOverridesNeoForgeClient.java → .../ResourcePackOverridesNeoForgeClient.java
diff --git a/...orge/data/client/ModLanguageProvider.java → ...orge/data/client/ModLanguageProvider.java b/...orge/data/client/ModLanguageProvider.java → ...orge/data/client/ModLanguageProvider.java
diff --git a/...ge/mixin/client/OptionsNeoForgeMixin.java → ...ge/mixin/client/OptionsNeoForgeMixin.java b/...ge/mixin/client/OptionsNeoForgeMixin.java → ...ge/mixin/client/OptionsNeoForgeMixin.java
diff --git a/.../services/NeoForgeClientAbstractions.java → .../services/NeoForgeClientAbstractions.java b/.../services/NeoForgeClientAbstractions.java → .../services/NeoForgeClientAbstractions.java
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/...packoverrides.services.ClientAbstractions → ...packoverrides.services.ClientAbstractions b/...packoverrides.services.ClientAbstractions → ...packoverrides.services.ClientAbstractions
diff --git a/...esourcepackoverrides.neoforge.mixins.json → ...esourcepackoverrides.neoforge.mixins.json b/...esourcepackoverrides.neoforge.mixins.json → ...esourcepackoverrides.neoforge.mixins.json
diff --git a/1.21/build.gradle → 1.21.1/build.gradle b/1.21/build.gradle → 1.21.1/build.gradle
@@ -6,4 +6,4 @@ plugins {
     alias libs.plugins.minotaur apply false
 }
 
-apply from: "https://raw.githubusercontent.com/Fuzss/modresources/main/gradle/v2/main.gradle"
+apply from: "https://raw.githubusercontent.com/Fuzss/modresources/main/gradle/${libs.versions.minecraft.get()}/main.gradle"
diff --git a/1.21/gradle.properties → 1.21.1/gradle.properties b/1.21/gradle.properties → 1.21.1/gradle.properties
@@ -5,7 +5,7 @@ copyBuildJar=true
 # Mod Attributes
 modId=resourcepackoverrides
 modName=Resource Pack Overrides
-modVersion=21.0.0
+modVersion=21.1.0
 modAuthor=Fuzs
 modDescription=Ensures important resource packs stay always active and helps clean up the pack selection screen.
 modLicense=MPL-2.0
@@ -19,9 +19,9 @@ modForgeDisplayTest=IGNORE_ALL_VERSION
 modFabricEnvironment=client
 
 # Version Catalog
-dependenciesVersionCatalog=1.21-v3
-#dependenciesPuzzlesLibVersion=21.0.0
-#dependenciesMinPuzzlesLibVersion=21.0.0
+dependenciesVersionCatalog=1.21.1-v6
+dependenciesPuzzlesLibVersion=21.1.8
+dependenciesMinPuzzlesLibVersion=21.1.8
 
 # Mod Publishing
 projectReleaseType=release

diff --git a/1.21/gradle/wrapper/gradle-wrapper.jar → 1.21.1/gradle/wrapper/gradle-wrapper.jar b/1.21/gradle/wrapper/gradle-wrapper.jar → 1.21.1/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/1.21/gradlew → 1.21.1/gradlew b/1.21/gradlew → 1.21.1/gradlew
diff --git a/1.21/gradlew.bat → 1.21.1/gradlew.bat b/1.21/gradlew.bat → 1.21.1/gradlew.bat
diff --git a/1.21/settings.gradle → 1.21.1/settings.gradle b/1.21/settings.gradle → 1.21.1/settings.gradle
diff --git a/1.21/Forge/build.gradle b/1.21/Forge/build.gradle
diff --git a/1.21/Forge/gradle.properties b/1.21/Forge/gradle.properties
diff --git a/1.21/Forge/src/main/java/fuzs/resourcepackoverrides/forge/ResourcePackOverridesForge.java b/1.21/Forge/src/main/java/fuzs/resourcepackoverrides/forge/ResourcePackOverridesForge.java
diff --git a/...c/main/java/fuzs/resourcepackoverrides/forge/client/ResourcePackOverridesForgeClient.java b/...c/main/java/fuzs/resourcepackoverrides/forge/client/ResourcePackOverridesForgeClient.java
diff --git a/...orge/src/main/java/fuzs/resourcepackoverrides/forge/mixin/MixinConfigPluginForgeImpl.java b/...orge/src/main/java/fuzs/resourcepackoverrides/forge/mixin/MixinConfigPluginForgeImpl.java
diff --git a/.../Forge/src/main/java/fuzs/resourcepackoverrides/forge/mixin/client/OptionsForgeMixin.java b/.../Forge/src/main/java/fuzs/resourcepackoverrides/forge/mixin/client/OptionsForgeMixin.java
diff --git a/...orge/src/main/java/fuzs/resourcepackoverrides/forge/services/ForgeClientAbstractions.java b/...orge/src/main/java/fuzs/resourcepackoverrides/forge/services/ForgeClientAbstractions.java
diff --git a/1.21/Forge/src/main/resources/META-INF/mods.toml b/1.21/Forge/src/main/resources/META-INF/mods.toml
diff --git a/...c/main/resources/META-INF/services/fuzs.resourcepackoverrides.services.ClientAbstractions b/...c/main/resources/META-INF/services/fuzs.resourcepackoverrides.services.ClientAbstractions
diff --git a/1.21/Forge/src/main/resources/resourcepackoverrides.forge.mixins.json b/1.21/Forge/src/main/resources/resourcepackoverrides.forge.mixins.json