diff --git a/CHANGELOG.md b/CHANGELOG.md index c563feded..1733fc0a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - The Vitrified Ender Pearl recipe now only accepts normal ender pearls (#1567) @TomPlop - Buffed production of fish oil and biomass amounts, tweaked biodiesel recipe slightly @Pyritie - Added compatibility between ad astra's 3x3 doors and GregTech wrenches (#1554) @Pyritie +- Added more icon sets for dusts and rods, so they look more visually distinct @Pyritie ### Bug fixes - Fixed a broken model for the aqueous accumulator. (#1557) @Redeix - Fixed broken recipes for the aqueous accumulator. @Pyritie diff --git a/kubejs/assets/gtceu/models/item/material_sets/bright/dust.json b/kubejs/assets/gtceu/models/item/material_sets/bright/dust.json new file mode 100644 index 000000000..c076efabc --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/bright/dust.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/bright/dust", + "layer1": "gtceu:item/material_sets/bright/dust_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/bright/dust_impure.json b/kubejs/assets/gtceu/models/item/material_sets/bright/dust_impure.json new file mode 100644 index 000000000..fb8d60606 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/bright/dust_impure.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/bright/dust", + "layer1": "gtceu:item/material_sets/bright/dust_secondary", + "layer2": "gtceu:item/material_sets/dull/dust_impure_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/bright/dust_pure.json b/kubejs/assets/gtceu/models/item/material_sets/bright/dust_pure.json new file mode 100644 index 000000000..329b45714 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/bright/dust_pure.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/bright/dust", + "layer1": "gtceu:item/material_sets/bright/dust_secondary", + "layer2": "gtceu:item/material_sets/dull/dust_pure_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/bright/rod.json b/kubejs/assets/gtceu/models/item/material_sets/bright/rod.json new file mode 100644 index 000000000..69a210c8a --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/bright/rod.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/bright/rod", + "layer1": "gtceu:item/material_sets/bright/rod_secondary", + "layer2": "gtceu:item/material_sets/bright/rod_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/diamond/dust.json b/kubejs/assets/gtceu/models/item/material_sets/diamond/dust.json new file mode 100644 index 000000000..4669f11b5 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/diamond/dust.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/diamond/dust", + "layer1": "gtceu:item/material_sets/diamond/dust_secondary", + "layer2": "gtceu:item/material_sets/diamond/dust_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/fine/dust.json b/kubejs/assets/gtceu/models/item/material_sets/fine/dust.json new file mode 100644 index 000000000..43639aa3d --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/fine/dust.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/fine/dust", + "layer1": "gtceu:item/material_sets/fine/dust_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/fine/dust_impure.json b/kubejs/assets/gtceu/models/item/material_sets/fine/dust_impure.json new file mode 100644 index 000000000..9c769cbc3 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/fine/dust_impure.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/fine/dust", + "layer1": "gtceu:item/material_sets/fine/dust_secondary", + "layer2": "gtceu:item/material_sets/dull/dust_impure_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/fine/dust_pure.json b/kubejs/assets/gtceu/models/item/material_sets/fine/dust_pure.json new file mode 100644 index 000000000..6b7ff2389 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/fine/dust_pure.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/fine/dust", + "layer1": "gtceu:item/material_sets/fine/dust_secondary", + "layer2": "gtceu:item/material_sets/dull/dust_pure_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/fine/rod.json b/kubejs/assets/gtceu/models/item/material_sets/fine/rod.json new file mode 100644 index 000000000..99be8f4ca --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/fine/rod.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/fine/rod", + "layer1": "gtceu:item/material_sets/fine/rod_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/metallic/dust.json b/kubejs/assets/gtceu/models/item/material_sets/metallic/dust.json new file mode 100644 index 000000000..2a93159ed --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/metallic/dust.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/metallic/dust", + "layer1": "gtceu:item/material_sets/metallic/dust_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/metallic/dust_impure.json b/kubejs/assets/gtceu/models/item/material_sets/metallic/dust_impure.json new file mode 100644 index 000000000..e73657d8d --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/metallic/dust_impure.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/metallic/dust", + "layer1": "gtceu:item/material_sets/metallic/dust_secondary", + "layer2": "gtceu:item/material_sets/dull/dust_impure_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/metallic/dust_pure.json b/kubejs/assets/gtceu/models/item/material_sets/metallic/dust_pure.json new file mode 100644 index 000000000..dba01a18c --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/metallic/dust_pure.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/metallic/dust", + "layer1": "gtceu:item/material_sets/metallic/dust_secondary", + "layer2": "gtceu:item/material_sets/dull/dust_pure_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/metallic/rod.json b/kubejs/assets/gtceu/models/item/material_sets/metallic/rod.json new file mode 100644 index 000000000..ef8403693 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/metallic/rod.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/metallic/rod", + "layer1": "gtceu:item/material_sets/metallic/rod_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/shiny/dust.json b/kubejs/assets/gtceu/models/item/material_sets/shiny/dust.json new file mode 100644 index 000000000..492276852 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/shiny/dust.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/dust", + "layer1": "gtceu:item/material_sets/shiny/dust_secondary" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/shiny/dust_impure.json b/kubejs/assets/gtceu/models/item/material_sets/shiny/dust_impure.json new file mode 100644 index 000000000..f9f47b959 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/shiny/dust_impure.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/dust", + "layer1": "gtceu:item/material_sets/shiny/dust_secondary", + "layer2": "gtceu:item/material_sets/dull/dust_impure_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/shiny/dust_pure.json b/kubejs/assets/gtceu/models/item/material_sets/shiny/dust_pure.json new file mode 100644 index 000000000..301a7ec59 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/shiny/dust_pure.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/dust", + "layer1": "gtceu:item/material_sets/shiny/dust_secondary", + "layer2": "gtceu:item/material_sets/dull/dust_pure_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/ingot_double.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/ingot_double.json new file mode 100644 index 000000000..214ea75f5 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/ingot_double.json @@ -0,0 +1,8 @@ +{ + "parent": "gtceu:item/material_sets/metallic/ingot", + "textures": { + "layer0": "gtceu:item/material_sets/tfc_gold/ingot_double", + "layer1": "gtceu:item/material_sets/tfc_gold/ingot_double_secondary", + "layer2": "gtceu:item/material_sets/tfc_gold/ingot_double_overlay" + } +} diff --git a/kubejs/assets/gtceu/textures/item/material_sets/bright/dust.png b/kubejs/assets/gtceu/textures/item/material_sets/bright/dust.png new file mode 100644 index 000000000..47f18d250 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/bright/dust.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/bright/dust_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/bright/dust_secondary.png new file mode 100644 index 000000000..1ad8f95bc Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/bright/dust_secondary.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/bright/rod.png b/kubejs/assets/gtceu/textures/item/material_sets/bright/rod.png new file mode 100644 index 000000000..cec785c19 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/bright/rod.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/bright/rod_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/bright/rod_overlay.png new file mode 100644 index 000000000..6cbc04098 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/bright/rod_overlay.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/bright/rod_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/bright/rod_secondary.png new file mode 100644 index 000000000..51e86d51a Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/bright/rod_secondary.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/diamond/dust.png b/kubejs/assets/gtceu/textures/item/material_sets/diamond/dust.png new file mode 100644 index 000000000..9ba529946 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/diamond/dust.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/diamond/dust_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/diamond/dust_overlay.png new file mode 100644 index 000000000..a92dff4b8 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/diamond/dust_overlay.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/diamond/dust_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/diamond/dust_secondary.png new file mode 100644 index 000000000..709660897 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/diamond/dust_secondary.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/fine/dust.png b/kubejs/assets/gtceu/textures/item/material_sets/fine/dust.png new file mode 100644 index 000000000..337c70730 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/fine/dust.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/fine/dust_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/fine/dust_secondary.png new file mode 100644 index 000000000..2f6e65c4f Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/fine/dust_secondary.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/fine/rod.png b/kubejs/assets/gtceu/textures/item/material_sets/fine/rod.png new file mode 100644 index 000000000..62795c36f Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/fine/rod.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/fine/rod_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/fine/rod_secondary.png new file mode 100644 index 000000000..57b796727 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/fine/rod_secondary.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/metallic/dust.png b/kubejs/assets/gtceu/textures/item/material_sets/metallic/dust.png new file mode 100644 index 000000000..85ab5347b Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/metallic/dust.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/metallic/dust_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/metallic/dust_secondary.png new file mode 100644 index 000000000..de17cee78 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/metallic/dust_secondary.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/metallic/rod.png b/kubejs/assets/gtceu/textures/item/material_sets/metallic/rod.png new file mode 100644 index 000000000..39693a24d Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/metallic/rod.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/metallic/rod_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/metallic/rod_secondary.png new file mode 100644 index 000000000..63ffc361b Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/metallic/rod_secondary.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/rough/dust.png b/kubejs/assets/gtceu/textures/item/material_sets/rough/dust.png new file mode 100644 index 000000000..668e2df3f Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/rough/dust.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/rough/dust_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/rough/dust_secondary.png new file mode 100644 index 000000000..d180d1103 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/rough/dust_secondary.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/shiny/dust.png b/kubejs/assets/gtceu/textures/item/material_sets/shiny/dust.png new file mode 100644 index 000000000..1b8b7af84 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/shiny/dust.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/shiny/dust_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/shiny/dust_secondary.png new file mode 100644 index 000000000..2feaca70a Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/shiny/dust_secondary.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/tfc_gold/ingot_double.png b/kubejs/assets/gtceu/textures/item/material_sets/tfc_gold/ingot_double.png new file mode 100644 index 000000000..bf84f88f7 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/tfc_gold/ingot_double.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/tfc_gold/ingot_double_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/tfc_gold/ingot_double_overlay.png new file mode 100644 index 000000000..41bd70d1f Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/tfc_gold/ingot_double_overlay.png differ diff --git a/kubejs/assets/gtceu/textures/item/material_sets/tfc_gold/ingot_double_secondary.png b/kubejs/assets/gtceu/textures/item/material_sets/tfc_gold/ingot_double_secondary.png new file mode 100644 index 000000000..0076a75f0 Binary files /dev/null and b/kubejs/assets/gtceu/textures/item/material_sets/tfc_gold/ingot_double_secondary.png differ diff --git a/kubejs/startup_scripts/tfc/icon_sets.js b/kubejs/startup_scripts/tfc/icon_sets.js index cd872556b..7a90f7027 100644 --- a/kubejs/startup_scripts/tfc/icon_sets.js +++ b/kubejs/startup_scripts/tfc/icon_sets.js @@ -29,7 +29,7 @@ function registerTFCIconSets(event) { event.create('tfc_magnetite').parent('dull') event.create('tfc_malachite').parent('shiny') event.create('tfc_copper').parent('bright') - event.create('tfc_gold').parent('metallic') + event.create('tfc_gold').parent('shiny') event.create('tfc_silver').parent('shiny') event.create('tfc_sphalerite').parent('dull') event.create('tfc_tetrahedrite').parent('dull') diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 5efe68f78..8ecba7247 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -7,14 +7,14 @@ const registerTFGMaterials = (event) => { event.create('hardwood') .dust() .flags(GTMaterialFlags.FLAMMABLE) - .iconSet(GTMaterialIconSet.FINE) + .iconSet(GTMaterialIconSet.WOOD) .color('0x7a5225') .secondaryColor('0x7a5225') event.create('thermochemically_treated_hardwood') .dust() .flags(GTMaterialFlags.FLAMMABLE) - .iconSet(GTMaterialIconSet.FINE) + .iconSet(GTMaterialIconSet.WOOD) .color('0x52482c') .secondaryColor('0x52482c')