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

Do not load old data, fix a few bugs

Browse Source
This commit is contained in:
JFronny 2020-12-20 22:28:25 +01:00
parent 60b40ca1cf
commit 6535d74867
7 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -6,7 +6,7 @@ minecraft_version=1.16.4
yarn_mappings=1.16.4+build.7
loader_version=0.10.8
# Mod Properties
mod_version=1.1
mod_version=1.1.2
maven_group=io.gitlab.jfronny
archives_base_name=respackopts
# Dependencies

6
run/resourcepacks/lumi/assets/minecraft/lang/en_us.json
View File

@ -1,13 +1,7 @@
{
"respackopts.title.lumi": "Lumi Lights",
"respackopts.field.lumi.tonemap": "Tonemap mode",
"respackopts.field.lumi.tonemap.default": "Default",
"respackopts.field.lumi.tonemap.vibrant": "Vibrant",
"respackopts.field.lumi.tonemap.film": "Film",
"respackopts.field.lumi.pbr": "Enable PBR",
"respackopts.field.lumi.debugMode": "Debug Mode",
"respackopts.field.lumi.debugMode.none": "Disable",
"respackopts.field.lumi.debugMode.normal": "Render normals",
"respackopts.field.lumi.debugMode.viewDir": "Render view direction",
"respackopts.field.lumi.waterVertexWavy": "Wavy water model"
}

4
run/resourcepacks/lumi/assets/respackopts/conf.json
View File

@ -13,6 +13,8 @@
"normal",
"viewDir"
],
"waterVertexWavy": false
"waterVertexWavy": false,
"stringTest": "this is a string",
"numTest": 15.4
}
}

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

@ -85,7 +85,7 @@ public class GuiFactory {
}
i++;
}
config.addEntry(entryBuilder.startDropdownMenu(getText(n, b), (DropdownBoxEntry.SelectionTopCellElement) DropdownMenuBuilder.TopCellElementBuilder.of(sel, (s) -> s, (s) -> getText(s, b + "." + n)), new DropdownBoxEntry.DefaultSelectionCellCreator())
config.addEntry(entryBuilder.startDropdownMenu(getText(n, b), (DropdownBoxEntry.SelectionTopCellElement) DropdownMenuBuilder.TopCellElementBuilder.of(sel, (s) -> s, (s) -> new LiteralText(s)), new DropdownBoxEntry.DefaultSelectionCellCreator())
.setSuggestionMode(false)
.setDefaultValue(ev.first())
.setSelections(() -> ev.iterator())

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

@ -79,12 +79,30 @@ public class Respackopts implements ClientModInitializer {
Reader reader = Files.newBufferedReader(q);
Config c = g.fromJson(reader, Config.class);
reader.close();
if (c.bools != null)
boolVals.put(id, c.bools);
if (c.doubles != null)
numVals.put(id, c.doubles);
if (c.strings != null)
strVals.put(id, c.strings);
if (c.bools != null) {
boolVals.get(id).forEach((i, val) -> {
if (c.bools.containsKey(i)) {
boolVals.get(id).put(i, c.bools.get(i));
} else
System.out.println("Could not find bool " + i + " in " + id);
});
}
if (c.doubles != null) {
numVals.get(id).forEach((i, val) -> {
if (c.doubles.containsKey(i)) {
numVals.get(id).put(i, c.doubles.get(i));
} else
System.out.println("Could not find num " + i + " in " + id);
});
}
if (c.strings != null) {
strVals.get(id).forEach((i, val) -> {
if (c.strings.containsKey(i)) {
strVals.get(id).put(i, c.strings.get(i));
} else
System.out.println("Could not find str " + i + " in " + id);
});
}
} catch (IOException e) {
e.printStackTrace();
}

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

@ -9,6 +9,7 @@ import net.minecraft.util.Identifier;
import java.util.concurrent.atomic.AtomicInteger;
public class FrexCompat implements FrexInitializer {
boolean initial = true;
@Override
public void onInitalizeFrex() {
ShaderConfig.registerShaderConfigSupplier(new Identifier(Respackopts.ID, "config_supplier"), () -> {
@ -53,11 +54,12 @@ public class FrexCompat implements FrexInitializer {
System.out.println("[respackopts] enabled frex/canvas support");
Respackopts.saveActions.add(() -> {
try {
ShaderConfig.invalidateShaderConfig();
if (!initial)
ShaderConfig.invalidateShaderConfig();
initial = false;
}
catch (Throwable e) {
if (FabricLoader.getInstance().isDevelopmentEnvironment())
e.printStackTrace();
e.printStackTrace();
}
});
}

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

@ -29,6 +29,7 @@ public class ResourcePackManagerMixin {
profiles.forEach((s, v) -> {
if (hasMetadata(v, "conf.json")) {
try {
boolean overwriteData = false;
Respackmeta conf = Respackopts.g.fromJson(readMetadata(v, "conf.json", Respackopts.g), Respackmeta.class);
if (!Respackopts.boolVals.containsKey(conf.id))
Respackopts.boolVals.put(conf.id, new HashMap<>());
@ -39,8 +40,8 @@ public class ResourcePackManagerMixin {
if (!Respackopts.enumKeys.containsKey(conf.id))
Respackopts.enumKeys.put(conf.id, new HashMap<>());
if (Respackopts.metaVersion.equals(conf.version)) {
overwriteData |= !Respackopts.resPackMetas.containsKey(v.getDisplayName().asString());
Respackopts.resPackMetas.put(v.getDisplayName().asString(), conf);
Respackopts.load(conf.id);
}
else {
System.err.println(s + " was not loaded as it specifies a different respackopts version than is installed");
@ -98,6 +99,9 @@ public class ResourcePackManagerMixin {
System.err.println("[respackopts] Unsupported non-primitive datatype");
}
}
if (overwriteData) {
Respackopts.load(conf.id);
}
} catch (Throwable e) {
e.printStackTrace();
}