diff --git a/.gitignore b/.gitignore index 2c770e0..ea505d1 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ build # other eclipse run +logs \ No newline at end of file diff --git a/build.gradle b/build.gradle index c26b7e7..41aec0a 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,6 @@ repositories { } } dependencies { - runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-${curios_version}") - compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-${curios_version}:api") + compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}:api") + runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}") } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 13db525..14f0680 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,25 +2,26 @@ mod_version = 1.0.0 mod_id = toadterror maven_group = dev.itsmeow.toadterror + at_file = accesstransformer # Forge - mc_version = 1.15.2 - forge_version = 31.2.24 - mappings_version = 20200624 + mc_version = 1.16.4 + forge_version = 35.1.36 + mappings_version = 20201028 mappings_channel = snapshot - mappings_mc_version = 1.15.1 + mappings_mc_version = 1.16.3 # Publishing github = itsmeowCommissions/ToadTerror name = ToadTerror url = https://github.com/itsmeowCommissions/ToadTerror curse_project_id = 392392 - curse_title = ToadTerror 1.15.2-1.0.0 - curse_versions = Java 8,Forge,Minecraft 1.15:1.15.2 + curse_title = ToadTerror 1.16.4-1.0.0 + curse_versions = Java 8,Forge,Minecraft 1.16:1.16.4,Minecraft 1.16:1.16.3 curse_relations = requiredDependency:curios # Misc org.gradle.jvmargs=-Xmx6G org.gradle.daemon=true - imdlib_version=1.15.2-0518876d216aaa2f9d730269d9130ca7d109219b - curios_version=1.15.2-2.0.2.4 \ No newline at end of file + imdlib_version=1.16.3-5930b3390817eff4f911a6ece32baa40c6388864 + curios_version=1.16.4-4.0.3.0 \ No newline at end of file diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache new file mode 100644 index 0000000..4f216f9 --- /dev/null +++ b/src/generated/resources/.cache/cache @@ -0,0 +1,84 @@ +37c7f7bc89ba61fa0f1a341e0120cf8b9ca8170a assets/toadterror/blockstates/chiseled_sacred_stone_brick_slab.json +9f25604b580fd216698612bcc9f0bb114bb846ef assets/toadterror/blockstates/chiseled_sacred_stone_brick_stairs.json +90480bff647f1d00c56c531e1839a96b913584a4 assets/toadterror/blockstates/chiseled_sacred_stone_brick_wall.json +de204e723779763261ee516d7fe9ef800092dc6b assets/toadterror/blockstates/chiseled_sacred_stone_bricks.json +5a07e30df4ce51a33c16651e5ef7fb8068fdc7d2 assets/toadterror/blockstates/cracked_sacred_stone_brick_slab.json +5ec8cac824e7a89cf1994109821e2544e2653d49 assets/toadterror/blockstates/cracked_sacred_stone_brick_stairs.json +78f656f6d3ce5fb76f886e94b9675caba5125a00 assets/toadterror/blockstates/cracked_sacred_stone_brick_wall.json +3e41942f8babda395ae6432276121bb46b617d3d assets/toadterror/blockstates/cracked_sacred_stone_bricks.json +abdfb959a0ea2e8baf02c932a5ec64abb14edbbd assets/toadterror/blockstates/mossy_sacred_stone_brick_slab.json +04063516f23088fc6017bbe1f5c29b30f8711851 assets/toadterror/blockstates/mossy_sacred_stone_brick_stairs.json +623acefb5f6f293d2c9c5a6ff0241a0481cc077f assets/toadterror/blockstates/mossy_sacred_stone_brick_wall.json +4d208a46b0717dc1525cdee840445376400462ea assets/toadterror/blockstates/mossy_sacred_stone_bricks.json +38babecb181503427bdfac9059341d3fa21a4637 assets/toadterror/blockstates/sacred_stone_brick_slab.json +e5aef688cc6816f19a1df1f004230bc166d4c1ed assets/toadterror/blockstates/sacred_stone_brick_stairs.json +4dd26463766ed82b5bee8f68b43fd50792c01ae1 assets/toadterror/blockstates/sacred_stone_brick_wall.json +1c4777d6ea0ee1f6805b5d732faf46808ab4a685 assets/toadterror/blockstates/sacred_stone_bricks.json +4da5e335df8ae1a5f4de68bac90b26af3edeb5e2 assets/toadterror/models/block/chiseled_sacred_stone_brick_slab.json +3c6927375c9b24e48c17b976ed4b2b48293970d6 assets/toadterror/models/block/chiseled_sacred_stone_brick_slab_top.json +c0a196fd3ddea2e081c7b986c253005ea07c7738 assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs.json +7349f27f5ec3d2bca23da598c3d48ae31ff6f726 assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_inner.json +57cdf4355a19101e81471bf8aec3ab81658b3fcc assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_outer.json +1ea32979d5f393f0f9a2f6e9cfb8b14113f432ec assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_post.json +6d227951289eb27c988c8b1e182ab4d5561002f5 assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side.json +db0b3e85063a53e88f113e7f3244caf778c75801 assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side_tall.json +ad1fbd9f7096efb1e837a0cc1c6f609dec73beb4 assets/toadterror/models/block/chiseled_sacred_stone_bricks.json +3818377cc97715b66d0321448ca0fc2668bf9b9a assets/toadterror/models/block/cracked_sacred_stone_brick_slab.json +c22c236f0a05bd8d1ceed40e3ce7da7ac1bad50d assets/toadterror/models/block/cracked_sacred_stone_brick_slab_top.json +e01843cd53bacb0d4daa6b1dc5bc3877fce4348c assets/toadterror/models/block/cracked_sacred_stone_brick_stairs.json +1fa70c1cd808bf582eeb35b80be8000656251514 assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_inner.json +c6bdeb65bb6a4a5ab162d7535bbc21aa84546b45 assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_outer.json +390b5b0279881b36ab54b549b3ec67b7cec9cf8d assets/toadterror/models/block/cracked_sacred_stone_brick_wall_post.json +05654735a782892863e05c23be2d92f63d2b4b7a assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side.json +9ac71dc21b04df9ba2554d3394c996ea4200360e assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side_tall.json +f377fe7d9e7d54429297c2b92772ff5ebe8d928b assets/toadterror/models/block/cracked_sacred_stone_bricks.json +a680e9743b9779efe98f7e6ea6665d9bc9a14c69 assets/toadterror/models/block/mossy_sacred_stone_brick_slab.json +f6d8d069a89ba5b7caca57d7d90914b7c2c41b9c assets/toadterror/models/block/mossy_sacred_stone_brick_slab_top.json +620612e83d4f0a27cde656ed6c8b8ba7be216955 assets/toadterror/models/block/mossy_sacred_stone_brick_stairs.json +602fd4b9f7f17b9077f4777f6789111fa40e4e83 assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_inner.json +f4ed31dc71c6e70cb5b8026bae5830bbaeeb8028 assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_outer.json +80fe5e8c8311f7e8f000c7ec174c3e0f3ed54ba8 assets/toadterror/models/block/mossy_sacred_stone_brick_wall_post.json +fe16029ca180df99de3f858645fd06b4a82460f3 assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side.json +01d4604a244c5b5efacb39689c4b081801d00fc6 assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side_tall.json +de51478e766935dec2d71b24698287f02c27d896 assets/toadterror/models/block/mossy_sacred_stone_bricks.json +f16b0407311d5c12d06b669c6d33df0f3d719ffe assets/toadterror/models/block/sacred_stone_brick_slab.json +be5f7e6ce1915cad1487aa1659cd4b8e60ac332a assets/toadterror/models/block/sacred_stone_brick_slab_top.json +36e421081fc3dfd31dd8090844c7243f6eb0acf1 assets/toadterror/models/block/sacred_stone_brick_stairs.json +97222b5fd7b194e4923f4e345ed8f8af341534a1 assets/toadterror/models/block/sacred_stone_brick_stairs_inner.json +d8dd596335db082a9fce96b425c7c4497a97b3dc assets/toadterror/models/block/sacred_stone_brick_stairs_outer.json +8f1ed451e8edd8515b6119d596330c64906b9b37 assets/toadterror/models/block/sacred_stone_brick_wall_post.json +32b92ffd5d81264b53b7e2decc45a0d6e1a925c0 assets/toadterror/models/block/sacred_stone_brick_wall_side.json +5184fef8884826c1ede0e6b649bd2bea7fb10217 assets/toadterror/models/block/sacred_stone_brick_wall_side_tall.json +bad3f38f254d8dd41488360ba2b46d88a2b24844 assets/toadterror/models/block/sacred_stone_bricks.json +7b98f3cdf02a2abdb5a58b981b4f24bbd1daf9ab assets/toadterror/models/item/broken_toad_eye.json +4da5e335df8ae1a5f4de68bac90b26af3edeb5e2 assets/toadterror/models/item/chiseled_sacred_stone_brick_slab.json +c0a196fd3ddea2e081c7b986c253005ea07c7738 assets/toadterror/models/item/chiseled_sacred_stone_brick_stairs.json +87fa0af2e532ee751627e99bad3d19a14fcc59d0 assets/toadterror/models/item/chiseled_sacred_stone_brick_wall.json +ad1fbd9f7096efb1e837a0cc1c6f609dec73beb4 assets/toadterror/models/item/chiseled_sacred_stone_bricks.json +3818377cc97715b66d0321448ca0fc2668bf9b9a assets/toadterror/models/item/cracked_sacred_stone_brick_slab.json +e01843cd53bacb0d4daa6b1dc5bc3877fce4348c assets/toadterror/models/item/cracked_sacred_stone_brick_stairs.json +7ac48996da62df9f4c0f3ca369631d217e7005ea assets/toadterror/models/item/cracked_sacred_stone_brick_wall.json +f377fe7d9e7d54429297c2b92772ff5ebe8d928b assets/toadterror/models/item/cracked_sacred_stone_bricks.json +cc624a44ef327564eeaf1a9cc6532f11cf081cf2 assets/toadterror/models/item/empty_toad_eye.json +a680e9743b9779efe98f7e6ea6665d9bc9a14c69 assets/toadterror/models/item/mossy_sacred_stone_brick_slab.json +620612e83d4f0a27cde656ed6c8b8ba7be216955 assets/toadterror/models/item/mossy_sacred_stone_brick_stairs.json +9c7b7d6428377fd037fd2ceb5cb01a6003ed7d1e assets/toadterror/models/item/mossy_sacred_stone_brick_wall.json +de51478e766935dec2d71b24698287f02c27d896 assets/toadterror/models/item/mossy_sacred_stone_bricks.json +f16b0407311d5c12d06b669c6d33df0f3d719ffe assets/toadterror/models/item/sacred_stone_brick_slab.json +36e421081fc3dfd31dd8090844c7243f6eb0acf1 assets/toadterror/models/item/sacred_stone_brick_stairs.json +028d79a4cf15900df010bb5e23be1cf88427a52d assets/toadterror/models/item/sacred_stone_brick_wall.json +bad3f38f254d8dd41488360ba2b46d88a2b24844 assets/toadterror/models/item/sacred_stone_bricks.json +137c6d5af552babf9392224695e694e2fd7e9c39 assets/toadterror/models/item/toad_chops.json +dcdf08564b4c0eba459b241dbe12e4ba6aadead4 assets/toadterror/models/item/toad_eye.json +98167609bf3898587f7565736a6fc24a7966cacd assets/toadterror/models/item/toad_protector_spawn_egg.json +98167609bf3898587f7565736a6fc24a7966cacd assets/toadterror/models/item/toad_sentinel_spawn_egg.json +2feca9b011250c142f806559b39e7607c715b1a2 data/minecraft/tags/blocks/slabs.json +ccbeca1597cf7f0707027f483716efc459436ed6 data/minecraft/tags/blocks/stairs.json +21ff8233d8d3b82517c40554541383cbff8e98b1 data/minecraft/tags/blocks/stone_bricks.json +a16dbbee9197d4dbf7e1113cadb7724fc1c37513 data/minecraft/tags/blocks/walls.json +2feca9b011250c142f806559b39e7607c715b1a2 data/minecraft/tags/items/slabs.json +ccbeca1597cf7f0707027f483716efc459436ed6 data/minecraft/tags/items/stairs.json +21ff8233d8d3b82517c40554541383cbff8e98b1 data/minecraft/tags/items/stone_bricks.json +a16dbbee9197d4dbf7e1113cadb7724fc1c37513 data/minecraft/tags/items/walls.json +787ef470f3843678833e3962c538ddd9e409f787 data/toadterror/tags/blocks/sacred_stone_bricks.json +787ef470f3843678833e3962c538ddd9e409f787 data/toadterror/tags/items/sacred_stone_bricks.json diff --git a/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_slab.json new file mode 100644 index 0000000..854c800 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "toadterror:block/chiseled_sacred_stone_brick_slab_top" + }, + "type=bottom": { + "model": "toadterror:block/chiseled_sacred_stone_brick_slab" + }, + "type=double": { + "model": "toadterror:block/chiseled_sacred_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_stairs.json new file mode 100644 index 0000000..503d8d8 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_wall.json b/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_wall.json new file mode 100644 index 0000000..d9c2b5c --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "toadterror:block/chiseled_sacred_stone_brick_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_bricks.json new file mode 100644 index 0000000..537f99e --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/chiseled_sacred_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "toadterror:block/chiseled_sacred_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_slab.json new file mode 100644 index 0000000..c330cfa --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "toadterror:block/cracked_sacred_stone_brick_slab_top" + }, + "type=bottom": { + "model": "toadterror:block/cracked_sacred_stone_brick_slab" + }, + "type=double": { + "model": "toadterror:block/cracked_sacred_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_stairs.json new file mode 100644 index 0000000..5ca8225 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_wall.json b/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_wall.json new file mode 100644 index 0000000..a25ebf7 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "toadterror:block/cracked_sacred_stone_brick_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "toadterror:block/cracked_sacred_stone_brick_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "toadterror:block/cracked_sacred_stone_brick_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "toadterror:block/cracked_sacred_stone_brick_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "toadterror:block/cracked_sacred_stone_brick_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "toadterror:block/cracked_sacred_stone_brick_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "toadterror:block/cracked_sacred_stone_brick_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "toadterror:block/cracked_sacred_stone_brick_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "toadterror:block/cracked_sacred_stone_brick_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_bricks.json new file mode 100644 index 0000000..32ec6e5 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/cracked_sacred_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "toadterror:block/cracked_sacred_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_slab.json new file mode 100644 index 0000000..eb90ba9 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "toadterror:block/mossy_sacred_stone_brick_slab_top" + }, + "type=bottom": { + "model": "toadterror:block/mossy_sacred_stone_brick_slab" + }, + "type=double": { + "model": "toadterror:block/mossy_sacred_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_stairs.json new file mode 100644 index 0000000..b385a59 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_wall.json b/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_wall.json new file mode 100644 index 0000000..12911f4 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "toadterror:block/mossy_sacred_stone_brick_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "toadterror:block/mossy_sacred_stone_brick_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "toadterror:block/mossy_sacred_stone_brick_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "toadterror:block/mossy_sacred_stone_brick_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "toadterror:block/mossy_sacred_stone_brick_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "toadterror:block/mossy_sacred_stone_brick_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "toadterror:block/mossy_sacred_stone_brick_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "toadterror:block/mossy_sacred_stone_brick_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "toadterror:block/mossy_sacred_stone_brick_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_bricks.json new file mode 100644 index 0000000..f2ae3b8 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/mossy_sacred_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "toadterror:block/mossy_sacred_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/blockstates/sacred_stone_brick_slab.json new file mode 100644 index 0000000..77d8911 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/sacred_stone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "toadterror:block/sacred_stone_brick_slab_top" + }, + "type=bottom": { + "model": "toadterror:block/sacred_stone_brick_slab" + }, + "type=double": { + "model": "toadterror:block/sacred_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/blockstates/sacred_stone_brick_stairs.json new file mode 100644 index 0000000..860479a --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/sacred_stone_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "toadterror:block/sacred_stone_brick_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "toadterror:block/sacred_stone_brick_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "toadterror:block/sacred_stone_brick_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "toadterror:block/sacred_stone_brick_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "toadterror:block/sacred_stone_brick_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "toadterror:block/sacred_stone_brick_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "toadterror:block/sacred_stone_brick_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "toadterror:block/sacred_stone_brick_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "toadterror:block/sacred_stone_brick_stairs_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/sacred_stone_brick_wall.json b/src/generated/resources/assets/toadterror/blockstates/sacred_stone_brick_wall.json new file mode 100644 index 0000000..bcd5bf0 --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/sacred_stone_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "toadterror:block/sacred_stone_brick_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "toadterror:block/sacred_stone_brick_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "toadterror:block/sacred_stone_brick_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "toadterror:block/sacred_stone_brick_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "toadterror:block/sacred_stone_brick_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "toadterror:block/sacred_stone_brick_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "toadterror:block/sacred_stone_brick_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "toadterror:block/sacred_stone_brick_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "toadterror:block/sacred_stone_brick_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/blockstates/sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/blockstates/sacred_stone_bricks.json new file mode 100644 index 0000000..af71bcf --- /dev/null +++ b/src/generated/resources/assets/toadterror/blockstates/sacred_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "toadterror:block/sacred_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab.json new file mode 100644 index 0000000..365103f --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "toadterror:block/chiseled_sacred_stone_bricks", + "bottom": "toadterror:block/chiseled_sacred_stone_bricks", + "top": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab_top.json b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab_top.json new file mode 100644 index 0000000..7f333ce --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "toadterror:block/chiseled_sacred_stone_bricks", + "bottom": "toadterror:block/chiseled_sacred_stone_bricks", + "top": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs.json new file mode 100644 index 0000000..6fffdcb --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "toadterror:block/chiseled_sacred_stone_bricks", + "bottom": "toadterror:block/chiseled_sacred_stone_bricks", + "top": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_inner.json b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_inner.json new file mode 100644 index 0000000..0c2efe1 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "toadterror:block/chiseled_sacred_stone_bricks", + "bottom": "toadterror:block/chiseled_sacred_stone_bricks", + "top": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_outer.json b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_outer.json new file mode 100644 index 0000000..13a7503 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "toadterror:block/chiseled_sacred_stone_bricks", + "bottom": "toadterror:block/chiseled_sacred_stone_bricks", + "top": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_post.json b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_post.json new file mode 100644 index 0000000..6220e93 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side.json b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side.json new file mode 100644 index 0000000..bbc34f4 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side_tall.json b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side_tall.json new file mode 100644 index 0000000..06eb96b --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_bricks.json new file mode 100644 index 0000000..97b3a97 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/chiseled_sacred_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab.json new file mode 100644 index 0000000..1b5660a --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "toadterror:block/cracked_sacred_stone_bricks", + "bottom": "toadterror:block/cracked_sacred_stone_bricks", + "top": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab_top.json b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab_top.json new file mode 100644 index 0000000..15c1abc --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "toadterror:block/cracked_sacred_stone_bricks", + "bottom": "toadterror:block/cracked_sacred_stone_bricks", + "top": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs.json new file mode 100644 index 0000000..6b3471f --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "toadterror:block/cracked_sacred_stone_bricks", + "bottom": "toadterror:block/cracked_sacred_stone_bricks", + "top": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_inner.json b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_inner.json new file mode 100644 index 0000000..938e862 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "toadterror:block/cracked_sacred_stone_bricks", + "bottom": "toadterror:block/cracked_sacred_stone_bricks", + "top": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_outer.json b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_outer.json new file mode 100644 index 0000000..1d708a1 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "toadterror:block/cracked_sacred_stone_bricks", + "bottom": "toadterror:block/cracked_sacred_stone_bricks", + "top": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_post.json b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_post.json new file mode 100644 index 0000000..2909f37 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side.json b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side.json new file mode 100644 index 0000000..c631a42 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side_tall.json b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side_tall.json new file mode 100644 index 0000000..fe425b7 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_bricks.json new file mode 100644 index 0000000..31da25a --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/cracked_sacred_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab.json new file mode 100644 index 0000000..35cb673 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "toadterror:block/mossy_sacred_stone_bricks", + "bottom": "toadterror:block/mossy_sacred_stone_bricks", + "top": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab_top.json b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab_top.json new file mode 100644 index 0000000..cdcdf5d --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "toadterror:block/mossy_sacred_stone_bricks", + "bottom": "toadterror:block/mossy_sacred_stone_bricks", + "top": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs.json new file mode 100644 index 0000000..99b7f70 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "toadterror:block/mossy_sacred_stone_bricks", + "bottom": "toadterror:block/mossy_sacred_stone_bricks", + "top": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_inner.json b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_inner.json new file mode 100644 index 0000000..3b71be7 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "toadterror:block/mossy_sacred_stone_bricks", + "bottom": "toadterror:block/mossy_sacred_stone_bricks", + "top": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_outer.json b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_outer.json new file mode 100644 index 0000000..1c13f8d --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "toadterror:block/mossy_sacred_stone_bricks", + "bottom": "toadterror:block/mossy_sacred_stone_bricks", + "top": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_post.json b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_post.json new file mode 100644 index 0000000..6a7c4d9 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side.json b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side.json new file mode 100644 index 0000000..b405d3b --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side_tall.json b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side_tall.json new file mode 100644 index 0000000..5e09601 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_bricks.json new file mode 100644 index 0000000..fd7d460 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/mossy_sacred_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_slab.json new file mode 100644 index 0000000..8b80270 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "toadterror:block/sacred_stone_bricks", + "bottom": "toadterror:block/sacred_stone_bricks", + "top": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_slab_top.json b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_slab_top.json new file mode 100644 index 0000000..4bf25f9 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "toadterror:block/sacred_stone_bricks", + "bottom": "toadterror:block/sacred_stone_bricks", + "top": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_stairs.json new file mode 100644 index 0000000..32de0d3 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "toadterror:block/sacred_stone_bricks", + "bottom": "toadterror:block/sacred_stone_bricks", + "top": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_inner.json b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_inner.json new file mode 100644 index 0000000..919b95d --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "toadterror:block/sacred_stone_bricks", + "bottom": "toadterror:block/sacred_stone_bricks", + "top": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_outer.json b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_outer.json new file mode 100644 index 0000000..23e29cf --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "toadterror:block/sacred_stone_bricks", + "bottom": "toadterror:block/sacred_stone_bricks", + "top": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_wall_post.json b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_wall_post.json new file mode 100644 index 0000000..3cdd071 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_wall_side.json b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_wall_side.json new file mode 100644 index 0000000..15ca410 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_wall_side_tall.json b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_wall_side_tall.json new file mode 100644 index 0000000..a199689 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/sacred_stone_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/block/sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/models/block/sacred_stone_bricks.json new file mode 100644 index 0000000..8274331 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/block/sacred_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/broken_toad_eye.json b/src/generated/resources/assets/toadterror/models/item/broken_toad_eye.json new file mode 100644 index 0000000..18bc206 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/broken_toad_eye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toadterror:items/broken_toad_eye" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_slab.json new file mode 100644 index 0000000..365103f --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "toadterror:block/chiseled_sacred_stone_bricks", + "bottom": "toadterror:block/chiseled_sacred_stone_bricks", + "top": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_stairs.json new file mode 100644 index 0000000..6fffdcb --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "toadterror:block/chiseled_sacred_stone_bricks", + "bottom": "toadterror:block/chiseled_sacred_stone_bricks", + "top": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_wall.json b/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_wall.json new file mode 100644 index 0000000..aeea6d7 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_bricks.json new file mode 100644 index 0000000..97b3a97 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/chiseled_sacred_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "toadterror:block/chiseled_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_slab.json new file mode 100644 index 0000000..1b5660a --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "toadterror:block/cracked_sacred_stone_bricks", + "bottom": "toadterror:block/cracked_sacred_stone_bricks", + "top": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_stairs.json new file mode 100644 index 0000000..6b3471f --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "toadterror:block/cracked_sacred_stone_bricks", + "bottom": "toadterror:block/cracked_sacred_stone_bricks", + "top": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_wall.json b/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_wall.json new file mode 100644 index 0000000..0ae2dee --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_bricks.json new file mode 100644 index 0000000..31da25a --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/cracked_sacred_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "toadterror:block/cracked_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/empty_toad_eye.json b/src/generated/resources/assets/toadterror/models/item/empty_toad_eye.json new file mode 100644 index 0000000..281bf25 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/empty_toad_eye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toadterror:items/empty_toad_eye" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_slab.json new file mode 100644 index 0000000..35cb673 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "toadterror:block/mossy_sacred_stone_bricks", + "bottom": "toadterror:block/mossy_sacred_stone_bricks", + "top": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_stairs.json new file mode 100644 index 0000000..99b7f70 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "toadterror:block/mossy_sacred_stone_bricks", + "bottom": "toadterror:block/mossy_sacred_stone_bricks", + "top": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_wall.json b/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_wall.json new file mode 100644 index 0000000..3d831eb --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_bricks.json new file mode 100644 index 0000000..fd7d460 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/mossy_sacred_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "toadterror:block/mossy_sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/sacred_stone_brick_slab.json b/src/generated/resources/assets/toadterror/models/item/sacred_stone_brick_slab.json new file mode 100644 index 0000000..8b80270 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/sacred_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "toadterror:block/sacred_stone_bricks", + "bottom": "toadterror:block/sacred_stone_bricks", + "top": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/sacred_stone_brick_stairs.json b/src/generated/resources/assets/toadterror/models/item/sacred_stone_brick_stairs.json new file mode 100644 index 0000000..32de0d3 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/sacred_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "toadterror:block/sacred_stone_bricks", + "bottom": "toadterror:block/sacred_stone_bricks", + "top": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/sacred_stone_brick_wall.json b/src/generated/resources/assets/toadterror/models/item/sacred_stone_brick_wall.json new file mode 100644 index 0000000..29984be --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/sacred_stone_brick_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/sacred_stone_bricks.json b/src/generated/resources/assets/toadterror/models/item/sacred_stone_bricks.json new file mode 100644 index 0000000..8274331 --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/sacred_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "toadterror:block/sacred_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/toad_chops.json b/src/generated/resources/assets/toadterror/models/item/toad_chops.json new file mode 100644 index 0000000..0f4c7cf --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/toad_chops.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toadterror:items/toad_chops" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/toad_eye.json b/src/generated/resources/assets/toadterror/models/item/toad_eye.json new file mode 100644 index 0000000..d96bd8e --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/toad_eye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toadterror:items/toad_eye" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/toad_protector_spawn_egg.json b/src/generated/resources/assets/toadterror/models/item/toad_protector_spawn_egg.json new file mode 100644 index 0000000..d1aaa9d --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/toad_protector_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/template_spawn_egg" +} \ No newline at end of file diff --git a/src/generated/resources/assets/toadterror/models/item/toad_sentinel_spawn_egg.json b/src/generated/resources/assets/toadterror/models/item/toad_sentinel_spawn_egg.json new file mode 100644 index 0000000..d1aaa9d --- /dev/null +++ b/src/generated/resources/assets/toadterror/models/item/toad_sentinel_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/template_spawn_egg" +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json similarity index 57% rename from src/main/resources/data/minecraft/tags/items/slabs.json rename to src/generated/resources/data/minecraft/tags/blocks/slabs.json index 5143b6f..0688085 100644 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/slabs.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "toadterror:sacred_stone_brick_slab", - "toadterror:mossy_sacred_stone_brick_slab", "toadterror:cracked_sacred_stone_brick_slab", - "toadterror:chiseled_sacred_stone_brick_slab" + "toadterror:chiseled_sacred_stone_brick_slab", + "toadterror:sacred_stone_brick_slab", + "toadterror:mossy_sacred_stone_brick_slab" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json similarity index 57% rename from src/main/resources/data/minecraft/tags/items/stairs.json rename to src/generated/resources/data/minecraft/tags/blocks/stairs.json index 22debe2..445b716 100644 --- a/src/main/resources/data/minecraft/tags/items/stairs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "toadterror:sacred_stone_brick_stairs", - "toadterror:mossy_sacred_stone_brick_stairs", "toadterror:cracked_sacred_stone_brick_stairs", - "toadterror:chiseled_sacred_stone_brick_stairs" + "toadterror:chiseled_sacred_stone_brick_stairs", + "toadterror:sacred_stone_brick_stairs", + "toadterror:mossy_sacred_stone_brick_stairs" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/stone_bricks.json b/src/generated/resources/data/minecraft/tags/blocks/stone_bricks.json similarity index 58% rename from src/main/resources/data/minecraft/tags/items/stone_bricks.json rename to src/generated/resources/data/minecraft/tags/blocks/stone_bricks.json index fb4354d..cd29d9d 100644 --- a/src/main/resources/data/minecraft/tags/items/stone_bricks.json +++ b/src/generated/resources/data/minecraft/tags/blocks/stone_bricks.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "toadterror:sacred_stone_bricks", - "toadterror:mossy_sacred_stone_bricks", "toadterror:cracked_sacred_stone_bricks", - "toadterror:chiseled_sacred_stone_bricks" + "toadterror:chiseled_sacred_stone_bricks", + "toadterror:sacred_stone_bricks", + "toadterror:mossy_sacred_stone_bricks" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json similarity index 57% rename from src/main/resources/data/minecraft/tags/items/walls.json rename to src/generated/resources/data/minecraft/tags/blocks/walls.json index 4d4bf8b..505f8b2 100644 --- a/src/main/resources/data/minecraft/tags/items/walls.json +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "toadterror:sacred_stone_brick_wall", - "toadterror:mossy_sacred_stone_brick_wall", "toadterror:cracked_sacred_stone_brick_wall", - "toadterror:chiseled_sacred_stone_brick_wall" + "toadterror:chiseled_sacred_stone_brick_wall", + "toadterror:sacred_stone_brick_wall", + "toadterror:mossy_sacred_stone_brick_wall" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json similarity index 57% rename from src/main/resources/data/minecraft/tags/blocks/slabs.json rename to src/generated/resources/data/minecraft/tags/items/slabs.json index 5143b6f..0688085 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "toadterror:sacred_stone_brick_slab", - "toadterror:mossy_sacred_stone_brick_slab", "toadterror:cracked_sacred_stone_brick_slab", - "toadterror:chiseled_sacred_stone_brick_slab" + "toadterror:chiseled_sacred_stone_brick_slab", + "toadterror:sacred_stone_brick_slab", + "toadterror:mossy_sacred_stone_brick_slab" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json similarity index 57% rename from src/main/resources/data/minecraft/tags/blocks/stairs.json rename to src/generated/resources/data/minecraft/tags/items/stairs.json index 22debe2..445b716 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "toadterror:sacred_stone_brick_stairs", - "toadterror:mossy_sacred_stone_brick_stairs", "toadterror:cracked_sacred_stone_brick_stairs", - "toadterror:chiseled_sacred_stone_brick_stairs" + "toadterror:chiseled_sacred_stone_brick_stairs", + "toadterror:sacred_stone_brick_stairs", + "toadterror:mossy_sacred_stone_brick_stairs" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/stone_bricks.json b/src/generated/resources/data/minecraft/tags/items/stone_bricks.json similarity index 58% rename from src/main/resources/data/minecraft/tags/blocks/stone_bricks.json rename to src/generated/resources/data/minecraft/tags/items/stone_bricks.json index fb4354d..cd29d9d 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stone_bricks.json +++ b/src/generated/resources/data/minecraft/tags/items/stone_bricks.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "toadterror:sacred_stone_bricks", - "toadterror:mossy_sacred_stone_bricks", "toadterror:cracked_sacred_stone_bricks", - "toadterror:chiseled_sacred_stone_bricks" + "toadterror:chiseled_sacred_stone_bricks", + "toadterror:sacred_stone_bricks", + "toadterror:mossy_sacred_stone_bricks" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/items/walls.json similarity index 57% rename from src/main/resources/data/minecraft/tags/blocks/walls.json rename to src/generated/resources/data/minecraft/tags/items/walls.json index 4d4bf8b..505f8b2 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/generated/resources/data/minecraft/tags/items/walls.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "toadterror:sacred_stone_brick_wall", - "toadterror:mossy_sacred_stone_brick_wall", "toadterror:cracked_sacred_stone_brick_wall", - "toadterror:chiseled_sacred_stone_brick_wall" + "toadterror:chiseled_sacred_stone_brick_wall", + "toadterror:sacred_stone_brick_wall", + "toadterror:mossy_sacred_stone_brick_wall" ] } \ No newline at end of file diff --git a/src/generated/resources/data/toadterror/tags/blocks/sacred_stone_bricks.json b/src/generated/resources/data/toadterror/tags/blocks/sacred_stone_bricks.json new file mode 100644 index 0000000..3571825 --- /dev/null +++ b/src/generated/resources/data/toadterror/tags/blocks/sacred_stone_bricks.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "toadterror:cracked_sacred_stone_bricks", + "toadterror:cracked_sacred_stone_brick_stairs", + "toadterror:cracked_sacred_stone_brick_slab", + "toadterror:cracked_sacred_stone_brick_wall", + "toadterror:chiseled_sacred_stone_bricks", + "toadterror:chiseled_sacred_stone_brick_stairs", + "toadterror:chiseled_sacred_stone_brick_slab", + "toadterror:chiseled_sacred_stone_brick_wall", + "toadterror:sacred_stone_bricks", + "toadterror:sacred_stone_brick_stairs", + "toadterror:sacred_stone_brick_slab", + "toadterror:sacred_stone_brick_wall", + "toadterror:mossy_sacred_stone_bricks", + "toadterror:mossy_sacred_stone_brick_stairs", + "toadterror:mossy_sacred_stone_brick_slab", + "toadterror:mossy_sacred_stone_brick_wall" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toadterror/tags/items/sacred_stone_bricks.json b/src/generated/resources/data/toadterror/tags/items/sacred_stone_bricks.json new file mode 100644 index 0000000..3571825 --- /dev/null +++ b/src/generated/resources/data/toadterror/tags/items/sacred_stone_bricks.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "toadterror:cracked_sacred_stone_bricks", + "toadterror:cracked_sacred_stone_brick_stairs", + "toadterror:cracked_sacred_stone_brick_slab", + "toadterror:cracked_sacred_stone_brick_wall", + "toadterror:chiseled_sacred_stone_bricks", + "toadterror:chiseled_sacred_stone_brick_stairs", + "toadterror:chiseled_sacred_stone_brick_slab", + "toadterror:chiseled_sacred_stone_brick_wall", + "toadterror:sacred_stone_bricks", + "toadterror:sacred_stone_brick_stairs", + "toadterror:sacred_stone_brick_slab", + "toadterror:sacred_stone_brick_wall", + "toadterror:mossy_sacred_stone_bricks", + "toadterror:mossy_sacred_stone_brick_stairs", + "toadterror:mossy_sacred_stone_brick_slab", + "toadterror:mossy_sacred_stone_brick_wall" + ] +} \ No newline at end of file diff --git a/src/main/java/dev/itsmeow/toadterror/ToadTerror.java b/src/main/java/dev/itsmeow/toadterror/ToadTerror.java index 88f0d8c..cbd0131 100644 --- a/src/main/java/dev/itsmeow/toadterror/ToadTerror.java +++ b/src/main/java/dev/itsmeow/toadterror/ToadTerror.java @@ -1,19 +1,13 @@ package dev.itsmeow.toadterror; -import java.util.UUID; - import dev.itsmeow.imdlib.entity.util.EntityTypeContainer; import dev.itsmeow.toadterror.entity.ToadProtectorEntity; -import dev.itsmeow.toadterror.gen.SacredRuinsStructure; -import dev.itsmeow.toadterror.init.ModBlocks; -import dev.itsmeow.toadterror.init.ModEntities; -import dev.itsmeow.toadterror.init.ModItems; -import dev.itsmeow.toadterror.init.ModResources; -import dev.itsmeow.toadterror.init.ModSoundEvents; +import dev.itsmeow.toadterror.init.*; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.attributes.GlobalEntityTypeAttributes; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -23,38 +17,26 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraft.util.SoundEvent; -import net.minecraft.util.Tuple; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.IFeatureConfig; -import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.IStructurePieceType; -import net.minecraft.world.gen.feature.structure.Structure; -import net.minecraft.world.gen.placement.IPlacementConfig; -import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.BiomeDictionary.Type; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; +import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.DeferredWorkQueue; import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.ObjectHolder; -import top.theillusivec4.curios.api.CuriosAPI; -import top.theillusivec4.curios.api.capability.ICurioItemHandler; -import top.theillusivec4.curios.api.event.LivingCurioChangeEvent; -import top.theillusivec4.curios.api.event.LivingCurioDropsEvent; -import top.theillusivec4.curios.api.imc.CurioIMCMessage; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import top.theillusivec4.curios.api.CuriosApi; +import top.theillusivec4.curios.api.SlotTypeMessage; +import top.theillusivec4.curios.api.event.CurioChangeEvent; +import top.theillusivec4.curios.api.event.CurioDropsEvent; +import top.theillusivec4.curios.api.type.capability.ICuriosItemHandler; + +import java.util.UUID; -@SuppressWarnings("deprecation") @Mod.EventBusSubscriber(modid = ToadTerror.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) @Mod(value = ToadTerror.MODID) public class ToadTerror { @@ -62,9 +44,6 @@ public class ToadTerror { public static final String MODID = "toadterror"; public static final String CURIO_ID = "toad_eye_holder"; public static ItemGroup ITEM_GROUP; - public static IStructurePieceType RUINS_PIECE_TYPE = null; - @ObjectHolder(MODID + ":sacred_ruins") - public static Structure SACRED_RUINS_STRUCTURE; public ToadTerror() { ITEM_GROUP = new ItemGroup(MODID) { @@ -84,31 +63,13 @@ public void fill(NonNullList toDisplay) { } } }; - } - - @SubscribeEvent - public static void setup(final FMLCommonSetupEvent event) { - DeferredWorkQueue.runLater(() -> { - BiomeDictionary.getBiomes(Type.SWAMP).forEach((biome) -> { - biome.addStructure(SACRED_RUINS_STRUCTURE.withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG)); - }); - // add to all biomes so it doesn't get cut off - ForgeRegistries.BIOMES.forEach((biome) -> { - biome.addFeature(GenerationStage.Decoration.SURFACE_STRUCTURES, SACRED_RUINS_STRUCTURE.withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG).withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG))); - }); - }); + IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); + ModWorldGen.subscribe(modBus); } @SubscribeEvent public static void interModEnqueue(final InterModEnqueueEvent event) { - InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage(CURIO_ID).setSize(3).setEnabled(true).setHidden(false)); - InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_ICON, () -> new Tuple<>(CURIO_ID, ModResources.CURIO_SLOT_ICON)); - } - - @SubscribeEvent - public static void registerFeatures(RegistryEvent.Register> event) { - RUINS_PIECE_TYPE = Registry.register(Registry.STRUCTURE_PIECE, ModResources.SACRED_RUINS_STRUCTURE, SacredRuinsStructure.Piece::new); - event.getRegistry().register(new SacredRuinsStructure(NoFeatureConfig::deserialize).setRegistryName(ModResources.SACRED_RUINS_STRUCTURE)); + InterModComms.sendTo(CuriosApi.MODID, SlotTypeMessage.REGISTER_TYPE, () -> new SlotTypeMessage.Builder(CURIO_ID).size(3).icon(ModResources.CURIO_SLOT_ICON).build()); } @SubscribeEvent @@ -135,7 +96,10 @@ public static void registerItems(final RegistryEvent.Register event) { @SubscribeEvent public static void registerEntities(final RegistryEvent.Register> event) { - ModEntities.H.ENTITIES.values().forEach(e -> event.getRegistry().register(e.entityType)); + ModEntities.H.ENTITIES.values().forEach(e -> { + event.getRegistry().register(e.entityType); + e.registerAttributes(); + }); } @SubscribeEvent @@ -171,24 +135,26 @@ public static void onAnvilUpdate(final AnvilUpdateEvent event) { } @SubscribeEvent - public static void onCurioSlotChanged(final LivingCurioChangeEvent event) { + public static void onCurioSlotChanged(final CurioChangeEvent event) { if(event.getEntityLiving() instanceof PlayerEntity) { PlayerEntity player = (PlayerEntity) event.getEntityLiving(); - if(event.getTypeIdentifier().equals(CURIO_ID)) { + if(event.getIdentifier().equals(CURIO_ID)) { ItemStack emptyEye = event.getFrom().copy(); if(event.getTo().getItem() == ModItems.TOAD_EYE) { - LazyOptional handler = CuriosAPI.getCuriosHandler(player); + LazyOptional handler = CuriosApi.getCuriosHelper().getCuriosHandler(player); handler.ifPresent(h -> { - ItemStack toadEye = event.getTo(); - ItemStack newEye = new ItemStack(ModItems.EMPTY_TOAD_EYE); - CompoundNBT newTag = new CompoundNBT(); - if(!toadEye.hasTag() || !toadEye.getTag().contains("uid")) { - newTag.putString("uid", createNewEntity(player).toString()); - } else { - newTag.putString("uid", createEntityFromEye(player, toadEye.getTag()).toString()); - } - newEye.setTag(newTag); - h.setStackInSlot(CURIO_ID, event.getSlotIndex(), newEye); + h.getStacksHandler(ToadTerror.CURIO_ID).ifPresent(sH -> { + ItemStack toadEye = event.getTo(); + ItemStack newEye = new ItemStack(ModItems.EMPTY_TOAD_EYE); + CompoundNBT newTag = new CompoundNBT(); + if(!toadEye.hasTag() || !toadEye.getTag().contains("uid")) { + newTag.putString("uid", createNewEntity(player).toString()); + } else { + newTag.putString("uid", createEntityFromEye(player, toadEye.getTag()).toString()); + } + newEye.setTag(newTag); + sH.getStacks().setStackInSlot(event.getSlotIndex(), newEye); + }); }); } if(event.getFrom().getItem() == ModItems.EMPTY_TOAD_EYE) { @@ -218,22 +184,24 @@ public static void onCurioSlotChanged(final LivingCurioChangeEvent event) { if(player.world instanceof ServerWorld) { ServerWorld world = (ServerWorld) player.world; Entity ent = world.getEntityByUuid(UUID.fromString(event.getTo().getTag().getString("uid"))); - LazyOptional handler = CuriosAPI.getCuriosHandler(player); + LazyOptional handler = CuriosApi.getCuriosHelper().getCuriosHandler(player); if(ent != null && ent instanceof ToadProtectorEntity) { handler.ifPresent(h -> { - ItemStack toadEye = event.getTo(); - ItemStack newEye = new ItemStack(ModItems.EMPTY_TOAD_EYE); - CompoundNBT newTag = new CompoundNBT(); - newTag.putString("uid", createEntityFromEye(player, toadEye.getTag()).toString()); - newEye.setTag(newTag); - h.setStackInSlot(CURIO_ID, event.getSlotIndex(), newEye); + h.getStacksHandler(ToadTerror.CURIO_ID).ifPresent(sH -> { + ItemStack toadEye = event.getTo(); + ItemStack newEye = new ItemStack(ModItems.EMPTY_TOAD_EYE); + CompoundNBT newTag = new CompoundNBT(); + newTag.putString("uid", createEntityFromEye(player, toadEye.getTag()).toString()); + newEye.setTag(newTag); + sH.getStacks().setStackInSlot(event.getSlotIndex(), newEye); + }); }); } else { if(!player.inventory.addItemStackToInventory(event.getTo())) { player.dropItem(event.getTo(), false); } handler.ifPresent(h -> { - h.setStackInSlot(CURIO_ID, event.getSlotIndex(), ItemStack.EMPTY); + h.getStacksHandler(ToadTerror.CURIO_ID).ifPresent(sH -> sH.getStacks().setStackInSlot(event.getSlotIndex(), ItemStack.EMPTY)); }); } } @@ -244,7 +212,7 @@ public static void onCurioSlotChanged(final LivingCurioChangeEvent event) { } @SubscribeEvent - public static void onCuriosDeath(LivingCurioDropsEvent event) { + public static void onCuriosDeath(CurioDropsEvent event) { if(event.getEntityLiving() instanceof PlayerEntity) { event.getDrops().forEach(e -> updateItemEntity((PlayerEntity) event.getEntityLiving(), e)); } @@ -287,7 +255,7 @@ private static UUID createEntityFromEye(PlayerEntity player, CompoundNBT tag) { prot.setMotion(0, 0, 0); prot.setUniqueId(id); prot.fallDistance = 0F; - prot.setFireTimer(0); + prot.setFire(0); // stop dying if(prot.getHealth() <= 0F || !prot.isAlive() || prot.deathTime > 0) { prot.revive(); diff --git a/src/main/java/dev/itsmeow/toadterror/block/BlockSetContainer.java b/src/main/java/dev/itsmeow/toadterror/block/BlockSetContainer.java index b0e5db8..bff5737 100644 --- a/src/main/java/dev/itsmeow/toadterror/block/BlockSetContainer.java +++ b/src/main/java/dev/itsmeow/toadterror/block/BlockSetContainer.java @@ -5,6 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; public class BlockSetContainer { @@ -16,8 +17,10 @@ public class BlockSetContainer { protected final BlockItem stairs_item; protected final BlockItem slab_item; protected final BlockItem wall_item; + private ResourceLocation texture; public BlockSetContainer(String baseName, Block.Properties baseProps) { + texture = new ResourceLocation(ToadTerror.MODID, "block/" + baseName + "s"); this.brick = new ModBlock(baseName + "s", baseProps); this.stairs = new ModStairs(baseName + "_stairs", baseProps, brick::getDefaultState); this.slab = new ModSlab(baseName + "_slab", baseProps); @@ -29,6 +32,10 @@ public BlockSetContainer(String baseName, Block.Properties baseProps) { this.wall_item = new ModBlockItem(wall, prop); } + public ResourceLocation getTexture() { + return texture; + } + public Block[] getAll() { return new Block[] { brick, stairs, slab, wall }; } diff --git a/src/main/java/dev/itsmeow/toadterror/client/model/ToadSentinelModel.java b/src/main/java/dev/itsmeow/toadterror/client/model/ToadSentinelModel.java index 9589c04..28358a8 100644 --- a/src/main/java/dev/itsmeow/toadterror/client/model/ToadSentinelModel.java +++ b/src/main/java/dev/itsmeow/toadterror/client/model/ToadSentinelModel.java @@ -8,11 +8,11 @@ import dev.itsmeow.imdlib.client.util.RenderUtil; import dev.itsmeow.toadterror.entity.ToadSentinelEntity; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.entity.model.EntityModel; import net.minecraft.client.renderer.model.ModelRenderer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Vector3f; public class ToadSentinelModel extends EntityModel { public ModelRenderer Body; diff --git a/src/main/java/dev/itsmeow/toadterror/entity/ToadProtectorEntity.java b/src/main/java/dev/itsmeow/toadterror/entity/ToadProtectorEntity.java index 758fdd1..25fdcb5 100644 --- a/src/main/java/dev/itsmeow/toadterror/entity/ToadProtectorEntity.java +++ b/src/main/java/dev/itsmeow/toadterror/entity/ToadProtectorEntity.java @@ -11,7 +11,6 @@ import dev.itsmeow.toadterror.init.ModResources; import dev.itsmeow.toadterror.init.ModSoundEvents; import net.minecraft.entity.AgeableEntity; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.goal.FollowOwnerGoal; import net.minecraft.entity.ai.goal.LeapAtTargetGoal; import net.minecraft.entity.ai.goal.LookAtGoal; @@ -29,16 +28,21 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.ListNBT; import net.minecraft.particles.ParticleTypes; +import net.minecraft.util.ActionResultType; import net.minecraft.util.DamageSource; import net.minecraft.util.Hand; import net.minecraft.util.SoundEvent; +import net.minecraft.world.DimensionType; import net.minecraft.world.World; -import net.minecraft.world.dimension.DimensionType; +import net.minecraft.world.server.ServerWorld; +import net.minecraft.world.storage.FolderName; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.LazyOptional; -import top.theillusivec4.curios.api.CuriosAPI; -import top.theillusivec4.curios.api.capability.ICurioItemHandler; -import top.theillusivec4.curios.api.inventory.CurioStackHandler; +import top.theillusivec4.curios.api.CuriosApi; +import top.theillusivec4.curios.api.type.capability.ICuriosItemHandler; +import top.theillusivec4.curios.api.type.inventory.ICurioStacksHandler; + +import javax.annotation.Nullable; public class ToadProtectorEntity extends TameableEntity { @@ -59,15 +63,6 @@ protected void registerGoals() { this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this)); } - @Override - protected void registerAttributes() { - super.registerAttributes(); - this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(30D); - this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.4D); - this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE); - this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(2D); - } - @Override protected SoundEvent getAmbientSound() { return ModSoundEvents.TOAD_PROTECTOR_IDLE; @@ -89,20 +84,21 @@ protected SoundEvent getHurtSound(DamageSource damageSourceIn) { } @Override - public boolean processInteract(PlayerEntity player, Hand hand) { + public ActionResultType func_230254_b_(PlayerEntity player, Hand hand) { if(ModResources.Tags.Items.SACRED_STONE_BRICKS.contains(player.getHeldItem(hand).getItem())) { this.consumeItemFromStack(player, player.getHeldItem(hand)); this.setHealth(this.getMaxHealth()); for(int i = 0; i < 10; i++) { this.world.addParticle(ParticleTypes.HAPPY_VILLAGER, this.getPosX() + Math.random() * 2F - 1F, this.getPosY() + 1F, this.getPosZ() + Math.random() * 2F - 1F, 0, 0, 0); } - return true; + return ActionResultType.CONSUME; } - return super.processInteract(player, hand); + return super.func_230254_b_(player, hand); } + @Nullable @Override - public AgeableEntity createChild(AgeableEntity ageable) { + public AgeableEntity func_241840_a(ServerWorld p_241840_1_, AgeableEntity p_241840_2_) { return null; } @@ -113,11 +109,11 @@ public void onDeath(DamageSource cause) { if(this.getServer() != null) { ServerPlayerEntity owner = this.getServer().getPlayerList().getPlayerByUUID(ownerID); if(owner != null) { - LazyOptional handler = CuriosAPI.getCuriosHandler(owner); + LazyOptional handler = CuriosApi.getCuriosHelper().getCuriosHandler(owner); handler.ifPresent(h -> { - CurioStackHandler sH = h.getStackHandler(ToadTerror.CURIO_ID); + ICurioStacksHandler sH = h.getStacksHandler(ToadTerror.CURIO_ID).get(); for(int slot = 0; slot < sH.getSlots(); slot++) { - ItemStack content = sH.getStackInSlot(slot); + ItemStack content = sH.getStacks().getStackInSlot(slot); if(content.getItem() == ModItems.EMPTY_TOAD_EYE && content.hasTag() && content.getTag().contains("uid")) { UUID uid = UUID.fromString(content.getTag().getString("uid")); if(uid.equals(this.getUniqueID())) { @@ -125,7 +121,7 @@ public void onDeath(DamageSource cause) { ItemStack newStack = new ItemStack(ModItems.BROKEN_TOAD_EYE); data.putString("uid", uid.toString()); newStack.setTag(data); - sH.setStackInSlot(slot, newStack); + sH.getStacks().setStackInSlot(slot, newStack); super.onDeath(cause); return; } @@ -135,7 +131,7 @@ public void onDeath(DamageSource cause) { } else { // offline... work time! try { - File playerFile = new File(this.getServer().getWorld(DimensionType.OVERWORLD).getSaveHandler().getPlayerFolder(), ownerID.toString() + ".dat"); + File playerFile = new File(this.getServer().func_240776_a_(FolderName.PLAYERDATA).toFile(), ownerID.toString() + ".dat"); if(playerFile.exists() && playerFile.isFile()) { FileInputStream in = new FileInputStream(playerFile); CompoundNBT tag = CompressedStreamTools.readCompressed(in); @@ -150,29 +146,37 @@ public void onDeath(DamageSource cause) { for(int j = 0; j < listIden.size(); j++) { CompoundNBT iden = listIden.getCompound(j); if(iden.contains("Identifier") && iden.getString("Identifier").equals(ToadTerror.CURIO_ID)) { - ListNBT itemList = iden.getList("Items", Constants.NBT.TAG_COMPOUND); - for(int i = 0; i < itemList.size(); i++) { - CompoundNBT itemTag = itemList.getCompound(i); - if(itemTag.contains("id") && itemTag.getString("id").equals(ModItems.EMPTY_TOAD_EYE.getRegistryName().toString())) { - if(itemTag.contains("tag") && itemTag.getCompound("tag").contains("uid")) { - if(itemTag.getCompound("tag").getString("uid").equals(this.getUniqueID().toString())) { - // MATCH! - ItemStack newStack = new ItemStack(ModItems.BROKEN_TOAD_EYE); - data.putString("uid", this.getUniqueID().toString()); - newStack.setTag(data); - CompoundNBT newDat = newStack.serializeNBT(); - newDat.putInt("Slot", itemTag.getInt("Slot")); - itemList.set(i, newDat); - iden.put("Items", itemList); - listIden.set(j, iden); - curiosInv.put("Curios", listIden); - forgeCaps.put("curios:inventory", curiosInv); - tag.put("ForgeCaps", forgeCaps); - FileOutputStream out = new FileOutputStream(playerFile); - CompressedStreamTools.writeCompressed(tag, out); - out.close(); - super.onDeath(cause); - return; + if(iden.contains("StacksHandler")) { + CompoundNBT sH = iden.getCompound("StacksHandler"); + if(sH.contains("Stacks")) { + CompoundNBT stacks = sH.getCompound("Stacks"); + ListNBT itemList = stacks.getList("Items", Constants.NBT.TAG_COMPOUND); + for (int i = 0; i < itemList.size(); i++) { + CompoundNBT itemTag = itemList.getCompound(i); + if (itemTag.contains("id") && itemTag.getString("id").equals(ModItems.EMPTY_TOAD_EYE.getRegistryName().toString())) { + if (itemTag.contains("tag") && itemTag.getCompound("tag").contains("uid")) { + if (itemTag.getCompound("tag").getString("uid").equals(this.getUniqueID().toString())) { + // MATCH! + ItemStack newStack = new ItemStack(ModItems.BROKEN_TOAD_EYE); + data.putString("uid", this.getUniqueID().toString()); + newStack.setTag(data); + CompoundNBT newDat = newStack.serializeNBT(); + newDat.putInt("Slot", itemTag.getInt("Slot")); + itemList.set(i, newDat); + stacks.put("Items", itemList); + sH.put("Stacks", stacks); + iden.put("StacksHandler", sH); + listIden.set(j, iden); + curiosInv.put("Curios", listIden); + forgeCaps.put("curios:inventory", curiosInv); + tag.put("ForgeCaps", forgeCaps); + FileOutputStream out = new FileOutputStream(playerFile); + CompressedStreamTools.writeCompressed(tag, out); + out.close(); + super.onDeath(cause); + return; + } + } } } } diff --git a/src/main/java/dev/itsmeow/toadterror/entity/ToadSentinelEntity.java b/src/main/java/dev/itsmeow/toadterror/entity/ToadSentinelEntity.java index a889bf7..5233a4c 100644 --- a/src/main/java/dev/itsmeow/toadterror/entity/ToadSentinelEntity.java +++ b/src/main/java/dev/itsmeow/toadterror/entity/ToadSentinelEntity.java @@ -14,7 +14,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityPredicate; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.goal.Goal; import net.minecraft.entity.ai.goal.MeleeAttackGoal; import net.minecraft.entity.ai.goal.NearestAttackableTargetGoal; @@ -34,7 +33,7 @@ import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.BossInfo; import net.minecraft.world.World; @@ -73,7 +72,7 @@ public boolean shouldExecute() { @Override protected void checkAndPerformAttack(LivingEntity enemy, double distToEnemySqr) { super.checkAndPerformAttack(enemy, distToEnemySqr); - ToadSentinelEntity.this.dataManager.set(ATTACK_TICK, attackTick); + ToadSentinelEntity.this.dataManager.set(ATTACK_TICK, this.func_234041_j_()); } @Override @@ -85,16 +84,6 @@ protected double getAttackReachSqr(LivingEntity attackTarget) { this.targetSelector.addGoal(0, new NearestAttackableTargetGoal(this, PlayerEntity.class, false, false)); } - @Override - protected void registerAttributes() { - super.registerAttributes(); - this.getAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(200D); - this.getAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.3D); - this.getAttributes().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE); - this.getAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(5D); - this.getAttribute(SharedMonsterAttributes.ATTACK_KNOCKBACK).setBaseValue(2D); - } - @Override protected SoundEvent getAmbientSound() { return ModSoundEvents.TOAD_SENTINEL_IDLE; @@ -159,7 +148,7 @@ public void setTargetPos(Optional pos) { @Override public boolean isInvulnerableTo(DamageSource source) { - return super.isInvulnerableTo(source) || (source instanceof IndirectEntityDamageSource && source.damageType.equals("arrow")) || source == DamageSource.FIREWORKS || source == DamageSource.FALL; + return super.isInvulnerableTo(source) || (source instanceof IndirectEntityDamageSource && source.damageType.equals("arrow")) || source == DamageSource.FALL; } @Override @@ -295,7 +284,7 @@ public void tick() { double dirX = (target.getPosX() - toad.getPosX()); double dirY = (target.getPosY() - toad.getPosY()); double dirZ = (target.getPosZ() - toad.getPosZ()); - Vec3d targetPos = new Vec3d(dirX, dirY, dirZ).scale(toad.getTongueTicks() / startDistance).add(toad.getPositionVec()); + Vector3d targetPos = new Vector3d(dirX, dirY, dirZ).scale(toad.getTongueTicks() / startDistance).add(toad.getPositionVec()); target.setPositionAndUpdate(targetPos.x, targetPos.y, targetPos.z); if(!attackedThisCycle && toad.getDistanceSq(target) <= getAttackReachSqr(target)) { target.attackEntityFrom(DamageSource.causeMobDamage(toad), 2F); @@ -433,7 +422,7 @@ public void startExecuting() { toad.playSound(ModSoundEvents.TOAD_SENTINEL_RIBBIT, 2F, 1F); toad.playSound(ModSoundEvents.TOAD_SENTINEL_RIBBIT, 2F, 1F); if(target.attackEntityFrom(DamageSource.causeMobDamage(toad), 8F)) { - toad.knockBackNoResist(target, !target.onGround ? 6F : 0.5F); + toad.knockBackNoResist(target, !target.isOnGround() ? 6F : 0.5F); } } } @@ -448,15 +437,15 @@ protected void knockBackNoResist(LivingEntity target, float strengthIn) { float strength = strengthIn; double xRatio = this.getPosX() - target.getPosX(); double zRatio = this.getPosZ() - target.getPosZ(); - net.minecraftforge.event.entity.living.LivingKnockBackEvent event = net.minecraftforge.common.ForgeHooks.onLivingKnockBack(target, this, strength, xRatio, zRatio); + net.minecraftforge.event.entity.living.LivingKnockBackEvent event = net.minecraftforge.common.ForgeHooks.onLivingKnockBack(target, strength, xRatio, zRatio); if(!event.isCanceled()) { strength = event.getStrength(); xRatio = event.getRatioX(); zRatio = event.getRatioZ(); target.isAirBorne = true; - Vec3d vec3d = target.getMotion(); - Vec3d vec3d1 = (new Vec3d(xRatio, 0.0D, zRatio)).normalize().scale((double) strength); - target.setMotion(vec3d.x / 2.0D - vec3d1.x, target.onGround ? Math.min(0.4D, vec3d.y / 2.0D + (double) strength) : vec3d.y, vec3d.z / 2.0D - vec3d1.z); + Vector3d vec3d = target.getMotion(); + Vector3d vec3d1 = (new Vector3d(xRatio, 0.0D, zRatio)).normalize().scale((double) strength); + target.setMotion(vec3d.x / 2.0D - vec3d1.x, target.isOnGround() ? Math.min(0.4D, vec3d.y / 2.0D + (double) strength) : vec3d.y, vec3d.z / 2.0D - vec3d1.z); } } } diff --git a/src/main/java/dev/itsmeow/toadterror/gen/SacredRuinsStructure.java b/src/main/java/dev/itsmeow/toadterror/gen/SacredRuinsStructure.java index 8a9649c..3de8024 100644 --- a/src/main/java/dev/itsmeow/toadterror/gen/SacredRuinsStructure.java +++ b/src/main/java/dev/itsmeow/toadterror/gen/SacredRuinsStructure.java @@ -1,15 +1,10 @@ package dev.itsmeow.toadterror.gen; -import java.util.List; -import java.util.Random; -import java.util.function.Function; - -import com.mojang.datafixers.Dynamic; - +import com.mojang.serialization.Codec; import dev.itsmeow.toadterror.ToadTerror; import dev.itsmeow.toadterror.entity.ToadSentinelEntity; import dev.itsmeow.toadterror.init.ModEntities; -import dev.itsmeow.toadterror.init.ModResources; +import dev.itsmeow.toadterror.init.ModWorldGen; import net.minecraft.block.Blocks; import net.minecraft.entity.SpawnReason; import net.minecraft.nbt.CompoundNBT; @@ -20,95 +15,59 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MutableBoundingBox; -import net.minecraft.world.IWorld; +import net.minecraft.util.registry.DynamicRegistries; +import net.minecraft.world.ISeedReader; +import net.minecraft.world.IServerWorld; import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.BiomeManager; +import net.minecraft.world.biome.provider.BiomeProvider; import net.minecraft.world.gen.ChunkGenerator; +import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.Heightmap; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.feature.structure.ScatteredStructure; -import net.minecraft.world.gen.feature.structure.Structure; -import net.minecraft.world.gen.feature.structure.StructurePiece; -import net.minecraft.world.gen.feature.structure.StructureStart; -import net.minecraft.world.gen.feature.structure.TemplateStructurePiece; +import net.minecraft.world.gen.feature.structure.*; import net.minecraft.world.gen.feature.template.BlockIgnoreStructureProcessor; import net.minecraft.world.gen.feature.template.PlacementSettings; import net.minecraft.world.gen.feature.template.Template; import net.minecraft.world.gen.feature.template.TemplateManager; -public class SacredRuinsStructure extends ScatteredStructure { - - public SacredRuinsStructure(Function, ? extends NoFeatureConfig> configFactoryIn) { - super(configFactoryIn); - } - - @Override - protected int getSeedModifier() { - return 801395783; - } +import java.util.List; +import java.util.Random; - @Override - public IStartFactory getStartFactory() { - return SacredRuinsStructure.Start::new; - } +public class SacredRuinsStructure extends Structure { - @Override - public String getStructureName() { - return ModResources.SACRED_RUINS_STRUCTURE.toString(); + public SacredRuinsStructure(String s, Codec codec) { + super(codec); + Structure.NAME_STRUCTURE_BIMAP.put(s, this); } @Override - public int getSize() { - return 1; + public GenerationStage.Decoration getDecorationStage() { + return GenerationStage.Decoration.SURFACE_STRUCTURES; } @Override - protected ChunkPos getStartPositionForPosition(ChunkGenerator chunkGenerator, Random random, int x, int z, int spacingOffsetsX, int spacingOffsetsZ) { - int minDistance = 35; - int maxDistance = 40; - - int xTemp = x + maxDistance * spacingOffsetsX; - int ztemp = z + maxDistance * spacingOffsetsZ; - int xTemp2 = xTemp < 0 ? xTemp - maxDistance + 1 : xTemp; - int zTemp2 = ztemp < 0 ? ztemp - maxDistance + 1 : ztemp; - int validChunkX = xTemp2 / maxDistance; - int validChunkZ = zTemp2 / maxDistance; - - ((SharedSeedRandom) random).setLargeFeatureSeedWithSalt(chunkGenerator.getSeed(), validChunkX, validChunkZ, this.getSeedModifier()); - validChunkX = validChunkX * maxDistance; - validChunkZ = validChunkZ * maxDistance; - validChunkX = validChunkX + random.nextInt(maxDistance - minDistance); - validChunkZ = validChunkZ + random.nextInt(maxDistance - minDistance); - - return new ChunkPos(validChunkX, validChunkZ); + public IStartFactory getStartFactory() { + return SacredRuinsStructure.Start::new; } @Override - public boolean canBeGenerated(BiomeManager p_225558_1_, ChunkGenerator chunkGen, Random rand, int chunkPosX, int chunkPosZ, Biome biome) { - ChunkPos chunkpos = this.getStartPositionForPosition(chunkGen, rand, chunkPosX, chunkPosZ, 0, 0); - if(chunkPosX == chunkpos.x && chunkPosZ == chunkpos.z) { - if(chunkGen.hasStructure(biome, this)) { - if(chunkPosX > 4 && chunkPosZ > 4) { - return true; - } - } - } - return false; + protected boolean func_230363_a_(ChunkGenerator chunkGen, BiomeProvider biomeSource, long seed, SharedSeedRandom rand, int chunkPosX, int chunkPosZ, Biome biome, ChunkPos chunkPos, NoFeatureConfig featureConfig) { + return chunkPosX > 4 && chunkPosZ > 4; } - public static class Start extends StructureStart { + public static class Start extends StructureStart { - public Start(Structure structureIn, int chunkX, int chunkZ, MutableBoundingBox mutableBoundingBox, int referenceIn, long seedIn) { + public Start(Structure structureIn, int chunkX, int chunkZ, MutableBoundingBox mutableBoundingBox, int referenceIn, long seedIn) { super(structureIn, chunkX, chunkZ, mutableBoundingBox, referenceIn, seedIn); } @Override - public void init(ChunkGenerator generator, TemplateManager templateManagerIn, int chunkX, int chunkZ, Biome biomeIn) { + public void func_230364_a_(DynamicRegistries dynamicRegistryManager, ChunkGenerator generator, TemplateManager templateManagerIn, int chunkX, int chunkZ, Biome biome, NoFeatureConfig config) { Rotation rotation = Rotation.values()[this.rand.nextInt(Rotation.values().length)]; int x = (chunkX << 4) + 7; int z = (chunkZ << 4) + 7; // offset 12 to get center (roughly), move down 2 because dirt below - int surfaceY = Math.max(generator.func_222531_c(x + 12, z + 12, Heightmap.Type.WORLD_SURFACE_WG) - 2, generator.getGroundHeight() - 3); + int surfaceY = Math.max(generator.getNoiseHeightMinusOne(x + 12, z + 12, Heightmap.Type.WORLD_SURFACE_WG) - 2, generator.getGroundHeight() - 3); BlockPos blockpos = new BlockPos(x, surfaceY, z); Piece.start(templateManagerIn, blockpos, rotation, this.components, this.rand); this.recalculateStructureSize(); @@ -122,7 +81,7 @@ public static class Piece extends TemplateStructurePiece { private Rotation rotation; public Piece(TemplateManager templateManagerIn, ResourceLocation resourceLocationIn, BlockPos pos, Rotation rotationIn) { - super(ToadTerror.RUINS_PIECE_TYPE, 0); + super(ModWorldGen.RUINS_PIECE_TYPE, 0); this.resourceLocation = resourceLocationIn; this.templatePosition = pos; this.rotation = rotationIn; @@ -130,7 +89,7 @@ public Piece(TemplateManager templateManagerIn, ResourceLocation resourceLocatio } public Piece(TemplateManager templateManagerIn, CompoundNBT tagCompound) { - super(ToadTerror.RUINS_PIECE_TYPE, tagCompound); + super(ModWorldGen.RUINS_PIECE_TYPE, tagCompound); this.resourceLocation = new ResourceLocation(tagCompound.getString("Template")); this.rotation = Rotation.valueOf(tagCompound.getString("Rot")); this.setupPiece(templateManagerIn); @@ -141,7 +100,7 @@ public static void start(TemplateManager templateManager, BlockPos pos, Rotation int z = pos.getZ(); BlockPos rotationOffSet = new BlockPos(0, 0, 0).rotate(rotation); BlockPos blockpos = rotationOffSet.add(x, pos.getY(), z); - pieceList.add(new Piece(templateManager, ModResources.SACRED_RUINS_STRUCTURE, blockpos, rotation)); + pieceList.add(new Piece(templateManager, new ResourceLocation(ToadTerror.MODID, "sacred_ruins"), blockpos, rotation)); } private void setupPiece(TemplateManager templateManager) { @@ -158,7 +117,7 @@ protected void readAdditional(CompoundNBT tagCompound) { } @Override - protected void handleDataMarker(String function, BlockPos pos, IWorld worldIn, Random rand, MutableBoundingBox sbb) { + protected void handleDataMarker(String function, BlockPos pos, IServerWorld worldIn, Random rand, MutableBoundingBox sbb) { if("sentinel".equals(function)) { ToadSentinelEntity e = ModEntities.TOAD_SENTINEL.entityType.create(worldIn.getWorld()); e.enablePersistence(); @@ -170,12 +129,11 @@ protected void handleDataMarker(String function, BlockPos pos, IWorld worldIn, R } @Override - public boolean create(IWorld worldIn, ChunkGenerator p_225577_2_, Random randomIn, MutableBoundingBox structureBoundingBoxIn, ChunkPos chunkPos) { + public boolean func_230383_a_(ISeedReader seedReader, StructureManager structureManager, ChunkGenerator chunkGenerator, Random randomIn, MutableBoundingBox structureBoundingBoxIn, ChunkPos chunkPos, BlockPos pos) { PlacementSettings placementsettings = (new PlacementSettings()).setRotation(this.rotation).setMirror(Mirror.NONE).addProcessor(BlockIgnoreStructureProcessor.AIR_AND_STRUCTURE_BLOCK); BlockPos blockpos = BlockPos.ZERO; - this.templatePosition.add(Template.transformedBlockPos(placementsettings, new BlockPos(0 - blockpos.getX(), 0, 0 - blockpos.getZ()))); - - return super.create(worldIn, p_225577_2_, randomIn, structureBoundingBoxIn, chunkPos); + this.templatePosition.add(Template.transformedBlockPos(placementsettings, new BlockPos(-blockpos.getX(), 0, -blockpos.getZ()))); + return super.func_230383_a_(seedReader, structureManager, chunkGenerator, randomIn, structureBoundingBoxIn, chunkPos, pos); } } diff --git a/src/main/java/dev/itsmeow/toadterror/init/ModBlocks.java b/src/main/java/dev/itsmeow/toadterror/init/ModBlocks.java index f1918a9..9e20e24 100644 --- a/src/main/java/dev/itsmeow/toadterror/init/ModBlocks.java +++ b/src/main/java/dev/itsmeow/toadterror/init/ModBlocks.java @@ -1,9 +1,12 @@ package dev.itsmeow.toadterror.init; +import com.google.common.collect.Sets; import dev.itsmeow.toadterror.block.BlockSetContainer; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import java.util.Set; + public class ModBlocks { private static final Block.Properties BRICK_PROPS = Block.Properties.create(Material.ROCK).hardnessAndResistance(1.5F, 6.0F); @@ -11,5 +14,9 @@ public class ModBlocks { public static final BlockSetContainer CRACKED_SACRED_STONE_BRICK = new BlockSetContainer("cracked_sacred_stone_brick", BRICK_PROPS); public static final BlockSetContainer MOSSY_SACRED_STONE_BRICK = new BlockSetContainer("mossy_sacred_stone_brick", BRICK_PROPS); public static final BlockSetContainer CHISELED_SACRED_STONE_BRICK = new BlockSetContainer("chiseled_sacred_stone_brick", BRICK_PROPS); + private static final Set BLOCKS = Sets.newHashSet(ModBlocks.CHISELED_SACRED_STONE_BRICK, ModBlocks.CRACKED_SACRED_STONE_BRICK, ModBlocks.MOSSY_SACRED_STONE_BRICK, ModBlocks.SACRED_STONE_BRICK); + public static Set getAll() { + return BLOCKS; + } } diff --git a/src/main/java/dev/itsmeow/toadterror/init/ModDataGen.java b/src/main/java/dev/itsmeow/toadterror/init/ModDataGen.java new file mode 100644 index 0000000..ec72edf --- /dev/null +++ b/src/main/java/dev/itsmeow/toadterror/init/ModDataGen.java @@ -0,0 +1,140 @@ +package dev.itsmeow.toadterror.init; + +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import dev.itsmeow.toadterror.ToadTerror; +import net.minecraft.block.Block; +import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.ItemTagsProvider; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraftforge.client.model.generators.BlockStateProvider; +import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; + +import java.util.List; + +@Mod.EventBusSubscriber(modid = ToadTerror.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class ModDataGen { + + @SubscribeEvent + public static void gatherData(GatherDataEvent event) { + ToadTerrorBlockTagsProvider blockTags = new ToadTerrorBlockTagsProvider(event.getGenerator(), event.getExistingFileHelper()); + event.getGenerator().addProvider(blockTags); + event.getGenerator().addProvider(new ToadTerrorItemTagsProvider(event.getGenerator(), blockTags, event.getExistingFileHelper())); + event.getGenerator().addProvider(new ToadTerrorBlockStateProvider(event.getGenerator(), event.getExistingFileHelper())); + event.getGenerator().addProvider(new ToadTerrorItemModelProvider(event.getGenerator(), event.getExistingFileHelper())); + //event.getGenerator().addProvider(new ToadTerrorLootTableProvider(event.getGenerator())); + //event.getGenerator().addProvider(new ToadTerrorRecipeProvider(event.getGenerator())); + ModEntities.H.gatherData(event.getGenerator(), event.getExistingFileHelper()); + } + + public static class ToadTerrorBlockTagsProvider extends BlockTagsProvider { + + public ToadTerrorBlockTagsProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator, ToadTerror.MODID, existingFileHelper); + } + + @Override + public String getName() { + return ToadTerror.MODID + "_block_tags"; + } + + @Override + protected void registerTags() { + Builder sacredBricks = this.getOrCreateBuilder(ModResources.Tags.Blocks.SACRED_STONE_BRICKS); + Builder slabs = this.getOrCreateBuilder(BlockTags.SLABS); + Builder stairs = this.getOrCreateBuilder(BlockTags.STAIRS); + Builder stone_bricks = this.getOrCreateBuilder(BlockTags.STONE_BRICKS); + Builder walls = this.getOrCreateBuilder(BlockTags.WALLS); + ModBlocks.getAll().forEach(c -> { + sacredBricks.add(c.getAll()); + slabs.add(c.getSlab()); + stairs.add(c.getStairs()); + stone_bricks.add(c.getBricks()); + walls.add(c.getWall()); + }); + } + } + + public static class ToadTerrorItemTagsProvider extends ItemTagsProvider { + + public ToadTerrorItemTagsProvider(DataGenerator generator, ToadTerrorBlockTagsProvider blockTagProvider, ExistingFileHelper existingFileHelper) { + super(generator, blockTagProvider, ToadTerror.MODID, existingFileHelper); + } + + @Override + public String getName() { + return ToadTerror.MODID + "_item_tags"; + } + + @Override + protected void registerTags() { + this.copy(ModResources.Tags.Blocks.SACRED_STONE_BRICKS, ModResources.Tags.Items.SACRED_STONE_BRICKS); + Builder slabs = this.getOrCreateBuilder(ItemTags.SLABS); + Builder stairs = this.getOrCreateBuilder(ItemTags.STAIRS); + Builder stone_bricks = this.getOrCreateBuilder(ItemTags.STONE_BRICKS); + Builder walls = this.getOrCreateBuilder(ItemTags.WALLS); + ModBlocks.getAll().forEach(c -> { + slabs.add(c.getSlabItem()); + stairs.add(c.getStairsItem()); + stone_bricks.add(c.getBricksItem()); + walls.add(c.getWallItem()); + }); + } + } + + public static class ToadTerrorItemModelProvider extends ItemModelProvider { + + public ToadTerrorItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator, ToadTerror.MODID, existingFileHelper); + } + + @Override + public String getName() { + return ToadTerror.MODID + "_items"; + } + + @Override + protected void registerModels() { + ModItems.getAll().forEach(item -> { + this.withExistingParent(item.getRegistryName().getPath(), "minecraft:item/generated").texture("layer0", ToadTerror.MODID + ":items/" + item.getRegistryName().getPath()); + }); + ModBlocks.getAll().forEach(c -> { + this.wallInventory(c.getWallItem().getRegistryName().getPath(), c.getTexture()); + this.stairs(c.getStairsItem().getRegistryName().getPath(), c.getTexture(), c.getTexture(), c.getTexture()); + this.cubeAll(c.getBricksItem().getRegistryName().getPath(), c.getTexture()); + this.slab(c.getSlabItem().getRegistryName().getPath(), c.getTexture(), c.getTexture(), c.getTexture()); + }); + } + + } + + public static class ToadTerrorBlockStateProvider extends BlockStateProvider { + public ToadTerrorBlockStateProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator, ToadTerror.MODID, existingFileHelper); + } + + @Override + public String getName() { + return ToadTerror.MODID + "_blocks"; + } + + @Override + protected void registerStatesAndModels() { + ModBlocks.getAll().forEach(c -> { + this.wallBlock(c.getWall(), c.getTexture()); + this.stairsBlock(c.getStairs(), c.getTexture()); + this.simpleBlock(c.getBricks()); + this.slabBlock(c.getSlab(), c.getTexture(), c.getTexture()); + }); + } + } + +} diff --git a/src/main/java/dev/itsmeow/toadterror/init/ModEntities.java b/src/main/java/dev/itsmeow/toadterror/init/ModEntities.java index 76bfde0..6c7e2b3 100644 --- a/src/main/java/dev/itsmeow/toadterror/init/ModEntities.java +++ b/src/main/java/dev/itsmeow/toadterror/init/ModEntities.java @@ -7,17 +7,28 @@ import dev.itsmeow.toadterror.ToadTerror; import dev.itsmeow.toadterror.entity.ToadProtectorEntity; import dev.itsmeow.toadterror.entity.ToadSentinelEntity; +import net.minecraft.entity.MobEntity; +import net.minecraft.entity.ai.attributes.Attributes; public class ModEntities { public static final EntityRegistrarHandler H = IMDLib.entityHandler(ToadTerror.MODID); public static final EntityTypeContainer TOAD_SENTINEL = H.add(Builder - .create(ToadSentinelEntity.class, ToadSentinelEntity::new, "toad_sentinel", ToadTerror.MODID) + .create(ToadSentinelEntity.class, ToadSentinelEntity::new, "toad_sentinel", () -> MobEntity.func_233666_p_() + .createMutableAttribute(Attributes.MAX_HEALTH, 200D) + .createMutableAttribute(Attributes.MOVEMENT_SPEED, 0.3D) + .createMutableAttribute(Attributes.ATTACK_DAMAGE) + .createMutableAttribute(Attributes.ATTACK_DAMAGE, 5D) + .createMutableAttribute(Attributes.ATTACK_KNOCKBACK, 2D), ToadTerror.MODID) .egg(0x435963, 0xa9bcbb) .size(3F, 2F)); public static final EntityTypeContainer TOAD_PROTECTOR = H.add(Builder - .create(ToadProtectorEntity.class, ToadProtectorEntity::new, "toad_protector", ToadTerror.MODID) + .create(ToadProtectorEntity.class, ToadProtectorEntity::new, "toad_protector", () -> MobEntity.func_233666_p_() + .createMutableAttribute(Attributes.MAX_HEALTH, 30D) + .createMutableAttribute(Attributes.MOVEMENT_SPEED, 0.4D) + .createMutableAttribute(Attributes.ATTACK_DAMAGE) + .createMutableAttribute(Attributes.ATTACK_DAMAGE, 2D), ToadTerror.MODID) .size(1F, 1F)); } diff --git a/src/main/java/dev/itsmeow/toadterror/init/ModItems.java b/src/main/java/dev/itsmeow/toadterror/init/ModItems.java index 6c3bcbd..7628d9e 100644 --- a/src/main/java/dev/itsmeow/toadterror/init/ModItems.java +++ b/src/main/java/dev/itsmeow/toadterror/init/ModItems.java @@ -1,10 +1,13 @@ package dev.itsmeow.toadterror.init; +import com.google.common.collect.Sets; import dev.itsmeow.toadterror.item.ModItem; import dev.itsmeow.toadterror.item.ToadEyeItem; import net.minecraft.item.Foods; import net.minecraft.item.ItemStack; +import java.util.Set; + public class ModItems { public static final ModItem TOAD_EYE = new ToadEyeItem("toad_eye", false); @@ -16,5 +19,9 @@ public int getUseDuration(ItemStack stack) { return 32; } }; + private static final Set ITEMS = Sets.newHashSet(ModItems.TOAD_EYE, ModItems.EMPTY_TOAD_EYE, ModItems.BROKEN_TOAD_EYE, ModItems.TOAD_CHOPS); + public static Set getAll() { + return ITEMS; + } } diff --git a/src/main/java/dev/itsmeow/toadterror/init/ModResources.java b/src/main/java/dev/itsmeow/toadterror/init/ModResources.java index 0f2a673..8138cd3 100644 --- a/src/main/java/dev/itsmeow/toadterror/init/ModResources.java +++ b/src/main/java/dev/itsmeow/toadterror/init/ModResources.java @@ -1,23 +1,31 @@ package dev.itsmeow.toadterror.init; import dev.itsmeow.toadterror.ToadTerror; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.Tags.IOptionalNamedTag; public class ModResources { public static final ResourceLocation TOAD_SENTINEL_LOOT_TABLE = new ResourceLocation(ToadTerror.MODID, "entities/toad_sentinel"); public static final ResourceLocation CURIO_SLOT_ICON = new ResourceLocation(ToadTerror.MODID, "items/toad_eye_holder"); - public static final ResourceLocation SACRED_RUINS_STRUCTURE = new ResourceLocation(ToadTerror.MODID, "sacred_ruins"); public static class Tags { public static class Blocks { - public static final BlockTags.Wrapper SACRED_STONE_BRICKS = new BlockTags.Wrapper(new ResourceLocation(ToadTerror.MODID, "sacred_stone_bricks")); + public static final IOptionalNamedTag SACRED_STONE_BRICKS = tag("sacred_stone_bricks"); + private static IOptionalNamedTag tag(String name) { + return BlockTags.createOptional(new ResourceLocation(ToadTerror.MODID, name)); + } } public static class Items { - public static final ItemTags.Wrapper SACRED_STONE_BRICKS = new ItemTags.Wrapper(new ResourceLocation(ToadTerror.MODID, "sacred_stone_bricks")); + public static final IOptionalNamedTag SACRED_STONE_BRICKS = tag("sacred_stone_bricks"); + private static IOptionalNamedTag tag(String name) { + return ItemTags.createOptional(new ResourceLocation(ToadTerror.MODID, name)); + } } } diff --git a/src/main/java/dev/itsmeow/toadterror/init/ModWorldGen.java b/src/main/java/dev/itsmeow/toadterror/init/ModWorldGen.java new file mode 100644 index 0000000..004464a --- /dev/null +++ b/src/main/java/dev/itsmeow/toadterror/init/ModWorldGen.java @@ -0,0 +1,93 @@ +package dev.itsmeow.toadterror.init; + +import com.google.common.collect.ImmutableMap; +import dev.itsmeow.toadterror.ToadTerror; +import dev.itsmeow.toadterror.gen.SacredRuinsStructure; +import net.minecraft.util.RegistryKey; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.WorldGenRegistries; +import net.minecraft.world.World; +import net.minecraft.world.gen.FlatChunkGenerator; +import net.minecraft.world.gen.FlatGenerationSettings; +import net.minecraft.world.gen.feature.IFeatureConfig; +import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.StructureFeature; +import net.minecraft.world.gen.feature.structure.IStructurePieceType; +import net.minecraft.world.gen.feature.structure.Structure; +import net.minecraft.world.gen.settings.DimensionStructuresSettings; +import net.minecraft.world.gen.settings.StructureSeparationSettings; +import net.minecraft.world.server.ServerWorld; +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.event.world.BiomeLoadingEvent; +import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.eventbus.api.EventPriority; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; +import java.util.function.Supplier; + +@Mod.EventBusSubscriber(modid = ToadTerror.MODID) +public class ModWorldGen { + + private static final DeferredRegister> STRUCTURES = DeferredRegister.create(ForgeRegistries.STRUCTURE_FEATURES, ToadTerror.MODID); + + public static IStructurePieceType RUINS_PIECE_TYPE = null; + public static RegistryObject> SACRED_RUINS_STRUCTURE = r("sacred_ruins", s -> new SacredRuinsStructure(s, NoFeatureConfig.field_236558_a_)); + public static LazyOptional> SACRED_RUINS_CONFIGURED_STRUCTURE = LazyOptional.of(() -> SACRED_RUINS_STRUCTURE.get().withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG)); + + private static > RegistryObject r(String name, Supplier s) { + return STRUCTURES.register(name, s); + } + + private static > RegistryObject r(String name, Function s) { + return STRUCTURES.register(name, () -> s.apply(ToadTerror.MODID + ":" + name)); + } + + public static void subscribe(IEventBus bus) { + STRUCTURES.register(bus); + bus.addListener(ModWorldGen::setup); + } + + public static void setup(final FMLCommonSetupEvent event) { + event.enqueueWork(() -> { + RUINS_PIECE_TYPE = Registry.register(Registry.STRUCTURE_PIECE, new ResourceLocation(ToadTerror.MODID, "sacred_ruins"), SacredRuinsStructure.Piece::new); + DimensionStructuresSettings.field_236191_b_ = + ImmutableMap., StructureSeparationSettings>builder() + .putAll(DimensionStructuresSettings.field_236191_b_) + .put(SACRED_RUINS_STRUCTURE.get(), new StructureSeparationSettings(40, 35, 801395783)) + .build(); + Registry.register(WorldGenRegistries.CONFIGURED_STRUCTURE_FEATURE, new ResourceLocation(ToadTerror.MODID, "sacred_ruins"), SACRED_RUINS_CONFIGURED_STRUCTURE.resolve().get()); + FlatGenerationSettings.STRUCTURES.put(SACRED_RUINS_STRUCTURE.get(), SACRED_RUINS_CONFIGURED_STRUCTURE.resolve().get()); + }); + + } + + @SubscribeEvent(priority = EventPriority.HIGH) + public static void biomeLoad(final BiomeLoadingEvent event) { + if (BiomeDictionary.hasType(RegistryKey.getOrCreateKey(Registry.BIOME_KEY, event.getName()), BiomeDictionary.Type.SWAMP)) + event.getGeneration().getStructures().add(SACRED_RUINS_CONFIGURED_STRUCTURE.resolve()::get); + } + + @SubscribeEvent + public static void addDimensionalSpacing(final WorldEvent.Load event) { + if (event.getWorld() instanceof ServerWorld) { + ServerWorld serverWorld = (ServerWorld) event.getWorld(); + if (serverWorld.getChunkProvider().getChunkGenerator() instanceof FlatChunkGenerator && serverWorld.getDimensionKey().equals(World.OVERWORLD)) { + return; + } + Map, StructureSeparationSettings> tempMap = new HashMap<>(serverWorld.getChunkProvider().generator.func_235957_b_().func_236195_a_()); + tempMap.put(SACRED_RUINS_STRUCTURE.get(), DimensionStructuresSettings.field_236191_b_.get(SACRED_RUINS_STRUCTURE.get())); + serverWorld.getChunkProvider().generator.func_235957_b_().field_236193_d_ = tempMap; + } + } +} diff --git a/src/main/java/dev/itsmeow/toadterror/item/ToadEyeItem.java b/src/main/java/dev/itsmeow/toadterror/item/ToadEyeItem.java index 489995e..bfc6dfd 100644 --- a/src/main/java/dev/itsmeow/toadterror/item/ToadEyeItem.java +++ b/src/main/java/dev/itsmeow/toadterror/item/ToadEyeItem.java @@ -32,21 +32,20 @@ public void addInformation(ItemStack stack, World worldIn, List if(stack.hasTag()) { if(stack.getTag().contains("uid")) { if(stack.getTag().contains("noLocate") && stack.getItem() == ModItems.EMPTY_TOAD_EYE) { - tooltip.add(new TranslationTextComponent("tooltip.toadterror.nolocate").setStyle(new Style().setColor(TextFormatting.RED))); + tooltip.add(new TranslationTextComponent("tooltip.toadterror.nolocate").mergeStyle(TextFormatting.RED)); } else if(stack.getItem() == ModItems.TOAD_EYE) { - tooltip.add(new TranslationTextComponent("tooltip.toadterror.located").setStyle(new Style().setColor(TextFormatting.GREEN))); + tooltip.add(new TranslationTextComponent("tooltip.toadterror.located").mergeStyle(TextFormatting.GREEN)); if(stack.getTag().contains("Health", Constants.NBT.TAG_FLOAT)) { tooltip.add( new TranslationTextComponent("tooltip.toadterror.health", - new StringTextComponent("" + stack.getTag().getFloat("Health")) - .setStyle(new Style().setColor(TextFormatting.GRAY))) - .setStyle(new Style().setColor(TextFormatting.GREEN))); + new StringTextComponent("" + stack.getTag().getFloat("Health")).mergeStyle(TextFormatting.GRAY)) + .mergeStyle(TextFormatting.GREEN)); } } if(flagIn == ITooltipFlag.TooltipFlags.ADVANCED) { - tooltip.add(new StringTextComponent("UUID: " + stack.getTag().getString("uid")).setStyle(new Style().setColor(TextFormatting.DARK_GRAY))); + tooltip.add(new StringTextComponent("UUID: " + stack.getTag().getString("uid")).mergeStyle(TextFormatting.DARK_GRAY)); if(Screen.hasAltDown()) { - tooltip.add(new StringTextComponent(stack.getTag().toString()).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new StringTextComponent(stack.getTag().toString()).mergeStyle(TextFormatting.GRAY)); } } } diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 0000000..eb140c2 --- /dev/null +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -0,0 +1,3 @@ +public-f net.minecraft.world.gen.settings.DimensionStructuresSettings field_236191_b_ # DEFAULT_STRUCTURE_CONFIGS +public-f net.minecraft.world.gen.settings.DimensionStructuresSettings field_236193_d_ # structures +public-f net.minecraft.world.gen.FlatGenerationSettings field_202247_j #STRUCTURES \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 7320296..dc49a5e 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,10 +1,11 @@ modLoader="javafml" -loaderVersion="[31,)" +loaderVersion="[33,)" issueTrackerURL="http://github.com/itsmeowCommissions/ToadTerror/issues" displayURL="https://www.curseforge.com/minecraft/mc-mods/toad-terror" logoFile="logo.png" credits="itsmeow for Programming, Proddy & Coda for art" authors="itsmeow, Coda, Proddy" +license="All Rights Reserved" [[mods]] modId="toadterror" version="${file.jarVersion}" @@ -14,12 +15,12 @@ Adds a toad boss, structure, and protector.''' [[dependencies.toadterror]] modId="forge" mandatory=true - versionRange="[31.2.0,)" + versionRange="[34.1.0,)" ordering="NONE" side="BOTH" [[dependencies.toadterror]] modId="curios" mandatory=true - versionRange="FORGE-1.15.2-[2.0,)" + versionRange="FORGE-1.16.[3,4]-[4.0.1.0,)" ordering="NONE" side="BOTH" \ No newline at end of file diff --git a/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_slab.json deleted file mode 100644 index 47c7582..0000000 --- a/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=bottom": { "model": "toadterror:block/chiseled_sacred_stone_brick_slab" }, - "type=top": { "model": "toadterror:block/chiseled_sacred_stone_brick_slab_top" }, - "type=double": { "model": "toadterror:block/chiseled_sacred_stone_bricks" } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_stairs.json deleted file mode 100644 index 52a391e..0000000 --- a/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "toadterror:block/chiseled_sacred_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_wall.json b/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_wall.json deleted file mode 100644 index 79f96bf..0000000 --- a/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_brick_wall.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "toadterror:block/chiseled_sacred_stone_brick_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "toadterror:block/chiseled_sacred_stone_brick_wall_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_bricks.json b/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_bricks.json deleted file mode 100644 index 4693daa..0000000 --- a/src/main/resources/assets/toadterror/blockstates/chiseled_sacred_stone_bricks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "toadterror:block/chiseled_sacred_stone_bricks" } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_slab.json deleted file mode 100644 index b2e175d..0000000 --- a/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=bottom": { "model": "toadterror:block/cracked_sacred_stone_brick_slab" }, - "type=top": { "model": "toadterror:block/cracked_sacred_stone_brick_slab_top" }, - "type=double": { "model": "toadterror:block/cracked_sacred_stone_bricks" } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_stairs.json deleted file mode 100644 index e9c38f5..0000000 --- a/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "toadterror:block/cracked_sacred_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_wall.json b/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_wall.json deleted file mode 100644 index b0a1867..0000000 --- a/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_brick_wall.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "toadterror:block/cracked_sacred_stone_brick_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "toadterror:block/cracked_sacred_stone_brick_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "toadterror:block/cracked_sacred_stone_brick_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "toadterror:block/cracked_sacred_stone_brick_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "toadterror:block/cracked_sacred_stone_brick_wall_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_bricks.json b/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_bricks.json deleted file mode 100644 index 60b257e..0000000 --- a/src/main/resources/assets/toadterror/blockstates/cracked_sacred_stone_bricks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "toadterror:block/cracked_sacred_stone_bricks" } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_slab.json deleted file mode 100644 index 5dfac5e..0000000 --- a/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=bottom": { "model": "toadterror:block/mossy_sacred_stone_brick_slab" }, - "type=top": { "model": "toadterror:block/mossy_sacred_stone_brick_slab_top" }, - "type=double": { "model": "toadterror:block/mossy_sacred_stone_bricks" } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_stairs.json deleted file mode 100644 index e501592..0000000 --- a/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "toadterror:block/mossy_sacred_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_wall.json b/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_wall.json deleted file mode 100644 index 2a79365..0000000 --- a/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_brick_wall.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "toadterror:block/mossy_sacred_stone_brick_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "toadterror:block/mossy_sacred_stone_brick_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "toadterror:block/mossy_sacred_stone_brick_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "toadterror:block/mossy_sacred_stone_brick_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "toadterror:block/mossy_sacred_stone_brick_wall_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_bricks.json b/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_bricks.json deleted file mode 100644 index e56befc..0000000 --- a/src/main/resources/assets/toadterror/blockstates/mossy_sacred_stone_bricks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "toadterror:block/mossy_sacred_stone_bricks" } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/blockstates/sacred_stone_brick_slab.json deleted file mode 100644 index d12c8b9..0000000 --- a/src/main/resources/assets/toadterror/blockstates/sacred_stone_brick_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=bottom": { "model": "toadterror:block/sacred_stone_brick_slab" }, - "type=top": { "model": "toadterror:block/sacred_stone_brick_slab_top" }, - "type=double": { "model": "toadterror:block/sacred_stone_bricks" } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/blockstates/sacred_stone_brick_stairs.json deleted file mode 100644 index 7810644..0000000 --- a/src/main/resources/assets/toadterror/blockstates/sacred_stone_brick_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "toadterror:block/sacred_stone_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "toadterror:block/sacred_stone_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "toadterror:block/sacred_stone_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "toadterror:block/sacred_stone_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "toadterror:block/sacred_stone_brick_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "toadterror:block/sacred_stone_brick_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "toadterror:block/sacred_stone_brick_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "toadterror:block/sacred_stone_brick_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "toadterror:block/sacred_stone_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "toadterror:block/sacred_stone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "toadterror:block/sacred_stone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "toadterror:block/sacred_stone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "toadterror:block/sacred_stone_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "toadterror:block/sacred_stone_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/toadterror/blockstates/sacred_stone_brick_wall.json b/src/main/resources/assets/toadterror/blockstates/sacred_stone_brick_wall.json deleted file mode 100644 index 2967223..0000000 --- a/src/main/resources/assets/toadterror/blockstates/sacred_stone_brick_wall.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "multipart": [ - { "when": { "up": "true" }, - "apply": { "model": "toadterror:block/sacred_stone_brick_wall_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "toadterror:block/sacred_stone_brick_wall_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "toadterror:block/sacred_stone_brick_wall_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "toadterror:block/sacred_stone_brick_wall_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "toadterror:block/sacred_stone_brick_wall_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/toadterror/blockstates/sacred_stone_bricks.json b/src/main/resources/assets/toadterror/blockstates/sacred_stone_bricks.json deleted file mode 100644 index f5f1e0d..0000000 --- a/src/main/resources/assets/toadterror/blockstates/sacred_stone_bricks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "toadterror:block/sacred_stone_bricks" } - } -} diff --git a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab.json deleted file mode 100644 index d3d5214..0000000 --- a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "toadterror:blocks/chiseled_sacred_stone_bricks", - "top": "toadterror:blocks/chiseled_sacred_stone_bricks", - "side": "toadterror:blocks/chiseled_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab_top.json b/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab_top.json deleted file mode 100644 index d4537ea..0000000 --- a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "toadterror:blocks/chiseled_sacred_stone_bricks", - "top": "toadterror:blocks/chiseled_sacred_stone_bricks", - "side": "toadterror:blocks/chiseled_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs.json deleted file mode 100644 index afc831b..0000000 --- a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "toadterror:blocks/chiseled_sacred_stone_bricks", - "top": "toadterror:blocks/chiseled_sacred_stone_bricks", - "side": "toadterror:blocks/chiseled_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_inner.json b/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_inner.json deleted file mode 100644 index e6ebf85..0000000 --- a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "toadterror:blocks/chiseled_sacred_stone_bricks", - "top": "toadterror:blocks/chiseled_sacred_stone_bricks", - "side": "toadterror:blocks/chiseled_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_outer.json b/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_outer.json deleted file mode 100644 index fdf50a7..0000000 --- a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "toadterror:blocks/chiseled_sacred_stone_bricks", - "top": "toadterror:blocks/chiseled_sacred_stone_bricks", - "side": "toadterror:blocks/chiseled_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_inventory.json b/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_inventory.json deleted file mode 100644 index b350ba5..0000000 --- a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "toadterror:blocks/chiseled_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_post.json b/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_post.json deleted file mode 100644 index 8cb36e0..0000000 --- a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "toadterror:blocks/chiseled_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side.json b/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side.json deleted file mode 100644 index f16fa68..0000000 --- a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_brick_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "toadterror:blocks/chiseled_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_bricks.json b/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_bricks.json deleted file mode 100644 index 77fb00b..0000000 --- a/src/main/resources/assets/toadterror/models/block/chiseled_sacred_stone_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "toadterror:blocks/chiseled_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab.json deleted file mode 100644 index 885fcfd..0000000 --- a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "toadterror:blocks/cracked_sacred_stone_bricks", - "top": "toadterror:blocks/cracked_sacred_stone_bricks", - "side": "toadterror:blocks/cracked_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab_top.json b/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab_top.json deleted file mode 100644 index a1511b7..0000000 --- a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "toadterror:blocks/cracked_sacred_stone_bricks", - "top": "toadterror:blocks/cracked_sacred_stone_bricks", - "side": "toadterror:blocks/cracked_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs.json deleted file mode 100644 index 2191165..0000000 --- a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "toadterror:blocks/cracked_sacred_stone_bricks", - "top": "toadterror:blocks/cracked_sacred_stone_bricks", - "side": "toadterror:blocks/cracked_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_inner.json b/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_inner.json deleted file mode 100644 index 62d44ad..0000000 --- a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "toadterror:blocks/cracked_sacred_stone_bricks", - "top": "toadterror:blocks/cracked_sacred_stone_bricks", - "side": "toadterror:blocks/cracked_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_outer.json b/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_outer.json deleted file mode 100644 index 00640d4..0000000 --- a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "toadterror:blocks/cracked_sacred_stone_bricks", - "top": "toadterror:blocks/cracked_sacred_stone_bricks", - "side": "toadterror:blocks/cracked_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_inventory.json b/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_inventory.json deleted file mode 100644 index 6030657..0000000 --- a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "toadterror:blocks/cracked_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_post.json b/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_post.json deleted file mode 100644 index fcbd4ba..0000000 --- a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "toadterror:blocks/cracked_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side.json b/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side.json deleted file mode 100644 index 6ed2170..0000000 --- a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_brick_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "toadterror:blocks/cracked_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_bricks.json b/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_bricks.json deleted file mode 100644 index abc14fd..0000000 --- a/src/main/resources/assets/toadterror/models/block/cracked_sacred_stone_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "toadterror:blocks/cracked_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab.json deleted file mode 100644 index 9b33c37..0000000 --- a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "toadterror:blocks/mossy_sacred_stone_bricks", - "top": "toadterror:blocks/mossy_sacred_stone_bricks", - "side": "toadterror:blocks/mossy_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab_top.json b/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab_top.json deleted file mode 100644 index 8c6b975..0000000 --- a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "toadterror:blocks/mossy_sacred_stone_bricks", - "top": "toadterror:blocks/mossy_sacred_stone_bricks", - "side": "toadterror:blocks/mossy_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs.json deleted file mode 100644 index 618a082..0000000 --- a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "toadterror:blocks/mossy_sacred_stone_bricks", - "top": "toadterror:blocks/mossy_sacred_stone_bricks", - "side": "toadterror:blocks/mossy_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_inner.json b/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_inner.json deleted file mode 100644 index f2c944c..0000000 --- a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "toadterror:blocks/mossy_sacred_stone_bricks", - "top": "toadterror:blocks/mossy_sacred_stone_bricks", - "side": "toadterror:blocks/mossy_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_outer.json b/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_outer.json deleted file mode 100644 index 1517b45..0000000 --- a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "toadterror:blocks/mossy_sacred_stone_bricks", - "top": "toadterror:blocks/mossy_sacred_stone_bricks", - "side": "toadterror:blocks/mossy_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_inventory.json b/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_inventory.json deleted file mode 100644 index 5cae319..0000000 --- a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "toadterror:blocks/mossy_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_post.json b/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_post.json deleted file mode 100644 index 78e841b..0000000 --- a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "toadterror:blocks/mossy_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side.json b/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side.json deleted file mode 100644 index 4ad3ac7..0000000 --- a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_brick_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "toadterror:blocks/mossy_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_bricks.json b/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_bricks.json deleted file mode 100644 index 4160c94..0000000 --- a/src/main/resources/assets/toadterror/models/block/mossy_sacred_stone_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "toadterror:blocks/mossy_sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_slab.json deleted file mode 100644 index f073cd2..0000000 --- a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "toadterror:blocks/sacred_stone_bricks", - "top": "toadterror:blocks/sacred_stone_bricks", - "side": "toadterror:blocks/sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_slab_top.json b/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_slab_top.json deleted file mode 100644 index 5e9382c..0000000 --- a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "toadterror:blocks/sacred_stone_bricks", - "top": "toadterror:blocks/sacred_stone_bricks", - "side": "toadterror:blocks/sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_stairs.json deleted file mode 100644 index 2a6a8cc..0000000 --- a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "toadterror:blocks/sacred_stone_bricks", - "top": "toadterror:blocks/sacred_stone_bricks", - "side": "toadterror:blocks/sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_inner.json b/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_inner.json deleted file mode 100644 index 6538ece..0000000 --- a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "toadterror:blocks/sacred_stone_bricks", - "top": "toadterror:blocks/sacred_stone_bricks", - "side": "toadterror:blocks/sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_outer.json b/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_outer.json deleted file mode 100644 index 28ece9a..0000000 --- a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "toadterror:blocks/sacred_stone_bricks", - "top": "toadterror:blocks/sacred_stone_bricks", - "side": "toadterror:blocks/sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_wall_inventory.json b/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_wall_inventory.json deleted file mode 100644 index 9118e02..0000000 --- a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_wall_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "toadterror:blocks/sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_wall_post.json b/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_wall_post.json deleted file mode 100644 index 18fd783..0000000 --- a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "toadterror:blocks/sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_wall_side.json b/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_wall_side.json deleted file mode 100644 index a6ae963..0000000 --- a/src/main/resources/assets/toadterror/models/block/sacred_stone_brick_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "toadterror:blocks/sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/block/sacred_stone_bricks.json b/src/main/resources/assets/toadterror/models/block/sacred_stone_bricks.json deleted file mode 100644 index e57e251..0000000 --- a/src/main/resources/assets/toadterror/models/block/sacred_stone_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "toadterror:blocks/sacred_stone_bricks" - } -} diff --git a/src/main/resources/assets/toadterror/models/item/broken_toad_eye.json b/src/main/resources/assets/toadterror/models/item/broken_toad_eye.json deleted file mode 100644 index d4535cf..0000000 --- a/src/main/resources/assets/toadterror/models/item/broken_toad_eye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "toadterror:items/broken_toad_eye" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_slab.json deleted file mode 100644 index 312e4c6..0000000 --- a/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/chiseled_sacred_stone_brick_slab" -} diff --git a/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_stairs.json deleted file mode 100644 index 0999ae2..0000000 --- a/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/chiseled_sacred_stone_brick_stairs" -} diff --git a/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_wall.json b/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_wall.json deleted file mode 100644 index b661805..0000000 --- a/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_brick_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/chiseled_sacred_stone_brick_wall_inventory" -} diff --git a/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_bricks.json b/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_bricks.json deleted file mode 100644 index 089468c..0000000 --- a/src/main/resources/assets/toadterror/models/item/chiseled_sacred_stone_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/chiseled_sacred_stone_bricks" -} diff --git a/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_slab.json deleted file mode 100644 index c1030c9..0000000 --- a/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/cracked_sacred_stone_brick_slab" -} diff --git a/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_stairs.json deleted file mode 100644 index b101ae5..0000000 --- a/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/cracked_sacred_stone_brick_stairs" -} diff --git a/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_wall.json b/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_wall.json deleted file mode 100644 index dfad566..0000000 --- a/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_brick_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/cracked_sacred_stone_brick_wall_inventory" -} diff --git a/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_bricks.json b/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_bricks.json deleted file mode 100644 index 5670347..0000000 --- a/src/main/resources/assets/toadterror/models/item/cracked_sacred_stone_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/cracked_sacred_stone_bricks" -} diff --git a/src/main/resources/assets/toadterror/models/item/empty_toad_eye.json b/src/main/resources/assets/toadterror/models/item/empty_toad_eye.json deleted file mode 100644 index f5c047a..0000000 --- a/src/main/resources/assets/toadterror/models/item/empty_toad_eye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "toadterror:items/empty_toad_eye" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_slab.json deleted file mode 100644 index 8bc02c5..0000000 --- a/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/mossy_sacred_stone_brick_slab" -} diff --git a/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_stairs.json deleted file mode 100644 index 3afa7be..0000000 --- a/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/mossy_sacred_stone_brick_stairs" -} diff --git a/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_wall.json b/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_wall.json deleted file mode 100644 index 3f7de76..0000000 --- a/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_brick_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/mossy_sacred_stone_brick_wall_inventory" -} diff --git a/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_bricks.json b/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_bricks.json deleted file mode 100644 index 34a2489..0000000 --- a/src/main/resources/assets/toadterror/models/item/mossy_sacred_stone_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/mossy_sacred_stone_bricks" -} diff --git a/src/main/resources/assets/toadterror/models/item/sacred_stone_brick_slab.json b/src/main/resources/assets/toadterror/models/item/sacred_stone_brick_slab.json deleted file mode 100644 index 123cc40..0000000 --- a/src/main/resources/assets/toadterror/models/item/sacred_stone_brick_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/sacred_stone_brick_slab" -} diff --git a/src/main/resources/assets/toadterror/models/item/sacred_stone_brick_stairs.json b/src/main/resources/assets/toadterror/models/item/sacred_stone_brick_stairs.json deleted file mode 100644 index 2069c6a..0000000 --- a/src/main/resources/assets/toadterror/models/item/sacred_stone_brick_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/sacred_stone_brick_stairs" -} diff --git a/src/main/resources/assets/toadterror/models/item/sacred_stone_brick_wall.json b/src/main/resources/assets/toadterror/models/item/sacred_stone_brick_wall.json deleted file mode 100644 index c46f4ca..0000000 --- a/src/main/resources/assets/toadterror/models/item/sacred_stone_brick_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/sacred_stone_brick_wall_inventory" -} diff --git a/src/main/resources/assets/toadterror/models/item/sacred_stone_bricks.json b/src/main/resources/assets/toadterror/models/item/sacred_stone_bricks.json deleted file mode 100644 index 794a587..0000000 --- a/src/main/resources/assets/toadterror/models/item/sacred_stone_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "toadterror:block/sacred_stone_bricks" -} diff --git a/src/main/resources/assets/toadterror/models/item/toad_chops.json b/src/main/resources/assets/toadterror/models/item/toad_chops.json deleted file mode 100644 index 83e9b64..0000000 --- a/src/main/resources/assets/toadterror/models/item/toad_chops.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "toadterror:items/toad_chops" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/toadterror/models/item/toad_eye.json b/src/main/resources/assets/toadterror/models/item/toad_eye.json deleted file mode 100644 index cc0d623..0000000 --- a/src/main/resources/assets/toadterror/models/item/toad_eye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "toadterror:items/toad_eye" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/toadterror/models/item/toad_sentinel_spawn_egg.json b/src/main/resources/assets/toadterror/models/item/toad_sentinel_spawn_egg.json deleted file mode 100644 index 912b201..0000000 --- a/src/main/resources/assets/toadterror/models/item/toad_sentinel_spawn_egg.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "item/template_spawn_egg" -} \ No newline at end of file diff --git a/src/main/resources/assets/toadterror/textures/blocks/chiseled_sacred_stone_bricks.png b/src/main/resources/assets/toadterror/textures/block/chiseled_sacred_stone_bricks.png similarity index 100% rename from src/main/resources/assets/toadterror/textures/blocks/chiseled_sacred_stone_bricks.png rename to src/main/resources/assets/toadterror/textures/block/chiseled_sacred_stone_bricks.png diff --git a/src/main/resources/assets/toadterror/textures/blocks/cracked_sacred_stone_bricks.png b/src/main/resources/assets/toadterror/textures/block/cracked_sacred_stone_bricks.png similarity index 100% rename from src/main/resources/assets/toadterror/textures/blocks/cracked_sacred_stone_bricks.png rename to src/main/resources/assets/toadterror/textures/block/cracked_sacred_stone_bricks.png diff --git a/src/main/resources/assets/toadterror/textures/blocks/mossy_sacred_stone_bricks.png b/src/main/resources/assets/toadterror/textures/block/mossy_sacred_stone_bricks.png similarity index 100% rename from src/main/resources/assets/toadterror/textures/blocks/mossy_sacred_stone_bricks.png rename to src/main/resources/assets/toadterror/textures/block/mossy_sacred_stone_bricks.png diff --git a/src/main/resources/assets/toadterror/textures/blocks/sacred_stone_bricks.png b/src/main/resources/assets/toadterror/textures/block/sacred_stone_bricks.png similarity index 100% rename from src/main/resources/assets/toadterror/textures/blocks/sacred_stone_bricks.png rename to src/main/resources/assets/toadterror/textures/block/sacred_stone_bricks.png diff --git a/src/main/resources/data/toadterror/tags/blocks/sacred_stone_bricks.json b/src/main/resources/data/toadterror/tags/blocks/sacred_stone_bricks.json deleted file mode 100644 index fb4354d..0000000 --- a/src/main/resources/data/toadterror/tags/blocks/sacred_stone_bricks.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "toadterror:sacred_stone_bricks", - "toadterror:mossy_sacred_stone_bricks", - "toadterror:cracked_sacred_stone_bricks", - "toadterror:chiseled_sacred_stone_bricks" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toadterror/tags/items/sacred_stone_bricks.json b/src/main/resources/data/toadterror/tags/items/sacred_stone_bricks.json deleted file mode 100644 index fb4354d..0000000 --- a/src/main/resources/data/toadterror/tags/items/sacred_stone_bricks.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "toadterror:sacred_stone_bricks", - "toadterror:mossy_sacred_stone_bricks", - "toadterror:cracked_sacred_stone_bricks", - "toadterror:chiseled_sacred_stone_bricks" - ] -} \ No newline at end of file