diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/CosmicMaterials.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/CosmicMaterials.java index 04303f3aa..36c056fc7 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/CosmicMaterials.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/CosmicMaterials.java @@ -408,8 +408,8 @@ public static void register() { Trinavine = new Material.Builder(CosmicCore.id("trinavine")) .ingot() .formula("⋖Tv⋗") - .liquid(new FluidBuilder().temperature(1500)) - .color(0xfe2d2d).secondaryColor(0x353535).iconSet(CosmicMaterialSet.TRINAVINE) + .liquid(new FluidBuilder().temperature(1500).customStill()) + .iconSet(CosmicMaterialSet.TRINAVINE) .flags(GENERATE_BOLT_SCREW, GENERATE_ROUND, GENERATE_GEAR, GENERATE_SMALL_GEAR, GENERATE_RING, GENERATE_FRAME, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE, GENERATE_DENSE) .cableProperties(GTValues.V[7], 4, 3) diff --git a/src/main/resources/assets/cosmiccore/textures/block/fluids/fluid.trinavine.png b/src/main/resources/assets/cosmiccore/textures/block/fluids/fluid.trinavine.png new file mode 100644 index 000000000..8c12b3735 Binary files /dev/null and b/src/main/resources/assets/cosmiccore/textures/block/fluids/fluid.trinavine.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt_overlay.png.mcmeta b/src/main/resources/assets/cosmiccore/textures/block/fluids/fluid.trinavine.png.mcmeta similarity index 100% rename from src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt_overlay.png.mcmeta rename to src/main/resources/assets/cosmiccore/textures/block/fluids/fluid.trinavine.png.mcmeta diff --git a/src/main/resources/assets/gtceu/models/block/material_sets/trinavine/block.json b/src/main/resources/assets/gtceu/models/block/material_sets/trinavine/block.json new file mode 100644 index 000000000..45d4af22d --- /dev/null +++ b/src/main/resources/assets/gtceu/models/block/material_sets/trinavine/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/cube/tinted/all_0", + "textures": { + "all": "gtceu:block/material_sets/trinavine/block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/material_sets/trinavine/frame_gt.json b/src/main/resources/assets/gtceu/models/block/material_sets/trinavine/frame_gt.json new file mode 100644 index 000000000..c1431c9fe --- /dev/null +++ b/src/main/resources/assets/gtceu/models/block/material_sets/trinavine/frame_gt.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/cube/tinted/all_0", + "textures": { + "all": "gtceu:block/material_sets/trinavine/frame_gt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/alve_foil_insulator.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/alve_foil_insulator.json new file mode 100644 index 000000000..ed482d5ab --- /dev/null +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/alve_foil_insulator.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/trinavine/alve_foil_insulator" + } +} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/bolt.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/bolt.json index 437307af4..50b8db36e 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/bolt.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/bolt.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/bolt", - "layer1": "gtceu:item/material_sets/trinavine/bolt_secondary", - "layer2": "gtceu:item/material_sets/trinavine/bolt_overlay" + "layer0": "gtceu:item/material_sets/trinavine/bolt" } } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/crushed.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/crushed.json deleted file mode 100644 index 3a7708653..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/crushed.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/crushed", - "layer1": "gtceu:item/material_sets/trinavine/crushed_secondary", - "layer2": "gtceu:item/material_sets/trinavine/crushed_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/crushed_purified.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/crushed_purified.json deleted file mode 100644 index 06f5789fe..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/crushed_purified.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/crushed_purified", - "layer1": "gtceu:item/material_sets/trinavine/crushed_purified_secondary" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/crushed_refined.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/crushed_refined.json deleted file mode 100644 index f1963793a..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/crushed_refined.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/crushed_refine", - "layer1": "gtceu:item/material_sets/trinavine/crushed_refined_secondary", - "layer2": "gtceu:item/material_sets/trinavine/crushed_refined_overlay" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust.json index 7ffa3527c..c99af4459 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust.json @@ -1,7 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/dust", - "layer1": "gtceu:item/material_sets/trinavine/dust_secondary" + "layer0": "gtceu:item/material_sets/trinavine/dust" } } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_impure.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_impure.json deleted file mode 100644 index a167f29c7..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_impure.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/dust_impure", - "layer1": "gtceu:item/material_sets/trinavine/dust_impure_secondary", - "layer2": "gtceu:item/material_sets/trinavine/dust_impure_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_pure.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_pure.json deleted file mode 100644 index 68008157f..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_pure.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/dust_pure", - "layer1": "gtceu:item/material_sets/trinavine/dust_pure_secondary", - "layer2": "gtceu:item/material_sets/trinavine/dust_pure_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_small.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_small.json index 6480d46df..c7ff2c620 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_small.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_small.json @@ -1,7 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/dust_small", - "layer1": "gtceu:item/material_sets/trinavine/dust_small_secondary" + "layer0": "gtceu:item/material_sets/trinavine/dust_small" } } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_tiny.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_tiny.json index a9a5085ce..ab7b847aa 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_tiny.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/dust_tiny.json @@ -1,7 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/dust_tiny", - "layer1": "gtceu:item/material_sets/trinavine/dust_tiny_secondary" + "layer0": "gtceu:item/material_sets/trinavine/dust_tiny" } } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/foil.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/foil.json index 129a42149..c690325ea 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/foil.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/foil.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/foil", - "layer1": "gtceu:item/material_sets/trinavine/foil_secondary", - "layer2": "gtceu:item/material_sets/trinavine/foil_overlay" + "layer0": "gtceu:item/material_sets/trinavine/foil" } } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gear.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gear.json index 713296902..8479436d6 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gear.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gear.json @@ -1,7 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/gear", - "layer1": "gtceu:item/material_sets/trinavine/gear_secondary" + "layer0": "gtceu:item/material_sets/trinavine/gear" } } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gear_small.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gear_small.json index 1870e9418..29e723e7e 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gear_small.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gear_small.json @@ -1,7 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/gear_small", - "layer1": "gtceu:item/material_sets/trinavine/gear_small_secondary" + "layer0": "gtceu:item/material_sets/trinavine/gear_small" } } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem.json deleted file mode 100644 index 558e1f501..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/gem" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_chipped.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_chipped.json deleted file mode 100644 index 14579138f..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_chipped.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/gem_chipped" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_exquisite.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_exquisite.json deleted file mode 100644 index aca816661..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_exquisite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/gem_exquisite" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_flawed.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_flawed.json deleted file mode 100644 index db7f381d4..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_flawed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/gem_flawed" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_flawless.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_flawless.json deleted file mode 100644 index 28fdb7ab7..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/gem_flawless.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/gem_flawless" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot.json index eebfcf8b2..b0ec3712a 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/ingot", - "layer1": "gtceu:item/material_sets/trinavine/ingot_secondary", - "layer2": "gtceu:item/material_sets/trinavine/ingot_overlay" + "layer0": "gtceu:item/material_sets/trinavine/ingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot_double.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot_double.json deleted file mode 100644 index cd682e7d9..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "gtceu:item/material_sets/trinavine/ingot", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/ingot_double", - "layer1": "gtceu:item/material_sets/trinavine/ingot_double_secondary", - "layer2": "gtceu:item/material_sets/trinavine/ingot_double_overlay" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot_hot.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot_hot.json index c6ce88543..fe32b22df 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot_hot.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ingot_hot.json @@ -1,8 +1,6 @@ { "parent": "gtceu:item/material_sets/trinavine/ingot", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/ingot", - "layer1": "gtceu:item/material_sets/trinavine/ingot_secondary", - "layer2": "gtceu:item/material_sets/trinavine/ingot_hot_overlay" + "layer0": "gtceu:item/material_sets/trinavine/ingot_hot" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/lens.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/lens.json deleted file mode 100644 index c2d694dce..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/lens.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/lens" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/nugget.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/nugget.json index f4de57a50..a898c51f3 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/nugget.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/nugget.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/nugget", - "layer1": "gtceu:item/material_sets/trinavine/nugget_secondary", - "layer2": "gtceu:item/material_sets/trinavine/nugget_overlay" + "layer0": "gtceu:item/material_sets/trinavine/nugget" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plasmites.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plasmites.json new file mode 100644 index 000000000..65c03543f --- /dev/null +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plasmites.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/trinavine/plasmites" + } +} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate.json index fbc2cbc43..ee38408f3 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/plate", - "layer1": "gtceu:item/material_sets/trinavine/plate_secondary", - "layer2": "gtceu:item/material_sets/trinavine/plate_overlay" + "layer0": "gtceu:item/material_sets/trinavine/plate" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate_dense.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate_dense.json index 2220d102a..6f6e9eca6 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate_dense.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate_dense.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/plate_dense", - "layer1": "gtceu:item/material_sets/trinavine/plate_dense_secondary", - "layer2": "gtceu:item/material_sets/trinavine/plate_dense_overlay" + "layer0": "gtceu:item/material_sets/trinavine/plate_dense" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate_double.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate_double.json index 146763950..3fa3be2b4 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate_double.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/plate_double.json @@ -1,8 +1,6 @@ { - "parent": "gtceu:item/material_sets/trinavine/plate", + "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/plate_double", - "layer1": "gtceu:item/material_sets/trinavine/plate_double_secondary", - "layer2": "gtceu:item/material_sets/trinavine/plate_double_overlay" + "layer0": "gtceu:item/material_sets/trinavine/plate_double" } } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/raw_ore.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/raw_ore.json deleted file mode 100644 index f6d675fe7..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/raw_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/raw_ore", - "layer1": "gtceu:item/material_sets/trinavine/raw_ore_secondary" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ring.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ring.json index 07fe96f4f..778f9130a 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ring.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/ring.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/ring", - "layer1": "gtceu:item/material_sets/trinavine/ring_secondary", - "layer2": "gtceu:item/material_sets/trinavine/ring_overlay" + "layer0": "gtceu:item/material_sets/trinavine/ring" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rod.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rod.json index 93bad6574..866764131 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rod.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rod.json @@ -1,8 +1,6 @@ { - "parent": "item/handheld", + "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/rod", - "layer1": "gtceu:item/material_sets/trinavine/rod_secondary", - "layer2": "gtceu:item/material_sets/trinavine/rod_overlay" + "layer0": "gtceu:item/material_sets/trinavine/rod" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rod_long.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rod_long.json index b92906730..fb67dd868 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rod_long.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rod_long.json @@ -1,8 +1,6 @@ { - "parent": "item/handheld", + "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/rod_long", - "layer1": "gtceu:item/material_sets/trinavine/rod_long_secondary", - "layer2": "gtceu:item/material_sets/trinavine/rod_long_overlay" + "layer0": "gtceu:item/material_sets/trinavine/rod_long" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rotor.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rotor.json index 4a3904547..d36b568df 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rotor.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/rotor.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/rotor", - "layer1": "gtceu:item/material_sets/trinavine/rotor_secondary", - "layer2": "gtceu:item/material_sets/trinavine/rotor_overlay" + "layer0": "gtceu:item/material_sets/trinavine/rotor" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/round.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/round.json index ff139eb4c..e896f5e15 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/round.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/round.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/round", - "layer1": "gtceu:item/material_sets/trinavine/round_secondary", - "layer2": "gtceu:item/material_sets/trinavine/round_overlay" + "layer0": "gtceu:item/material_sets/trinavine/round" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/screw.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/screw.json index 9f8c675c8..df1dddfa9 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/screw.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/screw.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/screw", - "layer1": "gtceu:item/material_sets/trinavine/screw_secondary", - "layer2": "gtceu:item/material_sets/trinavine/screw_overlay" + "layer0": "gtceu:item/material_sets/trinavine/screw" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/shape_memory_foil.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/shape_memory_foil.json new file mode 100644 index 000000000..bf123733a --- /dev/null +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/shape_memory_foil.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/trinavine/shape_memory_foil" + } +} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/spring.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/spring.json index 34c7f9173..9d0e6cb1e 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/spring.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/spring.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/spring", - "layer1": "gtceu:item/material_sets/trinavine/spring_secondary", - "layer2": "gtceu:item/material_sets/trinavine/spring_overlay" + "layer0": "gtceu:item/material_sets/trinavine/spring" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/spring_small.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/spring_small.json index 8b3156d4b..6dad496d0 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/spring_small.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/spring_small.json @@ -1,8 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/spring_small", - "layer1": "gtceu:item/material_sets/trinavine/spring_small_secondary", - "layer2": "gtceu:item/material_sets/trinavine/spring_small_overlay" + "layer0": "gtceu:item/material_sets/trinavine/spring_small" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_buzz_saw.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_buzz_saw.json deleted file mode 100644 index 11ab0942f..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_buzz_saw.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/tool_head_buzz_saw", - "layer1": "gtceu:item/material_sets/trinavine/tool_head_buzz_saw_secondary", - "layer2": "gtceu:item/material_sets/trinavine/tool_head_buzz_saw_overlay" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_chainsaw.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_chainsaw.json deleted file mode 100644 index 175e3844d..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_chainsaw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/tool_head_chainsaw", - "layer1": "gtceu:item/material_sets/trinavine/tool_head_chainsaw_secondary" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_drill.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_drill.json deleted file mode 100644 index 4b9e5728b..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_drill.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/tool_head_drill", - "layer1": "gtceu:item/material_sets/trinavine/tool_head_drill_secondary" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_screwdriver.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_screwdriver.json deleted file mode 100644 index b9f62ab87..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_screwdriver.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/tool_head_screwdiver", - "layer1": "gtceu:item/material_sets/trinavine/tool_head_screwdiver_secondary", - "layer2": "gtceu:item/material_sets/trinavine/tool_head_screwdriver_overlay" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_wire_cutter.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_wire_cutter.json deleted file mode 100644 index 94ca2a992..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_wire_cutter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/tool_head_wirecutter" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_wrench.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_wrench.json deleted file mode 100644 index 6946c402e..000000000 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/tool_head_wrench.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/trinavine/tool_head_wrench", - "layer1": "gtceu:item/material_sets/trinavine/tool_head_wrench_secondary", - "layer2": "gtceu:item/material_sets/trinavine/tool_head_wrench_overlay" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/turbine_blade.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/turbine_blade.json index 4a61b87bd..c4bf47e67 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/turbine_blade.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/turbine_blade.json @@ -3,4 +3,4 @@ "textures": { "layer0": "gtceu:item/material_sets/trinavine/turbine_blade" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/wire_fine.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/wire_fine.json index 7394cc392..49603df0e 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/wire_fine.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/wire_fine.json @@ -2,7 +2,6 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/trinavine/wire_fine", - "layer1": "gtceu:item/material_sets/trinavine/wire_fine_secondary", - "layer2": "gtceu:item/material_sets/trinavine/wire_fine_overlay" + "layer1": "gtceu:item/material_sets/trinavine/wire_fine_overlay" } } diff --git a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/wire_spool.json b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/wire_spool.json index 1852aa791..409fdb28c 100644 --- a/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/wire_spool.json +++ b/src/main/resources/assets/gtceu/models/item/material_sets/trinavine/wire_spool.json @@ -1,8 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/trinavine/wire_spool", - "layer1": "gtceu:item/void", - "layer2": "gtceu:item/material_sets/dull/wire_spool_overlay" + "layer0": "gtceu:item/material_sets/trinavine/wire_spool", + "layer1": "gtceu:item/material_sets/trinavine/wire_spool_overlay" } } diff --git a/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/block.png b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/block.png new file mode 100644 index 000000000..5a7283f3e Binary files /dev/null and b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/block.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/block.png.mcmeta similarity index 100% rename from src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt_secondary.png.mcmeta rename to src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/block.png.mcmeta diff --git a/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/frame_gt.png b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/frame_gt.png new file mode 100644 index 000000000..05ec09e8e Binary files /dev/null and b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/frame_gt.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed.png.mcmeta b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/frame_gt.png.mcmeta similarity index 100% rename from src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed.png.mcmeta rename to src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/frame_gt.png.mcmeta diff --git a/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/wire.png b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/wire.png new file mode 100644 index 000000000..bcdc46445 Binary files /dev/null and b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/wire.png differ diff --git a/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/wire_end.png b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/wire_end.png new file mode 100644 index 000000000..bcdc46445 Binary files /dev/null and b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/wire_end.png differ diff --git a/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/wire_side.png b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/wire_side.png new file mode 100644 index 000000000..bcdc46445 Binary files /dev/null and b/src/main/resources/assets/gtceu/textures/block/material_sets/trinavine/wire_side.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/alve_foil_insulator.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/alve_foil_insulator.png new file mode 100644 index 000000000..292d03fab Binary files /dev/null and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/alve_foil_insulator.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/alve_foil_insulator.png.mcmeta similarity index 100% rename from src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_overlay.png.mcmeta rename to src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/alve_foil_insulator.png.mcmeta diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt.png index b26f8db3f..66f0c88ed 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt_overlay.png deleted file mode 100644 index 6f450dd14..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt_secondary.png deleted file mode 100644 index fb642ca3b..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/bolt_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed.png deleted file mode 100644 index 849788ac9..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_overlay.png deleted file mode 100644 index 8d9c1e290..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_purified.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_purified.png deleted file mode 100644 index 849788ac9..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_purified.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_purified_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_purified_secondary.png deleted file mode 100644 index 96350cbac..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_purified_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined.png deleted file mode 100644 index 849788ac9..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined_overlay.png deleted file mode 100644 index 76f1bc4f2..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined_secondary.png deleted file mode 100644 index 96350cbac..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_secondary.png deleted file mode 100644 index 96350cbac..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust.png index 179300e3d..f99699f7c 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure.png deleted file mode 100644 index c57b4042f..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_overlay.png deleted file mode 100644 index 67b9e6558..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_secondary.png deleted file mode 100644 index 02d56c0a1..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_impure_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure.png deleted file mode 100644 index 8ee8a99ee..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure_overlay.png deleted file mode 100644 index 016f5b629..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure_secondary.png deleted file mode 100644 index ee9558b4a..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_pure_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_secondary.png deleted file mode 100644 index b9bc6b53c..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_small.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_small.png index 9d8c6a5d4..075b1d586 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_small.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_small.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_small_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_small_secondary.png deleted file mode 100644 index a3713ba4c..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_small_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_small_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_small_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_small_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_tiny.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_tiny.png index 7ca271037..db6bafde4 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_tiny.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_tiny.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_tiny_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_tiny_secondary.png deleted file mode 100644 index 4c48e17ba..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_tiny_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_tiny_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_tiny_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/dust_tiny_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil.png index ec5677473..e2669807c 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_overlay.png deleted file mode 100644 index 6483f7fe2..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_secondary.png deleted file mode 100644 index 5b702a3e3..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/foil_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear.png index c0e0f34d9..37502a0df 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_secondary.png deleted file mode 100644 index 4c487b920..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_small.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_small.png index 4bee9e93d..de92af508 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_small.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_small.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_small_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_small_secondary.png deleted file mode 100644 index 2e2e6df10..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_small_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_small_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_small_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/gear_small_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/heavy_beam.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/heavy_beam.png index 47311a4af..b69d72707 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/heavy_beam.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/heavy_beam.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot.png index 6bb0a4239..dee3ba03f 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double.png index a44f50f0e..9477f20cb 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_overlay.png deleted file mode 100644 index 8f9196cdf..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_secondary.png deleted file mode 100644 index a5b63e403..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_double_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_hot.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_hot.png index 00614d483..1f2d786bc 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_hot.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_hot.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_hot_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_hot_overlay.png deleted file mode 100644 index 73b00fd78..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_hot_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_overlay.png deleted file mode 100644 index ed865fbbe..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_secondary.png deleted file mode 100644 index c566203ab..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ingot_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/modular_shelling.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/modular_shelling.png index 72f2bf21a..0054d5dc2 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/modular_shelling.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/modular_shelling.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget.png index 93cefe3a4..e2765c13e 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_overlay.png deleted file mode 100644 index e7231625c..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_secondary.png deleted file mode 100644 index f85561b36..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/nugget_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plasmites.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plasmites.png index 5110a0d19..a1bcba752 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plasmites.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plasmites.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plasmites.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plasmites.png.mcmeta index 6a199bf8f..f5a5fd7c2 100644 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plasmites.png.mcmeta +++ b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plasmites.png.mcmeta @@ -1,6 +1,6 @@ { - "animation": { - "interpolate": true, - "frametime": 1 - } -} + "animation": { + "interpolate": true, + "frametime": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate.png index 7d5273d08..611e73f67 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense.png index 366d370a3..ab3fbcdcd 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_overlay.png deleted file mode 100644 index 5f53c84ca..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_secondary.png deleted file mode 100644 index 6803e14fb..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_dense_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double.png index 5714bc674..80162b706 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_overlay.png deleted file mode 100644 index 4a439d731..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_secondary.png deleted file mode 100644 index 90b5b7f6a..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_double_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_overlay.png deleted file mode 100644 index 6ab0baa6d..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_secondary.png deleted file mode 100644 index 8ea76e959..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/plate_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore.png deleted file mode 100644 index d99ecc1fd..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore_secondary.png deleted file mode 100644 index 5ea6f5c0f..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/raw_ore_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring.png index b0e7270e2..6b54cbd0a 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_overlay.png deleted file mode 100644 index 6825ddad4..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_secondary.png deleted file mode 100644 index 1b33a16d3..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ring_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod.png index 54fce9312..5387bfbfe 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long.png index 3b3e5d339..570ef12a1 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_overlay.png deleted file mode 100644 index ba9fb43c5..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_secondary.png deleted file mode 100644 index 6e6af6759..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_long_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_overlay.png deleted file mode 100644 index 06cc774e7..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_secondary.png deleted file mode 100644 index 04ecc1229..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rod_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor.png index da8f3a099..261033ab6 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_overlay.png deleted file mode 100644 index 06680c939..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_secondary.png deleted file mode 100644 index 7392889a7..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/rotor_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round.png index fa955da62..879ea0704 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_overlay.png deleted file mode 100644 index 673e3960d..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_secondary.png deleted file mode 100644 index 1d9e09585..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/round_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw.png index f783220a6..02f5ca6f2 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_overlay.png deleted file mode 100644 index b17a76a79..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_secondary.png deleted file mode 100644 index 406e35dd0..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/screw_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/shape_memory_foil.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/shape_memory_foil.png new file mode 100644 index 000000000..4525b62df Binary files /dev/null and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/shape_memory_foil.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_purified.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/shape_memory_foil.png.mcmeta similarity index 100% rename from src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_purified.png.mcmeta rename to src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/shape_memory_foil.png.mcmeta diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring.png index 50351a0a6..c137350f8 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_overlay.png deleted file mode 100644 index 74e43e73c..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_secondary.png deleted file mode 100644 index 38d124f45..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small.png index 14df3ecbe..f181262c5 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_overlay.png deleted file mode 100644 index e35dfb468..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_secondary.png deleted file mode 100644 index 217901e30..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/spring_small_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw.png deleted file mode 100644 index e99660fca..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_overlay.png deleted file mode 100644 index beb19da24..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_secondary.png deleted file mode 100644 index e82337d2b..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_buzz_saw_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw.png deleted file mode 100644 index 3f8f4c37b..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw_secondary.png deleted file mode 100644 index d2d65a527..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_chainsaw_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill.png deleted file mode 100644 index e25e93a81..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill_secondary.png deleted file mode 100644 index b6645bbd2..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_drill_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver.png deleted file mode 100644 index 8120890e3..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_overlay.png deleted file mode 100644 index 3191ef3ee..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_secondary.png deleted file mode 100644 index f745365c4..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_screwdriver_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wirecutter.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wirecutter.png deleted file mode 100644 index 0cad5a434..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wirecutter.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wirecutter.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wirecutter.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wirecutter.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench.png deleted file mode 100644 index e7674614d..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_overlay.png deleted file mode 100644 index 8384a48f6..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_overlay.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_overlay.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_overlay.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_secondary.png deleted file mode 100644 index 781e3e3ff..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/tool_head_wrench_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ultradense_plate.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ultradense_plate.png index a5e762969..27f3d03ed 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ultradense_plate.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/ultradense_plate.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine.png index 300c5aec4..da455769f 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_overlay.png index 5ce9335a1..f4533d60b 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_overlay.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_overlay.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_purified_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_overlay.png.mcmeta similarity index 100% rename from src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_purified_secondary.png.mcmeta rename to src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_overlay.png.mcmeta diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_secondary.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_secondary.png deleted file mode 100644 index 77fe9a893..000000000 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_secondary.png and /dev/null differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_secondary.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_secondary.png.mcmeta deleted file mode 100644 index 278593081..000000000 --- a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_fine_secondary.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_spool.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_spool.png index 3ef312c0b..91cbc4347 100644 Binary files a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_spool.png and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_spool.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_spool_overlay.png b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_spool_overlay.png new file mode 100644 index 000000000..35b94178b Binary files /dev/null and b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_spool_overlay.png differ diff --git a/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined.png.mcmeta b/src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_spool_overlay.png.mcmeta similarity index 100% rename from src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/crushed_refined.png.mcmeta rename to src/main/resources/assets/gtceu/textures/item/material_sets/trinavine/wire_spool_overlay.png.mcmeta