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

Merge branch 'master' of https://github.com/paulevsGitch/BetterEnd.git

Browse source
This commit is contained in:
paulevsGitch 2020-12-31 05:57:05 +03:00
commit 82fa9b1047
14 changed files with 189 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/ru/betterend/config/Config.java
View file

@ -2,8 +2,6 @@ package ru.betterend.config;
import org.jetbrains.annotations.Nullable;
import com.google.gson.JsonObject;
import ru.betterend.BetterEnd;
import ru.betterend.config.ConfigKeeper.BooleanEntry;
import ru.betterend.config.ConfigKeeper.Entry;
@ -15,20 +13,16 @@ import ru.betterend.config.ConfigKeeper.StringEntry;
public abstract class Config {
protected final ConfigKeeper keeper;
protected final ConfigWriter writer;
protected abstract void registerEntries();
public Config(String group) {
this.writer = new ConfigWriter(group);
JsonObject settings = writer.load();
this.keeper = new ConfigKeeper(settings);
this.keeper = new ConfigKeeper(group);
this.registerEntries();
this.writer.save();
}
public void saveChanges() {
this.writer.save();
this.keeper.save();
}
@Nullable

137
src/main/java/ru/betterend/config/ConfigKeeper.java
View file

@ -9,7 +9,6 @@ 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.JsonHelper;
@ -18,15 +17,27 @@ import ru.betterend.util.JsonFactory;
public final class ConfigKeeper {
private Map<ConfigKey, Entry<?>> configEntries = Maps.newHashMap();
private final JsonObject configObject;
public ConfigKeeper(JsonObject config) {
this.configObject = config;
private final JsonObject configObject;
private final ConfigWriter writer;
private boolean changed = false;
public ConfigKeeper(String group) {
this.writer = new ConfigWriter(group);
this.configObject = writer.load();
}
private <T, E extends Entry<T>> void storeValue(ConfigKey key, E entry, T value) {
if (configObject == null) return;
public void save() {
if (!changed) return;
this.writer.save();
this.changed = false;
}
private <T, E extends Entry<T>> void initializeEntry(ConfigKey key, E entry) {
if (configObject == null) {
return;
}
String group = key.getOwner();
JsonObject jsonGroup;
if (configObject.has(group)) {
@ -45,33 +56,24 @@ public final class ConfigKeeper {
}
String paramKey = key.getEntry();
paramKey += " [default: " + entry.getDefault() + "]";
entry.toJson(jsonCategory, paramKey, value);
this.changed = entry.setLocation(jsonCategory, paramKey);
}
private <T, E extends Entry<T>> T getValue(ConfigKey key, E entry) {
private <T, E extends Entry<T>> void storeValue(E entry, T value) {
if (configObject == null) {
return entry.getDefault();
return;
}
T val = entry.getValue();
if (value.equals(val)) return;
entry.toJson(value);
this.changed = true;
}
String group = key.getOwner();
if (!configObject.has(group)) {
private <T, E extends Entry<T>> T getValue(E entry) {
if (!entry.hasLocation()) {
return entry.getDefault();
}
JsonObject jsonGroup = JsonHelper.getObject(configObject, group);
String category = key.getCategory();
if (!jsonGroup.has(category)) {
return entry.getDefault();
}
JsonObject jsonCategory = JsonHelper.getObject(jsonGroup, category);
String paramKey = key.getEntry();
paramKey += " [default: " + entry.getDefault() + "]";
if (!jsonCategory.has(paramKey)) {
return entry.getDefault();
}
return entry.fromJson(jsonCategory.get(paramKey));
return entry.fromJson();
}
@Nullable
@ -93,9 +95,9 @@ public final class ConfigKeeper {
}
public <T, E extends Entry<T>> E registerEntry(ConfigKey key, E entry) {
entry.setWriter(value -> this.storeValue(key, entry, value));
entry.setReader(() -> { return this.getValue(key, entry); });
this.storeValue(key, entry, entry.getValue());
entry.setWriter(value -> this.storeValue(entry, value));
entry.setReader(() -> { return this.getValue(entry); });
this.initializeEntry(key, entry);
this.configEntries.put(key, entry);
return entry;
}
@ -107,13 +109,13 @@ public final class ConfigKeeper {
}
@Override
public Boolean fromJson(JsonElement json) {
return json.getAsBoolean();
public Boolean fromJson() {
return JsonHelper.getBoolean(location, key, defaultValue);
}
@Override
public void toJson(JsonObject json, String key, Boolean value) {
json.addProperty(key, value);
public void toJson(Boolean value) {
this.location.addProperty(key, value);
}
}
@ -124,13 +126,13 @@ public final class ConfigKeeper {
}
@Override
public Float fromJson(JsonElement json) {
return json.getAsFloat();
public Float fromJson() {
return JsonHelper.getFloat(location, key, defaultValue);
}
@Override
public void toJson(JsonObject json, String key, Float value) {
json.addProperty(key, value);
public void toJson(Float value) {
this.location.addProperty(key, value);
}
}
@ -141,13 +143,13 @@ public final class ConfigKeeper {
}
@Override
public Float fromJson(JsonElement json) {
return json.getAsFloat();
public Float fromJson() {
return JsonHelper.getFloat(location, key, defaultValue);
}
@Override
public void toJson(JsonObject json, String key, Float value) {
json.addProperty(key, value);
public void toJson(Float value) {
this.location.addProperty(key, value);
}
}
@ -163,13 +165,13 @@ public final class ConfigKeeper {
}
@Override
public Integer fromJson(JsonElement json) {
return json.getAsInt();
public Integer fromJson() {
return JsonHelper.getInt(location, key, defaultValue);
}
@Override
public void toJson(JsonObject json, String key, Integer value) {
json.addProperty(key, value);
public void toJson(Integer value) {
this.location.addProperty(key, value);
}
}
@ -180,13 +182,13 @@ public final class ConfigKeeper {
}
@Override
public Integer fromJson(JsonElement json) {
return json.getAsInt();
public Integer fromJson() {
return JsonHelper.getInt(location, key, defaultValue);
}
@Override
public void toJson(JsonObject json, String key, Integer value) {
json.addProperty(key, value);
public void toJson(Integer value) {
this.location.addProperty(key, value);
}
}
@ -197,13 +199,13 @@ public final class ConfigKeeper {
}
@Override
public String fromJson(JsonElement json) {
return json.getAsString();
public String fromJson() {
return JsonHelper.getString(location, key, defaultValue);
}
@Override
public void toJson(JsonObject json, String key, String value) {
json.addProperty(key, value);
public void toJson(String value) {
this.location.addProperty(key, value);
}
}
@ -226,13 +228,13 @@ public final class ConfigKeeper {
}
@Override
public T fromJson(JsonElement json) {
return JsonFactory.GSON.fromJson(json, type);
public T fromJson() {
return JsonFactory.GSON.fromJson(location.get(key), type);
}
@Override
public void toJson(JsonObject json, String key, T value) {
json.addProperty(key, JsonFactory.GSON.toJson(json, type));
public void toJson(T value) {
location.addProperty(key, JsonFactory.GSON.toJson(value, type));
}
}
@ -265,9 +267,11 @@ public final class ConfigKeeper {
protected final T defaultValue;
protected Consumer<T> writer;
protected Supplier<T> reader;
protected JsonObject location;
protected String key;
public abstract T fromJson(JsonElement json);
public abstract void toJson(JsonObject json, String key, T value);
public abstract T fromJson();
public abstract void toJson(T value);
public Entry (T defaultValue) {
this.defaultValue = defaultValue;
@ -281,6 +285,21 @@ public final class ConfigKeeper {
this.reader = reader;
}
protected boolean setLocation(JsonObject location, String key) {
this.location = location;
this.key = key;
if (!location.has(key)) {
this.toJson(defaultValue);
return true;
}
return false;
}
protected boolean hasLocation() {
return this.location != null &&
this.key != null;
}
public T getValue() {
return this.reader.get();
}

12
src/main/java/ru/betterend/config/Configs.java
View file

@ -1,17 +1,17 @@
package ru.betterend.config;
public class Configs {
public static final IdConfig ITEM_CONFIG = new CategoryConfig("items");
public static final IdConfig BLOCK_CONFIG = new CategoryConfig("blocks");
public static final IdConfig ENTITY_CONFIG = new CategoryConfig("entities");
public static final IdConfig BLOCK_CONFIG = new CategoryConfig("blocks");
public static final SimpleConfig GENERAL = new SimpleConfig("settings");
public static final IdConfig ITEM_CONFIG = new CategoryConfig("items");
public static final IdConfig BIOME_CONFIG = new EntryConfig("biomes");
public static final SimpleConfig GENERATOR_CONFIG = new SimpleConfig("generator");
public static void saveConfigs() {
ITEM_CONFIG.saveChanges();
ENTITY_CONFIG.saveChanges();
BLOCK_CONFIG.saveChanges();
BIOME_CONFIG.saveChanges();
ENTITY_CONFIG.saveChanges();
GENERATOR_CONFIG.save();
ITEM_CONFIG.saveChanges();
GENERAL.saveChanges();
}
}

260
src/main/java/ru/betterend/config/SimpleConfig.java
View file

@ -1,256 +1,88 @@
package ru.betterend.config;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Reader;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import org.jetbrains.annotations.Nullable;
import ru.betterend.BetterEnd;
import ru.betterend.config.ConfigKeeper.Entry;
import ru.betterend.config.ConfigKeeper.FloatRange;
import ru.betterend.config.ConfigKeeper.IntegerRange;
public final class SimpleConfig {
private boolean rewrite = false;
private final String name;
private JsonObject config;
public class SimpleConfig extends Config {
public SimpleConfig(String name) {
this.name = name;
public SimpleConfig(String group) {
super(group);
}
private void load() {
if (config == null) {
File file = getFolder();
if (!file.exists())
file.mkdirs();
file = getFile();
if (file.exists()) {
Gson gson = new Gson();
try {
Reader reader = new FileReader(file);
config = gson.fromJson(reader, JsonObject.class);
if (config == null) {
config = new JsonObject();
rewrite = true;
}
else {
rewrite = false;
}
}
catch (FileNotFoundException e) {
e.printStackTrace();
config = new JsonObject();
rewrite = true;
}
}
else {
config = new JsonObject();
rewrite = true;
}
}
@Override
protected void registerEntries() {}
protected ConfigKey createKey(String category, String key) {
return new ConfigKey(BetterEnd.MOD_ID, category, key);
}
public void save() {
if (rewrite) {
File file = getFolder();
if (!file.exists())
file.mkdirs();
file = getFile();
Gson gson = new GsonBuilder().setPrettyPrinting().create();
try {
FileWriter writer = new FileWriter(file);
String gstring = gson.toJson(config);
writer.write(gstring);
writer.flush();
writer.close();
rewrite = false;
}
catch (IOException e) {
e.printStackTrace();
}
}
@Nullable
public <T, E extends Entry<T>> E getEntry(String category, String key, Class<E> type) {
return this.getEntry(createKey(category, key), type);
}
private File getFile() {
return new File(String.format("./config/%s/%s.json", BetterEnd.MOD_ID, name));
@Nullable
public <T, E extends Entry<T>> T getDefault(String category, String key, Class<E> type) {
return this.getDefault(createKey(category, key), type);
}
private File getFolder() {
return new File("./config/" + BetterEnd.MOD_ID + "/");
public String getString(String category, String key, String defaultValue) {
return this.getString(createKey(category, key), defaultValue);
}
public boolean getBoolean(String groups, String name, boolean def) {
load();
name += "[def: " + def + "]";
JsonObject group = getGroup(groups);
JsonElement element = group.get(name);
if (element != null) {
return element.getAsBoolean();
}
else {
group.addProperty(name, def);
rewrite = true;
return def;
}
public String getString(String category, String key) {
return this.getString(createKey(category, key));
}
public void setBoolean(String groups, String name, boolean def, boolean value) {
name += "[def: " + def + "]";
JsonObject group = getGroup(groups);
group.addProperty(name, value);
rewrite = true;
public boolean setString(String category, String key, String value) {
return this.setString(createKey(category, key), value);
}
public float getFloat(String groups, String name, float def) {
load();
name += "[def: " + def + "]";
JsonObject group = getGroup(groups);
JsonElement element = group.get(name);
if (element != null) {
return element.getAsFloat();
}
else {
group.addProperty(name, def);
rewrite = true;
return def;
}
public int getInt(String category, String key, int defaultValue) {
return this.getInt(createKey(category, key), defaultValue);
}
public void setFloat(String groups, String name, float def, float value) {
name += "[def: " + def + "]";
JsonObject group = getGroup(groups);
group.addProperty(name, value);
rewrite = true;
public int getInt(String category, String key) {
return this.getInt(createKey(category, key));
}
public int getInt(String groups, String name, int def) {
load();
name += "[def: " + def + "]";
JsonObject group = getGroup(groups);
JsonElement element = group.get(name);
if (element != null) {
return element.getAsInt();
}
else {
group.addProperty(name, def);
rewrite = true;
return def;
}
public boolean setInt(String category, String key, int value) {
return this.setInt(createKey(category, key), value);
}
public String getString(String groups, String name, String def) {
load();
name += "[def: " + def + "]";
JsonObject group = getGroup(groups);
JsonElement element = group.get(name);
if (element != null) {
return element.getAsString();
}
else {
group.addProperty(name, def);
rewrite = true;
return def;
}
public boolean setRangedInt(String category, String key, int value) {
return this.setRanged(createKey(category, key), value, IntegerRange.class);
}
public void setInt(String groups, String name, int def, int value) {
name += "[def: " + def + "]";
JsonObject group = getGroup(groups);
group.addProperty(name, value);
rewrite = true;
public boolean setRangedFloat(String category, String key, float value) {
return this.setRanged(createKey(category, key), value, FloatRange.class);
}
public void setStringLoad(String groups, String name, String value) {
JsonObject group = getGroup(groups);
group.addProperty(name, value);
public float getFloat(String category, String key, float defaultValue) {
return this.getFloat(createKey(category, key), defaultValue);
}
public String[] getStringArray(String groups, String name, String[] def) {
load();
JsonObject group = getGroup(groups);
JsonElement element = group.get(name);
if (element != null) {
return toStringArray(element.getAsJsonArray());
}
else {
group.add(name, toJsonArray(def));
rewrite = true;
return def;
}
public float getFloat(String category, String key) {
return this.getFloat(createKey(category, key));
}
private String[] toStringArray(JsonArray array) {
load();
String[] result = new String[array.size()];
for (int i = 0; i < array.size(); i++)
result[i] = array.get(i).getAsString();
return result;
public boolean setFloat(String category, String key, float value) {
return this.setFloat(createKey(category, key), value);
}
private JsonArray toJsonArray(String[] array) {
load();
JsonArray result = new JsonArray();
for (String s : array)
result.add(s);
return result;
public boolean getBoolean(String category, String key, boolean defaultValue) {
return this.getBoolean(createKey(category, key), defaultValue);
}
public JsonObject getGroup(String groups) {
JsonObject obj = config;
String[] groupsArr = groups.split("\\.");
for (String group : groupsArr) {
JsonObject jGroup = obj.getAsJsonObject(group);
if (jGroup == null) {
jGroup = new JsonObject();
obj.add(group, jGroup);
}
obj = jGroup;
}
return obj;
public boolean getBoolean(String category, String key) {
return this.getBoolean(createKey(category, key));
}
public List<String> getBaseGroups() {
List<String> groups = new ArrayList<String>();
Iterator<Entry<String, JsonElement>> iterator = config.entrySet().iterator();
iterator.forEachRemaining((element) -> {
groups.add(element.getKey());
});
return groups;
}
public List<Entry<String, JsonElement>> getGroupMembers(JsonObject group) {
List<Entry<String, JsonElement>> result = new ArrayList<Entry<String, JsonElement>>();
result.addAll(group.entrySet());
return result;
}
public void markToSave() {
rewrite = true;
public boolean setBoolean(String category, String key, boolean value) {
return this.setBoolean(createKey(category, key), value);
}
}

2
src/main/java/ru/betterend/compat/rei/REIAlloyingCategory.java → src/main/java/ru/betterend/integration/rei/REIAlloyingCategory.java
View file

@ -1,4 +1,4 @@
package ru.betterend.compat.rei;
package ru.betterend.integration.rei;
import java.text.DecimalFormat;
import java.util.List;

2
src/main/java/ru/betterend/compat/rei/REIAlloyingDisplay.java → src/main/java/ru/betterend/integration/rei/REIAlloyingDisplay.java
View file

@ -1,4 +1,4 @@
package ru.betterend.compat.rei;
package ru.betterend.integration.rei;
import java.util.Collections;
import java.util.List;

2
src/main/java/ru/betterend/compat/rei/REIAnvilCategory.java → src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java
View file

@ -1,4 +1,4 @@
package ru.betterend.compat.rei;
package ru.betterend.integration.rei;
import java.util.Collections;
import java.util.List;

2
src/main/java/ru/betterend/compat/rei/REIAnvilDisplay.java → src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java
View file

@ -1,4 +1,4 @@
package ru.betterend.compat.rei;
package ru.betterend.integration.rei;
import java.util.Collections;
import java.util.List;

2
src/main/java/ru/betterend/compat/rei/REIContainer.java → src/main/java/ru/betterend/integration/rei/REIContainer.java
View file

@ -1,4 +1,4 @@
package ru.betterend.compat.rei;
package ru.betterend.integration.rei;
import me.shedaniel.rei.plugin.containers.CraftingContainerInfoWrapper;
import me.shedaniel.rei.server.ContainerInfoHandler;

2
src/main/java/ru/betterend/compat/rei/REIInfusionCategory.java → src/main/java/ru/betterend/integration/rei/REIInfusionCategory.java
View file

@ -1,4 +1,4 @@
package ru.betterend.compat.rei;
package ru.betterend.integration.rei;
import java.util.List;

2
src/main/java/ru/betterend/compat/rei/REIInfusionDisplay.java → src/main/java/ru/betterend/integration/rei/REIInfusionDisplay.java
View file

@ -1,4 +1,4 @@
package ru.betterend.compat.rei;
package ru.betterend.integration.rei;
import java.util.Collections;
import java.util.List;

2
src/main/java/ru/betterend/compat/rei/REIPlugin.java → src/main/java/ru/betterend/integration/rei/REIPlugin.java
View file

@ -1,4 +1,4 @@
package ru.betterend.compat.rei;
package ru.betterend.integration.rei;
import me.shedaniel.rei.api.EntryStack;
import me.shedaniel.rei.api.RecipeHelper;

4
src/main/java/ru/betterend/world/generator/TerrainGenerator.java
View file

@ -22,8 +22,8 @@ public class TerrainGenerator {
private static boolean noRingVoid;
public static void init() {
newGenerator = Configs.GENERATOR_CONFIG.getBoolean("generator", "useNewGenerator", false);
noRingVoid = Configs.GENERATOR_CONFIG.getBoolean("generator", "noRingVoid", false);
newGenerator = Configs.GENERAL.getBoolean("generator", "useNewGenerator", false);
noRingVoid = Configs.GENERAL.getBoolean("generator", "noRingVoid", false);
}
public static void initNoise(long seed) {

4
src/main/resources/fabric.mod.json
View file

@ -26,10 +26,10 @@
"ru.betterend.client.BetterEndClient"
],
"rei_plugins": [
"ru.betterend.compat.rei.REIPlugin"
"ru.betterend.integration.rei.REIPlugin"
],
"rei_containers": [
"ru.betterend.compat.rei.REIContainer"
"ru.betterend.integration.rei.REIContainer"
]
},
"mixins": [