wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed up some things to do with the Java screen

Browse Source
This commit is contained in:
coolGi
2023-03-26 17:31:53 +10:30
parent 3a5485ea56
commit 9cdd7fc687
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java
+5 -3
View File
@@ -2,7 +2,8 @@ package com.seibel.lod.common.wrappers.gui;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.core.config.ConfigBase;
import com.seibel.lod.core.config.gui.JavaFXConfigScreen;
import com.seibel.lod.core.config.gui.ConfigScreen;
import com.seibel.lod.core.config.gui.JavaScreenHandlerScreen;
import com.seibel.lod.core.config.gui.OpenGLConfigScreen;
import net.minecraft.client.gui.screens.Screen;
@@ -11,7 +12,7 @@ public class GetConfigScreen {
public static enum type {
Classic,
@Deprecated
OpenGL, // This was jsut an attempt, it didnt work out and we are going to change to javafx soon
OpenGL, // This was jsut an attempt, it didn't work out, and we are going to change to javafx soon (as soon as that works)
JavaFX;
}
@@ -19,7 +20,8 @@ public class GetConfigScreen {
return switch (useScreen) {
case Classic -> ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
case OpenGL -> MinecraftScreen.getScreen(parent, new OpenGLConfigScreen(), ModInfo.ID + ".title");
case JavaFX -> MinecraftScreen.getScreen(parent, new JavaFXConfigScreen(), ModInfo.ID + ".title");
// case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");
case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
default -> null;
};
}
common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java
+18 -8
View File
@@ -1,5 +1,6 @@
package com.seibel.lod.common.wrappers.gui;
import com.mojang.blaze3d.platform.Window;
import com.mojang.blaze3d.vertex.PoseStack;
import com.seibel.lod.core.config.gui.AbstractScreen;
import net.minecraft.client.Minecraft;
@@ -40,9 +41,12 @@ public class MinecraftScreen {
@Override
protected void init() {
// super.init();
screen.width = this.width;
screen.height = this.height;
super.init(); // Init Minecraft's screen
Window mcWindow = this.minecraft.getWindow();
screen.width = mcWindow.getWidth();
screen.height = mcWindow.getHeight();
screen.scaledWidth = this.width;
screen.scaledHeight = this.height;
screen.init(); // Init our own config screen
this.list = new ConfigListWidget(this.minecraft, this.width, this.height, 0, this.height, 25); // Select the area to tint
@@ -65,20 +69,26 @@ public class MinecraftScreen {
@Override
public void resize(Minecraft mc, int width, int height) {
screen.width = this.width;
screen.height = this.height;
super.resize(mc, width, height); // Resize Minecraft's screen
Window mcWindow = this.minecraft.getWindow();
screen.width = mcWindow.getWidth();
screen.height = mcWindow.getHeight();
screen.scaledWidth = this.width;
screen.scaledHeight = this.height;
screen.onResize(); // Resize our screen
}
@Override
public void tick() {
screen.tick();
if (screen.close)
super.tick(); // Tick Minecraft's screen
screen.tick(); // Tick our screen
if (screen.close) // If we decide to close the screen, then actually close the screen
onClose();
}
@Override
public void onClose() {
screen.onClose();
screen.onClose(); // Close our screen
Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
}