From 5f0cc2f27a1e80640ba189f60ac38947cb48e678 Mon Sep 17 00:00:00 2001 From: Motschen Date: Wed, 14 Dec 2022 19:00:04 +0100 Subject: [PATCH] Update everything to 1.19.3 --- build.gradle | 2 +- .../resourcepacks/smartleaves/pack.mcmeta | 2 +- forge/build.gradle | 2 +- .../cullleaves/forge/CullLeavesClientEvents.java | 11 ++++------- gradle.properties | 16 ++++++++-------- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index c5d41c7..475260e 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ subprojects { // The following line declares the mojmap mappings, you may use other mappings as well //mappings loom.officialMojangMappings() // The following line declares the yarn mappings you may select this one as well. - mappings "net.fabricmc:yarn:1.19.2+build.3:v2" + mappings "net.fabricmc:yarn:1.19.3+build.3:v2" } } diff --git a/common/src/main/resources/resourcepacks/smartleaves/pack.mcmeta b/common/src/main/resources/resourcepacks/smartleaves/pack.mcmeta index 1d9f719..b16dbb7 100755 --- a/common/src/main/resources/resourcepacks/smartleaves/pack.mcmeta +++ b/common/src/main/resources/resourcepacks/smartleaves/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 9, + "pack_format": 12, "description": "§2Makes leaves look identical to OptiFine's smart leaves" } } diff --git a/forge/build.gradle b/forge/build.gradle index e029a09..f6edf87 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -31,7 +31,7 @@ dependencies { // Remove the next line if you don't want to depend on the API //modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" modImplementation "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-forge" - include "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-forge" + //include "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-forge" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } diff --git a/forge/src/main/java/eu/midnightdust/cullleaves/forge/CullLeavesClientEvents.java b/forge/src/main/java/eu/midnightdust/cullleaves/forge/CullLeavesClientEvents.java index acb60c8..28bd18d 100644 --- a/forge/src/main/java/eu/midnightdust/cullleaves/forge/CullLeavesClientEvents.java +++ b/forge/src/main/java/eu/midnightdust/cullleaves/forge/CullLeavesClientEvents.java @@ -1,7 +1,6 @@ package eu.midnightdust.cullleaves.forge; import net.minecraft.resource.*; -import net.minecraft.resource.metadata.PackResourceMetadata; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraftforge.api.distmarker.Dist; @@ -12,8 +11,6 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.resource.PathPackResources; -import java.io.IOException; - @Mod.EventBusSubscriber(modid = "cullleaves", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class CullLeavesClientEvents { @SubscribeEvent @@ -23,11 +20,11 @@ public class CullLeavesClientEvents { } } private static void registerResourcePack(AddPackFindersEvent event, Identifier id, boolean alwaysEnabled) { - event.addRepositorySource(((profileAdder, factory) -> { + event.addRepositorySource((profileAdder -> { IModFile file = ModList.get().getModFileById(id.getNamespace()).getFile(); - try (PathPackResources pack = new PathPackResources(id.toString(), file.findResource("resourcepacks/"+id.getPath()))) { - profileAdder.accept(new ResourcePackProfile(id.toString(), alwaysEnabled, () -> pack, Text.of(id.getNamespace()+"/"+id.getPath()), pack.parseMetadata(PackResourceMetadata.READER).getDescription().copy().append(" §7(built-in)"), ResourcePackCompatibility.COMPATIBLE, ResourcePackProfile.InsertionPosition.TOP, false, ResourcePackSource.PACK_SOURCE_BUILTIN, false)); - } catch (IOException | NullPointerException e) {e.printStackTrace();} + try (PathPackResources pack = new PathPackResources(id.toString(), true, file.findResource("resourcepacks/"+id.getPath()))) { + profileAdder.accept(ResourcePackProfile.create(id.toString(), Text.of(id.getNamespace()+"/"+id.getPath()), alwaysEnabled, a -> pack, ResourceType.CLIENT_RESOURCES, ResourcePackProfile.InsertionPosition.TOP, ResourcePackSource.BUILTIN)); + } catch (NullPointerException e) {e.printStackTrace();} })); } } diff --git a/gradle.properties b/gradle.properties index 07ba7a6..f259561 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,20 @@ org.gradle.jvmargs=-Xmx4096M -minecraft_version=1.19.2 +minecraft_version=1.19.3 enabled_platforms=quilt,fabric,forge archives_base_name=cullleaves -mod_version=3.0.1 +mod_version=3.0.2 maven_group=eu.midnightdust architectury_version=6.2.43 -midnightlib_version=1.0.0 +midnightlib_version=1.1.0 sodium_version=mc1.19.2-0.4.4 -fabric_loader_version=0.14.9 -fabric_api_version=0.59.0+1.19.2 +fabric_loader_version=0.14.11 +fabric_api_version=0.69.1+1.19.3 -forge_version=1.19.2-43.0.8 +forge_version=1.19.3-44.0.18 -quilt_loader_version=0.17.2-beta.3 -quilt_fabric_api_version=4.0.0-beta.7+0.59.0-1.19.2 +quilt_loader_version=0.18.1-beta.23 +quilt_fabric_api_version=5.0.0-beta.2+0.68.1-1.19.3