diff --git a/src/main/resources/assets/forestry/models/item/ambrosia.json b/src/main/resources/assets/forestry/models/item/ambrosia.json index f70569a4bf..c33a1c7d5f 100644 --- a/src/main/resources/assets/forestry/models/item/ambrosia.json +++ b/src/main/resources/assets/forestry/models/item/ambrosia.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/ambrosia" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/apatite.json b/src/main/resources/assets/forestry/models/item/apatite.json index 085b44bf38..55a52d6eef 100644 --- a/src/main/resources/assets/forestry/models/item/apatite.json +++ b/src/main/resources/assets/forestry/models/item/apatite.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/apatite" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/apiaristBoots.json b/src/main/resources/assets/forestry/models/item/apiaristBoots.json index f4f69cbc15..881a7cc46d 100644 --- a/src/main/resources/assets/forestry/models/item/apiaristBoots.json +++ b/src/main/resources/assets/forestry/models/item/apiaristBoots.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/apiaristBoots" }, diff --git a/src/main/resources/assets/forestry/models/item/apiaristChest.json b/src/main/resources/assets/forestry/models/item/apiaristChest.json index dca0c8a06d..6295e01e49 100644 --- a/src/main/resources/assets/forestry/models/item/apiaristChest.json +++ b/src/main/resources/assets/forestry/models/item/apiaristChest.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/apiaristChest" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/apiaristHelmet.json b/src/main/resources/assets/forestry/models/item/apiaristHelmet.json index 1a210b2b29..c494b8fcdc 100644 --- a/src/main/resources/assets/forestry/models/item/apiaristHelmet.json +++ b/src/main/resources/assets/forestry/models/item/apiaristHelmet.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/apiaristHelmet" }, diff --git a/src/main/resources/assets/forestry/models/item/apiaristLegs.json b/src/main/resources/assets/forestry/models/item/apiaristLegs.json index 1400ae28fd..ace14877d2 100644 --- a/src/main/resources/assets/forestry/models/item/apiaristLegs.json +++ b/src/main/resources/assets/forestry/models/item/apiaristLegs.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/apiaristLegs" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/ash.json b/src/main/resources/assets/forestry/models/item/ash.json index ba43a19f10..8e7a53462d 100644 --- a/src/main/resources/assets/forestry/models/item/ash.json +++ b/src/main/resources/assets/forestry/models/item/ash.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/ash" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/backpacks/normal_locked.json b/src/main/resources/assets/forestry/models/item/backpacks/normal_locked.json index 4cfb8b656a..bc58ffa41b 100644 --- a/src/main/resources/assets/forestry/models/item/backpacks/normal_locked.json +++ b/src/main/resources/assets/forestry/models/item/backpacks/normal_locked.json @@ -1,20 +1,8 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/backpacks/normal.cloth", "layer1": "forestry:items/backpacks/normal.outline", "layer2": "forestry:items/backpacks/locked" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/backpacks/normal_neutral.json b/src/main/resources/assets/forestry/models/item/backpacks/normal_neutral.json index ea7a8dd897..08026e811f 100644 --- a/src/main/resources/assets/forestry/models/item/backpacks/normal_neutral.json +++ b/src/main/resources/assets/forestry/models/item/backpacks/normal_neutral.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/backpacks/normal.cloth", "layer1": "forestry:items/backpacks/normal.outline" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/backpacks/normal_receive.json b/src/main/resources/assets/forestry/models/item/backpacks/normal_receive.json index 589ce090b3..f06afef88f 100644 --- a/src/main/resources/assets/forestry/models/item/backpacks/normal_receive.json +++ b/src/main/resources/assets/forestry/models/item/backpacks/normal_receive.json @@ -1,20 +1,8 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/backpacks/normal.cloth", "layer1": "forestry:items/backpacks/normal.outline", "layer2": "forestry:items/backpacks/receive" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/backpacks/normal_resupply.json b/src/main/resources/assets/forestry/models/item/backpacks/normal_resupply.json index 5bfc8a488e..eba3d4d023 100644 --- a/src/main/resources/assets/forestry/models/item/backpacks/normal_resupply.json +++ b/src/main/resources/assets/forestry/models/item/backpacks/normal_resupply.json @@ -1,20 +1,8 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/backpacks/normal.cloth", "layer1": "forestry:items/backpacks/normal.outline", "layer2": "forestry:items/backpacks/resupply" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/backpacks/woven_locked.json b/src/main/resources/assets/forestry/models/item/backpacks/woven_locked.json index ff27f8a00c..5dc7522eaa 100644 --- a/src/main/resources/assets/forestry/models/item/backpacks/woven_locked.json +++ b/src/main/resources/assets/forestry/models/item/backpacks/woven_locked.json @@ -1,20 +1,8 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/backpacks/woven.cloth", "layer1": "forestry:items/backpacks/woven.outline", "layer2": "forestry:items/backpacks/locked" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/backpacks/woven_neutral.json b/src/main/resources/assets/forestry/models/item/backpacks/woven_neutral.json index 3e8470d3c6..00861bfcaa 100644 --- a/src/main/resources/assets/forestry/models/item/backpacks/woven_neutral.json +++ b/src/main/resources/assets/forestry/models/item/backpacks/woven_neutral.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/backpacks/woven.cloth", "layer1": "forestry:items/backpacks/woven.outline" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/backpacks/woven_receive.json b/src/main/resources/assets/forestry/models/item/backpacks/woven_receive.json index 3936bdfe4b..0c14256f4d 100644 --- a/src/main/resources/assets/forestry/models/item/backpacks/woven_receive.json +++ b/src/main/resources/assets/forestry/models/item/backpacks/woven_receive.json @@ -1,20 +1,8 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/backpacks/woven.cloth", "layer1": "forestry:items/backpacks/woven.outline", "layer2": "forestry:items/backpacks/receive" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/backpacks/woven_resupply.json b/src/main/resources/assets/forestry/models/item/backpacks/woven_resupply.json index 2484f2d7e2..a8eeaf3a43 100644 --- a/src/main/resources/assets/forestry/models/item/backpacks/woven_resupply.json +++ b/src/main/resources/assets/forestry/models/item/backpacks/woven_resupply.json @@ -1,20 +1,8 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/backpacks/woven.cloth", "layer1": "forestry:items/backpacks/woven.outline", "layer2": "forestry:items/backpacks/resupply" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/beeCombs.json b/src/main/resources/assets/forestry/models/item/beeCombs.json index 4207db2ace..af92eaa672 100644 --- a/src/main/resources/assets/forestry/models/item/beeCombs.json +++ b/src/main/resources/assets/forestry/models/item/beeCombs.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/beeCombs.0", "layer1": "forestry:items/beeCombs.1" diff --git a/src/main/resources/assets/forestry/models/item/beealyzer.json b/src/main/resources/assets/forestry/models/item/beealyzer.json index e6e4ea409b..61651c0b0a 100644 --- a/src/main/resources/assets/forestry/models/item/beealyzer.json +++ b/src/main/resources/assets/forestry/models/item/beealyzer.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/beealyzer" }, diff --git a/src/main/resources/assets/forestry/models/item/beeswax.json b/src/main/resources/assets/forestry/models/item/beeswax.json index f9ef9782ef..4ea23ffa3d 100644 --- a/src/main/resources/assets/forestry/models/item/beeswax.json +++ b/src/main/resources/assets/forestry/models/item/beeswax.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/beeswax" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/bituminousPeat.json b/src/main/resources/assets/forestry/models/item/bituminousPeat.json index 0dce59324c..ceb13a69a8 100644 --- a/src/main/resources/assets/forestry/models/item/bituminousPeat.json +++ b/src/main/resources/assets/forestry/models/item/bituminousPeat.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/bituminousPeat" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json b/src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json index 56b6c8e7ba..5c36eed0d2 100644 --- a/src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json +++ b/src/main/resources/assets/forestry/models/item/brokenBronzePickaxe.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/brokenBronzePickaxe" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json b/src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json index c166c8de3f..bbaaadfd92 100644 --- a/src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json +++ b/src/main/resources/assets/forestry/models/item/brokenBronzeShovel.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/brokenBronzeShovel" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/bronzePickaxe.json b/src/main/resources/assets/forestry/models/item/bronzePickaxe.json index c917a399aa..fb0386429e 100644 --- a/src/main/resources/assets/forestry/models/item/bronzePickaxe.json +++ b/src/main/resources/assets/forestry/models/item/bronzePickaxe.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/bronzePickaxe" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/bronzeShovel.json b/src/main/resources/assets/forestry/models/item/bronzeShovel.json index 2c6298177e..db0ad9bb9f 100644 --- a/src/main/resources/assets/forestry/models/item/bronzeShovel.json +++ b/src/main/resources/assets/forestry/models/item/bronzeShovel.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/bronzeShovel" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/camouflagedPaneling.json b/src/main/resources/assets/forestry/models/item/camouflagedPaneling.json index 558a637968..8ad6b5f517 100644 --- a/src/main/resources/assets/forestry/models/item/camouflagedPaneling.json +++ b/src/main/resources/assets/forestry/models/item/camouflagedPaneling.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/camouflagedPaneling" }, diff --git a/src/main/resources/assets/forestry/models/item/candle.json b/src/main/resources/assets/forestry/models/item/candle.json index 6f7d355b10..473be0c6cc 100644 --- a/src/main/resources/assets/forestry/models/item/candle.json +++ b/src/main/resources/assets/forestry/models/item/candle.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/candle" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/cart.apiary.json b/src/main/resources/assets/forestry/models/item/cart.apiary.json index d31bb1e972..fb7675362c 100644 --- a/src/main/resources/assets/forestry/models/item/cart.apiary.json +++ b/src/main/resources/assets/forestry/models/item/cart.apiary.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cart.apiary" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/cart.beehouse.json b/src/main/resources/assets/forestry/models/item/cart.beehouse.json index 5d99adb9d3..a2c4518ba3 100644 --- a/src/main/resources/assets/forestry/models/item/cart.beehouse.json +++ b/src/main/resources/assets/forestry/models/item/cart.beehouse.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cart.beehouse" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/carton.json b/src/main/resources/assets/forestry/models/item/carton.json index ff3c7a84cc..9ef383fc1a 100644 --- a/src/main/resources/assets/forestry/models/item/carton.json +++ b/src/main/resources/assets/forestry/models/item/carton.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/carton" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/catalogue.json b/src/main/resources/assets/forestry/models/item/catalogue.json index 23fc6e4db0..94d8f47320 100644 --- a/src/main/resources/assets/forestry/models/item/catalogue.json +++ b/src/main/resources/assets/forestry/models/item/catalogue.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/catalogue" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/caterpillar.json b/src/main/resources/assets/forestry/models/item/caterpillar.json index 9b81b6c619..61fc64b359 100644 --- a/src/main/resources/assets/forestry/models/item/caterpillar.json +++ b/src/main/resources/assets/forestry/models/item/caterpillar.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/caterpillar.body2", "layer1": "forestry:items/caterpillar.body" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/chipsets.json b/src/main/resources/assets/forestry/models/item/chipsets.json index 81a74b27ff..cb6b4bcc8f 100644 --- a/src/main/resources/assets/forestry/models/item/chipsets.json +++ b/src/main/resources/assets/forestry/models/item/chipsets.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/chipsets.1", "layer1": "forestry:items/chipsets.0" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/cocoon_early.json b/src/main/resources/assets/forestry/models/item/cocoon_early.json index cc1e02590e..585b475222 100644 --- a/src/main/resources/assets/forestry/models/item/cocoon_early.json +++ b/src/main/resources/assets/forestry/models/item/cocoon_early.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cocoons/cocoon_early" } diff --git a/src/main/resources/assets/forestry/models/item/cocoon_late.json b/src/main/resources/assets/forestry/models/item/cocoon_late.json index 6476c5c5d3..ee5ca4ad1d 100644 --- a/src/main/resources/assets/forestry/models/item/cocoon_late.json +++ b/src/main/resources/assets/forestry/models/item/cocoon_late.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cocoons/cocoon_late" } diff --git a/src/main/resources/assets/forestry/models/item/cocoon_middle.json b/src/main/resources/assets/forestry/models/item/cocoon_middle.json index 6476c5c5d3..ee5ca4ad1d 100644 --- a/src/main/resources/assets/forestry/models/item/cocoon_middle.json +++ b/src/main/resources/assets/forestry/models/item/cocoon_middle.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cocoons/cocoon_late" } diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json index 459865b455..cea30fbc8b 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/dissipationCharge.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/dissipationCharge" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json b/src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json index 2f9b393f77..da2366510f 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/fertilizerCompound - Kopie (11).json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/pulsatingMesh" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json index e94958e396..173a335d91 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/iceShard.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/iceShard" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json index 7f958e947a..3e7959ddc1 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingDust.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/pulsatingDust" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json index 2f9b393f77..da2366510f 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/pulsatingMesh.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/pulsatingMesh" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json index bad1f46d50..7f23fa36ed 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/scentedPaneling.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/scentedPaneling" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json index ed3dd727c2..9715b20337 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/silkWisp.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/silkWisp" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json b/src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json index 20877f3e4b..00e7fee9c5 100644 --- a/src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json +++ b/src/main/resources/assets/forestry/models/item/craftingMaterial/wovenSilk.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/wovenSilk" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/crate-filled.json b/src/main/resources/assets/forestry/models/item/crate-filled.json index a8b3ae3cb5..a42159333a 100644 --- a/src/main/resources/assets/forestry/models/item/crate-filled.json +++ b/src/main/resources/assets/forestry/models/item/crate-filled.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/crate-filled" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/crate.json b/src/main/resources/assets/forestry/models/item/crate.json index ce245c4633..79b373d482 100644 --- a/src/main/resources/assets/forestry/models/item/crate.json +++ b/src/main/resources/assets/forestry/models/item/crate.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/crate" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/decayingWheat.json b/src/main/resources/assets/forestry/models/item/decayingWheat.json index f61c15dd37..6bc51433c9 100644 --- a/src/main/resources/assets/forestry/models/item/decayingWheat.json +++ b/src/main/resources/assets/forestry/models/item/decayingWheat.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/decayingWheat" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/dissipationCharge.json b/src/main/resources/assets/forestry/models/item/dissipationCharge.json index 990dea14c3..7920f9213c 100644 --- a/src/main/resources/assets/forestry/models/item/dissipationCharge.json +++ b/src/main/resources/assets/forestry/models/item/dissipationCharge.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/dissipationCharge" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/acacia.json b/src/main/resources/assets/forestry/models/item/doors/acacia.json index cb5536734f..053ee62811 100644 --- a/src/main/resources/assets/forestry/models/item/doors/acacia.json +++ b/src/main/resources/assets/forestry/models/item/doors/acacia.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/acacia" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/balsa.json b/src/main/resources/assets/forestry/models/item/doors/balsa.json index 8d782bdb6c..3375f732eb 100644 --- a/src/main/resources/assets/forestry/models/item/doors/balsa.json +++ b/src/main/resources/assets/forestry/models/item/doors/balsa.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/balsa" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/baobab.json b/src/main/resources/assets/forestry/models/item/doors/baobab.json index 8fb3b82a68..8af9f264e9 100644 --- a/src/main/resources/assets/forestry/models/item/doors/baobab.json +++ b/src/main/resources/assets/forestry/models/item/doors/baobab.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/baobab" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/cherry.json b/src/main/resources/assets/forestry/models/item/doors/cherry.json index 4d730cc949..eb87bca83b 100644 --- a/src/main/resources/assets/forestry/models/item/doors/cherry.json +++ b/src/main/resources/assets/forestry/models/item/doors/cherry.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/cherry" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/chestnut.json b/src/main/resources/assets/forestry/models/item/doors/chestnut.json index 1e581b9028..715f16ae8e 100644 --- a/src/main/resources/assets/forestry/models/item/doors/chestnut.json +++ b/src/main/resources/assets/forestry/models/item/doors/chestnut.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/chestnut" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/citrus.json b/src/main/resources/assets/forestry/models/item/doors/citrus.json index 105fa0a8a6..170f387e00 100644 --- a/src/main/resources/assets/forestry/models/item/doors/citrus.json +++ b/src/main/resources/assets/forestry/models/item/doors/citrus.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/citrus" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/cocobolo.json b/src/main/resources/assets/forestry/models/item/doors/cocobolo.json index 155b5a75df..d6cd166eca 100644 --- a/src/main/resources/assets/forestry/models/item/doors/cocobolo.json +++ b/src/main/resources/assets/forestry/models/item/doors/cocobolo.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/cocobolo" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/ebony.json b/src/main/resources/assets/forestry/models/item/doors/ebony.json index ab18a3800b..e9f879f2c3 100644 --- a/src/main/resources/assets/forestry/models/item/doors/ebony.json +++ b/src/main/resources/assets/forestry/models/item/doors/ebony.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/ebony" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/giganteum.json b/src/main/resources/assets/forestry/models/item/doors/giganteum.json index fddb476685..524e9089c5 100644 --- a/src/main/resources/assets/forestry/models/item/doors/giganteum.json +++ b/src/main/resources/assets/forestry/models/item/doors/giganteum.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/giganteum" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/greenheart.json b/src/main/resources/assets/forestry/models/item/doors/greenheart.json index 8dcbaf70bb..666506ae6c 100644 --- a/src/main/resources/assets/forestry/models/item/doors/greenheart.json +++ b/src/main/resources/assets/forestry/models/item/doors/greenheart.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/greenheart" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/ipe.json b/src/main/resources/assets/forestry/models/item/doors/ipe.json index c5e58ea262..5920516deb 100644 --- a/src/main/resources/assets/forestry/models/item/doors/ipe.json +++ b/src/main/resources/assets/forestry/models/item/doors/ipe.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/ipe" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/kapok.json b/src/main/resources/assets/forestry/models/item/doors/kapok.json index 73aa189061..23ea31ad1e 100644 --- a/src/main/resources/assets/forestry/models/item/doors/kapok.json +++ b/src/main/resources/assets/forestry/models/item/doors/kapok.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/kapok" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/larch.json b/src/main/resources/assets/forestry/models/item/doors/larch.json index 5364746eee..c2e4050f96 100644 --- a/src/main/resources/assets/forestry/models/item/doors/larch.json +++ b/src/main/resources/assets/forestry/models/item/doors/larch.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/larch" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/lime.json b/src/main/resources/assets/forestry/models/item/doors/lime.json index ee84aacd32..a2f9f64690 100644 --- a/src/main/resources/assets/forestry/models/item/doors/lime.json +++ b/src/main/resources/assets/forestry/models/item/doors/lime.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/lime" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/mahoe.json b/src/main/resources/assets/forestry/models/item/doors/mahoe.json index 1afd737226..14d92f1fa4 100644 --- a/src/main/resources/assets/forestry/models/item/doors/mahoe.json +++ b/src/main/resources/assets/forestry/models/item/doors/mahoe.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/mahoe" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/mahogany.json b/src/main/resources/assets/forestry/models/item/doors/mahogany.json index 8e137e909d..28921b6fee 100644 --- a/src/main/resources/assets/forestry/models/item/doors/mahogany.json +++ b/src/main/resources/assets/forestry/models/item/doors/mahogany.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/mahogany" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/maple.json b/src/main/resources/assets/forestry/models/item/doors/maple.json index 4292a205a9..220422b438 100644 --- a/src/main/resources/assets/forestry/models/item/doors/maple.json +++ b/src/main/resources/assets/forestry/models/item/doors/maple.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/maple" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/padauk.json b/src/main/resources/assets/forestry/models/item/doors/padauk.json index 9fa8a25045..73a0c3f571 100644 --- a/src/main/resources/assets/forestry/models/item/doors/padauk.json +++ b/src/main/resources/assets/forestry/models/item/doors/padauk.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/padauk" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/palm.json b/src/main/resources/assets/forestry/models/item/doors/palm.json index cb10acbc74..a90b574463 100644 --- a/src/main/resources/assets/forestry/models/item/doors/palm.json +++ b/src/main/resources/assets/forestry/models/item/doors/palm.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/palm" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/papaya.json b/src/main/resources/assets/forestry/models/item/doors/papaya.json index b3bd0ead0f..6b180ff9c1 100644 --- a/src/main/resources/assets/forestry/models/item/doors/papaya.json +++ b/src/main/resources/assets/forestry/models/item/doors/papaya.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/papaya" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/pine.json b/src/main/resources/assets/forestry/models/item/doors/pine.json index e4b7936fe1..4618a98410 100644 --- a/src/main/resources/assets/forestry/models/item/doors/pine.json +++ b/src/main/resources/assets/forestry/models/item/doors/pine.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/pine" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/plum.json b/src/main/resources/assets/forestry/models/item/doors/plum.json index dd48a40951..a9d1f47c24 100644 --- a/src/main/resources/assets/forestry/models/item/doors/plum.json +++ b/src/main/resources/assets/forestry/models/item/doors/plum.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/plum" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/poplar.json b/src/main/resources/assets/forestry/models/item/doors/poplar.json index fbf2cdfb34..9ae14ebe96 100644 --- a/src/main/resources/assets/forestry/models/item/doors/poplar.json +++ b/src/main/resources/assets/forestry/models/item/doors/poplar.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/poplar" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/sequoia.json b/src/main/resources/assets/forestry/models/item/doors/sequoia.json index fe462af2b6..89f53592af 100644 --- a/src/main/resources/assets/forestry/models/item/doors/sequoia.json +++ b/src/main/resources/assets/forestry/models/item/doors/sequoia.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/sequoia" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/teak.json b/src/main/resources/assets/forestry/models/item/doors/teak.json index d65cf1cf1c..9c5613585e 100644 --- a/src/main/resources/assets/forestry/models/item/doors/teak.json +++ b/src/main/resources/assets/forestry/models/item/doors/teak.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/teak" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/walnut.json b/src/main/resources/assets/forestry/models/item/doors/walnut.json index 18df0d51bd..77cc89db97 100644 --- a/src/main/resources/assets/forestry/models/item/doors/walnut.json +++ b/src/main/resources/assets/forestry/models/item/doors/walnut.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/walnut" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/wenge.json b/src/main/resources/assets/forestry/models/item/doors/wenge.json index 85d02b396f..65f07f12ea 100644 --- a/src/main/resources/assets/forestry/models/item/doors/wenge.json +++ b/src/main/resources/assets/forestry/models/item/doors/wenge.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/wenge" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/willow.json b/src/main/resources/assets/forestry/models/item/doors/willow.json index f21978fad1..ad70e806ab 100644 --- a/src/main/resources/assets/forestry/models/item/doors/willow.json +++ b/src/main/resources/assets/forestry/models/item/doors/willow.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/willow" }, diff --git a/src/main/resources/assets/forestry/models/item/doors/zebrawood.json b/src/main/resources/assets/forestry/models/item/doors/zebrawood.json index 6b7825867c..6c1a1b9a89 100644 --- a/src/main/resources/assets/forestry/models/item/doors/zebrawood.json +++ b/src/main/resources/assets/forestry/models/item/doors/zebrawood.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/doors/zebrawood" }, diff --git a/src/main/resources/assets/forestry/models/item/fertilizerBio.json b/src/main/resources/assets/forestry/models/item/fertilizerBio.json index 27360006b1..6024dff50c 100644 --- a/src/main/resources/assets/forestry/models/item/fertilizerBio.json +++ b/src/main/resources/assets/forestry/models/item/fertilizerBio.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/fertilizerBio" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/fertilizerCompound.json b/src/main/resources/assets/forestry/models/item/fertilizerCompound.json index 115fb0f63d..7adee3df41 100644 --- a/src/main/resources/assets/forestry/models/item/fertilizerCompound.json +++ b/src/main/resources/assets/forestry/models/item/fertilizerCompound.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/fertilizerCompound" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/flutterlyzer.json b/src/main/resources/assets/forestry/models/item/flutterlyzer.json index 55cf080c42..dfa2921a36 100644 --- a/src/main/resources/assets/forestry/models/item/flutterlyzer.json +++ b/src/main/resources/assets/forestry/models/item/flutterlyzer.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/flutterlyzer" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/frameImpregnated.json b/src/main/resources/assets/forestry/models/item/frameImpregnated.json index f3a558647a..893ffdc11a 100644 --- a/src/main/resources/assets/forestry/models/item/frameImpregnated.json +++ b/src/main/resources/assets/forestry/models/item/frameImpregnated.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/frameImpregnated" }, diff --git a/src/main/resources/assets/forestry/models/item/frameProven.json b/src/main/resources/assets/forestry/models/item/frameProven.json index 6b1d8f5b31..7c056fbb5a 100644 --- a/src/main/resources/assets/forestry/models/item/frameProven.json +++ b/src/main/resources/assets/forestry/models/item/frameProven.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/frameProven" }, diff --git a/src/main/resources/assets/forestry/models/item/frameUntreated.json b/src/main/resources/assets/forestry/models/item/frameUntreated.json index 29e814b459..a5bbe0adf9 100644 --- a/src/main/resources/assets/forestry/models/item/frameUntreated.json +++ b/src/main/resources/assets/forestry/models/item/frameUntreated.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/frameUntreated" }, diff --git a/src/main/resources/assets/forestry/models/item/fruits/cherry.json b/src/main/resources/assets/forestry/models/item/fruits/cherry.json index 6e33d3fa98..d53b567ccf 100644 --- a/src/main/resources/assets/forestry/models/item/fruits/cherry.json +++ b/src/main/resources/assets/forestry/models/item/fruits/cherry.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/fruits/cherry" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/fruits/chestnut.json b/src/main/resources/assets/forestry/models/item/fruits/chestnut.json index 3122f4bbfe..295d4128cb 100644 --- a/src/main/resources/assets/forestry/models/item/fruits/chestnut.json +++ b/src/main/resources/assets/forestry/models/item/fruits/chestnut.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/fruits/chestnut" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/fruits/dates.json b/src/main/resources/assets/forestry/models/item/fruits/dates.json index 3747992cb2..202db45450 100644 --- a/src/main/resources/assets/forestry/models/item/fruits/dates.json +++ b/src/main/resources/assets/forestry/models/item/fruits/dates.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/fruits/dates" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/fruits/lemon.json b/src/main/resources/assets/forestry/models/item/fruits/lemon.json index d0f4ec4b00..fb088d0ab8 100644 --- a/src/main/resources/assets/forestry/models/item/fruits/lemon.json +++ b/src/main/resources/assets/forestry/models/item/fruits/lemon.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/fruits/lemon" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/fruits/papaya.json b/src/main/resources/assets/forestry/models/item/fruits/papaya.json index b4a7e234a1..cb60833409 100644 --- a/src/main/resources/assets/forestry/models/item/fruits/papaya.json +++ b/src/main/resources/assets/forestry/models/item/fruits/papaya.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/fruits/papaya" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/fruits/plum.json b/src/main/resources/assets/forestry/models/item/fruits/plum.json index 0ab4391342..d0ba9138df 100644 --- a/src/main/resources/assets/forestry/models/item/fruits/plum.json +++ b/src/main/resources/assets/forestry/models/item/fruits/plum.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/fruits/plum" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/fruits/walnut.json b/src/main/resources/assets/forestry/models/item/fruits/walnut.json index f47edef7d5..82bf0019eb 100644 --- a/src/main/resources/assets/forestry/models/item/fruits/walnut.json +++ b/src/main/resources/assets/forestry/models/item/fruits/walnut.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/fruits/walnut" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/gearBronze.json b/src/main/resources/assets/forestry/models/item/gearBronze.json index b730183f6a..46c23f4314 100644 --- a/src/main/resources/assets/forestry/models/item/gearBronze.json +++ b/src/main/resources/assets/forestry/models/item/gearBronze.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/gearBronze" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/gearCopper.json b/src/main/resources/assets/forestry/models/item/gearCopper.json index a64de49668..83c2885156 100644 --- a/src/main/resources/assets/forestry/models/item/gearCopper.json +++ b/src/main/resources/assets/forestry/models/item/gearCopper.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/gearCopper" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/gearTin.json b/src/main/resources/assets/forestry/models/item/gearTin.json index 6a1c270a82..c9d18bec62 100644 --- a/src/main/resources/assets/forestry/models/item/gearTin.json +++ b/src/main/resources/assets/forestry/models/item/gearTin.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/gearTin" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json index 7eac645bd7..e906834f99 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeAcacia.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeAcacia" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json index d300b80a60..8f4faf08fe 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBalsa.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeBalsa" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json index f6bc1bf8fb..9aab7bdc7d 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeBaobab.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeBaobab" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json index 417ac3b0ad..6481cb3506 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCherry.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeCherry" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json index 9233785269..9a0087ca98 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeChestnut.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeChestnut" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json index 1bcdb00c4a..dac4285b32 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeCocobolo.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeCocobolo" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json index 567153fcf8..0a8d9786e9 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeDate.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeDate" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json index 414d35e386..a4df57811f 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeEbony.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeEbony" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json index 24c0e7bad1..1a12a73a63 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeGigant.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeGigant" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json index 8fa0745a57..81fc7a8b4e 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeIpe.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeIpe" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json index 143e4c091f..71216526d7 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeKapok.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeKapok" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json index 92c01f3a5e..02513d0dde 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLarch.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeLarch" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json index 01df6cf227..cebd34b58d 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLemon.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeLemon" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json index a0d83817d4..9b3f010fc1 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeLime.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeLime" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json index a67bec0a5d..848e0458ec 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahoe.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeMahoe" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json index 1ca19db141..d3c4ade307 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMahogony.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeMahogony" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json index cebed77de5..d3d4d959f0 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeMaple.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeMaple" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json index 0911c75851..9d55438b50 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePadauk.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treePadauk" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json index 37ca4edefb..01982f311e 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePapaya.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treePapaya" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json index 8593a31605..04de881f64 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePine.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treePine" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json index a1e7bb4491..37e885b425 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePlum.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treePlum" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json index 6283f71dd5..12a0b5ec76 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treePoplar.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treePoplar" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json index 45c4459731..8a0f6dbe35 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSequoia.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeSequoia" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json index 4b5803b00d..2979f73f91 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeSipiri.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeSipiri" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json index 3b573fc7c3..22cc310e9e 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeTeak.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeTeak" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json index 4075ae6e60..71382d4df8 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWalnut.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeWalnut" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json index 7f35b61715..992876d91f 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWenge.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeWenge" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json index 268840813d..08fd7db3e4 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeWillow.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeWillow" } diff --git a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json index 9d77a2b64b..c312c28c25 100644 --- a/src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json +++ b/src/main/resources/assets/forestry/models/item/germlings/sapling.treeZebrawood.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/germlings/sapling.treeZebrawood" } diff --git a/src/main/resources/assets/forestry/models/item/grafter.json b/src/main/resources/assets/forestry/models/item/grafter.json index ded2ecc105..378a915072 100644 --- a/src/main/resources/assets/forestry/models/item/grafter.json +++ b/src/main/resources/assets/forestry/models/item/grafter.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/grafter" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/grafterProven.json b/src/main/resources/assets/forestry/models/item/grafterProven.json index e22472550c..db0df3d8de 100644 --- a/src/main/resources/assets/forestry/models/item/grafterProven.json +++ b/src/main/resources/assets/forestry/models/item/grafterProven.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/grafterProven" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/greenhouse.door.json b/src/main/resources/assets/forestry/models/item/greenhouse.door.json index 1b5501839d..d72b401d06 100644 --- a/src/main/resources/assets/forestry/models/item/greenhouse.door.json +++ b/src/main/resources/assets/forestry/models/item/greenhouse.door.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/greenhouse.door" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/habitatLocator.json b/src/main/resources/assets/forestry/models/item/habitatLocator.json index 50bd77a3f8..024b3dcde9 100644 --- a/src/main/resources/assets/forestry/models/item/habitatLocator.json +++ b/src/main/resources/assets/forestry/models/item/habitatLocator.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/biomefinder" }, diff --git a/src/main/resources/assets/forestry/models/item/hardenedMachine.json b/src/main/resources/assets/forestry/models/item/hardenedMachine.json index 1800ebf97f..d64abe8d7c 100644 --- a/src/main/resources/assets/forestry/models/item/hardenedMachine.json +++ b/src/main/resources/assets/forestry/models/item/hardenedMachine.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/hardenedMachine" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/honeyDrop.json b/src/main/resources/assets/forestry/models/item/honeyDrop.json index 615ecc1487..cfe243c6d2 100644 --- a/src/main/resources/assets/forestry/models/item/honeyDrop.json +++ b/src/main/resources/assets/forestry/models/item/honeyDrop.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/honeyDrop.0", "layer1": "forestry:items/honeyDrop.1" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/honeyPot.json b/src/main/resources/assets/forestry/models/item/honeyPot.json index 9604cae762..897c7b2e4b 100644 --- a/src/main/resources/assets/forestry/models/item/honeyPot.json +++ b/src/main/resources/assets/forestry/models/item/honeyPot.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/honeyPot" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/honeydew.json b/src/main/resources/assets/forestry/models/item/honeydew.json index 593999242c..c92518b6e8 100644 --- a/src/main/resources/assets/forestry/models/item/honeydew.json +++ b/src/main/resources/assets/forestry/models/item/honeydew.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/honeydew" }, diff --git a/src/main/resources/assets/forestry/models/item/honeyedSlice.json b/src/main/resources/assets/forestry/models/item/honeyedSlice.json index 7bfc798d9d..399733eac5 100644 --- a/src/main/resources/assets/forestry/models/item/honeyedSlice.json +++ b/src/main/resources/assets/forestry/models/item/honeyedSlice.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/honeyedSlice" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/iceShard.json b/src/main/resources/assets/forestry/models/item/iceShard.json index 6a27044735..9c37a87de8 100644 --- a/src/main/resources/assets/forestry/models/item/iceShard.json +++ b/src/main/resources/assets/forestry/models/item/iceShard.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/iceShard" }, diff --git a/src/main/resources/assets/forestry/models/item/impregnatedCasing.json b/src/main/resources/assets/forestry/models/item/impregnatedCasing.json index f5c57f1f8f..0e7994990f 100644 --- a/src/main/resources/assets/forestry/models/item/impregnatedCasing.json +++ b/src/main/resources/assets/forestry/models/item/impregnatedCasing.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/impregnatedCasing" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/imprinter.json b/src/main/resources/assets/forestry/models/item/imprinter.json index b821a50b35..0f67bb26f2 100644 --- a/src/main/resources/assets/forestry/models/item/imprinter.json +++ b/src/main/resources/assets/forestry/models/item/imprinter.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/imprinter" }, diff --git a/src/main/resources/assets/forestry/models/item/infuser.json b/src/main/resources/assets/forestry/models/item/infuser.json index aed8f92f37..3d4ea41c53 100644 --- a/src/main/resources/assets/forestry/models/item/infuser.json +++ b/src/main/resources/assets/forestry/models/item/infuser.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/infuser" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/ingotBronze.json b/src/main/resources/assets/forestry/models/item/ingotBronze.json index 3c5405b55b..58ada37b14 100644 --- a/src/main/resources/assets/forestry/models/item/ingotBronze.json +++ b/src/main/resources/assets/forestry/models/item/ingotBronze.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/ingotBronze" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/ingotCopper.json b/src/main/resources/assets/forestry/models/item/ingotCopper.json index b7973100d5..b75dd4a126 100644 --- a/src/main/resources/assets/forestry/models/item/ingotCopper.json +++ b/src/main/resources/assets/forestry/models/item/ingotCopper.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/ingotCopper" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/ingotTin.json b/src/main/resources/assets/forestry/models/item/ingotTin.json index bca7297936..fde26163ad 100644 --- a/src/main/resources/assets/forestry/models/item/ingotTin.json +++ b/src/main/resources/assets/forestry/models/item/ingotTin.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/ingotTin" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/iodineCapsule.json b/src/main/resources/assets/forestry/models/item/iodineCapsule.json index 847db8a476..760402e4de 100644 --- a/src/main/resources/assets/forestry/models/item/iodineCapsule.json +++ b/src/main/resources/assets/forestry/models/item/iodineCapsule.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/iodineCapsule" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/kitPickaxe.json b/src/main/resources/assets/forestry/models/item/kitPickaxe.json index c71be00b10..94ab258f96 100644 --- a/src/main/resources/assets/forestry/models/item/kitPickaxe.json +++ b/src/main/resources/assets/forestry/models/item/kitPickaxe.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/kitPickaxe" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/kitShovel.json b/src/main/resources/assets/forestry/models/item/kitShovel.json index 32e5e05547..ea0c0b28dd 100644 --- a/src/main/resources/assets/forestry/models/item/kitShovel.json +++ b/src/main/resources/assets/forestry/models/item/kitShovel.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/kitShovel" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_early.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_early.json index 5664c49d93..585b475222 100644 --- a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_early.json +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_early.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cocoons/cocoon_early" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_late.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_late.json index a590e939a2..ee5ca4ad1d 100644 --- a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_late.json +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_late.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cocoons/cocoon_late" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_middle.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_middle.json index 180aa4be58..08b15ccd2f 100644 --- a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_middle.json +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_middle.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cocoons/cocoon_middle" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_early.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_early.json index 5664c49d93..585b475222 100644 --- a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_early.json +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_early.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cocoons/cocoon_early" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_late.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_late.json index 4abf6e91af..20cab7c168 100644 --- a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_late.json +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_late.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cocoons/cocoon_silk_late" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_middle.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_middle.json index 180aa4be58..08b15ccd2f 100644 --- a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_middle.json +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_middle.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/cocoons/cocoon_middle" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/liquids/can.json b/src/main/resources/assets/forestry/models/item/liquids/can.json index cf78f50003..ddb1d78a36 100644 --- a/src/main/resources/assets/forestry/models/item/liquids/can.json +++ b/src/main/resources/assets/forestry/models/item/liquids/can.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/liquids/can.bottle", "layer1": "forestry:items/liquids/can.contents" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/liquids/can_empty.json b/src/main/resources/assets/forestry/models/item/liquids/can_empty.json index eed9e8ba96..30bd35d534 100644 --- a/src/main/resources/assets/forestry/models/item/liquids/can_empty.json +++ b/src/main/resources/assets/forestry/models/item/liquids/can_empty.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/liquids/can.bottle" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/liquids/capsule.json b/src/main/resources/assets/forestry/models/item/liquids/capsule.json index 41bef71228..396d8b9713 100644 --- a/src/main/resources/assets/forestry/models/item/liquids/capsule.json +++ b/src/main/resources/assets/forestry/models/item/liquids/capsule.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/liquids/capsule.bottle", "layer1": "forestry:items/liquids/capsule.contents" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/liquids/capsule_empty.json b/src/main/resources/assets/forestry/models/item/liquids/capsule_empty.json index 61dfdac223..6459e4dd8f 100644 --- a/src/main/resources/assets/forestry/models/item/liquids/capsule_empty.json +++ b/src/main/resources/assets/forestry/models/item/liquids/capsule_empty.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/liquids/capsule.bottle" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/liquids/glass.json b/src/main/resources/assets/forestry/models/item/liquids/glass.json index 83675a6872..1e3b80bd99 100644 --- a/src/main/resources/assets/forestry/models/item/liquids/glass.json +++ b/src/main/resources/assets/forestry/models/item/liquids/glass.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/liquids/glass.bottle", "layer1": "forestry:items/liquids/glass.contents" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/liquids/jar.json b/src/main/resources/assets/forestry/models/item/liquids/jar.json index 82e8be3f7d..3d9c291a79 100644 --- a/src/main/resources/assets/forestry/models/item/liquids/jar.json +++ b/src/main/resources/assets/forestry/models/item/liquids/jar.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/liquids/jar.bottle", "layer1": "forestry:items/liquids/jar.contents" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/liquids/refractory.json b/src/main/resources/assets/forestry/models/item/liquids/refractory.json index 9644251d10..a98330c38e 100644 --- a/src/main/resources/assets/forestry/models/item/liquids/refractory.json +++ b/src/main/resources/assets/forestry/models/item/liquids/refractory.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/liquids/refractory.bottle", "layer1": "forestry:items/liquids/refractory.contents" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/liquids/refractory_empty.json b/src/main/resources/assets/forestry/models/item/liquids/refractory_empty.json index 007c24e8b3..c4fe1185b8 100644 --- a/src/main/resources/assets/forestry/models/item/liquids/refractory_empty.json +++ b/src/main/resources/assets/forestry/models/item/liquids/refractory_empty.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/liquids/refractory.bottle" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.0.emptied.json b/src/main/resources/assets/forestry/models/item/mail/letter.0.emptied.json index 0e2c32f0d0..238b31a7b7 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.0.emptied.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.0.emptied.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.0.emptied" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.0.fresh.json b/src/main/resources/assets/forestry/models/item/mail/letter.0.fresh.json index 3f78ebd173..7f07e17294 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.0.fresh.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.0.fresh.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.0.fresh" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.0.opened.json b/src/main/resources/assets/forestry/models/item/mail/letter.0.opened.json index 847d6b13e8..671d842ed7 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.0.opened.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.0.opened.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.0.opened" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.0.stamped.json b/src/main/resources/assets/forestry/models/item/mail/letter.0.stamped.json index fdd664a549..620b12a3ea 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.0.stamped.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.0.stamped.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.0.stamped" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.1.emptied.json b/src/main/resources/assets/forestry/models/item/mail/letter.1.emptied.json index 63db24abb6..94fbfb702b 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.1.emptied.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.1.emptied.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.1.emptied" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.1.fresh.json b/src/main/resources/assets/forestry/models/item/mail/letter.1.fresh.json index d886dc5c75..d76601a760 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.1.fresh.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.1.fresh.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.1.fresh" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.1.opened.json b/src/main/resources/assets/forestry/models/item/mail/letter.1.opened.json index 810f6ee5fb..5275a865fe 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.1.opened.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.1.opened.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.1.opened" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.1.stamped.json b/src/main/resources/assets/forestry/models/item/mail/letter.1.stamped.json index 0bd5b04386..7f06a8d812 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.1.stamped.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.1.stamped.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.1.stamped" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.2.emptied.json b/src/main/resources/assets/forestry/models/item/mail/letter.2.emptied.json index 2a735d48ab..9f771d94a5 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.2.emptied.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.2.emptied.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.2.emptied" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.2.fresh.json b/src/main/resources/assets/forestry/models/item/mail/letter.2.fresh.json index 4b92ec3df5..0a58b7061b 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.2.fresh.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.2.fresh.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.2.fresh" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.2.opened.json b/src/main/resources/assets/forestry/models/item/mail/letter.2.opened.json index ec909d5c4f..db00aaf513 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.2.opened.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.2.opened.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.2.opened" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mail/letter.2.stamped.json b/src/main/resources/assets/forestry/models/item/mail/letter.2.stamped.json index 7d73c95915..ce51bc7fe7 100644 --- a/src/main/resources/assets/forestry/models/item/mail/letter.2.stamped.json +++ b/src/main/resources/assets/forestry/models/item/mail/letter.2.stamped.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mail/letter.2.stamped" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mouldyWheat.json b/src/main/resources/assets/forestry/models/item/mouldyWheat.json index b54374be12..668889b87b 100644 --- a/src/main/resources/assets/forestry/models/item/mouldyWheat.json +++ b/src/main/resources/assets/forestry/models/item/mouldyWheat.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mouldyWheat" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/mulch.json b/src/main/resources/assets/forestry/models/item/mulch.json index e2944f909b..d12bb4098b 100644 --- a/src/main/resources/assets/forestry/models/item/mulch.json +++ b/src/main/resources/assets/forestry/models/item/mulch.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/mulch" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/naturalistHelmet.json b/src/main/resources/assets/forestry/models/item/naturalistHelmet.json index a4bab90583..059d5dc4aa 100644 --- a/src/main/resources/assets/forestry/models/item/naturalistHelmet.json +++ b/src/main/resources/assets/forestry/models/item/naturalistHelmet.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/spectacles" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/oakStick.json b/src/main/resources/assets/forestry/models/item/oakStick.json index f88d23c9cd..f6a9fb52be 100644 --- a/src/main/resources/assets/forestry/models/item/oakStick.json +++ b/src/main/resources/assets/forestry/models/item/oakStick.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/oakStick" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/peat.json b/src/main/resources/assets/forestry/models/item/peat.json index c4efb8454c..0b3f5f858d 100644 --- a/src/main/resources/assets/forestry/models/item/peat.json +++ b/src/main/resources/assets/forestry/models/item/peat.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/peat" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/phosphor.json b/src/main/resources/assets/forestry/models/item/phosphor.json index ea5cbceced..b67808092a 100644 --- a/src/main/resources/assets/forestry/models/item/phosphor.json +++ b/src/main/resources/assets/forestry/models/item/phosphor.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/phosphor" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/pipette.0.json b/src/main/resources/assets/forestry/models/item/pipette.0.json index 04ce194886..6711cb3d4c 100644 --- a/src/main/resources/assets/forestry/models/item/pipette.0.json +++ b/src/main/resources/assets/forestry/models/item/pipette.0.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/pipette.0" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/pipette.1.json b/src/main/resources/assets/forestry/models/item/pipette.1.json index 9395e45956..f21015b800 100644 --- a/src/main/resources/assets/forestry/models/item/pipette.1.json +++ b/src/main/resources/assets/forestry/models/item/pipette.1.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/pipette.1" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/pollen.json b/src/main/resources/assets/forestry/models/item/pollen.json index f3b2f62eb6..ff0e713ff4 100644 --- a/src/main/resources/assets/forestry/models/item/pollen.json +++ b/src/main/resources/assets/forestry/models/item/pollen.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/pollen.0", "layer1": "forestry:items/pollen.1" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/propolis.json b/src/main/resources/assets/forestry/models/item/propolis.json index a0a3a5abc8..89339f6cc0 100644 --- a/src/main/resources/assets/forestry/models/item/propolis.json +++ b/src/main/resources/assets/forestry/models/item/propolis.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/propolis.0" }, diff --git a/src/main/resources/assets/forestry/models/item/pulsatingDust.json b/src/main/resources/assets/forestry/models/item/pulsatingDust.json index 7f958e947a..3e7959ddc1 100644 --- a/src/main/resources/assets/forestry/models/item/pulsatingDust.json +++ b/src/main/resources/assets/forestry/models/item/pulsatingDust.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/pulsatingDust" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/pulsatingMesh.json b/src/main/resources/assets/forestry/models/item/pulsatingMesh.json index 2f9b393f77..da2366510f 100644 --- a/src/main/resources/assets/forestry/models/item/pulsatingMesh.json +++ b/src/main/resources/assets/forestry/models/item/pulsatingMesh.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/pulsatingMesh" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/refractoryWax.json b/src/main/resources/assets/forestry/models/item/refractoryWax.json index 3961140ab7..ab9d7035d6 100644 --- a/src/main/resources/assets/forestry/models/item/refractoryWax.json +++ b/src/main/resources/assets/forestry/models/item/refractoryWax.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/refractoryWax" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/royalJelly.json b/src/main/resources/assets/forestry/models/item/royalJelly.json index 3540256cde..b0028285c5 100644 --- a/src/main/resources/assets/forestry/models/item/royalJelly.json +++ b/src/main/resources/assets/forestry/models/item/royalJelly.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/royalJelly" }, diff --git a/src/main/resources/assets/forestry/models/item/scentedPaneling.json b/src/main/resources/assets/forestry/models/item/scentedPaneling.json index 225cb58277..60a1e84d59 100644 --- a/src/main/resources/assets/forestry/models/item/scentedPaneling.json +++ b/src/main/resources/assets/forestry/models/item/scentedPaneling.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/scentedPaneling" }, diff --git a/src/main/resources/assets/forestry/models/item/scoop.json b/src/main/resources/assets/forestry/models/item/scoop.json index 2a96e90e74..e64bf3e8ce 100644 --- a/src/main/resources/assets/forestry/models/item/scoop.json +++ b/src/main/resources/assets/forestry/models/item/scoop.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/scoop" }, diff --git a/src/main/resources/assets/forestry/models/item/silkWisp.json b/src/main/resources/assets/forestry/models/item/silkWisp.json index 8d3ebf31ef..4f411530dc 100644 --- a/src/main/resources/assets/forestry/models/item/silkWisp.json +++ b/src/main/resources/assets/forestry/models/item/silkWisp.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/silkWisp" }, diff --git a/src/main/resources/assets/forestry/models/item/solderingIron.json b/src/main/resources/assets/forestry/models/item/solderingIron.json index 0606bbc552..66a358726a 100644 --- a/src/main/resources/assets/forestry/models/item/solderingIron.json +++ b/src/main/resources/assets/forestry/models/item/solderingIron.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/solderingIron" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/stamps.json b/src/main/resources/assets/forestry/models/item/stamps.json index 4bcc468965..ef35d21ab6 100644 --- a/src/main/resources/assets/forestry/models/item/stamps.json +++ b/src/main/resources/assets/forestry/models/item/stamps.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/stamps.0", "layer1": "forestry:items/stamps.1" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/stick.json b/src/main/resources/assets/forestry/models/item/stick.json index daa1fbb461..a0b684dc59 100644 --- a/src/main/resources/assets/forestry/models/item/stick.json +++ b/src/main/resources/assets/forestry/models/item/stick.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "items/stick" }, diff --git a/src/main/resources/assets/forestry/models/item/stump.json b/src/main/resources/assets/forestry/models/item/stump.json index ef6f995035..21c58ee29d 100644 --- a/src/main/resources/assets/forestry/models/item/stump.json +++ b/src/main/resources/assets/forestry/models/item/stump.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:blocks/stump" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/sturdyMachine.json b/src/main/resources/assets/forestry/models/item/sturdyMachine.json index 84b7cd99ab..d91d3e04aa 100644 --- a/src/main/resources/assets/forestry/models/item/sturdyMachine.json +++ b/src/main/resources/assets/forestry/models/item/sturdyMachine.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/sturdyMachine" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/thermionicTubes.json b/src/main/resources/assets/forestry/models/item/thermionicTubes.json index b33b0cfd10..07224142da 100644 --- a/src/main/resources/assets/forestry/models/item/thermionicTubes.json +++ b/src/main/resources/assets/forestry/models/item/thermionicTubes.json @@ -1,19 +1,7 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/thermionicTubes.0", "layer1": "forestry:items/thermionicTubes.1" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/treealyzer.json b/src/main/resources/assets/forestry/models/item/treealyzer.json index 4e565f23f8..ff9577ddd8 100644 --- a/src/main/resources/assets/forestry/models/item/treealyzer.json +++ b/src/main/resources/assets/forestry/models/item/treealyzer.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/treealyzer" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/waxCast.json b/src/main/resources/assets/forestry/models/item/waxCast.json index 86f598050a..047b7d12a6 100644 --- a/src/main/resources/assets/forestry/models/item/waxCast.json +++ b/src/main/resources/assets/forestry/models/item/waxCast.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/waxCast" }, diff --git a/src/main/resources/assets/forestry/models/item/woodPulp.json b/src/main/resources/assets/forestry/models/item/woodPulp.json index 147c36a045..43c0085d50 100644 --- a/src/main/resources/assets/forestry/models/item/woodPulp.json +++ b/src/main/resources/assets/forestry/models/item/woodPulp.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/woodPulp" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } } diff --git a/src/main/resources/assets/forestry/models/item/wovenSilk.json b/src/main/resources/assets/forestry/models/item/wovenSilk.json index 0ad7ea060b..d65b16f5f7 100644 --- a/src/main/resources/assets/forestry/models/item/wovenSilk.json +++ b/src/main/resources/assets/forestry/models/item/wovenSilk.json @@ -1,5 +1,5 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/wovenSilk" }, diff --git a/src/main/resources/assets/forestry/models/item/wrench.json b/src/main/resources/assets/forestry/models/item/wrench.json index 489d8fe9b2..3375501fda 100644 --- a/src/main/resources/assets/forestry/models/item/wrench.json +++ b/src/main/resources/assets/forestry/models/item/wrench.json @@ -1,18 +1,6 @@ { - "parent": "builtin/generated", + "parent": "item/generated", "textures": { "layer0": "forestry:items/wrench" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } } }