Skip to content

Commit 40d5dd2

Browse files
Remove environment annotations to match Fabric Loader 0.14.25 behaviour
1 parent 997e9df commit 40d5dd2

File tree

16 files changed

+272
-225
lines changed

16 files changed

+272
-225
lines changed

base/src/main/java/me/lortseam/completeconfig/api/ConfigGroup.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ default String getId() {
2121
*
2222
* @return a custom name translation key
2323
*/
24-
@Environment(EnvType.CLIENT)
2524
default String getNameKey() {
2625
return null;
2726
}
@@ -32,7 +31,6 @@ default String getNameKey() {
3231
*
3332
* @return a custom description translation key
3433
*/
35-
@Environment(EnvType.CLIENT)
3634
default String getDescriptionKey() {
3735
return null;
3836
}
@@ -51,7 +49,6 @@ default String getComment() {
5149
*
5250
* @return the background identifier
5351
*/
54-
@Environment(EnvType.CLIENT)
5552
default Identifier getBackground() {
5653
return null;
5754
}

base/src/main/java/me/lortseam/completeconfig/data/BooleanEntry.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515

1616
public class BooleanEntry extends Entry<Boolean> {
1717

18-
@Environment(EnvType.CLIENT)
1918
private Map<Boolean, TranslationKey> valueTranslations;
20-
@Environment(EnvType.CLIENT)
2119
@Getter
2220
private final boolean checkbox;
2321

@@ -26,7 +24,6 @@ public BooleanEntry(EntryOrigin origin) {
2624
checkbox = origin.isAnnotationPresent(ConfigEntry.Checkbox.class);
2725
}
2826

29-
@Environment(EnvType.CLIENT)
3027
private Map<Boolean, TranslationKey> getValueTranslations() {
3128
if (valueTranslations == null) {
3229
valueTranslations = new HashMap<>();

base/src/main/java/me/lortseam/completeconfig/data/Cluster.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@ public final class Cluster extends Parent implements Identifiable, DescriptionSu
2121
private final Parent parent;
2222
private final ConfigGroup group;
2323
private final String comment;
24-
@Environment(EnvType.CLIENT)
2524
private TranslationKey translation;
26-
@Environment(EnvType.CLIENT)
2725
private TranslationKey descriptionTranslation;
28-
@Environment(EnvType.CLIENT)
2926
private Identifier background;
3027

3128
Cluster(Parent parent, ConfigGroup group) {
@@ -68,7 +65,6 @@ public Optional<TranslationKey> getDescriptionTranslation() {
6865
return descriptionTranslation.exists() ? Optional.of(descriptionTranslation) : Optional.empty();
6966
}
7067

71-
@Environment(EnvType.CLIENT)
7268
public Optional<Identifier> getBackground() {
7369
return Optional.ofNullable(background);
7470
}

base/src/main/java/me/lortseam/completeconfig/data/Config.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class Config extends Parent implements ConfigContainer {
3535
private final ConfigOptions options;
3636
private final HoconConfigurationLoader loader;
3737
private Runnable resolver;
38-
@Environment(EnvType.CLIENT)
3938
private TranslationKey translation;
4039

4140
/**

base/src/main/java/me/lortseam/completeconfig/data/Entry.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ static Entry<?> create(EntryOrigin origin) {
4949
private final String id;
5050
@Getter
5151
private final T defaultValue;
52-
@Environment(EnvType.CLIENT)
5352
private TranslationKey translation;
54-
@Environment(EnvType.CLIENT)
5553
private TranslationKey descriptionTranslation;
5654
@Accessors(fluent = true)
5755
@Getter
@@ -159,7 +157,6 @@ public final Optional<TranslationKey> getDescriptionTranslation() {
159157
return descriptionTranslation.exists() ? Optional.of(descriptionTranslation) : Optional.empty();
160158
}
161159

162-
@Environment(EnvType.CLIENT)
163160
public Function<T, Text> getValueFormatter() {
164161
return value -> Text.of(value.toString());
165162
}

base/src/main/java/me/lortseam/completeconfig/data/Parent.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,8 @@ final boolean isEmpty() {
128128
return entries.isEmpty() && clusters.isEmpty();
129129
}
130130

131-
@Environment(EnvType.CLIENT)
132131
public abstract TranslationKey getBaseTranslation(TranslationBase translationBase, @Nullable Class<? extends ConfigContainer> clazz);
133132

134-
@Environment(EnvType.CLIENT)
135133
public final TranslationKey getBaseTranslation() {
136134
return getBaseTranslation(TranslationBase.INSTANCE, null);
137135
}

base/src/main/java/me/lortseam/completeconfig/data/SliderEntry.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
public class SliderEntry<T extends Number> extends BoundedEntry<T> {
1414

1515
private final T interval;
16-
@Environment(EnvType.CLIENT)
1716
private TranslationKey valueTranslation;
1817

1918
public SliderEntry(EntryOrigin origin, T min, T max, T interval) {

base/src/main/java/me/lortseam/completeconfig/data/structure/client/DescriptionSupplier.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99

1010
public interface DescriptionSupplier {
1111

12-
@Environment(EnvType.CLIENT)
1312
Optional<TranslationKey> getDescriptionTranslation();
1413

15-
@Environment(EnvType.CLIENT)
1614
default Optional<Text> getDescription() {
1715
return getDescriptionTranslation().map(TranslationKey::toText);
1816
}

base/src/main/java/me/lortseam/completeconfig/data/structure/client/Translatable.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77

88
public interface Translatable {
99

10-
@Environment(EnvType.CLIENT)
1110
TranslationKey getNameTranslation();
1211

13-
@Environment(EnvType.CLIENT)
1412
default Text getName() {
1513
return getNameTranslation().toText();
1614
}

base/src/main/java/me/lortseam/completeconfig/gui/ConfigScreenBuilder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import java.util.*;
1515
import java.util.function.Supplier;
1616

17-
@Environment(EnvType.CLIENT)
1817
public abstract class ConfigScreenBuilder<T> {
1918

2019
private static final Map<String, Supplier<ConfigScreenBuilder<?>>> suppliers = new HashMap<>();

0 commit comments

Comments
 (0)