Skip to content

Commit 7238636

Browse files
lowercasebtwlowercasebtw
committed
Fix modmenu issues
1 parent 80e8ea7 commit 7238636

File tree

16 files changed

+61
-71
lines changed

16 files changed

+61
-71
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ deps.devauth_version=1.2.1
2525
deps.mixinconstraints_version=1.1.0
2626
deps.mixinsquared_version=0.2.0
2727
deps.lombok_version=1.18.42
28+
deps.lightconfig_version=1.0-alpha.7
2829

2930
# Build Plugins
3031
# in libs.versions.toml

‎src/main/java/btw/lowercase/skyboxify/Skyboxify.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.mojang.math.Axis;
3434
import lombok.Getter;
3535
import lombok.experimental.UtilityClass;
36+
import net.fabricmc.loader.api.FabricLoader;
3637
import net.minecraft.client.multiplayer.ClientLevel;
3738
import net.minecraft.resources.ResourceLocation;
3839
import net.minecraft.world.level.Level;
@@ -41,8 +42,6 @@
4142
import org.slf4j.LoggerFactory;
4243
import org.visuals.legacy.lightconfig.lib.v1.events.EventManager;
4344

44-
import java.nio.file.Path;
45-
4645
@UtilityClass
4746
public class Skyboxify {
4847
public final String MOD_ID = "@MODID@";
@@ -51,14 +50,13 @@ public class Skyboxify {
5150
@Getter
5251
private final EventManager eventManager = new EventManager();
5352
@Getter
54-
private SkyboxifyConfig config;
53+
private final SkyboxifyConfig config = new SkyboxifyConfig();
5554

5655
public ResourceLocation locationOrNull(String path) {
5756
return ResourceLocation.tryBuild(MOD_ID, path);
5857
}
5958

60-
public void initialize(final Path configPath) {
61-
config = new SkyboxifyConfig(configPath);
59+
public void initialize() {
6260
config.load();
6361

6462
eventManager.listen(LevelTickEvent.Client.class, event -> SkyboxManager.INSTANCE.tick(event.getLevel()));

‎src/main/java/btw/lowercase/skyboxify/SkyboxifyClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
public final class SkyboxifyClient implements ClientModInitializer {
3636
@Override
3737
public void onInitializeClient() {
38-
Skyboxify.initialize(FabricLoader.getInstance().getConfigDir().resolve("optiboxes.json")); // TODO: change in the future
38+
Skyboxify.initialize(); // TODO: change in the future
3939
ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
4040
dispatcher.register(new SkyboxifyCommand("skyboxify"));
4141
dispatcher.register(new SkyboxifyCommand("optiboxes")); // TODO: Remove

‎src/main/java/btw/lowercase/skyboxify/config/ModMenuIntegration.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import com.terraformersmc.modmenu.api.ModMenuApi;
2929
import dev.kikugie.fletching_table.annotation.fabric.Entrypoint;
3030

31+
import java.util.Map;
32+
3133
@Entrypoint("modmenu")
3234
public class ModMenuIntegration implements ModMenuApi {
3335
@Override

‎src/main/java/btw/lowercase/skyboxify/config/SkyboxifyConfig.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,20 @@
2424
package btw.lowercase.skyboxify.config;
2525

2626
import btw.lowercase.skyboxify.Skyboxify;
27-
import net.minecraft.client.Minecraft;
2827
import net.minecraft.client.gui.screens.Screen;
2928
import net.minecraft.network.chat.Component;
3029
import org.visuals.legacy.lightconfig.lib.v1.Config;
3130
import org.visuals.legacy.lightconfig.lib.v1.field.BooleanConfigField;
3231

33-
import java.nio.file.Path;
34-
3532
public class SkyboxifyConfig extends Config {
3633
public final BooleanConfigField enabled = this.booleanFieldOf("enabled", true);
3734
public final BooleanConfigField renderSunMoon = this.booleanFieldOf("renderSunMoon", true);
3835
public final BooleanConfigField renderStars = this.booleanFieldOf("renderStars", true);
3936
public final BooleanConfigField showOverworldForUnknownDimension = this.booleanFieldOf("showOverworldForUnknownDimension", true);
4037
public final BooleanConfigField ignoreBrokenSkies = this.booleanFieldOf("ignoreBrokenSkies", false);
4138

42-
public SkyboxifyConfig(final Path path) {
43-
super(Skyboxify.MOD_ID, path);
44-
final Minecraft minecraft = Minecraft.getInstance();
45-
this.ignoreBrokenSkies.onValueChanged((oldVal, newVal) -> minecraft.reloadResourcePacks());
39+
public SkyboxifyConfig() {
40+
super(Skyboxify.MOD_ID);
4641
}
4742

4843
@Override

‎src/main/java/btw/lowercase/skyboxify/config/SkyboxifyConfigScreen.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,42 +37,42 @@
3737

3838
@SuppressWarnings("UnstableApiUsage")
3939
public class SkyboxifyConfigScreen extends InternalConfigScreen {
40-
public SkyboxifyConfigScreen(Component title, SkyboxifyConfig config, Screen parent) {
41-
super(title, config, parent);
42-
}
40+
public SkyboxifyConfigScreen(final Component title, final SkyboxifyConfig config, final Screen parent) {
41+
super(title, config, parent);
42+
}
4343

44-
@Override
45-
protected void init() {
46-
SkyboxifyConfig skyboxifyConfig = (SkyboxifyConfig) this.config;
44+
@Override
45+
protected void init() {
46+
final SkyboxifyConfig skyboxifyConfig = (SkyboxifyConfig) this.config;
4747

48-
HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this, 61, 33);
49-
LinearLayout linearLayout = layout.addToHeader(LinearLayout.vertical().spacing(8));
50-
linearLayout.addChild(new StringWidget(this.getTitle(), this.font), LayoutSettings::alignHorizontallyCenter);
48+
final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this, 61, 33);
49+
LinearLayout linearLayout = layout.addToHeader(LinearLayout.vertical().spacing(8));
50+
linearLayout.addChild(new StringWidget(this.getTitle(), this.font), LayoutSettings::alignHorizontallyCenter);
5151

52-
GridLayout gridLayout = new GridLayout();
53-
gridLayout.defaultCellSetting().paddingHorizontal(4).paddingBottom(4).alignHorizontallyCenter().alignVerticallyMiddle();
54-
GridLayout.RowHelper rowHelper = gridLayout.createRowHelper(2);
55-
// Didn't iterate fields here because I wanted custom order
56-
rowHelper.addChild(skyboxifyConfig.enabled.createWidget());
57-
rowHelper.addChild(skyboxifyConfig.showOverworldForUnknownDimension.createWidget());
58-
rowHelper.addChild(skyboxifyConfig.renderSunMoon.createWidget());
59-
rowHelper.addChild(skyboxifyConfig.renderStars.createWidget());
60-
rowHelper.addChild(skyboxifyConfig.ignoreBrokenSkies.createWidget());
61-
layout.addToContents(gridLayout);
52+
GridLayout gridLayout = new GridLayout();
53+
gridLayout.defaultCellSetting().paddingHorizontal(4).paddingBottom(4).alignHorizontallyCenter().alignVerticallyMiddle();
54+
GridLayout.RowHelper rowHelper = gridLayout.createRowHelper(2);
55+
// Didn't iterate fields here because I wanted custom order
56+
rowHelper.addChild(skyboxifyConfig.enabled.createWidget());
57+
rowHelper.addChild(skyboxifyConfig.showOverworldForUnknownDimension.createWidget());
58+
rowHelper.addChild(skyboxifyConfig.renderSunMoon.createWidget());
59+
rowHelper.addChild(skyboxifyConfig.renderStars.createWidget());
60+
rowHelper.addChild(skyboxifyConfig.ignoreBrokenSkies.createWidget(this.minecraft::reloadResourcePacks));
61+
layout.addToContents(gridLayout);
6262

63-
GridLayout footerGridLayout = new GridLayout();
64-
footerGridLayout.defaultCellSetting().paddingHorizontal(4).paddingBottom(4).alignHorizontallyCenter();
65-
GridLayout.RowHelper footerRowHelper = footerGridLayout.createRowHelper(2);
66-
footerRowHelper.addChild(Button.builder(Translations.RESET, (button) -> this.reset()).width(125).build());
67-
footerRowHelper.addChild(Button.builder(CommonComponents.GUI_DONE, (button) -> this.onClose()).width(125).build());
68-
layout.addToFooter(footerGridLayout);
63+
GridLayout footerGridLayout = new GridLayout();
64+
footerGridLayout.defaultCellSetting().paddingHorizontal(4).paddingBottom(4).alignHorizontallyCenter();
65+
GridLayout.RowHelper footerRowHelper = footerGridLayout.createRowHelper(2);
66+
footerRowHelper.addChild(Button.builder(Translations.RESET, (button) -> this.reset()).width(125).build());
67+
footerRowHelper.addChild(Button.builder(CommonComponents.GUI_DONE, (button) -> this.onClose()).width(125).build());
68+
layout.addToFooter(footerGridLayout);
6969

70-
layout.visitWidgets(this::addRenderableWidget);
71-
layout.arrangeElements();
72-
}
70+
layout.visitWidgets(this::addRenderableWidget);
71+
layout.arrangeElements();
72+
}
7373

74-
private void reset() {
75-
this.config.reset();
76-
this.minecraft.reloadResourcePacks();
77-
}
74+
private void reset() {
75+
this.config.reset();
76+
this.minecraft.reloadResourcePacks();
77+
}
7878
}

‎src/main/java/btw/lowercase/skyboxify/skybox/SkyPart.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,51 +23,51 @@
2323

2424
package btw.lowercase.skyboxify.skybox;
2525

26-
import btw.lowercase.skyboxify.skybox.components.UVRange;
26+
import btw.lowercase.skyboxify.skybox.components.UV;
2727
import org.joml.Matrix4f;
2828

2929
public enum SkyPart {
3030
BOTTOM(
3131
new Matrix4f().rotateY((float) Math.toRadians(90.0F)),
32-
new UVRange(0.0F, 0.0F, 0.33333334F, 0.5F)
32+
new UV(0.0F, 0.0F, 0.33333334F, 0.5F)
3333
),
3434
TOP(
3535
new Matrix4f().rotateX((float) Math.toRadians(180.0F)).rotateY((float) Math.toRadians(-90.0F)),
36-
new UVRange(0.33333334F, 0.0F, 0.6666667F, 0.5F)
36+
new UV(0.33333334F, 0.0F, 0.6666667F, 0.5F)
3737
),
3838
EAST(
3939
new Matrix4f().rotateX((float) Math.toRadians(90.0F)).rotateZ((float) Math.toRadians(90.0F)),
40-
new UVRange(0.6666667F, 0.0F, 1.0F, 0.5F)
40+
new UV(0.6666667F, 0.0F, 1.0F, 0.5F)
4141
),
4242
SOUTH(
4343
new Matrix4f().rotateX((float) Math.toRadians(90.0F)).rotateZ((float) Math.toRadians(180.0F)),
44-
new UVRange(0.0F, 0.5F, 0.33333334F, 1.0F)
44+
new UV(0.0F, 0.5F, 0.33333334F, 1.0F)
4545
),
4646
WEST(
4747
new Matrix4f().rotateX((float) Math.toRadians(90.0F)).rotateZ((float) Math.toRadians(-90.0F)),
48-
new UVRange(0.33333334F, 0.5F, 0.6666667F, 1.0F)
48+
new UV(0.33333334F, 0.5F, 0.6666667F, 1.0F)
4949
),
5050
NORTH(
5151
new Matrix4f().rotateX((float) Math.toRadians(90.0F)),
52-
new UVRange(0.6666667F, 0.5F, 1.0F, 1.0F)
52+
new UV(0.6666667F, 0.5F, 1.0F, 1.0F)
5353
);
5454

5555
public static final SkyPart[] VALUES = values();
5656
public static final int COUNT = VALUES.length;
5757

5858
private final Matrix4f rotationMatrix;
59-
private final UVRange uvRange;
59+
private final UV uv;
6060

61-
SkyPart(Matrix4f rotationMatrix, UVRange uvRange) {
61+
SkyPart(Matrix4f rotationMatrix, UV uv) {
6262
this.rotationMatrix = rotationMatrix;
63-
this.uvRange = uvRange;
63+
this.uv = uv;
6464
}
6565

6666
public Matrix4f getRotationMatrix() {
6767
return this.rotationMatrix;
6868
}
6969

70-
public UVRange getUVRange() {
71-
return uvRange;
70+
public UV getUVRange() {
71+
return uv;
7272
}
7373
}

‎src/main/java/btw/lowercase/skyboxify/skybox/SkyboxSkyRenderer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package btw.lowercase.skyboxify.skybox;
2525

2626
import btw.lowercase.skyboxify.mixins.RenderPipelinesAccessor;
27-
import btw.lowercase.skyboxify.skybox.components.UVRange;
27+
import btw.lowercase.skyboxify.skybox.components.UV;
2828
import btw.lowercase.skyboxify.utils.*;
2929
import com.mojang.blaze3d.systems.RenderSystem;
3030
import com.mojang.blaze3d.vertex.*;
@@ -59,12 +59,12 @@ private void buildSky() {
5959
final BufferBuilder builder = new BufferBuilder(byteBufferBuilder, vertexFormatMode, vertexFormat);
6060
for (final SkyPart skyPart : SkyPart.VALUES) {
6161
final Matrix4f matrix4f = skyPart.getRotationMatrix();
62-
final UVRange uvRange = skyPart.getUVRange();
62+
final UV uv = skyPart.getUVRange();
6363
final float quadSize = 30.0F;
64-
builder.addVertex(matrix4f, -quadSize, -quadSize, -quadSize).setUv(uvRange.minU(), uvRange.minV());
65-
builder.addVertex(matrix4f, -quadSize, -quadSize, quadSize).setUv(uvRange.minU(), uvRange.maxV());
66-
builder.addVertex(matrix4f, quadSize, -quadSize, quadSize).setUv(uvRange.maxU(), uvRange.maxV());
67-
builder.addVertex(matrix4f, quadSize, -quadSize, -quadSize).setUv(uvRange.maxU(), uvRange.minV());
64+
builder.addVertex(matrix4f, -quadSize, -quadSize, -quadSize).setUv(uv.minU(), uv.minV());
65+
builder.addVertex(matrix4f, -quadSize, -quadSize, quadSize).setUv(uv.minU(), uv.maxV());
66+
builder.addVertex(matrix4f, quadSize, -quadSize, quadSize).setUv(uv.maxU(), uv.maxV());
67+
builder.addVertex(matrix4f, quadSize, -quadSize, -quadSize).setUv(uv.maxU(), uv.minV());
6868
}
6969

7070
//? >=1.21.5

‎src/main/java/btw/lowercase/skyboxify/skybox/components/Range.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public record Range(float min, float max) {
4141

4242
@Override
4343
public @NotNull String toString() {
44-
return String.format("%s-%s", min, max);
44+
return String.format("%s..%s", min, max);
4545
}
4646
}

src/main/java/btw/lowercase/skyboxify/skybox/components/UVRange.java renamed to src/main/java/btw/lowercase/skyboxify/skybox/components/UV.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323

2424
package btw.lowercase.skyboxify.skybox.components;
2525

26-
public record UVRange(float minU, float minV, float maxU, float maxV) {
26+
public record UV(float minU, float minV, float maxU, float maxV) {
2727
}

0 commit comments

Comments
 (0)