From aed5f5471006aa42ff8329b6dbcf80875bb16d01 Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 5 Mar 2023 11:41:40 +1030 Subject: [PATCH] Minor refactor to the screen --- .../lod/common/wrappers/gui/GetConfigScreen.java | 3 ++- .../{ConfigScreenMC.java => MinecraftScreen.java} | 12 +++++------- 2 files changed, 7 insertions(+), 8 deletions(-) rename common/src/main/java/com/seibel/lod/common/wrappers/gui/{ConfigScreenMC.java => MinecraftScreen.java} (93%) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java b/common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java index fe9b33a96..39452465f 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java @@ -1,5 +1,6 @@ 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.ConfigScreen; import net.minecraft.client.gui.screens.Screen; @@ -15,7 +16,7 @@ public class GetConfigScreen { if (useScreen == type.Classic) { return ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client"); } else if (useScreen == type.OpenGL) { - return ConfigScreenMC.getScreen(parent, new ConfigScreen()); + return MinecraftScreen.getScreen(parent, new ConfigScreen(), ModInfo.ID + ".title"); } return null; } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/ConfigScreenMC.java b/common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java similarity index 93% rename from common/src/main/java/com/seibel/lod/common/wrappers/gui/ConfigScreenMC.java rename to common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java index 7ca272541..a7bc9e154 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/ConfigScreenMC.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java @@ -1,7 +1,6 @@ package com.seibel.lod.common.wrappers.gui; import com.mojang.blaze3d.vertex.PoseStack; -import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.config.gui.AbstractScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.ContainerObjectSelectionList; @@ -9,10 +8,9 @@ import net.minecraft.client.gui.screens.Screen; import java.util.*; -public class ConfigScreenMC { - public static Screen getScreen(Screen parent, AbstractScreen screen) { - - return new ConfigScreenRenderer(parent, screen); +public class MinecraftScreen { + public static Screen getScreen(Screen parent, AbstractScreen screen, String translationName) { + return new ConfigScreenRenderer(parent, screen, translationName); } private static class ConfigScreenRenderer extends Screen { @@ -31,8 +29,8 @@ public class ConfigScreenMC { } #endif - protected ConfigScreenRenderer(Screen parent, AbstractScreen screen) { - super(translate(ModInfo.ID + ".config.title")); + protected ConfigScreenRenderer(Screen parent, AbstractScreen screen, String translationName) { + super(translate(translationName)); this.parent = parent; this.screen = screen; }