diff --git a/src/main/java/net/nussi/dedicated_applied_energistics/init/CommandInit.java b/src/main/java/net/nussi/dedicated_applied_energistics/init/CommandInit.java index a297906..61c7f4c 100644 --- a/src/main/java/net/nussi/dedicated_applied_energistics/init/CommandInit.java +++ b/src/main/java/net/nussi/dedicated_applied_energistics/init/CommandInit.java @@ -17,7 +17,7 @@ public class CommandInit { public static void onCommandsRegister(RegisterCommandsEvent event) { LiteralArgumentBuilder builder = Commands.literal("dae2"); - new GuiCommand().ConfigureCommand(builder); +// new GuiCommand().ConfigureCommand(builder); new StartCommand().ConfigureCommand(builder); new StopCommand().ConfigureCommand(builder); diff --git a/src/main/java/net/nussi/dedicated_applied_energistics/menus/SettingsScreen.java b/src/main/java/net/nussi/dedicated_applied_energistics/menus/SettingsScreen.java index 279c667..c62caa6 100644 --- a/src/main/java/net/nussi/dedicated_applied_energistics/menus/SettingsScreen.java +++ b/src/main/java/net/nussi/dedicated_applied_energistics/menus/SettingsScreen.java @@ -8,6 +8,7 @@ import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.nussi.dedicated_applied_energistics.DedicatedAppliedEnegistics; @@ -49,10 +50,10 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderColor(1,1,1,1); +// RenderSystem.setShader(GameRenderer::getPositionTexShader); +// RenderSystem.setShaderColor(1,1,1,1); RenderSystem.setShaderTexture(0, IMAGE_SETTINGS_INFO); - blit(poseStack, 0, 0, 0, 0, IMAGE_SETTINGS_WIDTH, IMAGE_SETTINGS_HEIGHT, IMAGE_SETTINGS_WIDTH, IMAGE_SETTINGS_HEIGHT); + GuiComponent.blit(poseStack, 0, 0, 0, 0, IMAGE_SETTINGS_WIDTH, IMAGE_SETTINGS_HEIGHT, IMAGE_SETTINGS_WIDTH, IMAGE_SETTINGS_HEIGHT); // String text = "Hello, Minecraft!"; // int x = width / 2 - font.width(text); @@ -61,6 +62,8 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic // GuiComponent.drawString(poseStack, font, text, x, y, color); + + // Add ticking logic for EditBox in editBox if(this.button != null) this.button.renderButton(poseStack, mouseX, mouseY, partialTicks); } diff --git a/src/main/resources/assets/dae2/textures/gui/container/icon.png b/src/main/resources/assets/dae2/textures/gui/container/icon.png deleted file mode 100644 index 2c15693..0000000 Binary files a/src/main/resources/assets/dae2/textures/gui/container/icon.png and /dev/null differ diff --git a/src/main/resources/assets/dae2/textures/gui/container/settings_credits.svg b/src/main/resources/assets/dae2/textures/gui/container/settings_credits.svg new file mode 100644 index 0000000..85856b9 --- /dev/null +++ b/src/main/resources/assets/dae2/textures/gui/container/settings_credits.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/assets/dae2/textures/gui/container/settings_database.png b/src/main/resources/assets/dae2/textures/gui/container/settings_database.png index ee3e5c8..4f01775 100644 Binary files a/src/main/resources/assets/dae2/textures/gui/container/settings_database.png and b/src/main/resources/assets/dae2/textures/gui/container/settings_database.png differ diff --git a/src/main/resources/assets/dae2/textures/gui/container/settings_database.svg b/src/main/resources/assets/dae2/textures/gui/container/settings_database.svg new file mode 100644 index 0000000..7940354 --- /dev/null +++ b/src/main/resources/assets/dae2/textures/gui/container/settings_database.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/assets/dae2/textures/gui/container/settings_info.svg b/src/main/resources/assets/dae2/textures/gui/container/settings_info.svg new file mode 100644 index 0000000..8c584fa --- /dev/null +++ b/src/main/resources/assets/dae2/textures/gui/container/settings_info.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +