diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/DiscShelfBlockEntityRenderer.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/DiscShelfBlockEntityRenderer.kt index cfe63b731e..c527019d10 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/DiscShelfBlockEntityRenderer.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/DiscShelfBlockEntityRenderer.kt @@ -37,6 +37,9 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) : private val slotHeightPixels = 2 private val textureSize = 16f + private val slotUMax = slotWidthPixels / textureSize + private val slotVMax = slotHeightPixels / textureSize + private val leftMargin = 1f private val rightMargin = 1f private val topMargin = 1f @@ -176,13 +179,15 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) : val g = (gBase * slotBrightnessMultiplier).coerceIn(0f, 1f) val b = (bBase * slotBrightnessMultiplier).coerceIn(0f, 1f) - consumer.addVertex(matrix, 0f, 0f, 0f).setColor(r, g, b, a).setUv(0f, 1f) + // The quad faces -Z, so a viewer looking at it sees +X on their left. + // U runs from slotUMax at x = 0 to 0 at x = width so the art is not mirrored. + consumer.addVertex(matrix, 0f, 0f, 0f).setColor(r, g, b, a).setUv(slotUMax, slotVMax) .setUv1(0, 0).setUv2(light and 0xFFFF, light shr 16).setNormal(0f, 0f, -1f) - consumer.addVertex(matrix, 0f, height, 0f).setColor(r, g, b, a).setUv(0f, 0f) + consumer.addVertex(matrix, 0f, height, 0f).setColor(r, g, b, a).setUv(slotUMax, 0f) .setUv1(0, 0).setUv2(light and 0xFFFF, light shr 16).setNormal(0f, 0f, -1f) - consumer.addVertex(matrix, width, height, 0f).setColor(r, g, b, a).setUv(1f, 0f) + consumer.addVertex(matrix, width, height, 0f).setColor(r, g, b, a).setUv(0f, 0f) .setUv1(0, 0).setUv2(light and 0xFFFF, light shr 16).setNormal(0f, 0f, -1f) - consumer.addVertex(matrix, width, 0f, 0f).setColor(r, g, b, a).setUv(1f, 1f) + consumer.addVertex(matrix, width, 0f, 0f).setColor(r, g, b, a).setUv(0f, slotVMax) .setUv1(0, 0).setUv2(light and 0xFFFF, light shr 16).setNormal(0f, 0f, -1f) } diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/dubious_disc.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/dubious_disc.png index e910fb2432..45cd0153ba 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/dubious_disc.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/dubious_disc.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/fallback.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/fallback.png index 1c61bc6c2b..4ab97b106c 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/fallback.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/fallback.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_11.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_11.png index e62eb5bdfe..8d7064ba58 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_11.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_11.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_13.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_13.png index eb6329b93e..529b6a96f1 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_13.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_13.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_5.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_5.png index d902604ee0..cf4b6147ae 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_5.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_5.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_blocks.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_blocks.png index fe8a69ea03..47d42ecb8e 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_blocks.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_blocks.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_cat.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_cat.png index 7b3699da0d..80f6060ecc 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_cat.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_cat.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_chirp.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_chirp.png index b05f6ca685..0e2ea8e960 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_chirp.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_chirp.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_creator.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_creator.png index 423bbfba3a..d577a23a6c 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_creator.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_creator.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_creator_music_box.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_creator_music_box.png index bb71cccbb7..3afbdcf6d7 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_creator_music_box.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_creator_music_box.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_far.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_far.png index 9a4fcee2eb..df7b3fb3bd 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_far.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_far.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_mall.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_mall.png index 6ded49d80a..d9c521773a 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_mall.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_mall.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_mellohi.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_mellohi.png index ab4dc09fc2..771a2bee2b 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_mellohi.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_mellohi.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_otherside.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_otherside.png index ee0105a2c8..74fcd9667f 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_otherside.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_otherside.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_pigstep.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_pigstep.png index d3b2aff782..ae6c3d5355 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_pigstep.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_pigstep.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_precipice.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_precipice.png index 76e03d93f4..a3883f05b5 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_precipice.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_precipice.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_relic.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_relic.png index 2c21aabc21..62bf51e550 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_relic.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_relic.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_stal.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_stal.png index 0480664e02..3ed10d4dfc 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_stal.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_stal.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_strad.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_strad.png index b3d7ee888a..5340f1f7ef 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_strad.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_strad.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_unknown.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_unknown.png index 2f6c08c20c..c51281d7b1 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_unknown.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_unknown.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_wait.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_wait.png index 92a80a287d..7bdf1f83e8 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_wait.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_wait.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_ward.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_ward.png index 1b8f6adf5f..e074270e34 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_ward.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/music_disc_ward.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine.png index e0dd7c9687..ccbc9e01c8 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine_base.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine_base.png index 285ae6fc7e..e9a222e2c1 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine_base.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine_base.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine_overlay.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine_overlay.png index e7abb848a6..b7dd0a4282 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine_overlay.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/technical_machine_overlay.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/upgrade.png b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/upgrade.png index 91a9477c58..24bb3adfbb 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/upgrade.png and b/common/src/main/resources/assets/cobblemon/textures/block/disc_shelf/upgrade.png differ