From 19afc5f05ccadda5f5d72faa954bc19694044d60 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Tue, 9 Apr 2024 17:30:53 -0500 Subject: [PATCH] Fixed up datagen. --- .../27a06cb38e627c3bacb7787d001fbadd6becbe3f | 20 ++++++------ .../b3ca5dca15f867120b82824364d3156b7fdfd666 | 4 +-- .../models/block/coffee_2.json | 2 +- .../models/block/coffee_3.json | 2 +- .../models/block/coffee_4.json | 2 +- .../models/block/flax_2.json | 2 +- .../models/block/flax_3.json | 2 +- .../models/block/flax_4.json | 2 +- .../models/block/rice_2.json | 2 +- .../models/block/rice_3.json | 2 +- .../models/block/rice_4.json | 2 +- .../models/item/item_tag.json | 2 +- .../data/BlockStateGenerator.java | 30 +++++++++--------- .../data/ItemModelGenerator.java | 2 -- .../mod/items/ActuallyItems.java | 2 +- .../textures/block/coffee_stage_2.png | Bin 0 -> 398 bytes .../textures/block/coffee_stage_3.png | Bin 398 -> 628 bytes ...{coffee_stage_6.png => coffee_stage_4.png} | Bin .../textures/block/coffee_stage_5.png | Bin 628 -> 0 bytes .../textures/block/flax_stage_2.png | Bin 0 -> 269 bytes .../textures/block/flax_stage_3.png | Bin 269 -> 400 bytes .../{flax_stage_6.png => flax_stage_4.png} | Bin .../textures/block/flax_stage_5.png | Bin 400 -> 0 bytes .../block/{unused => }/lamp_black.png | Bin .../textures/block/{unused => }/lamp_blue.png | Bin .../block/{unused => }/lamp_brown.png | Bin .../textures/block/{unused => }/lamp_cyan.png | Bin .../textures/block/{unused => }/lamp_gray.png | Bin .../block/{unused => }/lamp_green.png | Bin .../block/{unused => }/lamp_light_blue.png | Bin .../block/{unused => }/lamp_light_gray.png | Bin .../textures/block/{unused => }/lamp_lime.png | Bin .../block/{unused => }/lamp_magenta.png | Bin .../block/{unused => }/lamp_orange.png | Bin .../textures/block/{unused => }/lamp_pink.png | Bin .../block/{unused => }/lamp_purple.png | Bin .../textures/block/{unused => }/lamp_red.png | Bin .../block/{unused => }/lamp_white.png | Bin .../block/{unused => }/lamp_yellow.png | Bin .../textures/block/rice_stage_2.png | Bin 0 -> 339 bytes .../textures/block/rice_stage_3.png | Bin 339 -> 412 bytes .../{rice_stage_6.png => rice_stage_4.png} | Bin .../textures/block/rice_stage_5.png | Bin 412 -> 0 bytes 43 files changed, 38 insertions(+), 40 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_2.png rename src/main/resources/assets/actuallyadditions/textures/block/{coffee_stage_6.png => coffee_stage_4.png} (100%) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_5.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/flax_stage_2.png rename src/main/resources/assets/actuallyadditions/textures/block/{flax_stage_6.png => flax_stage_4.png} (100%) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/block/flax_stage_5.png rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_black.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_blue.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_brown.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_cyan.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_gray.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_green.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_light_blue.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_light_gray.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_lime.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_magenta.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_orange.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_pink.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_purple.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_red.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_white.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{unused => }/lamp_yellow.png (100%) create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/rice_stage_2.png rename src/main/resources/assets/actuallyadditions/textures/block/{rice_stage_6.png => rice_stage_4.png} (100%) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/block/rice_stage_5.png diff --git a/src/generated/resources/.cache/27a06cb38e627c3bacb7787d001fbadd6becbe3f b/src/generated/resources/.cache/27a06cb38e627c3bacb7787d001fbadd6becbe3f index fd7d24aee..624dbd2ee 100644 --- a/src/generated/resources/.cache/27a06cb38e627c3bacb7787d001fbadd6becbe3f +++ b/src/generated/resources/.cache/27a06cb38e627c3bacb7787d001fbadd6becbe3f @@ -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 88f479927d1abdf16e24a0950ccffa86b5af8b3f assets/actuallyadditions/blockstates/battery_box.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 29d5932afc6a6d4bb89f28a970166c1609fe89da assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json 3eda08a8f6b5dc113186debf0c8da244b137a5a6 assets/actuallyadditions/models/block/coffee_1.json -17c4df59313901a5ba7559159a13e043e4b3d706 assets/actuallyadditions/models/block/coffee_2.json -069d1284f427f9ba269c3eaa62171f39948a8541 assets/actuallyadditions/models/block/coffee_3.json -9312b68e6fe152019de67451229e067fc0b2f181 assets/actuallyadditions/models/block/coffee_4.json +35b065ebd2d2740f48c9285fc1a46422a3881635 assets/actuallyadditions/models/block/coffee_2.json +17c4df59313901a5ba7559159a13e043e4b3d706 assets/actuallyadditions/models/block/coffee_3.json +4f14c36754115d4b2d1afefc14bfb6126be473ee assets/actuallyadditions/models/block/coffee_4.json 0f5e8d59d2021944eaefc6f9ea13d09e6822f1f1 assets/actuallyadditions/models/block/diamatine_crystal_block.json 4737de603e9b5f0612529f4a987af159c033e914 assets/actuallyadditions/models/block/emeradic_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 f44be9b3805792e67d95dd649dbe6e77b7106b35 assets/actuallyadditions/models/block/ethetic_white_wall_side_tall.json e7144ef52d0e76e6fe683242589a71539311519c assets/actuallyadditions/models/block/flax_1.json -358fa90c122fa9589b7f5fb458dced2722b040c7 assets/actuallyadditions/models/block/flax_2.json -646fd2eda0238e8ddf35f1208781ff430e3763e4 assets/actuallyadditions/models/block/flax_3.json -62358e5dd86ea015ebbed607045d7cb72f3301fa assets/actuallyadditions/models/block/flax_4.json +8edad370bff2c2cf154982d1cfa87ad96725ceff assets/actuallyadditions/models/block/flax_2.json +358fa90c122fa9589b7f5fb458dced2722b040c7 assets/actuallyadditions/models/block/flax_3.json +ee95fd71aeeabf7a60fef2078542a952a8a6cd30 assets/actuallyadditions/models/block/flax_4.json 402e7e76f54d81f96b3a9f1ad5aff2570415a18e assets/actuallyadditions/models/block/iron_casing.json 0839cdce8e285345ddef93068319da0005e37d29 assets/actuallyadditions/models/block/lamp_black.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 58d4c88e8f7533d3e943a7253814093e24303032 assets/actuallyadditions/models/block/restonia_crystal_block.json 7f0e4c034d807a3049bb2f92f78c2b82d97c4de5 assets/actuallyadditions/models/block/rice_1.json -a04264a3fe830df25c50e499a8ff7f3745b5d90e assets/actuallyadditions/models/block/rice_2.json -2d45f1a0e8ef94bd5b3b9e298ebff4ccce13cb3f assets/actuallyadditions/models/block/rice_3.json -62ed7fce050484dade4dc60824d6e0c4b47c016b assets/actuallyadditions/models/block/rice_4.json +548417050ce65ac4a3508875de8a0780913c6e96 assets/actuallyadditions/models/block/rice_2.json +a04264a3fe830df25c50e499a8ff7f3745b5d90e assets/actuallyadditions/models/block/rice_3.json +eff3f154627ad9f08c0f885e9c50082049192cac assets/actuallyadditions/models/block/rice_4.json 3d710199a99324077b4fffab49df908fdd9e2c45 assets/actuallyadditions/models/block/smooth_black_quartz_block.json b4d79c3364274a4eb4e60325340bdb8580e87a35 assets/actuallyadditions/models/block/smooth_black_quartz_slab.json 80e72f5732b6a94218f1ce05866d839adc528ffb assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json diff --git a/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 b/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 index c0a2db962..8d801fcd2 100644 --- a/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 +++ b/src/generated/resources/.cache/b3ca5dca15f867120b82824364d3156b7fdfd666 @@ -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 24594fc68e66011dc2d7b79b92c94b387e710318 assets/actuallyadditions/models/item/advanced_leaf_blower.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 bd9be4f8d1235d6a418280c0a9a585c53360a99e assets/actuallyadditions/models/item/iron_casing.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 ddecd4c60d4d0f77175eaa0178f6397afd7ee98f assets/actuallyadditions/models/item/lamp_blue.json 53e733a0cf113affea99490724efd72ee28cf823 assets/actuallyadditions/models/item/lamp_brown.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/coffee_2.json b/src/generated/resources/assets/actuallyadditions/models/block/coffee_2.json index 9814042a2..694793c6f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/coffee_2.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/coffee_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "actuallyadditions:block/coffee_stage_3" + "crop": "actuallyadditions:block/coffee_stage_2" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/coffee_3.json b/src/generated/resources/assets/actuallyadditions/models/block/coffee_3.json index 9cb017e6a..9814042a2 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/coffee_3.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/coffee_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "actuallyadditions:block/coffee_stage_5" + "crop": "actuallyadditions:block/coffee_stage_3" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/coffee_4.json b/src/generated/resources/assets/actuallyadditions/models/block/coffee_4.json index 6ab80f189..cd896cf71 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/coffee_4.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/coffee_4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "actuallyadditions:block/coffee_stage_6" + "crop": "actuallyadditions:block/coffee_stage_4" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/flax_2.json b/src/generated/resources/assets/actuallyadditions/models/block/flax_2.json index 5014e6a47..2224c092b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/flax_2.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/flax_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "actuallyadditions:block/flax_stage_3" + "crop": "actuallyadditions:block/flax_stage_2" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/flax_3.json b/src/generated/resources/assets/actuallyadditions/models/block/flax_3.json index 2db93ce21..5014e6a47 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/flax_3.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/flax_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "actuallyadditions:block/flax_stage_5" + "crop": "actuallyadditions:block/flax_stage_3" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/flax_4.json b/src/generated/resources/assets/actuallyadditions/models/block/flax_4.json index abf27ff27..5f83163cb 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/flax_4.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/flax_4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "actuallyadditions:block/flax_stage_6" + "crop": "actuallyadditions:block/flax_stage_4" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/rice_2.json b/src/generated/resources/assets/actuallyadditions/models/block/rice_2.json index 2b3d851a2..6d3a35811 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/rice_2.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/rice_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "actuallyadditions:block/rice_stage_3" + "crop": "actuallyadditions:block/rice_stage_2" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/rice_3.json b/src/generated/resources/assets/actuallyadditions/models/block/rice_3.json index 132d8369b..2b3d851a2 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/rice_3.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/rice_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "actuallyadditions:block/rice_stage_5" + "crop": "actuallyadditions:block/rice_stage_3" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/rice_4.json b/src/generated/resources/assets/actuallyadditions/models/block/rice_4.json index d351e689b..b0e39d5c9 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/rice_4.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/rice_4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/crop", "textures": { - "crop": "actuallyadditions:block/rice_stage_6" + "crop": "actuallyadditions:block/rice_stage_4" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_tag.json b/src/generated/resources/assets/actuallyadditions/models/item/item_tag.json index 5cfa9dd85..8cc18a307 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/item_tag.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/item_tag.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "minecraft:item/paper" + "layer0": "actuallyadditions:item/item_tag" } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java index da996b6ed..fed1d9a0a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java @@ -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() .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, 3).modelForState().modelFile(models().crop("rice_2", modLoc("block/rice_stage_3"))).addModel() - .partialState().with(CropBlock.AGE, 4).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_4"))).addModel() - .partialState().with(CropBlock.AGE, 6).modelForState().modelFile(models().crop("rice_3", modLoc("block/rice_stage_5"))).addModel() - .partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("rice_4", modLoc("block/rice_stage_6"))).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_3"))).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_3"))).addModel() + .partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("rice_4", modLoc("block/rice_stage_4"))).addModel(); getVariantBuilder(ActuallyBlocks.FLAX.get()).partialState() .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, 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, 4).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_4"))).addModel() - .partialState().with(CropBlock.AGE, 6).modelForState().modelFile(models().crop("flax_3", modLoc("block/flax_stage_5"))).addModel() - .partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("flax_4", modLoc("block/flax_stage_6"))).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_3"))).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_3"))).addModel() + .partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("flax_4", modLoc("block/flax_stage_4"))).addModel(); getVariantBuilder(ActuallyBlocks.COFFEE.get()).partialState() .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, 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, 4).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_4"))).addModel() - .partialState().with(CropBlock.AGE, 6).modelForState().modelFile(models().crop("coffee_3", modLoc("block/coffee_stage_5"))).addModel() - .partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("coffee_4", modLoc("block/coffee_stage_6"))).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_3"))).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_3"))).addModel() + .partialState().with(CropBlock.AGE, 7).modelForState().modelFile(models().crop("coffee_4", modLoc("block/coffee_stage_4"))).addModel(); buildCubeAll(ActuallyBlocks.ENDER_CASING); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java index 17bcddf32..d566ea336 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java @@ -36,8 +36,6 @@ public class ItemModelGenerator extends ItemModelProvider { ActuallyItems.SIMPLE_ITEMS.forEach(this::simpleItem); ActuallyItems.TOOLS.forEach(this::simpleTool); - singleTexture("item_tag", mcLoc("item/generated"), "layer0", mcLoc("item/paper")); - // Toolsets /* ActuallyItems.ALL_TOOL_SETS.stream() .map(ToolSet::getItemGroup) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java index 98af4ae41..407ef490a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java @@ -207,7 +207,7 @@ public final class ActuallyItems { COFFEE_CUP, RICE, /* CRUSHED_IRON, CRUSHED_GOLD, CRUSHED_DIAMOND, CRUSHED_EMERALD, CRUSHED_LAPIS, 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 ); diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_2.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0e8254e299f02c5d097a119ce88879ba53069e91 GIT binary patch literal 398 zcmV;90df9`P)TlfO#>VHn3h?=_^4?}zX6Jl|JHDOsho zmDK+M2&$IBr)+CNv2!9ERxjgaiT?r5ZuLzI{@xx9B@l zcCOplw@|FNln@m_Bomrwl=GObjZ?^wwwg4``K2AOasD8a35^%;gH$%eW66NoE*1i| zF7BmM$e`;}-Y*a7J5x;8#viBy^9OLVpJQ!P(CrCy{aZZiE$1MW4T)mCg+GwQsy5GO z2jq?r{y=>Q)d&D0Z8h=65u%kl08H0j4)9aanjt15pJ>epdIAI_5g=BzAs)s%=@4I^ s1On#$1?i0=Oh*1(2SI?};=m|>0V#-XD>F(<3IG5A07*qoM6N<$f`gZyq5uE@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_3.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_3.png index 0e8254e299f02c5d097a119ce88879ba53069e91..c46a260baa0a32f76d431cfbcb79b7fc4386d802 100644 GIT binary patch delta 583 zcmV-N0=WH-1M~!tIDY~rNkl?5skw#so#s6&`{i zVZtb|L&pv}MOhJeDn=q(gf}CMj9?3q|D{7X>Cb<*!_ufJb!li!x-1wC8TjApAe)<; zU3#a-_xCcZ%DvYHfWDHYvEo>4V?Z@S?u+|qrN>fQ`BBcqSx)wIc7^afatQu7e)Ob>7cXkM4 z#LHS=gu`@5WfP=o#bX?JKyK zQ|KCO-+anpI)BE*YMMbm6!%sA6#x<1nIU7CxEvM&+DTJOg(9AKqG}o*?MK(Z?iAvz zfeO19u{#AF^INza7JlT8X>GUjI{5|na*EK-4919;LI3Fs)i#lU7UcSy54?Ey5h+cM zBG(A5Cpk>V2(2gSnBPLX7bTy!HZ+m$0W0q16cejy_FDTve%H;G_4=g<$tAyGOA2caSG zz<(mbp~0y?pds2@+=OlmoC3q+E|f4FY%L6KbP$gavbP~y>OB?g86V#7hwt+|-&aT} zS*5g<)c*kptD3vkDS+JDmH+~v+Y>yMt`<8uZdXVqGzl;qhJWbxgaiT?r5ZuLzI{@x zx9B@lcCOplw@|FNln@m_Bomrwl=GObjZ?^wwwg4``K2AOasD8a35^%;gH$%eW66No zE*1i|F7BmM$e`;}-Y*a7J5x;8#viBy^9OLVpJQ!P(CrCy{aZZiE$1MW4T)mCg+GwQ zsy5GO2jq?r{#ZbL2-OGxB5gJC#u1{GI{-}AUJme6(V8J9BcEu^2zmkpBoQE1wILqH xJLwQ#p9BKt{RQcbBTPpATn9mb-{Qb1e*r0oZYwiNO9}u0002ovPDHLkV1goOnX~`^ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_6.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_4.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_6.png rename to src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_4.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_5.png b/src/main/resources/assets/actuallyadditions/textures/block/coffee_stage_5.png deleted file mode 100644 index c46a260baa0a32f76d431cfbcb79b7fc4386d802..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 628 zcmV-)0*n2LP)LlR-$+Q5?rVZxdupL>>eZZ0xK;v&IBP&=nqnAz{KO zutUcVIz?F#cq&FBTZA_wjErClk^iMbIO)%Sw!_k>DRpUROu8%>4H@{~>mZw(n_YUR z$M^R>U%v16eorW+_@C8M+1yA40g%#E`MecC{0m&`ivVB&=#5WSbT#LUl07H`G>cZ% zDvYHfWDHYvEo>4V?Z@S?u+|qrN>fQ`BBcqSx)wIc7^afatQu7e)Ob>7cXkM4#LHS= zgu`@5WfP=o#bX?JKyKQ|KCO z-+anpI>y9mnn6Dl_f`EB01?`mA!C@h92NrFNmEOOBA$4nY8oExN7uma6ymIb3cDAv zI|Uu{Teut+e&mj6ZMX9}`33iKiqOss#)y|e|LF_WHj#i9qqwiItqhA&p@?l|7@#Q(Ae2(vec+?>`|oCT zmHX4m#kNu%eDzlw06twmN$~vf#<_5*P;6GKu9kE3v#_G(clva_dhjn77u%WlHZC;) O00007@`I-#`+V&qh<6#it5-OjNRHtvS`}mFGw}ul=AE{sviOe!oDL#Al0^3C) zj=c1$%y<7k-T%7ErNwsQ+o1pK4+M7av3qAH>cDv8&B@>2ZaqubaBhClpE=j987`!` zNQ)@kT5xMw$2C`3o@=d7XK*g&7G@18m2(N5d)dr&#!;;UAv(3;i_Xr_h-72Xus};q*wl6yvk#v{j9m@ QHqa{!p00i_>zopr0Jy|$O#lD@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_3.png b/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_3.png index 2a6a628ac721da823cf3a6e944ce9c0e980f0e2d..86365c637d3c88f5ce7064a1d00392b42655d066 100644 GIT binary patch delta 353 zcmV-n0iOPi0+0icIDY{`Nkl1pw6o&s-r%NG=R}Y?ifZz-00PP|OxRWnX z3MQR;hhWGJJk=1;(hK+krgO>U!DGF+cq!&}iG(8CS@IT3vflUp|M5i3j9X%*7k{V# z09jpd9;dW$p8*g6+(Q5W?%WG`oRTcnL{?T8CK&*p%GX%{0e^r>o4=dTyE5Qe|P%t$a;L{%SPVty|$yT{mb?J6tz#VWv5EPYp^ z&6p@z1^_5O#F?Y@fVL^5s&gh6QTvO4)8(tQ8N*X<1_1P3>C@zwO#=F^l)*ZD8>#pK X)eJl<=7VzE00000NkvXXu0mjf2YF|A diff --git a/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_6.png b/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_4.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/flax_stage_6.png rename to src/main/resources/assets/actuallyadditions/textures/block/flax_stage_4.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_5.png b/src/main/resources/assets/actuallyadditions/textures/block/flax_stage_5.png deleted file mode 100644 index 86365c637d3c88f5ce7064a1d00392b42655d066..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 400 zcmV;B0dM|^P)LlQC+;FcgOWSEoxMi&qbxe1PB!=m6~^2)L6kPzolU zdWT@h4LsEl(9#R|0;Y4xo4=dTX@bZ1&*5o!7Xawm-<^&-3b3ya0AzWBcR`oM ze2nW~-jXq+DD+6arbjMREItL>_m l$iTaYR~cW|5I82b_yrZlc!T;BzMlX9002ovPDHLkV1ih!k`4d> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_3.png b/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_3.png index 3f0c041e499e2924e66ba0fa207ab4fa815fa042..0acf69fd192ce0e79fa5f875599b6a2ac472040f 100644 GIT binary patch delta 364 zcmV-y0h9jI0-OVoIe$(`L_t(IjipkpZiYY*oW0ax2v2}R5Dd@osgkc)46e^Wnm)l7 zUIS4qX>fH-O+^hs;IK8M2Fq6T_HqZfp1GghnVp?mVrKkj-PxCFDCNii$O@Tzoiq-C zlEdfwqy0`AglSwHvb@cZx7m^4`QuwEK?4B*>ugd^*FH+qxPS08E{Ng)b6J7g)k%YCTsVpYL~&s9oL>MyUbwNA zYO2`IPvi3Uo@jtQ2jcEJD;Bb@=;?C1a+>*M%kPT*(1HN%JMuPTF>;-icyu&TT8QF+ zy>N3LZ6kGyr)4Gr0KWPk=tM_}fc7RT0H}uYAYDlGzwZ^f3hJaGA@RaZhKJW#VHy`v zBcp8;R71)1@N#dQ_QDP8tRTBAX-8tZ9qx*rlz^?FIR);CW&Z{2_P10+i!|N<0000< KMNUMnLSTZ0NwCNO delta 291 zcmV+;0o?wa1JeSKIe!I7L_t(IjqQ^mZo@zjMc-IqCXr8IW?+Tn3`Mot(h#$r!K!+K zD%S{TX;hhoRV4)>)`DfGC94qAOi9LdTvw_T+9k6yqyP8+*%g+Q^hl+WDbvUmwWw1hcR#=4L^>3!3E#S)QCLsG9OmAHrtg zUFa3e0M?6*oJhpvdl$58BRqjP{r2r$Fa=UIrONH|wQg6nTs_@roF3`g2#dCi)Ot3n p?W&f@z`KW68602N5I82b_yrZlc!T;BzMlX9002ovPDHLkV1flCjL!f7 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_6.png b/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_4.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/rice_stage_6.png rename to src/main/resources/assets/actuallyadditions/textures/block/rice_stage_4.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_5.png b/src/main/resources/assets/actuallyadditions/textures/block/rice_stage_5.png deleted file mode 100644 index 0acf69fd192ce0e79fa5f875599b6a2ac472040f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmV;N0b~A&P)LQmt-=KoFe0)L{rufI|=r&+w^|uUHJO&p?_!!53Zw zQ7mb2bxlo04ME_rHKYd1R`m9A2e_WOpWT_Aom*mN{AbL5`TPi^V0RZc4Qcl-CO4GRTG%kqZ0CmzJ&3q>ziUX&R zAxJZy?TU5M(B*bzt;AO5v}7wF9h6@A?dg>?A=OEPXD?60KWPk=tM_}fc7RT0H}uYAYDlGzwZ^f3hJaGA@RaZhKJW#VHy`vBcp8; zR71)1@N#dQ_QDP8tRTBAX-8tZ9qx*rlz^?FIR);CW&Z{2_P10+i!|N<0000