Update to 1.19.1

This commit is contained in:
Johannes Frohnmeyer 2022-07-28 15:36:25 +02:00
parent e1187cbd1f
commit cb99626f20
Signed by: Johannes
GPG Key ID: E76429612C2929F4
8 changed files with 30 additions and 15 deletions

View File

@ -2,5 +2,5 @@ apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle"
dependencies { dependencies {
include modImplementation("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}") // for JfCommons include modImplementation("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}") // for JfCommons
modImplementation "com.terraformersmc:modmenu:4.0.0-beta.4" modImplementation "com.terraformersmc:modmenu:4.0.5"
} }

View File

@ -1,11 +1,11 @@
# https://fabricmc.net/develop # https://fabricmc.net/develop
minecraft_version=1.19 minecraft_version=1.19.1
yarn_mappings=build.1 yarn_mappings=build.1
loader_version=0.14.6 loader_version=0.14.8
maven_group=io.gitlab.jfronny maven_group=io.gitlab.jfronny
archives_base_name=resclone archives_base_name=resclone
fabric_version=0.55.1+1.19 fabric_version=0.58.5+1.19.1
jfapi_version=2.9.1 jfapi_version=2.10.0
modrinth_id=kVAQyCLX modrinth_id=resclone

View File

@ -0,0 +1,12 @@
{
"required": true,
"minVersion": "0.8",
"package": "io.gitlab.jfronny.resclone.mixin",
"compatibilityLevel": "JAVA_8",
"client": [
"GameOptionsMixin"
],
"injectors": {
"defaultRequire": 1
}
}

View File

@ -22,7 +22,7 @@ public class Resclone implements ModInitializer, RescloneApi {
public static final Map<String, PackFetcher> FETCHER_INSTANCES = new LinkedHashMap<>(); public static final Map<String, PackFetcher> FETCHER_INSTANCES = new LinkedHashMap<>();
public static final Set<PackProcessor> PROCESSORS = new LinkedHashSet<>(); public static final Set<PackProcessor> PROCESSORS = new LinkedHashSet<>();
public static final Set<PackMetaLoaded> DOWNLOADED_PACKS = new LinkedHashSet<>(); public static final Set<PackMetaLoaded> DOWNLOADED_PACKS = new LinkedHashSet<>();
public static final Set<PackMetaLoaded> NEW_PACKS = new LinkedHashSet<>(); public static final Set<PackMetaLoaded> NEW_PACKS = new LinkedHashSet<>(); // Client-only!
public static final String MOD_ID = "resclone"; public static final String MOD_ID = "resclone";
public static final Logger LOGGER = Logger.forName(MOD_ID); public static final Logger LOGGER = Logger.forName(MOD_ID);
@ -119,8 +119,7 @@ public class Resclone implements ModInitializer, RescloneApi {
PackFetcher.Result fr = FETCHER_INSTANCES.get(meta.fetcher).get(meta.source, cacheDir, meta.forceDownload); PackFetcher.Result fr = FETCHER_INSTANCES.get(meta.fetcher).get(meta.source, cacheDir, meta.forceDownload);
p = new PackMetaLoaded(fr.downloadPath(), meta.name, meta.forceEnable); p = new PackMetaLoaded(fr.downloadPath(), meta.name, meta.forceEnable);
metas.add(p); metas.add(p);
if (isNew) if (isNew && FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) NEW_PACKS.add(p);
NEW_PACKS.add(p);
if (fr.freshDownload()) { if (fr.freshDownload()) {
//Process //Process
Map<String, String> props = new HashMap<>(); Map<String, String> props = new HashMap<>();

View File

@ -3,7 +3,7 @@ package io.gitlab.jfronny.resclone.processors;
import io.gitlab.jfronny.resclone.*; import io.gitlab.jfronny.resclone.*;
import io.gitlab.jfronny.resclone.api.PackProcessor; import io.gitlab.jfronny.resclone.api.PackProcessor;
import io.gitlab.jfronny.resclone.util.io.PathPruneVisitor; import io.gitlab.jfronny.resclone.util.io.PathPruneVisitor;
import net.minecraft.client.MinecraftClient; import net.minecraft.server.MinecraftServer;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import java.io.IOException; import java.io.IOException;
@ -15,7 +15,7 @@ import java.nio.file.StandardOpenOption;
public class PruneVanillaProcessor implements PackProcessor { public class PruneVanillaProcessor implements PackProcessor {
@Override @Override
public void process(FileSystem p) throws Exception { public void process(FileSystem p) throws Exception {
ClassLoader cl = MinecraftClient.class.getClassLoader(); ClassLoader cl = MinecraftServer.class.getClassLoader();
try { try {
if (Files.isDirectory(p.getPath("/assets/minecraft"))) { if (Files.isDirectory(p.getPath("/assets/minecraft"))) {
Files.walkFileTree(p.getPath("/assets/minecraft"), new PathPruneVisitor((s) -> { Files.walkFileTree(p.getPath("/assets/minecraft"), new PathPruneVisitor((s) -> {

View File

@ -20,10 +20,15 @@
] ]
}, },
"mixins": [ "mixins": [
"resclone.mixins.json" "resclone.mixins.json",
{
"config": "resclone.client.mixins.json",
"environment": "client"
}
], ],
"depends": { "depends": {
"fabricloader": ">=0.12.0", "fabricloader": ">=0.12.0",
"minecraft": "*" "minecraft": "*",
"libjf-base": "*"
} }
} }

View File

@ -4,8 +4,7 @@
"package": "io.gitlab.jfronny.resclone.mixin", "package": "io.gitlab.jfronny.resclone.mixin",
"compatibilityLevel": "JAVA_8", "compatibilityLevel": "JAVA_8",
"mixins": [ "mixins": [
"FileResourcePackProviderMixin", "FileResourcePackProviderMixin"
"GameOptionsMixin"
], ],
"injectors": { "injectors": {
"defaultRequire": 1 "defaultRequire": 1