Skip to content

Commit

Permalink
Move drive cell models to datagen
Browse files Browse the repository at this point in the history
  • Loading branch information
@62832
62832 committed Jul 14, 2024
1 parent a96089a commit 0ed7f4f
Show file tree
Hide file tree
Showing 40 changed files with 1,072 additions and 676 deletions.
37 changes: 37 additions & 0 deletions src/data/java/gripe/_90/megacells/datagen/MEGAModelProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.ArrayList;

import net.minecraft.core.Direction;
import net.minecraft.data.PackOutput;
import net.minecraft.data.models.blockstates.PropertyDispatch;
import net.minecraft.data.models.blockstates.Variant;
Expand Down Expand Up @@ -75,6 +76,9 @@ protected void registerStatesAndModels() {
MEGAItems.getItemPortables().forEach(cell -> portable(cell, itemPortableHousing));
MEGAItems.getFluidPortables().forEach(cell -> portable(cell, fluidPortableHousing));

MEGAItems.getAllCells().forEach(this::driveCell);
driveCell(MEGAItems.BULK_ITEM_CELL, 0);

var craftingPattern =
AppEng.makeId("item/" + AEItems.CRAFTING_PATTERN.id().getPath());
existing.trackGenerated(craftingPattern, ModelProvider.TEXTURE);
Expand Down Expand Up @@ -233,6 +237,39 @@ private void portable(ItemDefinition<?> portable, ResourceLocation housing) {
.texture("layer3", MEGACells.makeId("item/cell/portable/portable_cell_side" + tierSuffix));
}

private void driveCell(MEGAItems.CellDefinition cell) {
driveCell(
cell.tier().namePrefix() + "_" + cell.keyType() + "_cell",
"mega_" + cell.keyType() + "_cell",
(cell.tier().index() - 6) * 2);
}

private void driveCell(ItemDefinition<?> cell, int offset) {
driveCell(cell.id().getPath(), "misc_cell", offset);
}

private void driveCell(String cell, String texture, int offset) {
var texturePrefix = "block/drive/cells/";
models().getBuilder(texturePrefix + cell)
.ao(false)
.texture("cell", texturePrefix + texture)
.texture("particle", texturePrefix + texture)
.element()
.to(6, 2, 2)
.face(Direction.NORTH)
.uvs(0, offset, 6, offset + 2)
.end()
.face(Direction.UP)
.uvs(6, offset, 0, offset + 2)
.end()
.face(Direction.DOWN)
.uvs(6, offset, 0, offset + 2)
.end()
.faces((dir, builder) ->
builder.texture("#cell").cullface(Direction.NORTH).end())
.end();
}

/*
private void portable(ItemDefinition<?> portable) {
var id = portable.id().getPath();
Expand Down
13 changes: 12 additions & 1 deletion src/generated/resources/.cache/cc4b70e39bb0fb6efac7e3196e5bd714468e6114
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-07-13T20:28:57.674621144 Block States / Models
// 1.21 2024-07-14T15:32:59.680212145 Block States / Models
8d69a3c391bcb75b5aac370510d15fa9c367b200 assets/megacells/blockstates/16m_crafting_storage.json
6b8ebbdecbd556e59c1c0d9abb4222d5de046e9a assets/megacells/blockstates/1m_crafting_storage.json
c716f5bd44bda4274f6e5f2c2f2b09f6223a8de7 assets/megacells/blockstates/256m_crafting_storage.json
Expand Down Expand Up @@ -28,6 +28,17 @@ bb279ec5c0a166e1b7f0d11ab67408f29e7b37d8 assets/megacells/models/block/crafting/
bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f assets/megacells/models/block/crafting/monitor_formed.json
75fdc6d6aad6a4d9403b71994b38f1ec774ce7d1 assets/megacells/models/block/crafting/unit.json
bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f assets/megacells/models/block/crafting/unit_formed.json
ac19152e615ec413b01f03ea64b9c97202c69b93 assets/megacells/models/block/drive/cells/16m_fluid_cell.json
c162baa8189635e58888371831e5be75effe7f15 assets/megacells/models/block/drive/cells/16m_item_cell.json
4e95d9b0ba21cfe132def34adb29b7a6bea6dc31 assets/megacells/models/block/drive/cells/1m_fluid_cell.json
f760556eae133ae2dbea5045f640357a46e846f4 assets/megacells/models/block/drive/cells/1m_item_cell.json
46f51bb7d95664321c22cc3285af668fbae2568f assets/megacells/models/block/drive/cells/256m_fluid_cell.json
edea8ebddb6bdb2463fdebd36e60b8df5d451316 assets/megacells/models/block/drive/cells/256m_item_cell.json
e1930c2351da19d57397450fb8d485184e58e349 assets/megacells/models/block/drive/cells/4m_fluid_cell.json
721100216b33d4ee9476a16e0afd6193e28c7424 assets/megacells/models/block/drive/cells/4m_item_cell.json
1f0566b718fcf79a27c65f53848249f803224c49 assets/megacells/models/block/drive/cells/64m_fluid_cell.json
7d68f252b72cf9bfce7fbd0d19c87338baca97d5 assets/megacells/models/block/drive/cells/64m_item_cell.json
9923abfaabaf29512ab6ffc57e6631201612cd02 assets/megacells/models/block/drive/cells/bulk_item_cell.json
5e974aa730bec68d50d47c26f432bddefb0eea5a assets/megacells/models/block/mega_energy_cell_0.json
cc3cd206c9efe98482b647fe8f4a30894b858384 assets/megacells/models/block/mega_energy_cell_1.json
485c5bd0670da5d8016e61f0e503ba9f035215f5 assets/megacells/models/block/mega_energy_cell_2.json
Expand Down
97 changes: 97 additions & 0 deletions src/generated/resources/assets/megacells/models/block/drive/cells/16m_fluid_cell.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
{
"ambientocclusion": false,
"elements": [
{
"faces": {
"down": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
4.0,
0.0,
6.0
]
},
"north": {
"cullface": "north",
"texture": "#cell",
"uv": [
0.0,
4.0,
6.0,
6.0
]
},
"up": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
4.0,
0.0,
6.0
]
}
},
"from": [
0,
0,
0
],
"to": [
6,
2,
2
]
},
{
"faces": {
"down": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
4.0,
0.0,
6.0
]
},
"north": {
"cullface": "north",
"texture": "#cell",
"uv": [
0.0,
4.0,
6.0,
6.0
]
},
"up": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
4.0,
0.0,
6.0
]
}
},
"from": [
0,
0,
0
],
"to": [
6,
2,
2
]
}
],
"textures": {
"cell": "megacells:block/drive/cells/mega_fluid_cell",
"particle": "megacells:block/drive/cells/mega_fluid_cell"
}
}
97 changes: 97 additions & 0 deletions src/generated/resources/assets/megacells/models/block/drive/cells/16m_item_cell.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
{
"ambientocclusion": false,
"elements": [
{
"faces": {
"down": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
4.0,
0.0,
6.0
]
},
"north": {
"cullface": "north",
"texture": "#cell",
"uv": [
0.0,
4.0,
6.0,
6.0
]
},
"up": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
4.0,
0.0,
6.0
]
}
},
"from": [
0,
0,
0
],
"to": [
6,
2,
2
]
},
{
"faces": {
"down": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
4.0,
0.0,
6.0
]
},
"north": {
"cullface": "north",
"texture": "#cell",
"uv": [
0.0,
4.0,
6.0,
6.0
]
},
"up": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
4.0,
0.0,
6.0
]
}
},
"from": [
0,
0,
0
],
"to": [
6,
2,
2
]
}
],
"textures": {
"cell": "megacells:block/drive/cells/mega_item_cell",
"particle": "megacells:block/drive/cells/mega_item_cell"
}
}
97 changes: 97 additions & 0 deletions src/generated/resources/assets/megacells/models/block/drive/cells/1m_fluid_cell.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
{
"ambientocclusion": false,
"elements": [
{
"faces": {
"down": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
0.0,
0.0,
2.0
]
},
"north": {
"cullface": "north",
"texture": "#cell",
"uv": [
0.0,
0.0,
6.0,
2.0
]
},
"up": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
0.0,
0.0,
2.0
]
}
},
"from": [
0,
0,
0
],
"to": [
6,
2,
2
]
},
{
"faces": {
"down": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
0.0,
0.0,
2.0
]
},
"north": {
"cullface": "north",
"texture": "#cell",
"uv": [
0.0,
0.0,
6.0,
2.0
]
},
"up": {
"cullface": "north",
"texture": "#cell",
"uv": [
6.0,
0.0,
0.0,
2.0
]
}
},
"from": [
0,
0,
0
],
"to": [
6,
2,
2
]
}
],
"textures": {
"cell": "megacells:block/drive/cells/mega_fluid_cell",
"particle": "megacells:block/drive/cells/mega_fluid_cell"
}
}
Loading

0 comments on commit 0ed7f4f

Please sign in to comment.