Skip to content

Commit 5054bea

Browse files
lowercasebtwlowercasebtw
committed
Cleanup/rewriting
1 parent 60afe7c commit 5054bea

File tree

8 files changed

+19
-17
lines changed

8 files changed

+19
-17
lines changed

‎src/main/java/btw/lowercase/optiboxes/OptiBoxesClient.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import btw.lowercase.optiboxes.skybox.OptiFineCustomSkybox;
55
import btw.lowercase.optiboxes.skybox.SkyboxManager;
66
import btw.lowercase.optiboxes.utils.CommonUtils;
7-
import btw.lowercase.optiboxes.utils.OptiFineResourceManagerHelper;
7+
import btw.lowercase.optiboxes.utils.OptiFineResourceHelper;
88
import btw.lowercase.optiboxes.utils.api.AbstractSkybox;
99
import com.google.gson.JsonArray;
1010
import com.google.gson.JsonObject;
@@ -40,11 +40,11 @@ public class OptiBoxesClient implements ClientModInitializer {
4040
public void onInitializeClient() {
4141
INSTANCE = this;
4242
OptiBoxesConfig.load();
43-
ResourceManagerHelper.get(PackType.CLIENT_RESOURCES).registerReloadListener(new OptiFineResourceManagerHelper());
43+
ResourceManagerHelper.get(PackType.CLIENT_RESOURCES).registerReloadListener(new OptiFineResourceHelper());
4444
ClientTickEvents.END_WORLD_TICK.register(SkyboxManager.INSTANCE::tick);
4545
}
4646

47-
public void inject(OptiFineResourceManagerHelper managerAccessor) {
47+
public void inject(OptiFineResourceHelper managerAccessor) {
4848
this.logger.warn("OptiBoxes is converting MCPatcher/OptiFine custom skies resource packs! Any visual bugs are likely caused by OptiBoxes. Please do not report these issues to Resource Pack creators!");
4949
SkyboxManager.INSTANCE.clearSkyboxes();
5050
if (OptiBoxesConfig.instance().enabled) {
@@ -53,7 +53,7 @@ public void inject(OptiFineResourceManagerHelper managerAccessor) {
5353
}
5454
}
5555

56-
public void convert(OptiFineResourceManagerHelper managerAccessor) {
56+
public void convert(OptiFineResourceHelper managerAccessor) {
5757
if (OptiBoxesConfig.instance().processOptiFine) {
5858
this.convertNamespace(managerAccessor, OPTIFINE_SKY_PARENT, OPTIFINE_SKY_PATTERN);
5959
}
@@ -63,10 +63,10 @@ public void convert(OptiFineResourceManagerHelper managerAccessor) {
6363
}
6464
}
6565

66-
private void convertNamespace(OptiFineResourceManagerHelper optiFineResourceManagerHelper, String skyParent, Pattern skyPattern) {
66+
private void convertNamespace(OptiFineResourceHelper optiFineResourceHelper, String skyParent, Pattern skyPattern) {
6767
final JsonArray overworldLayers = new JsonArray();
6868
final JsonArray endLayers = new JsonArray();
69-
optiFineResourceManagerHelper.searchIn(skyParent)
69+
optiFineResourceHelper.searchIn(skyParent)
7070
.filter(id -> id.getPath().endsWith(".properties"))
7171
.sorted(Comparator.comparing(ResourceLocation::getPath, (id1, id2) -> {
7272
Matcher matcherId1 = skyPattern.matcher(id1);
@@ -94,7 +94,7 @@ private void convertNamespace(OptiFineResourceManagerHelper optiFineResourceMana
9494
return;
9595
}
9696

97-
InputStream inputStream = optiFineResourceManagerHelper.getInputStream(id);
97+
InputStream inputStream = optiFineResourceHelper.getInputStream(id);
9898
if (inputStream == null) {
9999
this.logger.error("Error trying to read namespaced identifier: {}", id);
100100
return;
@@ -114,7 +114,7 @@ private void convertNamespace(OptiFineResourceManagerHelper optiFineResourceMana
114114
}
115115
}
116116

117-
JsonObject json = CommonUtils.convertOptiFineSkyProperties(optiFineResourceManagerHelper, properties, id);
117+
JsonObject json = CommonUtils.convertOptiFineSkyProperties(optiFineResourceHelper, properties, id);
118118
if (json != null) {
119119
if (world.equals("world0")) {
120120
overworldLayers.add(json);

‎src/main/java/btw/lowercase/optiboxes/skybox/OptiFineCustomSkybox.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ private void render(PoseStack poseStack, float tickDelta) {
152152
}
153153
}
154154

155-
Blend.ADD.getBlendFunc().accept(1.0F - rainLevel);
155+
Blend.ADD.apply(1.0F - rainLevel);
156156
}
157157

158158
@Override

‎src/main/java/btw/lowercase/optiboxes/skybox/OptiFineSkyLayer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void render(Level level, PoseStack poseStack, int timeOfDay, float skyAng
8787
float finalAlpha = Mth.clamp(this.conditionAlpha * weatherAlpha * fadeAlpha, 0.0F, 1.0F);
8888
if (!(finalAlpha < 1.0E-4F)) {
8989
RenderSystem.setShaderTexture(0, this.source);
90-
this.blend.getBlendFunc().accept(finalAlpha);
90+
this.blend.apply(finalAlpha);
9191
poseStack.pushPose();
9292
if (this.rotate) {
9393
float angle = getAngle(level, skyAngle);

‎src/main/java/btw/lowercase/optiboxes/skybox/SkyboxManager.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public void tick(ClientLevel level) {
5959
}
6060
}
6161

62+
// TODO/NOTE: Layer is always 0? Do I need "getLayer" anymore? Do I need this call anymore?
6263
this.activeAbstractSkyboxes.sort(Comparator.comparingInt(AbstractSkybox::getLayer));
6364
}
6465

‎src/main/java/btw/lowercase/optiboxes/utils/CommonUtils.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
public class CommonUtils {
1717
private static final Pattern OPTIFINE_RANGE_SEPARATOR = Pattern.compile("(\\d|\\))-(\\d|\\()");
1818

19-
public static JsonObject convertOptiFineSkyProperties(OptiFineResourceManagerHelper optiFineResourceManagerHelper, Properties properties, ResourceLocation propertiesResourceLocation) {
19+
public static JsonObject convertOptiFineSkyProperties(OptiFineResourceHelper optiFineResourceHelper, Properties properties, ResourceLocation propertiesResourceLocation) {
2020
JsonObject jsonObject = new JsonObject();
21-
ResourceLocation sourceTexture = parseSourceTexture(properties.getProperty("source", null), optiFineResourceManagerHelper, propertiesResourceLocation);
21+
ResourceLocation sourceTexture = parseSourceTexture(properties.getProperty("source", null), optiFineResourceHelper, propertiesResourceLocation);
2222
if (sourceTexture == null) {
2323
return null;
2424
} else {
@@ -158,7 +158,7 @@ public static JsonObject convertOptiFineSkyProperties(OptiFineResourceManagerHel
158158
return jsonObject;
159159
}
160160

161-
public static ResourceLocation parseSourceTexture(String source, OptiFineResourceManagerHelper optiFineResourceManagerHelper, ResourceLocation propertiesId) {
161+
public static ResourceLocation parseSourceTexture(String source, OptiFineResourceHelper optiFineResourceHelper, ResourceLocation propertiesId) {
162162
ResourceLocation textureId;
163163
String namespace;
164164
String path;
@@ -193,7 +193,7 @@ public static ResourceLocation parseSourceTexture(String source, OptiFineResourc
193193
return null;
194194
}
195195

196-
InputStream textureInputStream = optiFineResourceManagerHelper.getInputStream(textureId);
196+
InputStream textureInputStream = optiFineResourceHelper.getInputStream(textureId);
197197
if (textureInputStream == null) {
198198
return null;
199199
}

src/main/java/btw/lowercase/optiboxes/utils/OptiFineResourceManagerHelper.java renamed to src/main/java/btw/lowercase/optiboxes/utils/OptiFineResourceHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.concurrent.Executor;
1414
import java.util.stream.Stream;
1515

16-
public class OptiFineResourceManagerHelper implements IdentifiableResourceReloadListener {
16+
public class OptiFineResourceHelper implements IdentifiableResourceReloadListener {
1717
private ResourceManager resourceManager;
1818

1919
@Override

‎src/main/java/btw/lowercase/optiboxes/utils/api/AbstractSkybox.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import net.minecraft.client.renderer.SkyRenderer;
99

1010
public interface AbstractSkybox {
11+
// TODO/NOTE: Not needed anymore?
1112
default int getLayer() {
1213
return 0;
1314
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public enum Blend {
6161
this.blendFunc = blendFunc;
6262
}
6363

64-
public Consumer<Float> getBlendFunc() {
65-
return this.blendFunc;
64+
public void apply(float value) {
65+
this.blendFunc.accept(value);
6666
}
6767

6868
public static Blend byName(String name) {

0 commit comments

Comments
 (0)