diff options
22 files changed, 27 insertions, 1 deletions
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 Binary files differdeleted file mode 100644 index b58ded215f..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block1.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index a56a62ad1b..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block2.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 6de77b309b..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block3.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index e5f7b5e76f..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block4.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 4bb49067ed..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block5.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index b58ded215f..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/block6.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 2edad5a448..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/foil.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index d93c52c24c..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/frameGt.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 935f66ff43..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/ore.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 0a7e9d6e9e..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/oreSmall.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 7985626666..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeHuge.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 65529e2772..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeLarge.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 06b3e0d189..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeMedium.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index b33a1bac91..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeNonuple.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 343e8ff5b8..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeQuadruple.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index aec8883d6a..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSide.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index b5e620f045..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeSmall.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index c1ef295198..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/pipeTiny.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index d83a131004..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/void.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 455335e5c2..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/transcendentmetal/wire.png +++ /dev/null |
