JfMods/Respackopts
JfMods/Respackopts
1
1
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fix compile

Browse Source
This commit is contained in:
JFronny 2021-06-10 16:11:19 +02:00
parent 2393c48913
commit 41f5408a7e
No known key found for this signature in database
GPG Key ID: BEC5ACBBD4EE17E5
13 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java
View File

@ -2,8 +2,8 @@ package io.gitlab.jfronny.respackopts;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import io.gitlab.jfronny.respackopts.data.entry.*;
import io.gitlab.jfronny.respackopts.data.Respackmeta;
import io.gitlab.jfronny.respackopts.data.entry.*;
import io.gitlab.jfronny.respackopts.gson.BooleanEntrySerializer;
import io.gitlab.jfronny.respackopts.gson.ConfigBranchSerializer;
import io.gitlab.jfronny.respackopts.gson.EnumEntrySerializer;
@ -17,10 +17,15 @@ import net.minecraft.util.Identifier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.*;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@Environment(EnvType.CLIENT)
public class Respackopts implements ClientModInitializer {
@ -63,7 +68,6 @@ public class Respackopts implements ClientModInitializer {
public static void save() {
for (String s : resPackMetas.keySet()) {
s = resPackMetas.get(s).id;
//LOGGER.info(s + ": " + CONFIG_BRANCH.get(s));
try (Writer writer = Files.newBufferedWriter(CONF_DIR.resolve(s + ".json"))) {
GSON.toJson(CONFIG_BRANCH.get(s), writer);
writer.flush();
@ -89,8 +93,5 @@ public class Respackopts implements ClientModInitializer {
LOGGER.error("Failed to load " + id, e);
}
}
/*if ("lumi".equals(id)) {
LOGGER.info("w" + CONFIG_BRANCH.get(id).subClasses.get("subcategoryTest").booleanEntries.get("enableLangJokeFallback").value);
}*/
}
}

2
src/main/java/io/gitlab/jfronny/respackopts/data/entry/Entry.java
View File

@ -32,7 +32,7 @@ public abstract class Entry<T> {
public abstract boolean typeMatches(Entry<?> val);
public void appendString(StringBuilder sb) {
sb.append(value + " (" + defaultValue + ")");
sb.append(value).append(" (").append(defaultValue).append(")");
}
@Override

4
src/main/java/io/gitlab/jfronny/respackopts/filters/FilterProvider.java
View File

@ -1,10 +1,8 @@
package io.gitlab.jfronny.respackopts.filters;
import io.gitlab.jfronny.respackopts.abstractions.FileOpenProvider;
import io.gitlab.jfronny.respackopts.filters.conditions.ResourcePackFilter;
import io.gitlab.jfronny.respackopts.filters.fallback.FallbackFilter;
import net.minecraft.resource.ResourceNotFoundException;
import net.minecraft.resource.ResourceType;
import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@ -50,7 +48,7 @@ public class FilterProvider {
}
}
public void findResources(ResourceType type, String namespace, String prefix, int maxDepth, Predicate<String> pathFilter, CallbackInfoReturnable<Collection<Identifier>> info) {
public void findResources(String namespace, CallbackInfoReturnable<Collection<Identifier>> info) {
Collection<Identifier> ret = info.getReturnValue();
ret.removeIf(s -> rpo.fileHidden(s.getPath()) && !fbt.fileVisible(namespace));
fbt.addFallbackResources(ret, namespace);

2
src/main/java/io/gitlab/jfronny/respackopts/filters/conditions/ResourcePackFilter.java
View File

@ -1,8 +1,8 @@
package io.gitlab.jfronny.respackopts.filters.conditions;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.filters.FileOpenProvider;
import io.gitlab.jfronny.respackopts.data.Rpo;
import io.gitlab.jfronny.respackopts.filters.FileOpenProvider;
import java.io.InputStream;
import java.io.InputStreamReader;

2
src/main/java/io/gitlab/jfronny/respackopts/filters/fallback/FallbackFilter.java
View File

@ -1,8 +1,8 @@
package io.gitlab.jfronny.respackopts.filters.fallback;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.filters.FileOpenProvider;
import io.gitlab.jfronny.respackopts.data.Rpo;
import io.gitlab.jfronny.respackopts.filters.FileOpenProvider;
import net.minecraft.resource.ResourceNotFoundException;
import net.minecraft.util.Identifier;

2
src/main/java/io/gitlab/jfronny/respackopts/gson/LegacyConfigDeserializer.java
View File

@ -3,10 +3,10 @@ package io.gitlab.jfronny.respackopts.gson;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import io.gitlab.jfronny.respackopts.data.LegacyConfig;
import io.gitlab.jfronny.respackopts.data.entry.ConfigBooleanEntry;
import io.gitlab.jfronny.respackopts.data.entry.ConfigBranch;
import io.gitlab.jfronny.respackopts.data.entry.ConfigNumericEntry;
import io.gitlab.jfronny.respackopts.data.LegacyConfig;
import java.util.Map;

6
src/main/java/io/gitlab/jfronny/respackopts/gui/GuiFactory.java
View File

@ -1,10 +1,10 @@
package io.gitlab.jfronny.respackopts.gui;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.data.entry.*;
import io.gitlab.jfronny.respackopts.gui.abstractions.JfConfigCategory;
import io.gitlab.jfronny.respackopts.gui.abstractions.JfConfigCategoryPrimary;
import io.gitlab.jfronny.respackopts.gui.abstractions.JfConfigCategorySub;
import io.gitlab.jfronny.respackopts.data.entry.*;
import me.shedaniel.clothconfig2.api.ConfigBuilder;
import me.shedaniel.clothconfig2.api.ConfigCategory;
import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
@ -13,7 +13,9 @@ import me.shedaniel.clothconfig2.impl.builders.DropdownMenuBuilder;
import me.shedaniel.clothconfig2.impl.builders.SubCategoryBuilder;
import net.minecraft.client.gui.screen.FatalErrorScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.*;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Language;
import java.util.Map;

2
src/main/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java
View File

@ -3,8 +3,8 @@ package io.gitlab.jfronny.respackopts.integration;
import grondag.frex.FrexInitializer;
import grondag.frex.api.config.ShaderConfig;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.data.entry.ConfigBranch;
import io.gitlab.jfronny.respackopts.data.RpoError;
import io.gitlab.jfronny.respackopts.data.entry.ConfigBranch;
import net.minecraft.util.Identifier;
import java.util.Map;

1
src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackEntryMixin.java
View File

@ -7,7 +7,6 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.screen.pack.PackListWidget;
import net.minecraft.client.gui.screen.pack.ResourcePackOrganizer;
import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.Final;

6
src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java
View File

@ -1,9 +1,11 @@
package io.gitlab.jfronny.respackopts.mixin;
import com.google.gson.*;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import io.gitlab.jfronny.respackopts.Respackopts;
import io.gitlab.jfronny.respackopts.data.entry.SyncMode;
import io.gitlab.jfronny.respackopts.data.Respackmeta;
import io.gitlab.jfronny.respackopts.data.entry.SyncMode;
import net.minecraft.resource.ResourcePackManager;
import net.minecraft.resource.ResourcePackProfile;
import net.minecraft.resource.ResourceType;

6
src/main/java/io/gitlab/jfronny/respackopts/mixin/conditions/DirectoryResourcePackMixin.java
View File

@ -11,7 +11,9 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.io.*;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
import java.util.Set;
import java.util.function.Predicate;
@ -42,6 +44,6 @@ public abstract class DirectoryResourcePackMixin extends AbstractFileResourcePac
@Inject(at = @At("TAIL"), method = "findResources(Lnet/minecraft/resource/ResourceType;Ljava/lang/String;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection;")
private void findResources(ResourceType type, String namespace, String prefix, int maxDepth, Predicate<String> pathFilter, CallbackInfoReturnable<Collection<Identifier>> info) {
rpo$filter.findResources(type, namespace, prefix, maxDepth, pathFilter, info);
rpo$filter.findResources(namespace, info);
}
}

6
src/main/java/io/gitlab/jfronny/respackopts/mixin/conditions/ZipResourcePackMixin.java
View File

@ -11,7 +11,9 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.io.*;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
import java.util.Set;
import java.util.function.Predicate;
@ -42,6 +44,6 @@ public abstract class ZipResourcePackMixin extends AbstractFileResourcePack {
@Inject(at = @At("TAIL"), method = "findResources(Lnet/minecraft/resource/ResourceType;Ljava/lang/String;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection;")
private void findResources(ResourceType type, String namespace, String prefix, int maxDepth, Predicate<String> pathFilter, CallbackInfoReturnable<Collection<Identifier>> info) {
rpo$filter.findResources(type, namespace, prefix, maxDepth, pathFilter, info);
rpo$filter.findResources(namespace, info);
}
}

5
src/main/resources/respackopts.mixins.json
View File

@ -4,12 +4,13 @@
"package": "io.gitlab.jfronny.respackopts.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [
"conditions.DirectoryResourcePackMixin",
"conditions.ZipResourcePackMixin"
],
"client": [
"OptionsScreenMixin",
"ResourcePackEntryMixin",
"ResourcePackManagerMixin",
"ResourcePackConditionMixin"
"ResourcePackManagerMixin"
],
"injectors": {
"defaultRequire": 1