diff --git a/src/main/java/io/github/codeutilities/mod/mixin/render/screen/MTitleScreen.java b/src/main/java/io/github/codeutilities/mod/mixin/render/screen/MTitleScreen.java index b22d8a8c..d4399ed2 100644 --- a/src/main/java/io/github/codeutilities/mod/mixin/render/screen/MTitleScreen.java +++ b/src/main/java/io/github/codeutilities/mod/mixin/render/screen/MTitleScreen.java @@ -19,13 +19,19 @@ @Mixin(TitleScreen.class) public class MTitleScreen extends Screen { + // Valid positions: "top_left" && "bottom_right". + // DM 8Blits if you would like to have the numbers be in another position, or if you want other texture changes. + private static final String NUM_LOCATION = "top_left"; + private final Identifier identifier_main = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/df.png"); - private final Identifier identifier_beta = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/beta.png"); - private final Identifier identifier_node1 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/node1.png"); - private final Identifier identifier_node2 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/node2.png"); - private final Identifier identifier_node3 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/node3.png"); - private final Identifier identifier_node4 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/node4-valley.png"); - private final Identifier identifier_node5 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/node5.png"); + private final Identifier identifier_beta = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/" + NUM_LOCATION + "/beta.png"); + private final Identifier identifier_node1 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/" + NUM_LOCATION + "/node1.png"); + private final Identifier identifier_node2 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/" + NUM_LOCATION + "/node2.png"); + private final Identifier identifier_node3 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/" + NUM_LOCATION + "/node3.png"); + private final Identifier identifier_node4 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/" + NUM_LOCATION + "/node4.png"); + private final Identifier identifier_node5 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/" + NUM_LOCATION + "/node5.png"); + private final Identifier identifier_node6 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/" + NUM_LOCATION + "/node6.png"); + private final Identifier identifier_node7 = new Identifier(CodeUtilities.MOD_ID + ":textures/gui/" + NUM_LOCATION + "/node7.png"); protected MTitleScreen(LiteralText title) { super(title); @@ -35,6 +41,7 @@ protected MTitleScreen(LiteralText title) { public void drawMenuButton(int y, int spacingY, CallbackInfo info) { if (Config.getBoolean("dfButton")) { if (!Config.getBoolean("dfNodeButtons")) { + // Default Server Join this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104, y + spacingY, 20, 20, 0, 0, 20, identifier_main, 20, 40, (button) -> { MinecraftClient mc = MinecraftClient.getInstance(); @@ -50,6 +57,7 @@ public void drawMenuButton(int y, int spacingY, CallbackInfo info) { modMenuButtonPresent = io.github.codeutilities.sys.util.ModMenuSupport.isModsButtonPresent(); } + // Default Server Join this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104, y - spacingY, 20, 20, 0, 0, 20, identifier_main, 20, 40, (button) -> { MinecraftClient mc = MinecraftClient.getInstance(); @@ -57,6 +65,7 @@ public void drawMenuButton(int y, int spacingY, CallbackInfo info) { mc.openScreen(new ConnectScreen(mc.currentScreen, mc, serverInfo)); })); + // Node Beta this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104 + 22, y - spacingY, 20, 20, 0, 0, 20, identifier_beta, 20, 40, (button) -> { MinecraftClient mc = MinecraftClient.getInstance(); @@ -64,40 +73,61 @@ public void drawMenuButton(int y, int spacingY, CallbackInfo info) { mc.openScreen(new ConnectScreen(mc.currentScreen, mc, serverInfo)); })); - this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104, y, 20, 20, 0, 0, 20, identifier_node1, 20, 40, + // Node 1 + this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104 + 44, y - spacingY, 20, 20, 0, 0, 20, identifier_node1, 20, 40, (button) -> { MinecraftClient mc = MinecraftClient.getInstance(); ServerInfo serverInfo = new ServerInfo("DF Node1", "node1.mcdiamondfire.com:25565", false); mc.openScreen(new ConnectScreen(mc.currentScreen, mc, serverInfo)); })); - this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104 + 22, y, 20, 20, 0, 0, 20, identifier_node2, 20, 40, + // Node 2 + this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104, y, 20, 20, 0, 0, 20, identifier_node2, 20, 40, (button) -> { MinecraftClient mc = MinecraftClient.getInstance(); ServerInfo serverInfo = new ServerInfo("DF Node2", "node2.mcdiamondfire.com:25565", false); mc.openScreen(new ConnectScreen(mc.currentScreen, mc, serverInfo)); })); - this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104, y + spacingY, 20, 20, 0, 0, 20, identifier_node3, 20, 40, + // Node 3 + this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104 + 22, y, 20, 20, 0, 0, 20, identifier_node3, 20, 40, (button) -> { MinecraftClient mc = MinecraftClient.getInstance(); ServerInfo serverInfo = new ServerInfo("DF Node3", "node3.mcdiamondfire.com:25565", false); mc.openScreen(new ConnectScreen(mc.currentScreen, mc, serverInfo)); })); - this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104 + 22, y + spacingY, 20, 20, 0, 0, 20, identifier_node4, 20, 40, + // Node 4 + this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104 + 44, y, 20, 20, 0, 0, 20, identifier_node4, 20, 40, (button) -> { MinecraftClient mc = MinecraftClient.getInstance(); ServerInfo serverInfo = new ServerInfo("DF Node4", "node4.mcdiamondfire.com:25565", false); mc.openScreen(new ConnectScreen(mc.currentScreen, mc, serverInfo)); })); - this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104 + (modMenuButtonPresent ? 22 : 0), y + spacingY + 24, 20, 20, 0, 0, 20, identifier_node5, 20, 40, + // Node 5 + this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104, y + spacingY, 20, 20, 0, 0, 20, identifier_node5, 20, 40, (button) -> { MinecraftClient mc = MinecraftClient.getInstance(); ServerInfo serverInfo = new ServerInfo("DF Node5", "node5.mcdiamondfire.com:25565", false); mc.openScreen(new ConnectScreen(mc.currentScreen, mc, serverInfo)); })); + + // Node 6 + this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104 + 22, y + spacingY, 20, 20, 0, 0, 20, identifier_node6, 20, 40, + (button) -> { + MinecraftClient mc = MinecraftClient.getInstance(); + ServerInfo serverInfo = new ServerInfo("DF Node6", "node6.mcdiamondfire.com:25565", false); + mc.openScreen(new ConnectScreen(mc.currentScreen, mc, serverInfo)); + })); + + // Node 7 + this.addButton(new BlendableTexturedButtonWidget(this.width / 2 + 104 + 44, y + spacingY, 20, 20, 0, 0, 20, identifier_node7, 20, 40, + (button) -> { + MinecraftClient mc = MinecraftClient.getInstance(); + ServerInfo serverInfo = new ServerInfo("DF Node7", "node7.mcdiamondfire.com:25565", false); + mc.openScreen(new ConnectScreen(mc.currentScreen, mc, serverInfo)); + })); } } diff --git a/src/main/resources/assets/codeutilities/textures/gui/beta.png b/src/main/resources/assets/codeutilities/textures/gui/beta.png deleted file mode 100644 index 233c4e6c..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/beta.png and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/bottom_right/beta.png b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/beta.png new file mode 100644 index 00000000..2d4c2c11 Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/beta.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node1.png b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node1.png new file mode 100644 index 00000000..c5c4b085 Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node1.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node2.png b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node2.png new file mode 100644 index 00000000..8958fc23 Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node2.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node3.png b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node3.png new file mode 100644 index 00000000..055b837b Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node3.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node4.png b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node4.png new file mode 100644 index 00000000..f52df2a2 Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node4.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node5.png b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node5.png new file mode 100644 index 00000000..39eeef0e Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node5.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node6.png b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node6.png new file mode 100644 index 00000000..4cdca13a Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node6.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node7.png b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node7.png new file mode 100644 index 00000000..b845969d Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/bottom_right/node7.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/df-old.png b/src/main/resources/assets/codeutilities/textures/gui/df-old.png deleted file mode 100644 index a33bdbd7..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/df-old.png and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/df.png b/src/main/resources/assets/codeutilities/textures/gui/df.png index fb1eab38..067d6305 100644 Binary files a/src/main/resources/assets/codeutilities/textures/gui/df.png and b/src/main/resources/assets/codeutilities/textures/gui/df.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/diamondfire.jpg b/src/main/resources/assets/codeutilities/textures/gui/diamondfire.jpg deleted file mode 100644 index ae84ecc7..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/diamondfire.jpg and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/node1.png b/src/main/resources/assets/codeutilities/textures/gui/node1.png deleted file mode 100644 index 6cfba9f8..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/node1.png and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/node2.png b/src/main/resources/assets/codeutilities/textures/gui/node2.png deleted file mode 100644 index 463124f8..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/node2.png and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/node3.png b/src/main/resources/assets/codeutilities/textures/gui/node3.png deleted file mode 100644 index 887a13bc..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/node3.png and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/node4-valley.png b/src/main/resources/assets/codeutilities/textures/gui/node4-valley.png deleted file mode 100644 index f4a7da46..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/node4-valley.png and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/node4.png b/src/main/resources/assets/codeutilities/textures/gui/node4.png deleted file mode 100644 index d52ae2c6..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/node4.png and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/node5.png b/src/main/resources/assets/codeutilities/textures/gui/node5.png deleted file mode 100644 index f0036075..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/node5.png and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/play.png b/src/main/resources/assets/codeutilities/textures/gui/play.png deleted file mode 100644 index 82783b20..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/play.png and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/playrestricted.png b/src/main/resources/assets/codeutilities/textures/gui/playrestricted.png deleted file mode 100644 index d5e6e43a..00000000 Binary files a/src/main/resources/assets/codeutilities/textures/gui/playrestricted.png and /dev/null differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/top_left/beta.png b/src/main/resources/assets/codeutilities/textures/gui/top_left/beta.png new file mode 100644 index 00000000..abf0f4f5 Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/top_left/beta.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/top_left/node1.png b/src/main/resources/assets/codeutilities/textures/gui/top_left/node1.png new file mode 100644 index 00000000..7f7075ca Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/top_left/node1.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/top_left/node2.png b/src/main/resources/assets/codeutilities/textures/gui/top_left/node2.png new file mode 100644 index 00000000..4ebe3369 Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/top_left/node2.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/top_left/node3.png b/src/main/resources/assets/codeutilities/textures/gui/top_left/node3.png new file mode 100644 index 00000000..01ee58b7 Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/top_left/node3.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/top_left/node4.png b/src/main/resources/assets/codeutilities/textures/gui/top_left/node4.png new file mode 100644 index 00000000..de133ded Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/top_left/node4.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/top_left/node5.png b/src/main/resources/assets/codeutilities/textures/gui/top_left/node5.png new file mode 100644 index 00000000..5fa8ac4b Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/top_left/node5.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/top_left/node6.png b/src/main/resources/assets/codeutilities/textures/gui/top_left/node6.png new file mode 100644 index 00000000..3c2deacb Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/top_left/node6.png differ diff --git a/src/main/resources/assets/codeutilities/textures/gui/top_left/node7.png b/src/main/resources/assets/codeutilities/textures/gui/top_left/node7.png new file mode 100644 index 00000000..5269b266 Binary files /dev/null and b/src/main/resources/assets/codeutilities/textures/gui/top_left/node7.png differ