diff --git a/kubejs/assets/betterend/models/item/amber_root_wild.json b/kubejs/assets/betterend/models/item/amber_root_wild.json index d23882932..80abace34 100644 --- a/kubejs/assets/betterend/models/item/amber_root_wild.json +++ b/kubejs/assets/betterend/models/item/amber_root_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/amber_root_wild_mature" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/amber_root_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/blossom_berry_wild.json b/kubejs/assets/betterend/models/item/blossom_berry_wild.json index 85cbcb7b9..2e4b9e1ee 100644 --- a/kubejs/assets/betterend/models/item/blossom_berry_wild.json +++ b/kubejs/assets/betterend/models/item/blossom_berry_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/blossom_berry_wild_mature" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/blossom_berry_seed_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json index 19e445b33..c6023eafc 100644 --- a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json +++ b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/bolux_mushroom_wild_mature" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/bolux_mushroom_greenhouse_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json b/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json index f252404ac..f28a9349b 100644 --- a/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/cave_pumpkin_wild" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/cave_pumpkin_stem_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json index 6e95364a6..f6d53a097 100644 --- a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json +++ b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/chorus_mushroom_wild_mature" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/chorus_mushroom_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/shadow_berry_wild.json b/kubejs/assets/betterend/models/item/shadow_berry_wild.json index 0ebb8c7c2..8ce40e68e 100644 --- a/kubejs/assets/betterend/models/item/shadow_berry_wild.json +++ b/kubejs/assets/betterend/models/item/shadow_berry_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/shadow_berry_wild_mature" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/shadow_berry_greenhouse_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/textures/block/blossom_berry_seed_3.png b/kubejs/assets/betterend/textures/block/blossom_berry_seed_3.png new file mode 100644 index 000000000..6c5b329b5 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/blossom_berry_seed_3.png differ diff --git a/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_0.png b/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_0.png new file mode 100644 index 000000000..63415ca53 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_0.png differ diff --git a/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_1.png b/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_1.png new file mode 100644 index 000000000..07db13313 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_1.png differ diff --git a/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_2.png b/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_2.png new file mode 100644 index 000000000..50958dda4 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_2.png differ diff --git a/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_3.png b/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_3.png new file mode 100644 index 000000000..765bf8918 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_3.png differ diff --git a/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_0.png b/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_0.png new file mode 100644 index 000000000..c3f8d5d60 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_0.png differ diff --git a/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_1.png b/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_1.png new file mode 100644 index 000000000..680f1f5c6 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_1.png differ diff --git a/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_2.png b/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_2.png new file mode 100644 index 000000000..fe017c068 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_2.png differ diff --git a/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_3.png b/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_3.png new file mode 100644 index 000000000..b5f0abb15 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_3.png differ diff --git a/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_0.png b/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_0.png new file mode 100644 index 000000000..ca56507ef Binary files /dev/null and b/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_0.png differ diff --git a/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_1.png b/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_1.png new file mode 100644 index 000000000..c8c35d534 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_1.png differ diff --git a/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_2.png b/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_2.png new file mode 100644 index 000000000..632fe668a Binary files /dev/null and b/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_2.png differ diff --git a/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_3.png b/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_3.png new file mode 100644 index 000000000..c02fdb0fa Binary files /dev/null and b/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_3.png differ diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 0a89ca871..0946de948 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -425,7 +425,7 @@ const registerTFGFLPlanters = (event) => { 'betterend:block/blossom_berry_seed_0', 'betterend:block/blossom_berry_seed_1', 'betterend:block/blossom_berry_seed_2', - 'betterend:block/blossom_berry_seed_3' // TODO + 'betterend:block/blossom_berry_seed_3' ], null ) @@ -440,7 +440,6 @@ const registerTFGFLPlanters = (event) => { 'betterend:bolux_mushroom_product', 'phosphorous', [ - // TODO: all 'betterend:block/bolux_mushroom_greenhouse_0', 'betterend:block/bolux_mushroom_greenhouse_1', 'betterend:block/bolux_mushroom_greenhouse_2', @@ -477,13 +476,13 @@ const registerTFGFLPlanters = (event) => { 'betterend:cave_pumpkin', 'phosphorous', [ - // TODO: all 'betterend:block/cave_pumpkin_greenhouse_0', 'betterend:block/cave_pumpkin_greenhouse_1', 'betterend:block/cave_pumpkin_greenhouse_2', 'betterend:block/cave_pumpkin_greenhouse_3' ], - 'betterend:block/cave_pumpkin_greenhouse_fruit' + //'betterend:block/cave_pumpkin_greenhouse_fruit' + 'betterend:block/cave_pumpkin_top' // TODO: check ) event.firmalifePlantable( @@ -496,7 +495,6 @@ const registerTFGFLPlanters = (event) => { 'betterend:shadow_berry_product', 'potassium', [ - // TODO: all 'betterend:block/shadow_berry_greenhouse_0', 'betterend:block/shadow_berry_greenhouse_1', 'betterend:block/shadow_berry_greenhouse_2',