From 166450d430a4f03006058471e274a312af3d426c Mon Sep 17 00:00:00 2001 From: SihenZhang <1334125013@qq.com> Date: Thu, 30 Jan 2025 23:52:31 +0800 Subject: [PATCH] DataGen for new models --- .../.cache/1deb191a257cc8c4ce96391d9d59f3a0efa1c03d | 11 +++++------ .../crockpot/models/block/eggplants_stage0.json | 4 ++-- .../crockpot/models/block/eggplants_stage1.json | 4 ++-- .../crockpot/models/block/eggplants_stage2.json | 4 ++-- .../crockpot/models/block/eggplants_stage3.json | 4 ++-- .../assets/crockpot/models/block/unknown_crops.json | 7 ------- .../crockpot/data/CrockPotBlockStateProvider.java | 5 +++-- .../crockpot/models/block/eggplants_stage0.json | 7 ------- .../crockpot/models/block/eggplants_stage1.json | 7 ------- .../crockpot/models/block/eggplants_stage2.json | 7 ------- .../crockpot/models/block/eggplants_stage3.json | 7 ------- .../assets/crockpot/models/block/unknown_crops.json | 1 + 12 files changed, 17 insertions(+), 51 deletions(-) delete mode 100644 src/generated/resources/assets/crockpot/models/block/unknown_crops.json delete mode 100644 src/main/resources/assets/crockpot/models/block/eggplants_stage0.json delete mode 100644 src/main/resources/assets/crockpot/models/block/eggplants_stage1.json delete mode 100644 src/main/resources/assets/crockpot/models/block/eggplants_stage2.json delete mode 100644 src/main/resources/assets/crockpot/models/block/eggplants_stage3.json diff --git a/src/generated/resources/.cache/1deb191a257cc8c4ce96391d9d59f3a0efa1c03d b/src/generated/resources/.cache/1deb191a257cc8c4ce96391d9d59f3a0efa1c03d index 7c34a82b..101a3503 100644 --- a/src/generated/resources/.cache/1deb191a257cc8c4ce96391d9d59f3a0efa1c03d +++ b/src/generated/resources/.cache/1deb191a257cc8c4ce96391d9d59f3a0efa1c03d @@ -1,4 +1,4 @@ -// 1.20.1 2024-02-21T23:15:41.3126671 Block States: crockpot +// 1.20.1 2025-01-30T23:09:21.9544478 Block States: crockpot bde83cad5ec9fda7a269a7b3b883216f00e62be5 assets/crockpot/blockstates/asparaguses.json 0e8353b1eefb4d79c54beeb9ada51e9bfd9afdd9 assets/crockpot/blockstates/asparagus_soup.json f74b7beee5efc17d4d1410b14e6d341ee61abb9f assets/crockpot/blockstates/avaj.json @@ -74,10 +74,10 @@ a11b1c7ddbd00ac5e1268348c92810b3b1fa0be3 assets/crockpot/models/block/corns_stag 372e02efa12f665c61e0ca81eee02f9909790062 assets/crockpot/models/block/corns_stage5.json 3319d782e0d057be90244e127118aa69766387d6 assets/crockpot/models/block/corns_stage6.json c32bae0e228748693113a223f7a322f291c00a6f assets/crockpot/models/block/corns_stage7.json -e46b0dd200950e680192b9147652442f740660d0 assets/crockpot/models/block/eggplants_stage0.json -a938d0befa10aaaac167f35f311cf618f9c22eaa assets/crockpot/models/block/eggplants_stage1.json -b99982d3993c87c25ec5e1fa7c05b4f06f5161d1 assets/crockpot/models/block/eggplants_stage2.json -2729ca13223db5e8c50ba036024c877f5b0675e4 assets/crockpot/models/block/eggplants_stage3.json +2e66b77a2c2942825eb47f22b59b02a62e257733 assets/crockpot/models/block/eggplants_stage0.json +41d8f6fcd2e03f2fb8b4e4b1b9887614bf65db59 assets/crockpot/models/block/eggplants_stage1.json +585722fe9a7bd5837c72f325623700681bdf051b assets/crockpot/models/block/eggplants_stage2.json +199c0b88f0b37dcc8864b3fc0ec3cc9116516240 assets/crockpot/models/block/eggplants_stage3.json 6af8a27c4c9e124c4b860e65026bac814067f5ed assets/crockpot/models/block/garlics_stage0.json cec528541c6d5a9d9b4b3218ba5100b29c0447ce assets/crockpot/models/block/garlics_stage1.json 5959eaabfd51a40c0ecbf5fd5bec783b2907d9e3 assets/crockpot/models/block/garlics_stage2.json @@ -94,4 +94,3 @@ dd5f7833a263d70737968bec9de61efef6c0208d assets/crockpot/models/block/peppers_st 2ef81b2b11b451d6b5b631b0ee41509bfeb99a07 assets/crockpot/models/block/tomatoes_stage1.json ae2f2fdbfb2c0dd94f8ff9f4f070477f890a46b1 assets/crockpot/models/block/tomatoes_stage2.json 78685716363bc060923aef1fa1740f680aca9109 assets/crockpot/models/block/tomatoes_stage3.json -0bcd916ab5a8a43b23f0d5009c7f632c20bcd426 assets/crockpot/models/block/unknown_crops.json diff --git a/src/generated/resources/assets/crockpot/models/block/eggplants_stage0.json b/src/generated/resources/assets/crockpot/models/block/eggplants_stage0.json index 5075aeb9..ddb62801 100644 --- a/src/generated/resources/assets/crockpot/models/block/eggplants_stage0.json +++ b/src/generated/resources/assets/crockpot/models/block/eggplants_stage0.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "render_type": "minecraft:cutout", "textures": { - "crop": "crockpot:block/eggplants_stage0" + "cross": "crockpot:block/eggplants_stage0" } } \ No newline at end of file diff --git a/src/generated/resources/assets/crockpot/models/block/eggplants_stage1.json b/src/generated/resources/assets/crockpot/models/block/eggplants_stage1.json index b8519dcc..d20a515b 100644 --- a/src/generated/resources/assets/crockpot/models/block/eggplants_stage1.json +++ b/src/generated/resources/assets/crockpot/models/block/eggplants_stage1.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "render_type": "minecraft:cutout", "textures": { - "crop": "crockpot:block/eggplants_stage1" + "cross": "crockpot:block/eggplants_stage1" } } \ No newline at end of file diff --git a/src/generated/resources/assets/crockpot/models/block/eggplants_stage2.json b/src/generated/resources/assets/crockpot/models/block/eggplants_stage2.json index 4cd0d4af..fc1f2c4b 100644 --- a/src/generated/resources/assets/crockpot/models/block/eggplants_stage2.json +++ b/src/generated/resources/assets/crockpot/models/block/eggplants_stage2.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "render_type": "minecraft:cutout", "textures": { - "crop": "crockpot:block/eggplants_stage2" + "cross": "crockpot:block/eggplants_stage2" } } \ No newline at end of file diff --git a/src/generated/resources/assets/crockpot/models/block/eggplants_stage3.json b/src/generated/resources/assets/crockpot/models/block/eggplants_stage3.json index eb982378..636a0933 100644 --- a/src/generated/resources/assets/crockpot/models/block/eggplants_stage3.json +++ b/src/generated/resources/assets/crockpot/models/block/eggplants_stage3.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "render_type": "minecraft:cutout", "textures": { - "crop": "crockpot:block/eggplants_stage3" + "cross": "crockpot:block/eggplants_stage3" } } \ No newline at end of file diff --git a/src/generated/resources/assets/crockpot/models/block/unknown_crops.json b/src/generated/resources/assets/crockpot/models/block/unknown_crops.json deleted file mode 100644 index 6b5b2713..00000000 --- a/src/generated/resources/assets/crockpot/models/block/unknown_crops.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "render_type": "minecraft:cutout", - "textures": { - "crop": "crockpot:block/unknown_crops" - } -} \ No newline at end of file diff --git a/src/main/java/com/sihenzhang/crockpot/data/CrockPotBlockStateProvider.java b/src/main/java/com/sihenzhang/crockpot/data/CrockPotBlockStateProvider.java index 63ff1547..f713b203 100644 --- a/src/main/java/com/sihenzhang/crockpot/data/CrockPotBlockStateProvider.java +++ b/src/main/java/com/sihenzhang/crockpot/data/CrockPotBlockStateProvider.java @@ -29,10 +29,11 @@ protected void registerStatesAndModels() { this.crockPotBlock(CrockPotBlocks.CROCK_POT.get()); this.crockPotBlock(CrockPotBlocks.PORTABLE_CROCK_POT.get()); - this.simpleBlock(CrockPotBlocks.UNKNOWN_CROPS.get(), this.models().crop("unknown_crops", RLUtils.createRL("block/unknown_crops")).renderType(RLUtils.createVanillaRL("cutout"))); +// this.simpleBlock(CrockPotBlocks.UNKNOWN_CROPS.get(), this.models().crop("unknown_crops", RLUtils.createRL("block/unknown_crops")).renderType(RLUtils.createVanillaRL("cutout"))); + this.simpleBlock(CrockPotBlocks.UNKNOWN_CROPS.get(), this.models().getExistingFile(RLUtils.createRL("block/unknown_crops"))); this.customStageCropBlock(CrockPotBlocks.ASPARAGUS.get(), AbstractCrockPotCropBlock.AGE, List.of(0, 0, 1, 1, 2, 2, 2, 3)); this.customStageCropBlock(CrockPotBlocks.CORN.get(), CornBlock.AGE, List.of()); - this.customStageCropBlock(CrockPotBlocks.EGGPLANT.get(), AbstractCrockPotCropBlock.AGE, List.of(0, 0, 1, 1, 2, 2, 2, 3)); + this.customStageCrossBlock(CrockPotBlocks.EGGPLANT.get(), AbstractCrockPotCropBlock.AGE, List.of(0, 0, 1, 1, 2, 2, 2, 3)); this.customStageCropBlock(CrockPotBlocks.GARLIC.get(), AbstractCrockPotCropBlock.AGE, List.of(0, 0, 1, 1, 2, 2, 2, 3)); this.customStageCropBlock(CrockPotBlocks.ONION.get(), AbstractCrockPotCropBlock.AGE, List.of(0, 0, 1, 1, 2, 2, 2, 3)); this.customStageCropBlock(CrockPotBlocks.PEPPER.get(), AbstractCrockPotCropBlock.AGE, List.of(0, 0, 1, 1, 2, 2, 2, 3)); diff --git a/src/main/resources/assets/crockpot/models/block/eggplants_stage0.json b/src/main/resources/assets/crockpot/models/block/eggplants_stage0.json deleted file mode 100644 index ddb62801..00000000 --- a/src/main/resources/assets/crockpot/models/block/eggplants_stage0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "render_type": "minecraft:cutout", - "textures": { - "cross": "crockpot:block/eggplants_stage0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/crockpot/models/block/eggplants_stage1.json b/src/main/resources/assets/crockpot/models/block/eggplants_stage1.json deleted file mode 100644 index d20a515b..00000000 --- a/src/main/resources/assets/crockpot/models/block/eggplants_stage1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "render_type": "minecraft:cutout", - "textures": { - "cross": "crockpot:block/eggplants_stage1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/crockpot/models/block/eggplants_stage2.json b/src/main/resources/assets/crockpot/models/block/eggplants_stage2.json deleted file mode 100644 index fc1f2c4b..00000000 --- a/src/main/resources/assets/crockpot/models/block/eggplants_stage2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "render_type": "minecraft:cutout", - "textures": { - "cross": "crockpot:block/eggplants_stage2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/crockpot/models/block/eggplants_stage3.json b/src/main/resources/assets/crockpot/models/block/eggplants_stage3.json deleted file mode 100644 index 636a0933..00000000 --- a/src/main/resources/assets/crockpot/models/block/eggplants_stage3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "render_type": "minecraft:cutout", - "textures": { - "cross": "crockpot:block/eggplants_stage3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/crockpot/models/block/unknown_crops.json b/src/main/resources/assets/crockpot/models/block/unknown_crops.json index b9d8fd79..1b4f2919 100644 --- a/src/main/resources/assets/crockpot/models/block/unknown_crops.json +++ b/src/main/resources/assets/crockpot/models/block/unknown_crops.json @@ -1,4 +1,5 @@ { + "render_type": "minecraft:cutout", "credit": "Made with Blockbench", "ambientocclusion": false, "textures": {