diff --git a/projects/common/src/client/java/dan200/computercraft/client/gui/GuiSprites.java b/projects/common/src/client/java/dan200/computercraft/client/gui/GuiSprites.java index ffed5a1af..8e2627a74 100644 --- a/projects/common/src/client/java/dan200/computercraft/client/gui/GuiSprites.java +++ b/projects/common/src/client/java/dan200/computercraft/client/gui/GuiSprites.java @@ -32,10 +32,13 @@ public final class GuiSprites extends TextureAtlasHolder { public static final ComputerTextures COMPUTER_COMMAND = computer("command", false, true); public static final ComputerTextures COMPUTER_COLOUR = computer("colour", true, false); + public static final ResourceLocation TURTLE_NORMAL_SELECTED_SLOT = new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/sprites/turtle_normal_selected_slot"); + public static final ResourceLocation TURTLE_ADVANCED_SELECTED_SLOT = new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/sprites/turtle_advanced_selected_slot"); + private static ButtonTextures button(String name) { return new ButtonTextures( - new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name), - new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name + "_hover") + new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/sprites/buttons/" + name), + new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/sprites/buttons/" + name + "_hover") ); } diff --git a/projects/common/src/client/java/dan200/computercraft/client/gui/TurtleScreen.java b/projects/common/src/client/java/dan200/computercraft/client/gui/TurtleScreen.java index c401be67a..498ad8e68 100644 --- a/projects/common/src/client/java/dan200/computercraft/client/gui/TurtleScreen.java +++ b/projects/common/src/client/java/dan200/computercraft/client/gui/TurtleScreen.java @@ -54,9 +54,9 @@ public class TurtleScreen extends AbstractComputerScreen { if (slot >= 0) { var slotX = slot % 4; var slotY = slot / 4; - graphics.blit(texture, - leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18, 0, - 0, 217, 24, 24, FULL_TEX_SIZE, FULL_TEX_SIZE + graphics.blit( + leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18, 0, 22, 22, + GuiSprites.get(advanced ? GuiSprites.TURTLE_ADVANCED_SELECTED_SLOT : GuiSprites.TURTLE_NORMAL_SELECTED_SLOT) ); } diff --git a/projects/common/src/datagen/java/dan200/computercraft/data/DataProviders.java b/projects/common/src/datagen/java/dan200/computercraft/data/DataProviders.java index d58aeaf9b..7a2305bb4 100644 --- a/projects/common/src/datagen/java/dan200/computercraft/data/DataProviders.java +++ b/projects/common/src/datagen/java/dan200/computercraft/data/DataProviders.java @@ -57,6 +57,7 @@ public final class DataProviders { LecternPrintoutModel.TEXTURE ))); out.accept(GuiSprites.SPRITE_SHEET, makeSprites( + Stream.of(GuiSprites.TURTLE_NORMAL_SELECTED_SLOT, GuiSprites.TURTLE_ADVANCED_SELECTED_SLOT), // Buttons GuiSprites.TURNED_OFF.textures(), GuiSprites.TURNED_ON.textures(), diff --git a/projects/common/src/generated/resources/assets/computercraft/atlases/gui.json b/projects/common/src/generated/resources/assets/computercraft/atlases/gui.json index 8ad965c9d..3e34d5bb1 100644 --- a/projects/common/src/generated/resources/assets/computercraft/atlases/gui.json +++ b/projects/common/src/generated/resources/assets/computercraft/atlases/gui.json @@ -1,11 +1,13 @@ { "sources": [ - {"type": "minecraft:single", "resource": "computercraft:gui/buttons/turned_off"}, - {"type": "minecraft:single", "resource": "computercraft:gui/buttons/turned_off_hover"}, - {"type": "minecraft:single", "resource": "computercraft:gui/buttons/turned_on"}, - {"type": "minecraft:single", "resource": "computercraft:gui/buttons/turned_on_hover"}, - {"type": "minecraft:single", "resource": "computercraft:gui/buttons/terminate"}, - {"type": "minecraft:single", "resource": "computercraft:gui/buttons/terminate_hover"}, + {"type": "minecraft:single", "resource": "computercraft:gui/sprites/turtle_normal_selected_slot"}, + {"type": "minecraft:single", "resource": "computercraft:gui/sprites/turtle_advanced_selected_slot"}, + {"type": "minecraft:single", "resource": "computercraft:gui/sprites/buttons/turned_off"}, + {"type": "minecraft:single", "resource": "computercraft:gui/sprites/buttons/turned_off_hover"}, + {"type": "minecraft:single", "resource": "computercraft:gui/sprites/buttons/turned_on"}, + {"type": "minecraft:single", "resource": "computercraft:gui/sprites/buttons/turned_on_hover"}, + {"type": "minecraft:single", "resource": "computercraft:gui/sprites/buttons/terminate"}, + {"type": "minecraft:single", "resource": "computercraft:gui/sprites/buttons/terminate_hover"}, {"type": "minecraft:single", "resource": "computercraft:gui/border_normal"}, {"type": "minecraft:single", "resource": "computercraft:gui/pocket_bottom_normal"}, {"type": "minecraft:single", "resource": "computercraft:gui/sidebar_normal"}, diff --git a/projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/terminate.png b/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/terminate.png similarity index 100% rename from projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/terminate.png rename to projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/terminate.png diff --git a/projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/terminate_hover.png b/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/terminate_hover.png similarity index 100% rename from projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/terminate_hover.png rename to projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/terminate_hover.png diff --git a/projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/turned_off.png b/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/turned_off.png similarity index 100% rename from projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/turned_off.png rename to projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/turned_off.png diff --git a/projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/turned_off_hover.png b/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/turned_off_hover.png similarity index 100% rename from projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/turned_off_hover.png rename to projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/turned_off_hover.png diff --git a/projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/turned_on.png b/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/turned_on.png similarity index 100% rename from projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/turned_on.png rename to projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/turned_on.png diff --git a/projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/turned_on_hover.png b/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/turned_on_hover.png similarity index 100% rename from projects/common/src/main/resources/assets/computercraft/textures/gui/buttons/turned_on_hover.png rename to projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/buttons/turned_on_hover.png diff --git a/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/turtle_advanced_selected_slot.png b/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/turtle_advanced_selected_slot.png new file mode 100644 index 000000000..1550ea4c6 Binary files /dev/null and b/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/turtle_advanced_selected_slot.png differ diff --git a/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/turtle_normal_selected_slot.png b/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/turtle_normal_selected_slot.png new file mode 100644 index 000000000..bdf51ef11 Binary files /dev/null and b/projects/common/src/main/resources/assets/computercraft/textures/gui/sprites/turtle_normal_selected_slot.png differ diff --git a/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png b/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png index 8f7d66500..eaaeea36a 100644 Binary files a/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png and b/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png differ diff --git a/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png b/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png index f676c56b2..06cf90644 100644 Binary files a/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png and b/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png differ