src/generated/resources/.cache/cache

@@ -5,7 +5,6 @@ f4b3482fd851ad2e0071caf4aedbd7ee45fe0a31 assets/actuallyadditions/blockstates/bl
 c35de34900af2424569caedd4d331e4fbca086df assets/actuallyadditions/blockstates/black_quartz_brick_slab.json
 7ddec82b65e9ded21ce7660667de04d57d4aee2e assets/actuallyadditions/blockstates/black_quartz_brick_stair.json
 25d8557a7efa16df9937a8716bf92587a96fef3f assets/actuallyadditions/blockstates/black_quartz_brick_wall.json
-033a5ecdf1811e684ddd8b80e1ff5fd9f1757cce assets/actuallyadditions/blockstates/black_quartz_ore.json
 31b696d84e073be37ae3ce210463fd1568cdce47 assets/actuallyadditions/blockstates/black_quartz_pillar_block.json
 f89956366d02b0f1e5122ea0fdb23813ebac8858 assets/actuallyadditions/blockstates/black_quartz_pillar_slab.json
 73a53fb6db64ec85e180e9d493f7dca51d29da62 assets/actuallyadditions/blockstates/black_quartz_pillar_stair.json
@@ -16,7 +15,6 @@ ac5d75bda4dc24894fb380d5e3ec751a0aa5c498 assets/actuallyadditions/blockstates/bl
 5dea2f0e554a5ecb9b7f547526d745ff85353a40 assets/actuallyadditions/blockstates/breaker.json
 48eb2c3f1180c04e668046abc65dbadeaaf3aed6 assets/actuallyadditions/blockstates/canola.json
 5101139337dd4e5a057333e9e424df47f7138c93 assets/actuallyadditions/blockstates/canola_press.json
-c8d5786cd66f324b82d201e6e4eb0ae0a5978d13 assets/actuallyadditions/blockstates/charcoal_block.json
 998b11d1f63e153ab2f8bd11830405611c8886a2 assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json
 84525ecc49bdb7285b34ff5028fc25c198f03ccd assets/actuallyadditions/blockstates/chiseled_black_quartz_slab.json
 c2fe87cf0b2fea00b52ab59cd6a90d3d876b1218 assets/actuallyadditions/blockstates/chiseled_black_quartz_stair.json
@@ -62,9 +60,9 @@ f2a85c0cd664f17cef8aa41432ca8bc54088b155 assets/actuallyadditions/blockstates/fi
 4b8bd1dd56edbffa0478a287d8c07925ce18b0da assets/actuallyadditions/blockstates/fluid_placer.json
 03e4a9e1203c4325eed9f1178bf935f1578a0f34 assets/actuallyadditions/blockstates/greenhouse_glass.json
 573131431fb2e4ce5d2c2bf1f5aa76a6b9f8b996 assets/actuallyadditions/blockstates/heat_collector.json
-9547fc14c9420044e90419645248426c4462fb19 assets/actuallyadditions/blockstates/hopping_item_interface.json
 877d2ceed901ad947704e6c4496f75400bb55701 assets/actuallyadditions/blockstates/iron_casing.json
-0454474609a1f121e53b9350798c82f28eb3e97c assets/actuallyadditions/blockstates/item_interface.json
+faf45dd324cb2eb2fb41f4cb4e8a4f0c17354e55 assets/actuallyadditions/blockstates/item_viewer.json
+15221b5e677291096877b0521a9b25b45e481696 assets/actuallyadditions/blockstates/item_viewer_hopping.json
 78e22fe7ed75763a0b1380f6bbdf6d2ee75349c8 assets/actuallyadditions/blockstates/lamp_black.json
 e7303f1950c105585a232e129c08aec4ba4757b4 assets/actuallyadditions/blockstates/lamp_blue.json
 91a5344f0a56cf0f627545aeb280c1d3c078805b assets/actuallyadditions/blockstates/lamp_brown.json
@@ -129,7 +127,6 @@ fa8ed5a44ee7475368eaa6c8afcd2fdcc0342a4f assets/actuallyadditions/models/block/b
 49ac4ea10c1957475125ded8689aae1f03399514 assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json
 6ecc97ef2aa8e958f1c21a67e54fc4516087bba7 assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json
 f783b35710afcb46e17bf5d5c02025910cc35b3a assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json
-471a4ad9bb44c62639353cb26e275463654cb1f6 assets/actuallyadditions/models/block/black_quartz_ore.json
 0c025b6788abd7f33eb7a15cac85933dbe119596 assets/actuallyadditions/models/block/black_quartz_pillar_slab.json
 b87c74333526c7b52df48a4a09591f6116fe4b03 assets/actuallyadditions/models/block/black_quartz_pillar_slab_top.json
 480c94b0c400ccea983bac8d23662fb8cbe84da2 assets/actuallyadditions/models/block/black_quartz_pillar_stair.json
@@ -147,7 +144,6 @@ f277709029801d7292d300b13876189a32d1b3a4 assets/actuallyadditions/models/block/b
 1c617e7845d3211b4f7cda38a9bee59208de8c23 assets/actuallyadditions/models/block/black_quartz_wall_side.json
 46c7aa812a7af600d4f927eba5fa3f5b4956fa28 assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json
 e3b1972935fa68ca5feaad8f7412530df5d6b8a2 assets/actuallyadditions/models/block/canola.json
-49e551c7f9943bd24b1fa09fb65836bae48096df assets/actuallyadditions/models/block/charcoal_block.json
 48a6232ced27b9a35fc236705adb2ea817a03b3f assets/actuallyadditions/models/block/chiseled_black_quartz_slab.json
 85a969896c0aad4f70878d4c075c6c0885a5ade4 assets/actuallyadditions/models/block/chiseled_black_quartz_slab_top.json
 f0ee4cd74049c6a00f62166335348602f7b8972d assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json
@@ -220,16 +216,6 @@ ec9fa5a527a295dff5372ebd0df98372874c77fe assets/actuallyadditions/models/block/s
 83da16f21abc2ec8361ecc3b1bda2852d48dbd97 assets/actuallyadditions/models/block/wood_casing.json
 0753c814deb4cc275d0fce0b87ec12ba1b12c0eb assets/actuallyadditions/models/item/advanced_coil.json
 637043b066b31f811a9ed94de66d965333f35dd3 assets/actuallyadditions/models/item/advanced_leaf_blower.json
-545e115b1a4e92b2dae062e350e9ebf0897f0a6d assets/actuallyadditions/models/item/advanced_ring_of_fire_resistance.json
-d9f71f81d10a51b3a8084ee4a631052d688b098f assets/actuallyadditions/models/item/advanced_ring_of_haste.json
-080c9e9f8b7bd9306c5f338c570628c4e21d8fa1 assets/actuallyadditions/models/item/advanced_ring_of_invisibility.json
-97ffe564dc19a9e0bb87372365a27333f34ca3b2 assets/actuallyadditions/models/item/advanced_ring_of_jump_boost.json
-a5f120637438fce6d7e5086b2ff7e20af4d1fc08 assets/actuallyadditions/models/item/advanced_ring_of_night_vision.json
-66b7d196d0929c1935bd90f83f47ab408e3c4ae0 assets/actuallyadditions/models/item/advanced_ring_of_regeneration.json
-b44b89c4bdeba59dabbd1866ba2aa51bf362dfe2 assets/actuallyadditions/models/item/advanced_ring_of_resistance.json
-06019b99bfb91567fa3ecfe9477445961be6ee3f assets/actuallyadditions/models/item/advanced_ring_of_speed.json
-8d0f5847089b6026a6f6e6733e9b5a04195b5560 assets/actuallyadditions/models/item/advanced_ring_of_strength.json
-17dc79ab2bb098c6b99a924b226edf8a17d75ef1 assets/actuallyadditions/models/item/advanced_ring_of_water_breathing.json
 c2e3b2291b34f85eab9907c9266c6198d8478001 assets/actuallyadditions/models/item/atomic_reconstructor.json
 8c837329c79dd9f611a860f32b0184674ad8fb3c assets/actuallyadditions/models/item/basic_coil.json
 bbd32f2ac5a2a55332aa9b73fd06aa1462fdd29a assets/actuallyadditions/models/item/bats_wing.json
@@ -241,7 +227,6 @@ bbd32f2ac5a2a55332aa9b73fd06aa1462fdd29a assets/actuallyadditions/models/item/ba
 14391f4c4d029a354d40a7aa26af4f279dba6684 assets/actuallyadditions/models/item/black_quartz_brick_slab.json
 c3cf76ca67515c059d3eaf6b70369151a4f29831 assets/actuallyadditions/models/item/black_quartz_brick_stair.json
 fb3f2411b48e77c8230b9c9316ac7d214e505032 assets/actuallyadditions/models/item/black_quartz_brick_wall.json
-cd408ce9d0cc7ab33fe7327af3ebcc177fef6690 assets/actuallyadditions/models/item/black_quartz_ore.json
 50075e8e8b428b161113d45d583f6eae5e8360f3 assets/actuallyadditions/models/item/black_quartz_pillar_block.json
 5614453539110f6214c52d47c12aa1ce05447d53 assets/actuallyadditions/models/item/black_quartz_pillar_slab.json
 3bd2d755493ff85b07dff3cb31d0cc040e6150c5 assets/actuallyadditions/models/item/black_quartz_pillar_stair.json
@@ -254,7 +239,6 @@ f3282e55e71d26a32cee1287881ac2d5e91c30a8 assets/actuallyadditions/models/item/ca
 08c70d561c219bb4c6d21b5f56192df81f054e0a assets/actuallyadditions/models/item/canola_press.json
 0507025fadef30e363cbc825265576c782880f7b assets/actuallyadditions/models/item/canola_seeds.json
 b0f7c3915b646ccd27ca6ff40517e19e2a0fb7ef assets/actuallyadditions/models/item/canolaoil.json
-83b47876ba2c85d3ba83e36ee9b02a8d458f7230 assets/actuallyadditions/models/item/charcoal_block.json
 36179c5cc77dc38364a1931f2fabbf846ef9c39d assets/actuallyadditions/models/item/chiseled_black_quartz_block.json
 27c8ed9e39b600161a6a327db0ac53e10acc13bb assets/actuallyadditions/models/item/chiseled_black_quartz_slab.json
 0b574626d1648584c3afa6ee0ccc974fb68bb425 assets/actuallyadditions/models/item/chiseled_black_quartz_stair.json
@@ -389,10 +373,10 @@ cb44cc7dc93b234b6173bdf4d5152eb639c945b0 assets/actuallyadditions/models/item/gr
 5190164f6f3a4907439ab7893ba0f5b17dd4b44f assets/actuallyadditions/models/item/hairy_ball.json
 0d5a4fcc37d925f2adc52d7d3ddda708871dc4b8 assets/actuallyadditions/models/item/handheld_filler.json
 340d0e0eca2fe4be4577a40ba9f530186828cd4b assets/actuallyadditions/models/item/heat_collector.json
-aac45de00a0838a7a955e2bc56e125ef29c19a47 assets/actuallyadditions/models/item/hopping_item_interface.json
 5513baa5bd2d53702880a1ab6bb23d7159ebbd89 assets/actuallyadditions/models/item/iron_aiot.json
 a4bc0e00bec22d8a0da612b6dfe4dba7688a2758 assets/actuallyadditions/models/item/iron_casing.json
-971f45a5a05b2c399e8075597b0826965f6b6f0b assets/actuallyadditions/models/item/item_interface.json
+32974ab97db39decad106e89e5c051d79e87624c assets/actuallyadditions/models/item/item_viewer.json
+f18d781df4b1659ee8e38313db97360e5bbfe813 assets/actuallyadditions/models/item/item_viewer_hopping.json
 d676c5b6ddcc920059a70e8107faa0dbf023b05c assets/actuallyadditions/models/item/knife.json
 1e3d4970b8a5ed46ed72deedc5c38d8347658d2f assets/actuallyadditions/models/item/lamp_black.json
 8b730988dfb2cb6caa448647d245f9a4160c4247 assets/actuallyadditions/models/item/lamp_blue.json
@@ -495,18 +479,8 @@ f456241999745258c54b26e50aed4fdd2a995d9e assets/actuallyadditions/models/item/ri
 dcfcded1a57642706d6fc9bc7bdcf5338b18d183 assets/actuallyadditions/models/item/rice_seeds.json
 18087d4ee31e7ced9db334fe0036acd890f2f974 assets/actuallyadditions/models/item/rice_slimeball.json
 f8563b3660b69decda6e510e589c55ae568e941e assets/actuallyadditions/models/item/ring.json
-9fe5cd51e6bce1a40c4e9513629e3ff33ca1e8f5 assets/actuallyadditions/models/item/ring_of_fire_resistance.json
 c48d9fe3a0051a30496348f7dc22dc142be3a063 assets/actuallyadditions/models/item/ring_of_growth.json
-aa25eac98808f348703e47eb72e72d8922f91a0f assets/actuallyadditions/models/item/ring_of_haste.json
-5f44652db6124a9045449ba41f7d5e3368d574e0 assets/actuallyadditions/models/item/ring_of_invisibility.json
-4d1717c4a8ce82e8fcc37b81a80b6812407843a4 assets/actuallyadditions/models/item/ring_of_jump_boost.json
 6d2c70e9d473147c72b70fbea292f90dd50ab5c2 assets/actuallyadditions/models/item/ring_of_magnetizing.json
-9fd0c798d9fc66f7f0c7bef6540ad5b044041fb9 assets/actuallyadditions/models/item/ring_of_night_vision.json
-785231b5532e03c7798b47e20587e9b3afe1ac83 assets/actuallyadditions/models/item/ring_of_regeneration.json
-44ca21d87e5a88b1ef023eaeac6b49916f8239c2 assets/actuallyadditions/models/item/ring_of_resistance.json
-effc6399e0ff29ede6bc0c506ff3d4220b934b90 assets/actuallyadditions/models/item/ring_of_speed.json
-ab0b21a1a76f80574d19a31ef7be2f9bf332b247 assets/actuallyadditions/models/item/ring_of_strength.json
-5b216a312b45879855124a48b35a15e6ec3c2207 assets/actuallyadditions/models/item/ring_of_water_breathing.json
 8334f0d8c5364b930a8d674cfe86f8b4461b03f3 assets/actuallyadditions/models/item/shock_suppressor.json
 ef7f9a92f8b47c3de7f732172f7bb0d996b38718 assets/actuallyadditions/models/item/single_battery.json
 9f4437d75b9112335d96ca928da9d4e73a573f50 assets/actuallyadditions/models/item/smooth_black_quartz_block.json
@@ -630,9 +604,9 @@ c5ef6af5b4a1c108a1995e29f4889df68e4b1ee5 data/actuallyadditions/recipes/ethetic_
 6ed420df34b5b17fcef2ad2c3f4fb4ed35bf739d data/actuallyadditions/recipes/firework_box.json
 7faeab31bd3d1e7a935a3f36d82cdd54466a72e4 data/actuallyadditions/recipes/gold_aiot.json
 e86bd38ee24e97ed93d4b133af3850594e7b45de data/actuallyadditions/recipes/handheld_filler.json
-9b8ee8f545ef898e993b897d422fc54492854d34 data/actuallyadditions/recipes/hopping_item_interface.json
 a65757e5037582adc3b69b21b533af3f045c0eb8 data/actuallyadditions/recipes/iron_aiot.json
-94353c0c347081fcd8060f5e6f5686556785cfd9 data/actuallyadditions/recipes/item_interface.json
+ad12750777cb66c3e9f1943a83bcd83c0fe635d1 data/actuallyadditions/recipes/item_viewer.json
+4a13de3f3dc0874020c283ecf29eaea2fdf13693 data/actuallyadditions/recipes/item_viewer_hopping.json
 64c7d859937622662bb7e029c0e6f1d62d45d3be data/actuallyadditions/recipes/laser/crystalize_diamatine_crystal.json
 47add6ccc4dea960cd57fefc6081e6cd781225c2 data/actuallyadditions/recipes/laser/crystalize_diamatine_crystal_block.json
 0888ceaedf3303126f9f0c7cb2cad2139a25bd81 data/actuallyadditions/recipes/laser/crystalize_emeradic_crystal.json

src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_ore.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "actuallyadditions:block/black_quartz_ore"
-    }
-  }
-}

src/generated/resources/assets/actuallyadditions/blockstates/charcoal_block.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "actuallyadditions:block/charcoal_block"
-    }
-  }
-}

src/generated/resources/assets/actuallyadditions/blockstates/hopping_item_interface.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "actuallyadditions:block/hopping_item_interface"
-    }
-  }
-}

src/generated/resources/assets/actuallyadditions/blockstates/item_interface.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "actuallyadditions:block/item_interface"
-    }
-  }
-}

src/generated/resources/assets/actuallyadditions/blockstates/item_viewer.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "actuallyadditions:block/item_viewer"
+    }
+  }
+}

src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "actuallyadditions:block/item_viewer_hopping"
+    }
+  }
+}

src/generated/resources/assets/actuallyadditions/models/block/black_quartz_ore.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:block/cube_all",
-  "textures": {
-    "all": "actuallyadditions:block/black_quartz_ore"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_fire_resistance.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_fire_resistance"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_haste.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_haste"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_invisibility.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_invisibility"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_jump_boost.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_jump_boost"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_night_vision.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_night_vision"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_regeneration.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_regeneration"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_resistance.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_resistance"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_speed.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_speed"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_strength.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_strength"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_water_breathing.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/advanced_ring_of_water_breathing"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/black_quartz_ore.json

@@ -1,3 +0,0 @@
-{
-  "parent": "actuallyadditions:block/black_quartz_ore"
-}

src/generated/resources/assets/actuallyadditions/models/item/charcoal_block.json

@@ -1,3 +0,0 @@
-{
-  "parent": "actuallyadditions:block/charcoal_block"
-}

src/generated/resources/assets/actuallyadditions/models/item/hopping_item_interface.json

@@ -1,3 +0,0 @@
-{
-  "parent": "actuallyadditions:block/hopping_item_interface"
-}

src/generated/resources/assets/actuallyadditions/models/item/item_interface.json

@@ -1,3 +0,0 @@
-{
-  "parent": "actuallyadditions:block/item_interface"
-}

src/generated/resources/assets/actuallyadditions/models/item/item_viewer.json

@@ -0,0 +1,3 @@
+{
+  "parent": "actuallyadditions:block/item_viewer"
+}

src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping.json

@@ -0,0 +1,3 @@
+{
+  "parent": "actuallyadditions:block/item_viewer_hopping"
+}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_fire_resistance.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_fire_resistance"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_haste.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_haste"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_invisibility.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_invisibility"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_jump_boost.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_jump_boost"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_night_vision.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_night_vision"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_regeneration.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_regeneration"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_resistance.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_resistance"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_speed.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_speed"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_strength.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_strength"
-  }
-}

src/generated/resources/assets/actuallyadditions/models/item/ring_of_water_breathing.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "actuallyadditions:item/ring_of_water_breathing"
-  }
-}

src/generated/resources/data/actuallyadditions/recipes/hopping_item_interface.json

@@ -1,11 +0,0 @@
-{
-  "type": "minecraft:crafting_shapeless",
-  "ingredients": [
-    {
-      "item": "actuallyadditions:item_interface"
-    }
-  ],
-  "result": {
-    "item": "actuallyadditions:hopping_item_interface"
-  }
-}

src/generated/resources/data/actuallyadditions/recipes/item_viewer.json

@@ -20,6 +20,6 @@
     }
   },
   "result": {
-    "item": "actuallyadditions:item_interface"
+    "item": "actuallyadditions:item_viewer"
   }
 }

src/generated/resources/data/actuallyadditions/recipes/item_viewer_hopping.json

@@ -0,0 +1,11 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "item": "actuallyadditions:item_viewer"
+    }
+  ],
+  "result": {
+    "item": "actuallyadditions:item_viewer_hopping"
+  }
+}

src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java

@@ -121,12 +121,12 @@ public class BlockStateGenerator extends BlockStateProvider {
         buildCubeAll(ActuallyBlocks.FLAX);
         buildCubeAll(ActuallyBlocks.COFFEE);
 
-        buildCubeAll(ActuallyBlocks.CHARCOAL_BLOCK);
+        //buildCubeAll(ActuallyBlocks.CHARCOAL); //TODO hmm?
         buildCubeAll(ActuallyBlocks.ENDER_CASING);
         buildCubeAll(ActuallyBlocks.ENDER_PEARL_BLOCK);
         buildCubeAll(ActuallyBlocks.IRON_CASING);
         standardBlock(ActuallyBlocks.LAVA_FACTORY_CASING);
-        buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_ORE);
+        //buildCubeAll(ActuallyBlocks.ORE_BLACK_QUARTZ); //TODO HMM
         buildCubeAll(ActuallyBlocks.WOOD_CASING);
 
         // Quartz

src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java

@@ -145,10 +145,8 @@ public class ActuallyAdditions {
     }
 
     private void onConfigReload(ModConfig.ModConfigEvent event) {
-        Item item1 = ForgeRegistries.ITEMS.getValue(new ResourceLocation(CommonConfig.OTHER.REDSTONECONFIGURATOR.get()));
+        Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(CommonConfig.OTHER.REDSTONECONFIGURATOR.get()));
-        Item item2 = ForgeRegistries.ITEMS.getValue(new ResourceLocation(CommonConfig.OTHER.RELAYCONFIGURATOR.get()));
+        CommonConfig.OTHER.redstoneConfigureItem = item != null?item: Items.AIR;
-        CommonConfig.OTHER.redstoneConfigureItem = item1 != null?item1: Items.AIR;
-        CommonConfig.OTHER.relayConfigureItem = item2 != null?item2: Items.AIR;
     }
 
     private void clientSetup(FMLClientSetupEvent event) {

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java

@@ -156,9 +156,9 @@ public final class ActuallyBlocks {
     // Interface Blocks
     public static final AABlockReg<BlockPlayerInterface, AABlockItem, TileEntityPlayerInterface> PLAYER_INTERFACE = new AABlockReg<>("player_interface", BlockPlayerInterface::new,
         (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityPlayerInterface::new);
-    public static final AABlockReg<BlockItemInterface, AABlockItem, TileEntityItemInterface> ITEM_INTERFACE = new AABlockReg<>("item_interface", BlockItemInterface::new,
+    public static final AABlockReg<BlockItemInterface, AABlockItem, TileEntityItemInterface> ITEM_INTERFACE = new AABlockReg<>("item_viewer", BlockItemInterface::new,
         (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityItemInterface::new);
-    public static final AABlockReg<BlockItemInterfaceHopping, AABlockItem, TileEntityItemInterfaceHopping> ITEM_INTERFACE_HOPPING = new AABlockReg<>("hopping_item_interface", BlockItemInterfaceHopping::new,
+    public static final AABlockReg<BlockItemInterfaceHopping, AABlockItem, TileEntityItemInterfaceHopping> ITEM_INTERFACE_HOPPING = new AABlockReg<>("item_viewer_hopping", BlockItemInterfaceHopping::new,
         (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityItemInterfaceHopping::new);
 
     // Phantom stuff
@@ -208,10 +208,6 @@ public final class ActuallyBlocks {
     // Misc building blocks
     public static final AABlockReg<ActuallyBlock, AABlockItem, ?> ENDER_PEARL_BLOCK = new AABlockReg<>("ender_pearl_block", () -> new ActuallyBlock(miscBlockProperties),
         (b) -> new AABlockItem(b, defaultBlockItemProperties));
-    public static final AABlockReg<ActuallyBlock, AABlockItem, ?> CHARCOAL_BLOCK = new AABlockReg<>("charcoal_block", () -> new ActuallyBlock(miscBlockProperties),
-        (b) -> new AABlockItem(b, defaultBlockItemProperties));
-    public static final AABlockReg<ActuallyBlock, AABlockItem, ?> BLACK_QUARTZ_ORE = new AABlockReg<>("black_quartz_ore", () -> new ActuallyBlock(miscBlockProperties),
-        (b) -> new AABlockItem(b, defaultBlockItemProperties));
 
     public static final AABlockReg<ActuallyBlock, AABlockItem, ?> ETHETIC_GREEN_BLOCK = new AABlockReg<>("ethetic_green_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties));
     public static final AABlockReg<ActuallyBlock, AABlockItem, ?> ETHETIC_WHITE_BLOCK = new AABlockReg<>("ethetic_white_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties));
@@ -258,7 +254,6 @@ public final class ActuallyBlocks {
     public static final AABlockReg<BlockTinyTorch, AABlockItem, ?> TINY_TORCH = new AABlockReg<>("tiny_torch", BlockTinyTorch::new,
         (b) -> new AABlockItem(b, defaultBlockItemProperties));
 
-
     //public static final AABlockReg<> WILD_PLANT = new AABlockReg<>("wild", BlockWildPlant::new); //TODO: what is this?
 
     //TODO: Are plants normal blocks / blockitems? i have no idea... news at 11...

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java

@@ -15,7 +15,6 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.laser.Network;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.FullyDirectionalBlock;
-import de.ellpeck.actuallyadditions.mod.config.CommonConfig;
 import de.ellpeck.actuallyadditions.mod.config.ConfigValues;
 import de.ellpeck.actuallyadditions.mod.items.ItemEngineerGoggles;
 import de.ellpeck.actuallyadditions.mod.items.ItemLaserRelayUpgrade;
@@ -188,7 +187,7 @@ public class BlockLaserRelay extends FullyDirectionalBlock.Container implements
                         if (compass) {
                             expl = relay.getCompassDisplayString();
                         } else {
-                            expl = TextFormatting.GRAY.toString() + TextFormatting.ITALIC + StringUtil.localizeFormatted("info." + ActuallyAdditions.MODID + ".laserRelay.mode.noCompasss", StringUtil.localize(CommonConfig.OTHER.relayConfigureItem.getDescriptionId() + ".name"));
+                            expl = TextFormatting.GRAY.toString() + TextFormatting.ITALIC + StringUtil.localizeFormatted("info." + ActuallyAdditions.MODID + ".laserRelay.mode.noCompasss", StringUtil.localize(ConfigValues.itemCompassConfigurator.getDescriptionId() + ".name"));
                         }
 
                         StringUtil.drawSplitString(minecraft.font, expl, resolution.getGuiScaledWidth() / 2 + 5, resolution.getGuiScaledHeight() / 2 + 15, Integer.MAX_VALUE, StringUtil.DECIMAL_COLOR_WHITE, true);

src/main/java/de/ellpeck/actuallyadditions/mod/config/CommonConfig.java

@@ -33,9 +33,7 @@ public class CommonConfig {
         public static ForgeConfigSpec.BooleanValue MOST_BLAND_PERSON_EVER;
         public static ForgeConfigSpec.IntValue ELEVEN;
         public static ForgeConfigSpec.ConfigValue<String> REDSTONECONFIGURATOR;
-        public static ForgeConfigSpec.ConfigValue<String> RELAYCONFIGURATOR;
         public static Item redstoneConfigureItem = Items.AIR;
-        public static Item relayConfigureItem = Items.AIR;
 
 
         public static void build() {
@@ -91,7 +89,6 @@ public class CommonConfig {
             ELEVEN = BUILDER.comment("11?").defineInRange("whatIs11", 11, 0, 12);
 
             REDSTONECONFIGURATOR = BUILDER.comment("define the item used to configure Redstone Mode").define("redstoneConfigurator", Items.REDSTONE_TORCH.getRegistryName().toString(), obj -> obj instanceof String && ResourceLocation.isValidResourceLocation((String) obj));
-            RELAYCONFIGURATOR = BUILDER.comment("define the item used to configure Direction in laser relays").define("relayConfigurator", Items.COMPASS.getRegistryName().toString(), obj -> obj instanceof String && ResourceLocation.isValidResourceLocation((String) obj));
 
             BUILDER.pop();
         }

src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java

@@ -30,7 +30,6 @@ import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.Set;
-import java.util.function.Supplier;
 
 public final class ActuallyItems {
     public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ActuallyAdditions.MODID);
@@ -164,26 +163,9 @@ public final class ActuallyItems {
     public static final RegistryObject<Item> LEAF_BLOWER = ITEMS.register("leaf_blower", () -> new ItemLeafBlower(false));
     public static final RegistryObject<Item> ADVANCED_LEAF_BLOWER = ITEMS.register("advanced_leaf_blower", () -> new ItemLeafBlower(true));
 
-    public static final RegistryObject<Item> RING_OF_SPEED = ITEMS.register("ring_of_speed", basicItem());
+    // TODO [port] flatten
-    public static final RegistryObject<Item> RING_OF_HASTE = ITEMS.register("ring_of_haste", basicItem());
+    //public static final RegistryObject<Item> POTION_RING = ITEMS.register("potion_ring", () -> new ItemPotionRing(false));
-    public static final RegistryObject<Item> RING_OF_STRENGTH = ITEMS.register("ring_of_strength", basicItem());
+    //public static final RegistryObject<Item> POTION_RING_ADVANCED = ITEMS.register("potion_ring_advanced", () -> new ItemPotionRing(true));
-    public static final RegistryObject<Item> RING_OF_JUMP_BOOST = ITEMS.register("ring_of_jump_boost", basicItem());
-    public static final RegistryObject<Item> RING_OF_REGENERATION = ITEMS.register("ring_of_regeneration", basicItem());
-    public static final RegistryObject<Item> RING_OF_RESISTANCE = ITEMS.register("ring_of_resistance", basicItem());
-    public static final RegistryObject<Item> RING_OF_FIRE_RESISTANCE = ITEMS.register("ring_of_fire_resistance", basicItem());
-    public static final RegistryObject<Item> RING_OF_WATER_BREATHING = ITEMS.register("ring_of_water_breathing", basicItem());
-    public static final RegistryObject<Item> RING_OF_INVISIBILITY = ITEMS.register("ring_of_invisibility", basicItem());
-    public static final RegistryObject<Item> RING_OF_NIGHT_VISION = ITEMS.register("ring_of_night_vision", basicItem());
-    public static final RegistryObject<Item> ADVANCED_RING_OF_SPEED = ITEMS.register("advanced_ring_of_speed", basicItem());
-    public static final RegistryObject<Item> ADVANCED_RING_OF_HASTE = ITEMS.register("advanced_ring_of_haste", basicItem());
-    public static final RegistryObject<Item> ADVANCED_RING_OF_STRENGTH = ITEMS.register("advanced_ring_of_strength", basicItem());
-    public static final RegistryObject<Item> ADVANCED_RING_OF_JUMP_BOOST = ITEMS.register("advanced_ring_of_jump_boost", basicItem());
-    public static final RegistryObject<Item> ADVANCED_RING_OF_REGENERATION = ITEMS.register("advanced_ring_of_regeneration", basicItem());
-    public static final RegistryObject<Item> ADVANCED_RING_OF_RESISTANCE = ITEMS.register("advanced_ring_of_resistance", basicItem());
-    public static final RegistryObject<Item> ADVANCED_RING_OF_FIRE_RESISTANCE = ITEMS.register("advanced_ring_of_fire_resistance", basicItem());
-    public static final RegistryObject<Item> ADVANCED_RING_OF_WATER_BREATHING = ITEMS.register("advanced_ring_of_water_breathing", basicItem());
-    public static final RegistryObject<Item> ADVANCED_RING_OF_INVISIBILITY = ITEMS.register("advanced_ring_of_invisibility", basicItem());
-    public static final RegistryObject<Item> ADVANCED_RING_OF_NIGHT_VISION = ITEMS.register("advanced_ring_of_night_vision", basicItem());
 
     public static final RegistryObject<Item> HAIRY_BALL = ITEMS.register("hairy_ball", ItemHairBall::new);
     public static final RegistryObject<Item> COFFEE_BEANS = ITEMS.register("coffee_beans", ItemCoffeeBean::new);
@@ -309,11 +291,11 @@ public final class ActuallyItems {
         CRUSHED_QUARTZ, CRUSHED_COAL, CRUSHED_BLACK_QUARTZ, */
         SOLIDIFIED_EXPERIENCE, LEAF_BLOWER, ADVANCED_LEAF_BLOWER,
         RING_OF_GROWTH, RING_OF_MAGNETIZING,
-        RING_OF_SPEED, RING_OF_HASTE, RING_OF_STRENGTH, RING_OF_JUMP_BOOST,
+/*        RING_OF_SPEED, RING_OF_HASTE, RING_OF_STRENGTH, RING_OF_JUMP_BOOST,
         RING_OF_REGENERATION, RING_OF_RESISTANCE, RING_OF_FIRE_RESISTANCE, RING_OF_WATER_BREATHING, RING_OF_INVISIBILITY,
         RING_OF_NIGHT_VISION, ADVANCED_RING_OF_SPEED, ADVANCED_RING_OF_HASTE, ADVANCED_RING_OF_STRENGTH,
         ADVANCED_RING_OF_JUMP_BOOST, ADVANCED_RING_OF_REGENERATION, ADVANCED_RING_OF_RESISTANCE, ADVANCED_RING_OF_FIRE_RESISTANCE,
-        ADVANCED_RING_OF_WATER_BREATHING, ADVANCED_RING_OF_INVISIBILITY, ADVANCED_RING_OF_NIGHT_VISION,
+        ADVANCED_RING_OF_WATER_BREATHING, ADVANCED_RING_OF_INVISIBILITY, ADVANCED_RING_OF_NIGHT_VISION,*/
         HAIRY_BALL,
         COFFEE_BEANS, RICE_SEEDS, CANOLA_SEEDS, FLAX_SEEDS, COFFEE_SEEDS ,
         QUARTZ_HELMET, QUARTZ_CHEST, QUARTZ_LEGGINGS, QUARTZ_BOOTS, QUARTZ_PICKAXE, QUARTZ_AXE, QUARTZ_SHOVEL, QUARTZ_SWORD, QUARTZ_HOE,
@@ -326,9 +308,6 @@ public final class ActuallyItems {
         ENORI_PICKAXE, ENORI_AXE, ENORI_SHOVEL, ENORI_SWORD, ENORI_HOE, ENORI_HELMET, ENORI_CHEST, ENORI_LEGGINGS, ENORI_BOOTS, ENORI_AIOT
     );
 
-    private static Supplier<Item> basicItem() {
-        return () -> new Item(defaultProps());
-    }
     public static Item.Properties defaultProps() {
         return new Item.Properties().tab(ActuallyAdditions.GROUP);
     }

src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java

@@ -30,9 +30,10 @@ public enum ThePotionRings {
             Rarity.UNCOMMON,
             new ItemStack(Items.SUGAR)
     ),
+    //Slowness
     HASTE(
             14270531,
-        Effects.DIG_SPEED,
+            Effects.DIG_SPEED, // todo: wrong
             0,
             1,
             10,
@@ -40,9 +41,10 @@ public enum ThePotionRings {
             Rarity.EPIC,
             new ItemStack(Items.REPEATER)
     ),
+    //Mining Fatigue
     STRENGTH(
             9643043,
-        Effects.DAMAGE_BOOST,
+            Effects.DAMAGE_BOOST, // TODO: wrong?
             0,
             1,
             10,
@@ -50,6 +52,8 @@ public enum ThePotionRings {
             Rarity.RARE,
             new ItemStack(Items.BLAZE_POWDER)
     ),
+    //Health (Not Happening)
+    //Damage
     JUMP_BOOST(
             7889559,
             Effects.JUMP,
@@ -60,6 +64,7 @@ public enum ThePotionRings {
             Rarity.RARE,
             new ItemStack(Blocks.PISTON)
     ),
+    //Nausea
     REGEN(
             13458603,
             Effects.REGENERATION,
@@ -110,6 +115,7 @@ public enum ThePotionRings {
             Rarity.EPIC,
             new ItemStack(Items.FERMENTED_SPIDER_EYE)
     ),
+    //Blindness
     NIGHT_VISION(
             2039713,
             Effects.NIGHT_VISION,
@@ -120,6 +126,12 @@ public enum ThePotionRings {
             Rarity.RARE,
             new ItemStack(Items.GOLDEN_CARROT)
     );
+    //Hunger
+    //Weakness
+    //Poison
+    //Withering
+    //Health Boost (Not Happening)
+    //Absorption (Not Happening)
 
     public final String name;
     public final int color;

src/main/resources/assets/actuallyadditions/models/block/phantom_breaker.json

@@ -1,9 +1,9 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"particle": "actuallyadditions:block/ender_pearl_block",
+		"particle": "actuallyadditions:block/enderpearl_block",
-		"base": "actuallyadditions:block/ender_pearl_block",
+		"base": "actuallyadditions:block/enderpearl_block",
-		"frame": "actuallyadditions:block/diamatine_crystal_block",
+		"frame": "actuallyadditions:block/crystal_diamatine_block",
 		"breaker": "actuallyadditions:block/phantomface_breaker"
 	},
 	"elements": [

src/main/resources/assets/actuallyadditions/models/block/phantom_energyface.json

@@ -1,9 +1,9 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"frame": "actuallyadditions:block/diamatine_crystal_block",
+		"frame": "actuallyadditions:block/crystal_diamatine_block",
-		"particle": "actuallyadditions:block/ender_pearl_block",
+		"particle": "actuallyadditions:block/enderpearl_block",
-		"base": "actuallyadditions:block/ender_pearl_block",
+		"base": "actuallyadditions:block/enderpearl_block",
 		"energy": "actuallyadditions:block/phantomface_energy"
 	},
 	"elements": [

src/main/resources/assets/actuallyadditions/models/block/phantom_liquiface.json

@@ -1,9 +1,9 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"frame": "actuallyadditions:block/diamatine_crystal_block",
+		"frame": "actuallyadditions:block/crystal_diamatine_block",
-		"particle": "actuallyadditions:block/ender_pearl_block",
+		"particle": "actuallyadditions:block/enderpearl_block",
-		"base": "actuallyadditions:block/ender_pearl_block",
+		"base": "actuallyadditions:block/enderpearl_block",
 		"liquid": "actuallyadditions:block/phantomface_liquid"
 	},
 	"elements": [

src/main/resources/assets/actuallyadditions/models/block/phantom_placer.json

@@ -1,9 +1,9 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"particle": "actuallyadditions:block/ender_pearl_block",
+		"particle": "actuallyadditions:block/enderpearl_block",
-		"base": "actuallyadditions:block/ender_pearl_block",
+		"base": "actuallyadditions:block/enderpearl_block",
-		"frame": "actuallyadditions:block/diamatine_crystal_block",
+		"frame": "actuallyadditions:block/crystal_diamatine_block",
 		"placer": "actuallyadditions:block/phantomface_placer"
 	},
 	"elements": [

src/main/resources/assets/actuallyadditions/models/block/phantom_redstoneface.json

@@ -1,9 +1,9 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"particle": "actuallyadditions:block/ender_pearl_block",
+		"particle": "actuallyadditions:block/enderpearl_block",
-		"base": "actuallyadditions:block/ender_pearl_block",
+		"base": "actuallyadditions:block/enderpearl_block",
-		"frame": "actuallyadditions:block/diamatine_crystal_block",
+		"frame": "actuallyadditions:block/crystal_diamatine_block",
 		"redstone": "actuallyadditions:block/phantomface_redstone"
 	},
 	"elements": [

src/main/resources/assets/actuallyadditions/models/block/phantomface.json

@@ -1,9 +1,9 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"frame": "actuallyadditions:block/diamatine_crystal_block",
+		"frame": "actuallyadditions:block/crystal_diamatine_block",
-		"particle": "actuallyadditions:block/ender_pearl_block",
+		"particle": "actuallyadditions:block/enderpearl_block",
-		"base": "actuallyadditions:block/ender_pearl_block",
+		"base": "actuallyadditions:block/enderpearl_block",
 		"standard": "actuallyadditions:block/phantomface_standard"
 	},
 	"elements": [