From aa094aee4db85c9a08c7ee4054f14459c4ce4cc1 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Wed, 7 Sep 2022 17:20:57 +0800 Subject: revert to spritesheet for block textures for gaia spirit (#1351) * revert to spritesheet for block textures for gaia spirit also removed now-unused transcendent metal block textures * Spotless apply for branch fix/animated-material-texture-fix for #1351 (#1352) Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../java/gregtech/api/enums/MaterialsBotania.java | 2 +- src/main/java/gregtech/api/enums/TextureSet.java | 26 +++++++++++++++++++++ .../CUSTOM/transcendentmetal/block1.png | Bin 504 -> 0 bytes .../CUSTOM/transcendentmetal/block2.png | Bin 620 -> 0 bytes .../CUSTOM/transcendentmetal/block3.png | Bin 642 -> 0 bytes .../CUSTOM/transcendentmetal/block4.png | Bin 655 -> 0 bytes .../CUSTOM/transcendentmetal/block5.png | Bin 427 -> 0 bytes .../CUSTOM/transcendentmetal/block6.png | Bin 504 -> 0 bytes .../CUSTOM/transcendentmetal/foil.png | Bin 368 -> 0 bytes .../CUSTOM/transcendentmetal/frameGt.png | Bin 441 -> 0 bytes .../materialicons/CUSTOM/transcendentmetal/ore.png | Bin 249 -> 0 bytes .../CUSTOM/transcendentmetal/oreSmall.png | Bin 339 -> 0 bytes .../CUSTOM/transcendentmetal/pipeHuge.png | Bin 348 -> 0 bytes .../CUSTOM/transcendentmetal/pipeLarge.png | Bin 446 -> 0 bytes .../CUSTOM/transcendentmetal/pipeMedium.png | Bin 442 -> 0 bytes .../CUSTOM/transcendentmetal/pipeNonuple.png | Bin 497 -> 0 bytes .../CUSTOM/transcendentmetal/pipeQuadruple.png | Bin 521 -> 0 bytes .../CUSTOM/transcendentmetal/pipeSide.png | Bin 401 -> 0 bytes .../CUSTOM/transcendentmetal/pipeSmall.png | Bin 429 -> 0 bytes .../CUSTOM/transcendentmetal/pipeTiny.png | Bin 418 -> 0 bytes .../CUSTOM/transcendentmetal/void.png | Bin 143 -> 0 bytes .../CUSTOM/transcendentmetal/wire.png | Bin 513 -> 0 bytes 22 files changed, 27 insertions(+), 1 deletion(-) delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block1.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block2.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block3.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block4.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block5.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block6.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/foil.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/frameGt.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/ore.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/oreSmall.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeHuge.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeLarge.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeMedium.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeNonuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSide.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSmall.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeTiny.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/void.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/wire.png (limited to 'src') diff --git a/src/main/java/gregtech/api/enums/MaterialsBotania.java b/src/main/java/gregtech/api/enums/MaterialsBotania.java index 334940d47a..ef07ec4297 100644 --- a/src/main/java/gregtech/api/enums/MaterialsBotania.java +++ b/src/main/java/gregtech/api/enums/MaterialsBotania.java @@ -76,7 +76,7 @@ public class MaterialsBotania { .constructMaterial(); public static Materials GaiaSpirit = new Materials( 205, - TextureSet.SET_METALLIC, + TextureSet.SET_METALLIC.withBlockTextures("GaiaSpirit"), 32.0F, 850000, 12, diff --git a/src/main/java/gregtech/api/enums/TextureSet.java b/src/main/java/gregtech/api/enums/TextureSet.java index 78864e1ca5..52bb081bd3 100644 --- a/src/main/java/gregtech/api/enums/TextureSet.java +++ b/src/main/java/gregtech/api/enums/TextureSet.java @@ -187,4 +187,30 @@ public class TextureSet { this("CUSTOM/" + aSetName); this.is_custom = is_custom; } + + /** + * Construct a TextureSet that will delegate some of its textures to the origin TextureSet. + * + * This assumes you want to construct a custom texture set. + */ + private TextureSet(String aSetName, TextureSet origin, boolean overrideBlock, boolean overrideItem) { + this("CUSTOM/" + aSetName); + this.is_custom = true; + + for (int i = 0; i < mTextures.length; i++) { + if (mTextures[i] instanceof Textures.ItemIcons.CustomIcon) { + if (!overrideItem) { + mTextures[i] = origin.mTextures[i]; + } + } else if (mTextures[i] instanceof Textures.BlockIcons.CustomIcon) { + if (!overrideBlock) { + mTextures[i] = origin.mTextures[i]; + } + } + } + } + + public TextureSet withBlockTextures(String aNewSetName) { + return new TextureSet(aNewSetName, this, true, false); + } } diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block1.png deleted file mode 100644 index b58ded215f..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block1.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block2.png deleted file mode 100644 index a56a62ad1b..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block2.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block3.png deleted file mode 100644 index 6de77b309b..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block3.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block4.png deleted file mode 100644 index e5f7b5e76f..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block4.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block5.png deleted file mode 100644 index 4bb49067ed..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block5.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block6.png deleted file mode 100644 index b58ded215f..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block6.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/foil.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/foil.png deleted file mode 100644 index 2edad5a448..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/foil.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/frameGt.png deleted file mode 100644 index d93c52c24c..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/frameGt.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/ore.png deleted file mode 100644 index 935f66ff43..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/ore.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/oreSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/oreSmall.png deleted file mode 100644 index 0a7e9d6e9e..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/oreSmall.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeHuge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeHuge.png deleted file mode 100644 index 7985626666..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeHuge.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeLarge.png deleted file mode 100644 index 65529e2772..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeLarge.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeMedium.png deleted file mode 100644 index 06b3e0d189..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeMedium.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeNonuple.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeNonuple.png deleted file mode 100644 index b33a1bac91..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeNonuple.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeQuadruple.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeQuadruple.png deleted file mode 100644 index 343e8ff5b8..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeQuadruple.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSide.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSide.png deleted file mode 100644 index aec8883d6a..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSide.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSmall.png deleted file mode 100644 index b5e620f045..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSmall.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeTiny.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeTiny.png deleted file mode 100644 index c1ef295198..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeTiny.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/void.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/void.png deleted file mode 100644 index d83a131004..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/void.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/wire.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/wire.png deleted file mode 100644 index 455335e5c2..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/wire.png and /dev/null differ -- cgit