Skip to content

Commit 62f43d7

Browse files
committed
Remove hardcoded names, use internal enum names instead
1 parent 3a60913 commit 62f43d7

File tree

2 files changed

+17
-35
lines changed

2 files changed

+17
-35
lines changed

src/main/java/btw/lowercase/optiboxes/utils/components/Blend.java

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,58 +8,56 @@
88
import java.util.function.Consumer;
99

1010
public enum Blend {
11-
ALPHA("alpha", alpha -> {
11+
ALPHA(alpha -> {
1212
RenderSystem.enableBlend();
1313
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
1414
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
1515
}),
16-
ADD("add", alpha -> {
16+
ADD(alpha -> {
1717
RenderSystem.enableBlend();
1818
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE);
1919
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
2020
}),
21-
SUBTRACT("subtract", alpha -> {
21+
SUBTRACT(alpha -> {
2222
RenderSystem.enableBlend();
2323
RenderSystem.blendFunc(GlStateManager.SourceFactor.ONE_MINUS_DST_COLOR, GlStateManager.DestFactor.ZERO);
2424
RenderSystem.setShaderColor(alpha, alpha, alpha, 1.0F);
2525
}),
26-
MULTIPLY("multiply", alpha -> {
26+
MULTIPLY(alpha -> {
2727
RenderSystem.enableBlend();
2828
RenderSystem.blendFunc(GlStateManager.SourceFactor.DST_COLOR, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
2929
RenderSystem.setShaderColor(alpha, alpha, alpha, alpha);
3030
}),
31-
DODGE("dodge", alpha -> {
31+
DODGE(alpha -> {
3232
RenderSystem.enableBlend();
3333
RenderSystem.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE);
3434
RenderSystem.setShaderColor(alpha, alpha, alpha, 1.0F);
3535
}),
36-
BURN("burn", alpha -> {
36+
BURN(alpha -> {
3737
RenderSystem.enableBlend();
3838
RenderSystem.blendFunc(GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE_MINUS_SRC_COLOR);
3939
RenderSystem.setShaderColor(alpha, alpha, alpha, 1.0F);
4040
}),
41-
SCREEN("screen", alpha -> {
41+
SCREEN(alpha -> {
4242
RenderSystem.enableBlend();
4343
RenderSystem.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE_MINUS_SRC_COLOR);
4444
RenderSystem.setShaderColor(alpha, alpha, alpha, 1.0F);
4545
}),
46-
OVERLAY("overlay", alpha -> {
46+
OVERLAY(alpha -> {
4747
RenderSystem.enableBlend();
4848
RenderSystem.blendFunc(GlStateManager.SourceFactor.DST_COLOR, GlStateManager.DestFactor.SRC_COLOR);
4949
RenderSystem.setShaderColor(alpha, alpha, alpha, 1.0F);
5050
}),
51-
REPLACE("replace", alpha -> {
51+
REPLACE(alpha -> {
5252
RenderSystem.disableBlend();
5353
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
5454
});
5555

5656
public static final Codec<Blend> CODEC = Codec.STRING.xmap(Blend::byName, Blend::toString);
5757

58-
private final String name;
5958
private final Consumer<Float> blendFunc;
6059

61-
Blend(String name, Consumer<Float> blendFunc) {
62-
this.name = name;
60+
Blend(Consumer<Float> blendFunc) {
6361
this.blendFunc = blendFunc;
6462
}
6563

@@ -68,11 +66,6 @@ public Consumer<Float> getBlendFunc() {
6866
}
6967

7068
public static Blend byName(String name) {
71-
return Arrays.stream(Blend.values()).filter(blend -> blend.name.equals(name)).findFirst().orElse(ADD);
72-
}
73-
74-
@Override
75-
public String toString() {
76-
return this.name;
69+
return Arrays.stream(Blend.values()).filter(blend -> blend.name().toLowerCase().equals(name)).findFirst().orElse(ADD);
7770
}
7871
}

src/main/java/btw/lowercase/optiboxes/utils/components/Weather.java

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,15 @@
55
import java.util.Arrays;
66

77
public enum Weather {
8-
CLEAR("clear"),
9-
RAIN("rain"),
10-
BIOME_RAIN("rain_biome"),
11-
SNOW("snow"),
12-
THUNDER("thunder");
8+
CLEAR,
9+
RAIN,
10+
RAIN_BIOME,
11+
SNOW,
12+
THUNDER;
1313

1414
public static final Codec<Weather> CODEC = Codec.STRING.xmap(Weather::byName, Weather::toString);
1515

16-
private final String name;
17-
18-
Weather(String name) {
19-
this.name = name;
20-
}
21-
2216
public static Weather byName(String name) {
23-
return Arrays.stream(Weather.values()).filter(weather -> weather.name.equals(name)).findFirst().orElse(null);
24-
}
25-
26-
@Override
27-
public String toString() {
28-
return this.name;
17+
return Arrays.stream(Weather.values()).filter(weather -> weather.name().toLowerCase().equals(name)).findFirst().orElse(null);
2918
}
3019
}

0 commit comments

Comments
 (0)