Port to 1.16.4

.gitignore

@@ -20,3 +20,4 @@ build
 # other
 eclipse
 run
+logs

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}")
 }

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
+    imdlib_version=1.16.3-5930b3390817eff4f911a6ece32baa40c6388864
+    curios_version=1.16.4-4.0.3.0

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

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"
+    }
+  }
+}

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"
+    }
+  }
+}