Skip to content

Commit 655cf89

Browse files
committed
remove type and fix some stuff
1 parent 5c49f4f commit 655cf89

File tree

6 files changed

+6
-41
lines changed

6 files changed

+6
-41
lines changed

src/main/java/net/oceanias/opal/setting/OSetting.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,4 @@ protected OSetting(final String pretty, final T initial) {
3636
public void reset() {
3737
this.value = initial;
3838
}
39-
40-
public abstract Type type();
41-
42-
public enum Type {
43-
BOOLEAN,
44-
CHOICE,
45-
DOUBLE,
46-
INTEGER,
47-
STRING,
48-
}
4939
}

src/main/java/net/oceanias/opal/setting/impl/OBooleanSetting.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,8 @@ public OBooleanSetting(final String pretty, final boolean initial) {
2323
super(pretty, initial);
2424
}
2525

26-
@Override
27-
public Type type() {
28-
return Type.BOOLEAN;
29-
}
30-
3126
@RequiredArgsConstructor
32-
public static final class Item extends AbstractItem {
27+
public static class Item extends AbstractItem {
3328
private final OBooleanSetting setting;
3429

3530
@Override

src/main/java/net/oceanias/opal/setting/impl/OChoiceSetting.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,8 @@ public void value(final T value) {
4444
this.value = value;
4545
}
4646

47-
@Override
48-
public Type type() {
49-
return Type.CHOICE;
50-
}
51-
5247
@RequiredArgsConstructor
53-
public static final class Item<T> extends AbstractItem {
48+
public static class Item<T> extends AbstractItem {
5449
private final OChoiceSetting<T> setting;
5550

5651
@Override
@@ -71,7 +66,7 @@ public ItemProvider getItemProvider(final Player viewer) {
7166

7267
lore.add("&fCurrent: &6" + setting.value);
7368
lore.add("");
74-
lore.add("&fChoices:");
69+
lore.add("&eChoices:");
7570

7671
for (final T choice : setting.choices) {
7772
final String colour = choice.equals(setting.value) ? "&a" : "&7";

src/main/java/net/oceanias/opal/setting/impl/ODoubleSetting.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,7 @@ public void value(Double value) {
4747
this.value = value;
4848
}
4949

50-
@Override
51-
public Type type() {
52-
return Type.DOUBLE;
53-
}
54-
55-
public class Item extends AbstractItem {
50+
public static class Item extends AbstractItem {
5651
private final ODoubleSetting setting;
5752
private final double change;
5853

src/main/java/net/oceanias/opal/setting/impl/OIntegerSetting.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,7 @@ public void value(Integer value) {
4747
this.value = value;
4848
}
4949

50-
@Override
51-
public Type type() {
52-
return Type.INTEGER;
53-
}
54-
55-
public class Item extends AbstractItem {
50+
public static class Item extends AbstractItem {
5651
private final OIntegerSetting setting;
5752
private final int change;
5853

src/main/java/net/oceanias/opal/setting/impl/OStringSetting.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,8 @@ public void value(String value) {
6262
this.value = value;
6363
}
6464

65-
@Override
66-
public Type type() {
67-
return Type.STRING;
68-
}
69-
7065
@RequiredArgsConstructor
71-
public static final class Item extends AbstractItem {
66+
public static class Item extends AbstractItem {
7267
private final OStringSetting setting;
7368

7469
@Override

0 commit comments

Comments
 (0)