MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code style fix & version update

Browse source
This commit is contained in:
paulevsGitch 2021-07-19 21:41:07 +03:00
parent 6266b30088
commit 179ada3296
20 changed files with 392 additions and 427 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/ru/bclib/config/Config.java
View file

@ -1,7 +1,5 @@
package ru.bclib.config;
import java.io.File;
import org.jetbrains.annotations.Nullable;
import ru.bclib.BCLib;
import ru.bclib.config.ConfigKeeper.BooleanEntry;
@ -11,12 +9,14 @@ import ru.bclib.config.ConfigKeeper.IntegerEntry;
import ru.bclib.config.ConfigKeeper.RangeEntry;
import ru.bclib.config.ConfigKeeper.StringEntry;
import java.io.File;
public abstract class Config {
protected final ConfigKeeper keeper;
protected abstract void registerEntries();
public Config(String modID, String group){
public Config(String modID, String group) {
this(modID, group, null);
}

20
src/main/java/ru/bclib/config/ConfigKeeper.java
View file

@ -1,21 +1,19 @@
package ru.bclib.config;
import com.google.common.collect.Maps;
import com.google.common.reflect.TypeToken;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.util.GsonHelper;
import org.jetbrains.annotations.Nullable;
import ru.bclib.util.JsonFactory;
import java.io.File;
import java.lang.reflect.Type;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Supplier;
import org.jetbrains.annotations.Nullable;
import com.google.common.collect.Maps;
import com.google.common.reflect.TypeToken;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.util.GsonHelper;
import ru.bclib.util.JsonFactory;
public final class ConfigKeeper {
private final Map<ConfigKey, Entry<?>> configEntries = Maps.newHashMap();
private final JsonObject configObject;
@ -26,7 +24,7 @@ public final class ConfigKeeper {
public ConfigKeeper(String modID, String group) {
this(modID, group, null);
}
protected ConfigKeeper(String modID, String group, File path) {
this.writer = new ConfigWriter(modID, group, path);
this.configObject = writer.load();

4
src/main/java/ru/bclib/config/ConfigKey.java
View file

@ -1,9 +1,9 @@
package ru.bclib.config;
import java.util.Arrays;
import net.minecraft.resources.ResourceLocation;
import java.util.Arrays;
public class ConfigKey {
private final String path[];
private final String entry;

16
src/main/java/ru/bclib/config/ConfigWriter.java
View file

@ -1,14 +1,13 @@
package ru.bclib.config;
import java.io.File;
import java.nio.file.Path;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.fabricmc.loader.api.FabricLoader;
import ru.bclib.util.JsonFactory;
import java.io.File;
import java.nio.file.Path;
public class ConfigWriter {
private final static Path GAME_CONFIG_DIR = FabricLoader.getInstance().getConfigDir();
@ -18,14 +17,9 @@ public class ConfigWriter {
public ConfigWriter(String modID, String configFile) {
this(modID, configFile, null);
}
public ConfigWriter(String modID, String configFile, File configFolder) {
this.configFile = new File(
(configFolder==null
? GAME_CONFIG_DIR.resolve(modID).toFile()
: new File(configFolder, modID)),
configFile + ".json"
);
this.configFile = new File((configFolder == null ? GAME_CONFIG_DIR.resolve(modID).toFile() : new File(configFolder, modID)), configFile + ".json");
File parent = this.configFile.getParentFile();
if (!parent.exists()) {
parent.mkdirs();

2
src/main/java/ru/bclib/config/Configs.java
View file

@ -5,7 +5,7 @@ import ru.bclib.BCLib;
public class Configs {
public static final PathConfig MAIN_CONFIG = new PathConfig(BCLib.MOD_ID, "main");
public static final String MAIN_PATCH_CATEGORY = "patches";
public static final PathConfig RECIPE_CONFIG = new PathConfig(BCLib.MOD_ID, "recipes");
public static void save() {

6
src/main/java/ru/bclib/config/PathConfig.java
View file

@ -1,18 +1,18 @@
package ru.bclib.config;
import java.io.File;
import org.jetbrains.annotations.Nullable;
import ru.bclib.config.ConfigKeeper.Entry;
import ru.bclib.config.ConfigKeeper.FloatRange;
import ru.bclib.config.ConfigKeeper.IntegerRange;
import java.io.File;
public class PathConfig extends Config {
public PathConfig(String modID, String group) {
this(modID, group, null);
}
protected PathConfig(String modID, String group, File path) {
super(modID, group, path);
}

34
src/main/java/ru/bclib/config/SessionConfig.java
View file

@ -1,25 +1,25 @@
package ru.bclib.config;
import java.io.File;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.storage.LevelStorageSource;
import ru.bclib.BCLib;
public class SessionConfig extends PathConfig{
private static File getWorldFolder(LevelStorageSource.LevelStorageAccess session, ServerLevel world){
File dir = session.getDimensionPath(world.dimension());
if (!new File(dir, "level.dat").exists()) {
dir = dir.getParentFile();
}
return dir;
}
import java.io.File;
public final File levelFolder;
public SessionConfig(String modID, String group, LevelStorageSource.LevelStorageAccess session, ServerLevel world) {
super(modID, group, new File(getWorldFolder(session, world), BCLib.MOD_ID));
this.levelFolder = new File(getWorldFolder(session, world), BCLib.MOD_ID);
}
public class SessionConfig extends PathConfig {
private static File getWorldFolder(LevelStorageSource.LevelStorageAccess session, ServerLevel world) {
File dir = session.getDimensionPath(world.dimension());
if (!new File(dir, "level.dat").exists()) {
dir = dir.getParentFile();
}
return dir;
}
public final File levelFolder;
public SessionConfig(String modID, String group, LevelStorageSource.LevelStorageAccess session, ServerLevel world) {
super(modID, group, new File(getWorldFolder(session, world), BCLib.MOD_ID));
this.levelFolder = new File(getWorldFolder(session, world), BCLib.MOD_ID);
}
}