Fixed up datagen.

This commit is contained in:
Flanks255 2024-04-09 17:30:53 -05:00
parent 4aeb9bd34f
commit 19afc5f05c
43 changed files with 38 additions and 40 deletions

View file

@ -1,4 +1,4 @@
// 1.20.4 2024-03-05T23:27:48.3961458 Block States: actuallyadditions // 1.20.4 2024-04-09T17:25:30.7026673 Block States: actuallyadditions
23a6aa86c3f14e6a61fc8b17b65063f1995c8592 assets/actuallyadditions/blockstates/atomic_reconstructor.json 23a6aa86c3f14e6a61fc8b17b65063f1995c8592 assets/actuallyadditions/blockstates/atomic_reconstructor.json
88f479927d1abdf16e24a0950ccffa86b5af8b3f assets/actuallyadditions/blockstates/battery_box.json 88f479927d1abdf16e24a0950ccffa86b5af8b3f assets/actuallyadditions/blockstates/battery_box.json
6ada5cb9e03ed162433bfc048712b6fc3937b420 assets/actuallyadditions/blockstates/bio_reactor.json 6ada5cb9e03ed162433bfc048712b6fc3937b420 assets/actuallyadditions/blockstates/bio_reactor.json
@ -159,9 +159,9 @@ c6da383335271d06ea703665ef89f2752c7d6a32 assets/actuallyadditions/models/block/c
205a2abf24ef8b3d3ce854e42a1382de8616188c assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json 205a2abf24ef8b3d3ce854e42a1382de8616188c assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json
29d5932afc6a6d4bb89f28a970166c1609fe89da assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json 29d5932afc6a6d4bb89f28a970166c1609fe89da assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json
3eda08a8f6b5dc113186debf0c8da244b137a5a6 assets/actuallyadditions/models/block/coffee_1.json 3eda08a8f6b5dc113186debf0c8da244b137a5a6 assets/actuallyadditions/models/block/coffee_1.json
17c4df59313901a5ba7559159a13e043e4b3d706 assets/actuallyadditions/models/block/coffee_2.json 35b065ebd2d2740f48c9285fc1a46422a3881635 assets/actuallyadditions/models/block/coffee_2.json
069d1284f427f9ba269c3eaa62171f39948a8541 assets/actuallyadditions/models/block/coffee_3.json 17c4df59313901a5ba7559159a13e043e4b3d706 assets/actuallyadditions/models/block/coffee_3.json
9312b68e6fe152019de67451229e067fc0b2f181 assets/actuallyadditions/models/block/coffee_4.json 4f14c36754115d4b2d1afefc14bfb6126be473ee assets/actuallyadditions/models/block/coffee_4.json
0f5e8d59d2021944eaefc6f9ea13d09e6822f1f1 assets/actuallyadditions/models/block/diamatine_crystal_block.json 0f5e8d59d2021944eaefc6f9ea13d09e6822f1f1 assets/actuallyadditions/models/block/diamatine_crystal_block.json
4737de603e9b5f0612529f4a987af159c033e914 assets/actuallyadditions/models/block/emeradic_crystal_block.json 4737de603e9b5f0612529f4a987af159c033e914 assets/actuallyadditions/models/block/emeradic_crystal_block.json
fbbc3ad45d52d38444dc094fe58ef23268f459a1 assets/actuallyadditions/models/block/empowered_diamatine_crystal_block.json fbbc3ad45d52d38444dc094fe58ef23268f459a1 assets/actuallyadditions/models/block/empowered_diamatine_crystal_block.json
@ -191,9 +191,9 @@ e7e506073363b52d34a7ebb0d53e595838a2d809 assets/actuallyadditions/models/block/e
38b8e90785221f892d47dcb3d88bf9177b764820 assets/actuallyadditions/models/block/ethetic_white_wall_side.json 38b8e90785221f892d47dcb3d88bf9177b764820 assets/actuallyadditions/models/block/ethetic_white_wall_side.json
f44be9b3805792e67d95dd649dbe6e77b7106b35 assets/actuallyadditions/models/block/ethetic_white_wall_side_tall.json f44be9b3805792e67d95dd649dbe6e77b7106b35 assets/actuallyadditions/models/block/ethetic_white_wall_side_tall.json
e7144ef52d0e76e6fe683242589a71539311519c assets/actuallyadditions/models/block/flax_1.json e7144ef52d0e76e6fe683242589a71539311519c assets/actuallyadditions/models/block/flax_1.json
358fa90c122fa9589b7f5fb458dced2722b040c7 assets/actuallyadditions/models/block/flax_2.json 8edad370bff2c2cf154982d1cfa87ad96725ceff assets/actuallyadditions/models/block/flax_2.json
646fd2eda0238e8ddf35f1208781ff430e3763e4 assets/actuallyadditions/models/block/flax_3.json 358fa90c122fa9589b7f5fb458dced2722b040c7 assets/actuallyadditions/models/block/flax_3.json
62358e5dd86ea015ebbed607045d7cb72f3301fa assets/actuallyadditions/models/block/flax_4.json ee95fd71aeeabf7a60fef2078542a952a8a6cd30 assets/actuallyadditions/models/block/flax_4.json
402e7e76f54d81f96b3a9f1ad5aff2570415a18e assets/actuallyadditions/models/block/iron_casing.json 402e7e76f54d81f96b3a9f1ad5aff2570415a18e assets/actuallyadditions/models/block/iron_casing.json
0839cdce8e285345ddef93068319da0005e37d29 assets/actuallyadditions/models/block/lamp_black.json 0839cdce8e285345ddef93068319da0005e37d29 assets/actuallyadditions/models/block/lamp_black.json
1f4100eb3c45a368512a4b5ebb9ae570f8be6f8a assets/actuallyadditions/models/block/lamp_blue.json 1f4100eb3c45a368512a4b5ebb9ae570f8be6f8a assets/actuallyadditions/models/block/lamp_blue.json
@ -214,9 +214,9 @@ e9f8b43d10f6c9dd0b105ee3d4bf82fd9366d300 assets/actuallyadditions/models/block/l
59691e057ec8ae9f83477a3932ac25b49b175bc7 assets/actuallyadditions/models/block/palis_crystal_block.json 59691e057ec8ae9f83477a3932ac25b49b175bc7 assets/actuallyadditions/models/block/palis_crystal_block.json
58d4c88e8f7533d3e943a7253814093e24303032 assets/actuallyadditions/models/block/restonia_crystal_block.json 58d4c88e8f7533d3e943a7253814093e24303032 assets/actuallyadditions/models/block/restonia_crystal_block.json
7f0e4c034d807a3049bb2f92f78c2b82d97c4de5 assets/actuallyadditions/models/block/rice_1.json 7f0e4c034d807a3049bb2f92f78c2b82d97c4de5 assets/actuallyadditions/models/block/rice_1.json
a04264a3fe830df25c50e499a8ff7f3745b5d90e assets/actuallyadditions/models/block/rice_2.json 548417050ce65ac4a3508875de8a0780913c6e96 assets/actuallyadditions/models/block/rice_2.json
2d45f1a0e8ef94bd5b3b9e298ebff4ccce13cb3f assets/actuallyadditions/models/block/rice_3.json a04264a3fe830df25c50e499a8ff7f3745b5d90e assets/actuallyadditions/models/block/rice_3.json
62ed7fce050484dade4dc60824d6e0c4b47c016b assets/actuallyadditions/models/block/rice_4.json eff3f154627ad9f08c0f885e9c50082049192cac assets/actuallyadditions/models/block/rice_4.json
3d710199a99324077b4fffab49df908fdd9e2c45 assets/actuallyadditions/models/block/smooth_black_quartz_block.json 3d710199a99324077b4fffab49df908fdd9e2c45 assets/actuallyadditions/models/block/smooth_black_quartz_block.json
b4d79c3364274a4eb4e60325340bdb8580e87a35 assets/actuallyadditions/models/block/smooth_black_quartz_slab.json b4d79c3364274a4eb4e60325340bdb8580e87a35 assets/actuallyadditions/models/block/smooth_black_quartz_slab.json
80e72f5732b6a94218f1ce05866d839adc528ffb assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json 80e72f5732b6a94218f1ce05866d839adc528ffb assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json

View file

@ -1,4 +1,4 @@
// 1.20.4 2024-03-17T15:47:34.5137353 Item Models: actuallyadditions // 1.20.4 2024-04-09T17:25:30.7116661 Item Models: actuallyadditions
34463d3d2ae3fafaaea338e7ffc03cd139d3cfeb assets/actuallyadditions/models/item/advanced_coil.json 34463d3d2ae3fafaaea338e7ffc03cd139d3cfeb assets/actuallyadditions/models/item/advanced_coil.json
24594fc68e66011dc2d7b79b92c94b387e710318 assets/actuallyadditions/models/item/advanced_leaf_blower.json 24594fc68e66011dc2d7b79b92c94b387e710318 assets/actuallyadditions/models/item/advanced_leaf_blower.json
ba2d814e269cdef72e1045f200b3c20ed6961517 assets/actuallyadditions/models/item/atomic_reconstructor.json ba2d814e269cdef72e1045f200b3c20ed6961517 assets/actuallyadditions/models/item/atomic_reconstructor.json
@ -130,7 +130,7 @@ d058286787b169cd09245f2cae6606bfedeb4813 assets/actuallyadditions/models/item/he
f9f045a7713addffc4c419d1a3acdc9eac176065 assets/actuallyadditions/models/item/iron_aiot.json f9f045a7713addffc4c419d1a3acdc9eac176065 assets/actuallyadditions/models/item/iron_aiot.json
bd9be4f8d1235d6a418280c0a9a585c53360a99e assets/actuallyadditions/models/item/iron_casing.json bd9be4f8d1235d6a418280c0a9a585c53360a99e assets/actuallyadditions/models/item/iron_casing.json
4b742b7bf9df6b8f745ed00ac29860959ff6f076 assets/actuallyadditions/models/item/item_interface.json 4b742b7bf9df6b8f745ed00ac29860959ff6f076 assets/actuallyadditions/models/item/item_interface.json
9186aec3aa11a45a2b24103e84126c200f2ac5c2 assets/actuallyadditions/models/item/item_tag.json f290b9736cf0be8ce90e0731f40aa656d763f977 assets/actuallyadditions/models/item/item_tag.json
a0545bce8530d20e0d87775144ed47f2df070219 assets/actuallyadditions/models/item/lamp_black.json a0545bce8530d20e0d87775144ed47f2df070219 assets/actuallyadditions/models/item/lamp_black.json
ddecd4c60d4d0f77175eaa0178f6397afd7ee98f assets/actuallyadditions/models/item/lamp_blue.json ddecd4c60d4d0f77175eaa0178f6397afd7ee98f assets/actuallyadditions/models/item/lamp_blue.json
53e733a0cf113affea99490724efd72ee28cf823 assets/actuallyadditions/models/item/lamp_brown.json 53e733a0cf113affea99490724efd72ee28cf823 assets/actuallyadditions/models/item/lamp_brown.json

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:block/crop", "parent": "minecraft:block/crop",
"textures": { "textures": {
"crop": "actuallyadditions:block/coffee_stage_3" "crop": "actuallyadditions:block/coffee_stage_2"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:block/crop", "parent": "minecraft:block/crop",
"textures": { "textures": {
"crop": "actuallyadditions:block/coffee_stage_5" "crop": "actuallyadditions:block/coffee_stage_3"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:block/crop", "parent": "minecraft:block/crop",
"textures": { "textures": {
"crop": "actuallyadditions:block/coffee_stage_6" "crop": "actuallyadditions:block/coffee_stage_4"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:block/crop", "parent": "minecraft:block/crop",
"textures": { "textures": {
"crop": "actuallyadditions:block/flax_stage_3" "crop": "actuallyadditions:block/flax_stage_2"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:block/crop", "parent": "minecraft:block/crop",
"textures": { "textures": {
"crop": "actuallyadditions:block/flax_stage_5" "crop": "actuallyadditions:block/flax_stage_3"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:block/crop", "parent": "minecraft:block/crop",
"textures": { "textures": {
"crop": "actuallyadditions:block/flax_stage_6" "crop": "actuallyadditions:block/flax_stage_4"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:block/crop", "parent": "minecraft:block/crop",
"textures": { "textures": {
"crop": "actuallyadditions:block/rice_stage_3" "crop": "actuallyadditions:block/rice_stage_2"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:block/crop", "parent": "minecraft:block/crop",
"textures": { "textures": {
"crop": "actuallyadditions:block/rice_stage_5" "crop": "actuallyadditions:block/rice_stage_3"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:block/crop", "parent": "minecraft:block/crop",
"textures": { "textures": {
"crop": "actuallyadditions:block/rice_stage_6" "crop": "actuallyadditions:block/rice_stage_4"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:item/generated", "parent": "minecraft:item/generated",
"textures": { "textures": {
"layer0": "minecraft:item/paper" "layer0": "actuallyadditions:item/item_tag"
} }
} }

View file

@ -134,31 +134,31 @@ public class BlockStateGenerator extends BlockStateProvider {
.with(CropBlock.AGE, 0).modelForState().modelFile(models().crop("rice_1", modLoc("block/rice_stage_1"))).addModel() .with(CropBlock.AGE, 0).modelForState().modelFile(models().crop("rice_1", modLoc("block/rice_stage_1"))).addModel()
.partialState().with(CropBlock.AGE, 1).modelForState().modelFile(models().crop("rice_2", modLoc("block/rice_stage_2"))).addModel() .partialState().with(CropBlock.AGE, 1).modelForState().modelFile(models().crop("rice_2", modLoc("block/rice_stage_2"))).addModel()
.partialState().with(CropBlock.AGE, 2).modelForState().modelFile(models().crop("rice_2", modLoc("block/rice_stage_2"))).addModel() .partialState().with(CropBlock.AGE, 2).modelForState().modelFile(models().crop("rice_2", modLoc("block/rice_stage_2"))).addModel()
.partialState().with(CropBlock.AGE, 3).modelForState().modelFile(models().crop("rice_2", modLoc("block/rice_stage_3"))).addModel() .partialState().with(CropBlock.AGE, 3).modelForState().modelFile(models().crop("rice_2", modLoc("block/rice_stage_2"))).addModel()
.partialState().with(CropBlock.AGE, 4).modelForState().modelFile(models().crop("rice_3", modLoc("block/rice_stage_4"))).addModel() .partialState().with(CropBlock.AGE, 4).modelForState().modelFile(models().crop("rice_3", modLoc("block/rice_stage_3"))).addModel()
.partialState().with(CropBlock.AGE, 5).modelForState().modelFile(models().crop("rice_3", modLoc("block/rice_stage_4"))).addModel() .partialState().with(CropBlock.AGE, 5).modelForState().modelFile(models().crop("rice_3", modLoc("block/rice_stage_3"))).addModel()
.partialState().with(CropBlock.AGE, 6).modelForState().modelFile(models().crop("rice_3", modLoc("block/rice_stage_5"))).addModel() .partialState().with(CropBlock.AGE, 6).modelForState().modelFile(models().crop("rice_3", modLoc("block/rice_stage_3"))).addModel()
.partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("rice_4", modLoc("block/rice_stage_6"))).addModel(); .partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("rice_4", modLoc("block/rice_stage_4"))).addModel();
getVariantBuilder(ActuallyBlocks.FLAX.get()).partialState() getVariantBuilder(ActuallyBlocks.FLAX.get()).partialState()
.with(CropBlock.AGE, 0).modelForState().modelFile(models().crop("flax_1", modLoc("block/flax_stage_1"))).addModel() .with(CropBlock.AGE, 0).modelForState().modelFile(models().crop("flax_1", modLoc("block/flax_stage_1"))).addModel()
.partialState().with(CropBlock.AGE, 1).modelForState().modelFile(models().crop("flax_2", modLoc("block/flax_stage_2"))).addModel() .partialState().with(CropBlock.AGE, 1).modelForState().modelFile(models().crop("flax_2", modLoc("block/flax_stage_2"))).addModel()
.partialState().with(CropBlock.AGE, 2).modelForState().modelFile(models().crop("flax_2", modLoc("block/flax_stage_2"))).addModel() .partialState().with(CropBlock.AGE, 2).modelForState().modelFile(models().crop("flax_2", modLoc("block/flax_stage_2"))).addModel()
.partialState().with(CropBlock.AGE, 3).modelForState().modelFile(models().crop("flax_2", modLoc("block/flax_stage_3"))).addModel() .partialState().with(CropBlock.AGE, 3).modelForState().modelFile(models().crop("flax_2", modLoc("block/flax_stage_2"))).addModel()
.partialState().with(CropBlock.AGE, 4).modelForState().modelFile(models().crop("flax_3", modLoc("block/flax_stage_4"))).addModel() .partialState().with(CropBlock.AGE, 4).modelForState().modelFile(models().crop("flax_3", modLoc("block/flax_stage_3"))).addModel()
.partialState().with(CropBlock.AGE, 5).modelForState().modelFile(models().crop("flax_3", modLoc("block/flax_stage_4"))).addModel() .partialState().with(CropBlock.AGE, 5).modelForState().modelFile(models().crop("flax_3", modLoc("block/flax_stage_3"))).addModel()
.partialState().with(CropBlock.AGE, 6).modelForState().modelFile(models().crop("flax_3", modLoc("block/flax_stage_5"))).addModel() .partialState().with(CropBlock.AGE, 6).modelForState().modelFile(models().crop("flax_3", modLoc("block/flax_stage_3"))).addModel()
.partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("flax_4", modLoc("block/flax_stage_6"))).addModel(); .partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("flax_4", modLoc("block/flax_stage_4"))).addModel();
getVariantBuilder(ActuallyBlocks.COFFEE.get()).partialState() getVariantBuilder(ActuallyBlocks.COFFEE.get()).partialState()
.with(CropBlock.AGE, 0).modelForState().modelFile(models().crop("coffee_1", modLoc("block/coffee_stage_1"))).addModel() .with(CropBlock.AGE, 0).modelForState().modelFile(models().crop("coffee_1", modLoc("block/coffee_stage_1"))).addModel()
.partialState().with(CropBlock.AGE, 1).modelForState().modelFile(models().crop("coffee_2", modLoc("block/coffee_stage_2"))).addModel() .partialState().with(CropBlock.AGE, 1).modelForState().modelFile(models().crop("coffee_2", modLoc("block/coffee_stage_2"))).addModel()
.partialState().with(CropBlock.AGE, 2).modelForState().modelFile(models().crop("coffee_2", modLoc("block/coffee_stage_2"))).addModel() .partialState().with(CropBlock.AGE, 2).modelForState().modelFile(models().crop("coffee_2", modLoc("block/coffee_stage_2"))).addModel()
.partialState().with(CropBlock.AGE, 3).modelForState().modelFile(models().crop("coffee_2", modLoc("block/coffee_stage_3"))).addModel() .partialState().with(CropBlock.AGE, 3).modelForState().modelFile(models().crop("coffee_2", modLoc("block/coffee_stage_2"))).addModel()
.partialState().with(CropBlock.AGE, 4).modelForState().modelFile(models().crop("coffee_3", modLoc("block/coffee_stage_4"))).addModel() .partialState().with(CropBlock.AGE, 4).modelForState().modelFile(models().crop("coffee_3", modLoc("block/coffee_stage_3"))).addModel()
.partialState().with(CropBlock.AGE, 5).modelForState().modelFile(models().crop("coffee_3", modLoc("block/coffee_stage_4"))).addModel() .partialState().with(CropBlock.AGE, 5).modelForState().modelFile(models().crop("coffee_3", modLoc("block/coffee_stage_3"))).addModel()
.partialState().with(CropBlock.AGE, 6).modelForState().modelFile(models().crop("coffee_3", modLoc("block/coffee_stage_5"))).addModel() .partialState().with(CropBlock.AGE, 6).modelForState().modelFile(models().crop("coffee_3", modLoc("block/coffee_stage_3"))).addModel()
.partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("coffee_4", modLoc("block/coffee_stage_6"))).addModel(); .partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("coffee_4", modLoc("block/coffee_stage_4"))).addModel();
buildCubeAll(ActuallyBlocks.ENDER_CASING); buildCubeAll(ActuallyBlocks.ENDER_CASING);

View file

@ -36,8 +36,6 @@ public class ItemModelGenerator extends ItemModelProvider {
ActuallyItems.SIMPLE_ITEMS.forEach(this::simpleItem); ActuallyItems.SIMPLE_ITEMS.forEach(this::simpleItem);
ActuallyItems.TOOLS.forEach(this::simpleTool); ActuallyItems.TOOLS.forEach(this::simpleTool);
singleTexture("item_tag", mcLoc("item/generated"), "layer0", mcLoc("item/paper"));
// Toolsets // Toolsets
/* ActuallyItems.ALL_TOOL_SETS.stream() /* ActuallyItems.ALL_TOOL_SETS.stream()
.map(ToolSet::getItemGroup) .map(ToolSet::getItemGroup)

View file

@ -207,7 +207,7 @@ public final class ActuallyItems {
COFFEE_CUP, RICE, COFFEE_CUP, RICE,
/* CRUSHED_IRON, CRUSHED_GOLD, CRUSHED_DIAMOND, CRUSHED_EMERALD, CRUSHED_LAPIS, /* CRUSHED_IRON, CRUSHED_GOLD, CRUSHED_DIAMOND, CRUSHED_EMERALD, CRUSHED_LAPIS,
CRUSHED_QUARTZ, CRUSHED_COAL, CRUSHED_BLACK_QUARTZ, */ CRUSHED_QUARTZ, CRUSHED_COAL, CRUSHED_BLACK_QUARTZ, */
SOLIDIFIED_EXPERIENCE, SOLIDIFIED_EXPERIENCE, ITEM_TAG,
COFFEE_BEANS, RICE_SEEDS, CANOLA_SEEDS, FLAX_SEEDS, DRILL_PATTERN, LEAF_BLO_PATTERN, PHAN_CON_PATTERN, BOOK_PATTERN COFFEE_BEANS, RICE_SEEDS, CANOLA_SEEDS, FLAX_SEEDS, DRILL_PATTERN, LEAF_BLO_PATTERN, PHAN_CON_PATTERN, BOOK_PATTERN
); );

Binary file not shown.

After

Width:  |  Height:  |  Size: 398 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 628 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 628 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 B

After

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 412 B