Skip to content

Commit e9c8e8e

Browse files
committed
Fix mistakes
1 parent 6a09cbb commit e9c8e8e

File tree

10 files changed

+17
-24
lines changed

10 files changed

+17
-24
lines changed

src/main/java/org/visuals/legacy/lightconfig/lib/v1/Config.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
package org.visuals.legacy.lightconfig.lib.v1;
22

3-
import btw.lowercase.lightconfig.lib.v1.field.*;
4-
import com.google.gson.Gson;
5-
import com.google.gson.GsonBuilder;
6-
import com.google.gson.JsonElement;
7-
import com.google.gson.JsonObject;
3+
import com.google.gson.*;
84
import net.fabricmc.loader.api.ModContainer;
95
import net.minecraft.client.gui.screens.Screen;
106
import org.jetbrains.annotations.Nullable;
117
import org.slf4j.Logger;
128
import org.slf4j.LoggerFactory;
9+
import org.visuals.legacy.lightconfig.lib.v1.field.*;
1310

1411
import java.nio.file.Files;
1512
import java.nio.file.Path;
1613
import java.util.ArrayList;
1714
import java.util.List;
1815

1916
public abstract class Config {
20-
protected static final Gson GSON = new GsonBuilder().setPrettyPrinting().setLenient().create();
17+
protected static final Gson GSON = new GsonBuilder().setPrettyPrinting().setStrictness(Strictness.LENIENT).create();
2118
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
2219
protected final List<AbstractConfigField<?>> configFields = new ArrayList<>();
2320
protected final ModContainer modContainer;
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package org.visuals.legacy.lightconfig.lib.v1;
22

3+
// TODO
34
public class ConfigSerializer<T> {
45
public void read(T value) {
5-
66
}
77

88
public void write(T value) {
9-
109
}
1110
}

src/main/java/org/visuals/legacy/lightconfig/lib/v1/field/AbstractConfigField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.visuals.legacy.lightconfig.lib.v1.field;
22

3-
import btw.lowercase.lightconfig.lib.v1.Config;
43
import com.google.gson.JsonObject;
54
import net.minecraft.client.gui.components.AbstractWidget;
5+
import org.visuals.legacy.lightconfig.lib.v1.Config;
66

77
public abstract class AbstractConfigField<T> {
88
protected final Config config;

src/main/java/org/visuals/legacy/lightconfig/lib/v1/field/BooleanConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.visuals.legacy.lightconfig.lib.v1.field;
22

3-
import btw.lowercase.lightconfig.lib.ConfigTranslate;
4-
import btw.lowercase.lightconfig.lib.v1.Config;
53
import com.google.gson.JsonElement;
64
import com.google.gson.JsonObject;
75
import com.google.gson.JsonPrimitive;
86
import net.minecraft.client.gui.components.Button;
97
import net.minecraft.client.gui.components.Tooltip;
108
import net.minecraft.network.chat.Component;
9+
import org.visuals.legacy.lightconfig.lib.ConfigTranslate;
10+
import org.visuals.legacy.lightconfig.lib.v1.Config;
1111

1212
public class BooleanConfigField extends GenericConfigField<Boolean> {
1313
public BooleanConfigField(final Config config, final String name, final boolean defaultValue) {

src/main/java/org/visuals/legacy/lightconfig/lib/v1/field/EnumConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.visuals.legacy.lightconfig.lib.v1.field;
22

3-
import btw.lowercase.lightconfig.lib.ConfigTranslate;
4-
import btw.lowercase.lightconfig.lib.v1.Config;
53
import com.google.gson.JsonElement;
64
import com.google.gson.JsonObject;
75
import com.google.gson.JsonPrimitive;
86
import net.minecraft.client.gui.components.AbstractWidget;
97
import net.minecraft.client.gui.components.Button;
108
import net.minecraft.client.gui.components.Tooltip;
119
import net.minecraft.network.chat.Component;
10+
import org.visuals.legacy.lightconfig.lib.ConfigTranslate;
11+
import org.visuals.legacy.lightconfig.lib.v1.Config;
1212

1313
import java.util.Arrays;
1414
import java.util.Optional;

src/main/java/org/visuals/legacy/lightconfig/lib/v1/field/GenericConfigField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.visuals.legacy.lightconfig.lib.v1.field;
22

3-
import btw.lowercase.lightconfig.lib.v1.Config;
43
import com.google.gson.JsonObject;
54
import net.minecraft.client.gui.components.AbstractWidget;
5+
import org.visuals.legacy.lightconfig.lib.v1.Config;
66

77
public class GenericConfigField<T> extends AbstractConfigField<T> {
88
protected T value;

src/main/java/org/visuals/legacy/lightconfig/lib/v1/field/NumericConfigField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.visuals.legacy.lightconfig.lib.v1.field;
22

3-
import btw.lowercase.lightconfig.lib.v1.Config;
43
import com.google.gson.JsonElement;
54
import com.google.gson.JsonObject;
65
import com.google.gson.JsonPrimitive;
6+
import org.visuals.legacy.lightconfig.lib.v1.Config;
77

88
public class NumericConfigField<T extends Number> extends GenericConfigField<T> {
99
public NumericConfigField(final Config config, final String name, final T defaultValue) {

src/main/java/org/visuals/legacy/lightconfig/lib/v1/field/StringConfigField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.visuals.legacy.lightconfig.lib.v1.field;
22

3-
import btw.lowercase.lightconfig.lib.v1.Config;
43
import com.google.gson.JsonElement;
54
import com.google.gson.JsonObject;
65
import com.google.gson.JsonPrimitive;
6+
import org.visuals.legacy.lightconfig.lib.v1.Config;
77

88
public class StringConfigField extends GenericConfigField<String> {
99
public StringConfigField(final Config config, final String name, final String defaultValue) {

src/main/java/org/visuals/legacy/lightconfig/lib/v1/screen/ConfigScreenBuilder.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package org.visuals.legacy.lightconfig.lib.v1.screen;
22

3-
import btw.lowercase.lightconfig.lib.v1.Config;
4-
import btw.lowercase.optiboxes.config.OptiBoxesConfig;
5-
import btw.lowercase.optiboxes.config.OptiBoxesConfigScreen;
63
import net.minecraft.client.gui.screens.Screen;
74
import net.minecraft.network.chat.Component;
85
import org.jetbrains.annotations.Nullable;
6+
import org.visuals.legacy.lightconfig.lib.v1.Config;
97

108
public class ConfigScreenBuilder {
119
private final Config config;
@@ -27,7 +25,6 @@ public ConfigScreenBuilder setTitle(Component title) {
2725
}
2826

2927
public Screen build(@Nullable Screen parent) {
30-
return new OptiBoxesConfigScreen(parent, this.title, (OptiBoxesConfig) this.config);
31-
// TODO : return new ConfigScreen(this.title, this.config, parent);
28+
return new InternalConfigScreen(this.title, this.config, parent);
3229
}
3330
}

src/main/java/org/visuals/legacy/lightconfig/lib/v1/screen/ConfigScreen.java renamed to src/main/java/org/visuals/legacy/lightconfig/lib/v1/screen/InternalConfigScreen.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.visuals.legacy.lightconfig.lib.v1.screen;
22

3-
import btw.lowercase.lightconfig.lib.v1.Config;
43
import net.minecraft.client.gui.screens.Screen;
54
import net.minecraft.network.chat.Component;
5+
import org.visuals.legacy.lightconfig.lib.v1.Config;
66

7-
public class ConfigScreen extends Screen {
7+
public class InternalConfigScreen extends Screen {
88
private final Screen parent;
99
private final Config config;
1010

11-
public ConfigScreen(Component title, Config config, Screen parent) {
11+
public InternalConfigScreen(Component title, Config config, Screen parent) {
1212
super(title);
1313
this.parent = parent;
1414
this.config = config;

0 commit comments

Comments
 (0)