Skip to content

Trinavine materialset sprites #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
FuruchiW wants to merge 4 commits into from
Closed

Trinavine materialset sprites #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
012fb9d
Is this right?
RedMoonShi Mar 26, 2025
08a22e7
Fix and standardized neutronite assets
FuruchiW Mar 28, 2025
ffd6327
Merge remote-tracking branch 'origin/main-1.20.1-forge' into fork/Fur…
Ghostipedia Mar 29, 2025
4991275
Addition of trinavine material-set
FuruchiW Mar 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions src/main/java/com/ghostipedia/cosmiccore/common/data/materials/CosmicMaterialSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public class CosmicMaterialSet {
public static final MaterialIconSet INFINITY = new MaterialIconSet("infinity", SHINY);
public static final MaterialIconSet CHRONON = new MaterialIconSet("chronon", SHINY);
public static final MaterialIconSet NEUTRONITE = new MaterialIconSet("neutronite", SHINY);
public static final MaterialIconSet TRINAVINE = new MaterialIconSet("trinavine", SHINY);

public static void init() {}
}
4 changes: 2 additions & 2 deletions src/main/java/com/ghostipedia/cosmiccore/common/data/materials/CosmicMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static void register() {
.ingot()
.formula("⋖Tv⋗")
.liquid(new FluidBuilder().temperature(1500))
.color(0xdb5e5e).secondaryColor(0x5e0f3d).iconSet(MaterialIconSet.BRIGHT)
.color(0xfe2d2d).secondaryColor(0x353535).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)
.cableProperties(GTValues.V[7], 4, 6)
Expand Down Expand Up @@ -171,7 +171,7 @@ public static void register() {
.formula("⦽")
.blastTemp(8900)
.liquid(new FluidBuilder().temperature(7500))
.iconSet(CosmicMaterialSet.NEUTRONITE)
.color(0x80faf3).secondaryColor(0x8e2e2d).iconSet(CosmicMaterialSet.NEUTRONITE)
.flags(
GENERATE_PLATE,
GENERATE_DENSE,
Expand Down
Binary file modified src/main/resources/assets/cosmiccore/textures/item/void_blood_orb.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/bolt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/bolt" }
}
"layer0": "gtceu:item/material_sets/neutronite/bolt",
"layer1": "gtceu:item/material_sets/neutronite/bolt_secondary",
"layer2": "gtceu:item/material_sets/neutronite/bolt_overlay"
}
}
7 changes: 5 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/crushed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/crushed" }
}
"layer0": "gtceu:item/material_sets/neutronite/crushed",
"layer1": "gtceu:item/material_sets/neutronite/crushed_secondary",
"layer2": "gtceu:item/material_sets/neutronite/crushed_overlay"
}
}
5 changes: 3 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/crushed_purified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/crushed"
"layer0": "gtceu:item/material_sets/neutronite/crushed_purified",
"layer1": "gtceu:item/material_sets/neutronite/crushed_purified_secondary"
}
}
}
5 changes: 4 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/crushed_refined.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/crushed_refined" }
"layer0": "gtceu:item/material_sets/neutronite/crushed_refine",
"layer1": "gtceu:item/material_sets/neutronite/crushed_refined_secondary",
"layer2": "gtceu:item/material_sets/neutronite/crushed_refined_overlay"
}
}
5 changes: 3 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/dust.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/dust"
"layer0": "gtceu:item/material_sets/neutronite/dust",
"layer1": "gtceu:item/material_sets/neutronite/dust_secondary"
}
}
}
7 changes: 5 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/dust_impure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/dust_impure" }
}
"layer0": "gtceu:item/material_sets/neutronite/dust_impure",
"layer1": "gtceu:item/material_sets/neutronite/dust_impure_secondary",
"layer2": "gtceu:item/material_sets/neutronite/dust_impure_overlay"
}
}
7 changes: 5 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/dust_pure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/dust_pure" }
}
"layer0": "gtceu:item/material_sets/neutronite/dust_pure",
"layer1": "gtceu:item/material_sets/neutronite/dust_pure_secondary",
"layer2": "gtceu:item/material_sets/neutronite/dust_pure_overlay"
}
}
5 changes: 3 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/dust_small.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/dust_small"
"layer0": "gtceu:item/material_sets/neutronite/dust_small",
"layer1": "gtceu:item/material_sets/neutronite/dust_small_secondary"
}
}
}
5 changes: 3 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/dust_tiny.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/dust_tiny"
"layer0": "gtceu:item/material_sets/neutronite/dust_tiny",
"layer1": "gtceu:item/material_sets/neutronite/dust_tiny_secondary"
}
}
}
7 changes: 5 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/foil.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/foil" }
}
"layer0": "gtceu:item/material_sets/neutronite/foil",
"layer1": "gtceu:item/material_sets/neutronite/foil_secondary",
"layer2": "gtceu:item/material_sets/neutronite/foil_overlay"
}
}
6 changes: 4 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/gear.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/gear" }
}
"layer0": "gtceu:item/material_sets/neutronite/gear",
"layer1": "gtceu:item/material_sets/neutronite/gear_secondary"
}
}
6 changes: 4 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/gear_small.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/gear_small" }
}
"layer0": "gtceu:item/material_sets/neutronite/gear_small",
"layer1": "gtceu:item/material_sets/neutronite/gear_small_secondary"
}
}
3 changes: 2 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/gem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/gem" }
"layer0": "gtceu:item/material_sets/neutronite/gem"
}
}
3 changes: 2 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/gem_chipped.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/gem_chipped" }
"layer0": "gtceu:item/material_sets/neutronite/gem_chipped"
}
}
3 changes: 2 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/gem_exquisite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/gem_exquisite" }
"layer0": "gtceu:item/material_sets/neutronite/gem_exquisite"
}
}
3 changes: 2 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/gem_flawed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/gem_flawed" }
"layer0": "gtceu:item/material_sets/neutronite/gem_flawed"
}
}
3 changes: 2 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/gem_flawless.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/gem_flawless" }
"layer0": "gtceu:item/material_sets/neutronite/gem_flawless"
}
}
6 changes: 4 additions & 2 deletions src/main/resources/assets/gtceu/models/item/material_sets/neutronite/ingot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/ingot"
"layer0": "gtceu:item/material_sets/neutronite/ingot",
"layer1": "gtceu:item/material_sets/neutronite/ingot_secondary",
"layer2": "gtceu:item/material_sets/neutronite/ingot_overlay"
}
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/ingot_double.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "gtceu:item/material_sets/neutronite/ingot",
"textures": {
"layer3": "gtceu:item/material_sets/neutronite/ingot_double_overlay"
"layer0": "gtceu:item/material_sets/neutronite/ingot_double",
"layer1": "gtceu:item/material_sets/neutronite/ingot_double_secondary",
"layer2": "gtceu:item/material_sets/neutronite/ingot_double_overlay"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/ingot_hot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "gtceu:item/material_sets/neutronite/ingot",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/ingot",
"layer1": "gtceu:item/void",
"layer1": "gtceu:item/material_sets/neutronite/ingot_secondary",
"layer2": "gtceu:item/material_sets/neutronite/ingot_hot_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/nugget.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/nugget"
"layer0": "gtceu:item/material_sets/neutronite/nugget",
"layer1": "gtceu:item/material_sets/neutronite/nugget_secondary",
"layer2": "gtceu:item/material_sets/neutronite/nugget_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/plate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/plate"
"layer0": "gtceu:item/material_sets/neutronite/plate",
"layer1": "gtceu:item/material_sets/neutronite/plate_secondary",
"layer2": "gtceu:item/material_sets/neutronite/plate_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/plate_dense.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/plate_dense"
"layer0": "gtceu:item/material_sets/neutronite/plate_dense",
"layer1": "gtceu:item/material_sets/neutronite/plate_dense_secondary",
"layer2": "gtceu:item/material_sets/neutronite/plate_dense_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/plate_double.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "gtceu:item/material_sets/neutronite/plate",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/plate_double"
"layer0": "gtceu:item/material_sets/neutronite/plate_double",
"layer1": "gtceu:item/material_sets/neutronite/plate_double_secondary",
"layer2": "gtceu:item/material_sets/neutronite/plate_double_overlay"
}
}
3 changes: 2 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/raw_ore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/raw_ore"
"layer0": "gtceu:item/material_sets/neutronite/raw_ore",
"layer1": "gtceu:item/material_sets/neutronite/raw_ore_secondary"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/ring.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/ring"
"layer0": "gtceu:item/material_sets/neutronite/ring",
"layer1": "gtceu:item/material_sets/neutronite/ring_secondary",
"layer2": "gtceu:item/material_sets/neutronite/ring_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/rod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/rod"
"layer0": "gtceu:item/material_sets/neutronite/rod",
"layer1": "gtceu:item/material_sets/neutronite/rod_secondary",
"layer2": "gtceu:item/material_sets/neutronite/rod_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/rod_long.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/rod_long"
"layer0": "gtceu:item/material_sets/neutronite/rod_long",
"layer1": "gtceu:item/material_sets/neutronite/rod_long_secondary",
"layer2": "gtceu:item/material_sets/neutronite/rod_long_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/rotor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/rotor"
"layer0": "gtceu:item/material_sets/neutronite/rotor",
"layer1": "gtceu:item/material_sets/neutronite/rotor_secondary",
"layer2": "gtceu:item/material_sets/neutronite/rotor_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/round.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/round"
"layer0": "gtceu:item/material_sets/neutronite/round",
"layer1": "gtceu:item/material_sets/neutronite/round_secondary",
"layer2": "gtceu:item/material_sets/neutronite/round_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/screw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/screw"
"layer0": "gtceu:item/material_sets/neutronite/screw",
"layer1": "gtceu:item/material_sets/neutronite/screw_secondary",
"layer2": "gtceu:item/material_sets/neutronite/screw_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/spring.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/spring"
"layer0": "gtceu:item/material_sets/neutronite/spring",
"layer1": "gtceu:item/material_sets/neutronite/spring_secondary",
"layer2": "gtceu:item/material_sets/neutronite/spring_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/spring_small.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/spring_small"
"layer0": "gtceu:item/material_sets/neutronite/spring_small",
"layer1": "gtceu:item/material_sets/neutronite/spring_small_secondary",
"layer2": "gtceu:item/material_sets/neutronite/spring_small_overlay"
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/tool_head_buzz_saw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/tool_head_buzz_saw"
"layer0": "gtceu:item/material_sets/neutronite/tool_head_buzz_saw",
"layer1": "gtceu:item/material_sets/neutronite/tool_head_buzz_saw_secondary",
"layer2": "gtceu:item/material_sets/neutronite/tool_head_buzz_saw_overlay"
}
}
3 changes: 2 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/tool_head_chainsaw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/tool_head_chainsaw"
"layer0": "gtceu:item/material_sets/neutronite/tool_head_chainsaw",
"layer1": "gtceu:item/material_sets/neutronite/tool_head_chainsaw_secondary"
}
}
3 changes: 2 additions & 1 deletion src/main/resources/assets/gtceu/models/item/material_sets/neutronite/tool_head_drill.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gtceu:item/material_sets/neutronite/tool_head_drill"
"layer0": "gtceu:item/material_sets/neutronite/tool_head_drill",
"layer1": "gtceu:item/material_sets/neutronite/tool_head_drill_secondary"
}
}
Loading
Loading