PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-16 17:44:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Have forge config use the right class

Browse source
This commit is contained in:
Matthew Messinger 2019-03-24 19:35:41 -04:00
parent e30cf4cb3e
commit 4e069637a7
2 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/fml/java/com/minelittlepony/client/Config.java
View file

@ -2,16 +2,13 @@ package com.minelittlepony.client;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import com.minelittlepony.client.settings.ClientPonyConfig; import com.minelittlepony.client.settings.ClientPonyConfig;
import java.io.File; import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.nio.file.Files;
import java.io.OutputStreamWriter; import java.nio.file.Path;
class Config extends ClientPonyConfig { class Config extends ClientPonyConfig {
static final Gson gson = new GsonBuilder() static final Gson gson = new GsonBuilder()
@ -19,19 +16,16 @@ class Config extends ClientPonyConfig {
.excludeFieldsWithoutExposeAnnotation() .excludeFieldsWithoutExposeAnnotation()
.create(); .create();
private final File configFile; private final Path configFile;
Config(File file) { Config(Path file) {
configFile = file; configFile = file;
} }
@Override @Override
public void save() { public void save() {
if (configFile.exists()) {
configFile.delete();
}
try (JsonWriter writer = new JsonWriter(new OutputStreamWriter(new FileOutputStream(configFile)))) { try (JsonWriter writer = new JsonWriter(Files.newBufferedWriter(configFile))) {
writer.setIndent(" "); writer.setIndent(" ");
gson.toJson(this, Config.class, writer); gson.toJson(this, Config.class, writer);
@ -40,12 +34,12 @@ class Config extends ClientPonyConfig {
} }
} }
static Config of(File file) { static Config of(Path file) {
Config result = null; Config result = null;
if (file.exists()) { if (Files.exists(file)) {
try (FileInputStream s = new FileInputStream(file)) { try (BufferedReader s = Files.newBufferedReader(file)) {
result = gson.fromJson(new JsonReader(new InputStreamReader(s)), Config.class); result = gson.fromJson(s, Config.class);
} catch (IOException ignored) { } catch (IOException ignored) {
result = null; result = null;
} }

13
src/fml/java/com/minelittlepony/client/ForgeModMineLittlePony.java
View file

@ -14,11 +14,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLPaths;
import com.minelittlepony.client.IModUtilities;
import com.minelittlepony.client.MineLPClient;
import java.io.File;
@Mod("minelittlepony") @Mod("minelittlepony")
public class ForgeModMineLittlePony implements IModUtilities { public class ForgeModMineLittlePony implements IModUtilities {
@ -33,12 +29,7 @@ public class ForgeModMineLittlePony implements IModUtilities {
private void init(final FMLCommonSetupEvent event) { private void init(final FMLCommonSetupEvent event) {
// TODO: I don't know what forge did with `event.getModConfigurationDirectory()` but it's not where it used to be. mlp.init(Config.of(FMLPaths.CONFIGDIR.get().resolve("minelittlepony.json")));
File configDirectory = new File(Minecraft.getInstance().getFileResourcePacks().getParentFile(), "config");
File configFile = new File(configDirectory, "minelittlepony.json");
mlp.init(Config.of(configFile));
} }
private void posInit(FMLClientSetupEvent event) { private void posInit(FMLClientSetupEvent event) {