diff --git a/oats_guide.png b/oats_guide.png deleted file mode 100644 index 45305cbc..00000000 Binary files a/oats_guide.png and /dev/null differ diff --git a/oats_guide.xcf b/oats_guide.xcf new file mode 100644 index 00000000..c57ba5d0 Binary files /dev/null and b/oats_guide.xcf differ diff --git a/src/main/resources/assets/unicopia/blockstates/oats.json b/src/main/resources/assets/unicopia/blockstates/oats.json index cdba5a4a..109760e1 100644 --- a/src/main/resources/assets/unicopia/blockstates/oats.json +++ b/src/main/resources/assets/unicopia/blockstates/oats.json @@ -10,7 +10,7 @@ "age=7": { "model": "unicopia:block/oats_stage7_lower" }, "age=8": { "model": "unicopia:block/oats_stage8_lower" }, "age=9": { "model": "unicopia:block/oats_stage9_lower" }, - "age=10": { "model": "unicopia:block/oats_stage9_lower" }, - "age=11": { "model": "unicopia:block/oats_stage9_lower" } + "age=10": { "model": "unicopia:block/oats_stage10_lower" }, + "age=11": { "model": "unicopia:block/oats_stage11_lower" } } } diff --git a/src/main/resources/assets/unicopia/blockstates/oats_stem.json b/src/main/resources/assets/unicopia/blockstates/oats_stem.json index 9182a177..dac01154 100644 --- a/src/main/resources/assets/unicopia/blockstates/oats_stem.json +++ b/src/main/resources/assets/unicopia/blockstates/oats_stem.json @@ -5,7 +5,7 @@ "age=2": { "model": "unicopia:block/oats_stage7_upper" }, "age=3": { "model": "unicopia:block/oats_stage8_upper" }, "age=4": { "model": "unicopia:block/oats_stage9_upper" }, - "age=5": { "model": "unicopia:block/oats_stage10_lower" }, - "age=6": { "model": "unicopia:block/oats_stage9_lower" } + "age=5": { "model": "unicopia:block/oats_stage10_mid" }, + "age=6": { "model": "unicopia:block/oats_stage11_mid" } } } diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage10_mid.json b/src/main/resources/assets/unicopia/models/block/oats_stage10_mid.json new file mode 100644 index 00000000..160d2bd6 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/oats_stage10_mid.json @@ -0,0 +1,6 @@ +{ + "parent": "block/crop", + "textures": { + "crop": "unicopia:block/oats_stage10_mid" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage11_mid.json b/src/main/resources/assets/unicopia/models/block/oats_stage11_mid.json new file mode 100644 index 00000000..399ac8b0 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/oats_stage11_mid.json @@ -0,0 +1,6 @@ +{ + "parent": "block/crop", + "textures": { + "crop": "unicopia:block/oats_stage11_mid" + } +} diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage0.png b/src/main/resources/assets/unicopia/textures/block/oats_stage0.png index f82a89a8..237f8d04 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage0.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage0.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage1.png b/src/main/resources/assets/unicopia/textures/block/oats_stage1.png index 12b01a48..c8f2927c 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage1.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage1.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage10_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage10_lower.png index 60f2d466..a178222c 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage10_lower.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage10_lower.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage10_mid.png b/src/main/resources/assets/unicopia/textures/block/oats_stage10_mid.png new file mode 100644 index 00000000..c9340a50 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/block/oats_stage10_mid.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage10_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stage10_upper.png index 9cfef8cd..07006a4e 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage10_upper.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage10_upper.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage11_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage11_lower.png new file mode 100644 index 00000000..47b32105 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/block/oats_stage11_lower.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage11_mid.png b/src/main/resources/assets/unicopia/textures/block/oats_stage11_mid.png new file mode 100644 index 00000000..9b546043 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/block/oats_stage11_mid.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage11_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stage11_upper.png index 5cc4253e..4ab3720a 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage11_upper.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage11_upper.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage2.png b/src/main/resources/assets/unicopia/textures/block/oats_stage2.png index 11e6d25f..6885eb37 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage2.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage2.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage3.png b/src/main/resources/assets/unicopia/textures/block/oats_stage3.png index 158cb443..41f4dd9a 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage3.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage3.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage4.png b/src/main/resources/assets/unicopia/textures/block/oats_stage4.png index e608705d..50772957 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage4.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage4.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage5_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage5_lower.png index de0f6502..9d9e20cf 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage5_lower.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage5_lower.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage5_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stage5_upper.png index 7e96e59d..290cb6be 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage5_upper.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage5_upper.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage6_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage6_lower.png index 4d8a3e21..585fe3fb 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage6_lower.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage6_lower.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage6_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stage6_upper.png index 3dd2b8eb..5b25dd72 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage6_upper.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage6_upper.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage7_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage7_lower.png index 604f41cc..e4021922 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage7_lower.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage7_lower.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage7_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stage7_upper.png index 1f5f3a15..a1ff5395 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage7_upper.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage7_upper.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage8_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage8_lower.png index 7b7fbe9e..5285dae7 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage8_lower.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage8_lower.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage8_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stage8_upper.png index 8ec47213..47890d1a 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage8_upper.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage8_upper.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage9_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage9_lower.png index a7635f20..94487fe1 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage9_lower.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage9_lower.png differ diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage9_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stage9_upper.png index e8c832f3..a06c4592 100644 Binary files a/src/main/resources/assets/unicopia/textures/block/oats_stage9_upper.png and b/src/main/resources/assets/unicopia/textures/block/oats_stage9_upper.png differ