From 0867a55f49e7ba7d60e581906e4849128ef6484f Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Fri, 26 Nov 2021 18:21:01 -0600 Subject: [PATCH] fixed more blocks and things. --- src/generated/resources/.cache/cache | 36 +++- .../blockstates/black_quartz_ore.json | 7 + .../blockstates/charcoal_block.json | 7 + .../blockstates/hopping_item_interface.json | 7 + .../blockstates/item_interface.json | 7 + .../blockstates/item_viewer.json | 7 - .../blockstates/item_viewer_hopping.json | 7 - .../models/block/black_quartz_ore.json | 6 + .../models/block/charcoal_block.json | 0 .../advanced_ring_of_fire_resistance.json | 6 + .../models/item/advanced_ring_of_haste.json | 6 + .../item/advanced_ring_of_invisibility.json | 6 + .../item/advanced_ring_of_jump_boost.json | 6 + .../item/advanced_ring_of_night_vision.json | 6 + .../item/advanced_ring_of_regeneration.json | 6 + .../item/advanced_ring_of_resistance.json | 6 + .../models/item/advanced_ring_of_speed.json | 6 + .../item/advanced_ring_of_strength.json | 6 + .../advanced_ring_of_water_breathing.json | 6 + .../models/item/black_quartz_ore.json | 3 + .../models/item/charcoal_block.json | 3 + .../models/item/hopping_item_interface.json | 3 + .../models/item/item_interface.json | 3 + .../models/item/item_viewer.json | 3 - .../models/item/item_viewer_hopping.json | 3 - .../models/item/ring_of_fire_resistance.json | 6 + .../models/item/ring_of_haste.json | 6 + .../models/item/ring_of_invisibility.json | 6 + .../models/item/ring_of_jump_boost.json | 6 + .../models/item/ring_of_night_vision.json | 6 + .../models/item/ring_of_regeneration.json | 6 + .../models/item/ring_of_resistance.json | 6 + .../models/item/ring_of_speed.json | 6 + .../models/item/ring_of_strength.json | 6 + .../models/item/ring_of_water_breathing.json | 6 + .../recipes/hopping_item_interface.json | 11 ++ .../{item_viewer.json => item_interface.json} | 2 +- .../recipes/item_viewer_hopping.json | 11 -- .../data/BlockRecipeGenerator.java | 32 ++-- .../data/BlockStateGenerator.java | 4 +- .../mod/blocks/ActuallyBlocks.java | 4 +- .../mod/items/ActuallyItems.java | 31 +++- .../mod/items/metalists/ThePotionRings.java | 172 ++++++++---------- ...phantomface.json => phantom_itemface.json} | 0 .../textures/block/black_quartz_block.png | Bin 0 -> 3289 bytes .../textures/block/black_quartz_block_top.png | Bin 0 -> 3289 bytes ..._black_quartz.png => black_quartz_ore.png} | Bin .../{charcoal.png => charcoal_block.png} | Bin 48 files changed, 334 insertions(+), 155 deletions(-) create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_ore.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/charcoal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/hopping_item_interface.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/item_interface.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/item_viewer.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_quartz_ore.json rename src/{main => generated}/resources/assets/actuallyadditions/models/block/charcoal_block.json (100%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_fire_resistance.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_haste.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_invisibility.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_jump_boost.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_night_vision.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_regeneration.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_resistance.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_speed.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_strength.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_water_breathing.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_ore.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/charcoal_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/hopping_item_interface.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/item_interface.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/item_viewer.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_fire_resistance.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_haste.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_invisibility.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_jump_boost.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_night_vision.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_regeneration.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_resistance.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_speed.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_strength.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/ring_of_water_breathing.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/hopping_item_interface.json rename src/generated/resources/data/actuallyadditions/recipes/{item_viewer.json => item_interface.json} (88%) delete mode 100644 src/generated/resources/data/actuallyadditions/recipes/item_viewer_hopping.json rename src/main/resources/assets/actuallyadditions/models/block/{phantomface.json => phantom_itemface.json} (100%) create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block_top.png rename src/main/resources/assets/actuallyadditions/textures/block/{ore_black_quartz.png => black_quartz_ore.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{charcoal.png => charcoal_block.png} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index cf73bdef9..cf55e38c8 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -5,6 +5,7 @@ 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 @@ -15,6 +16,7 @@ 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 @@ -60,9 +62,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 -faf45dd324cb2eb2fb41f4cb4e8a4f0c17354e55 assets/actuallyadditions/blockstates/item_viewer.json -15221b5e677291096877b0521a9b25b45e481696 assets/actuallyadditions/blockstates/item_viewer_hopping.json +0454474609a1f121e53b9350798c82f28eb3e97c assets/actuallyadditions/blockstates/item_interface.json 78e22fe7ed75763a0b1380f6bbdf6d2ee75349c8 assets/actuallyadditions/blockstates/lamp_black.json e7303f1950c105585a232e129c08aec4ba4757b4 assets/actuallyadditions/blockstates/lamp_blue.json 91a5344f0a56cf0f627545aeb280c1d3c078805b assets/actuallyadditions/blockstates/lamp_brown.json @@ -127,6 +129,7 @@ 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 @@ -144,6 +147,7 @@ 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 @@ -216,6 +220,16 @@ 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 @@ -375,10 +389,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 -32974ab97db39decad106e89e5c051d79e87624c assets/actuallyadditions/models/item/item_viewer.json -f18d781df4b1659ee8e38313db97360e5bbfe813 assets/actuallyadditions/models/item/item_viewer_hopping.json +971f45a5a05b2c399e8075597b0826965f6b6f0b assets/actuallyadditions/models/item/item_interface.json d676c5b6ddcc920059a70e8107faa0dbf023b05c assets/actuallyadditions/models/item/knife.json 1e3d4970b8a5ed46ed72deedc5c38d8347658d2f assets/actuallyadditions/models/item/lamp_black.json 8b730988dfb2cb6caa448647d245f9a4160c4247 assets/actuallyadditions/models/item/lamp_blue.json @@ -481,8 +495,18 @@ 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 @@ -606,9 +630,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 -ad12750777cb66c3e9f1943a83bcd83c0fe635d1 data/actuallyadditions/recipes/item_viewer.json -4a13de3f3dc0874020c283ecf29eaea2fdf13693 data/actuallyadditions/recipes/item_viewer_hopping.json +94353c0c347081fcd8060f5e6f5686556785cfd9 data/actuallyadditions/recipes/item_interface.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 diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_ore.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_ore.json new file mode 100644 index 000000000..42b87af69 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/black_quartz_ore" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/charcoal_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/charcoal_block.json new file mode 100644 index 000000000..230f32fe1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/charcoal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/charcoal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/hopping_item_interface.json b/src/generated/resources/assets/actuallyadditions/blockstates/hopping_item_interface.json new file mode 100644 index 000000000..2cec71111 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/hopping_item_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/hopping_item_interface" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/item_interface.json b/src/generated/resources/assets/actuallyadditions/blockstates/item_interface.json new file mode 100644 index 000000000..c119f5c7b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/item_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/item_interface" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer.json b/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer.json deleted file mode 100644 index 2c0030bc9..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/item_viewer" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping.json b/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping.json deleted file mode 100644 index d65a337a2..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/item_viewer_hopping.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/item_viewer_hopping" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_ore.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_ore.json new file mode 100644 index 000000000..2ce4bb69e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/black_quartz_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/charcoal_block.json b/src/generated/resources/assets/actuallyadditions/models/block/charcoal_block.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/charcoal_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/charcoal_block.json diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_fire_resistance.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_fire_resistance.json new file mode 100644 index 000000000..e25149a63 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_fire_resistance.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_ring_of_fire_resistance" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_haste.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_haste.json new file mode 100644 index 000000000..a823ddffb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_haste.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_ring_of_haste" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_invisibility.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_invisibility.json new file mode 100644 index 000000000..127b69563 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_invisibility.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_ring_of_invisibility" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_jump_boost.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_jump_boost.json new file mode 100644 index 000000000..7561fc1ed --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_jump_boost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_ring_of_jump_boost" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_night_vision.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_night_vision.json new file mode 100644 index 000000000..c1a607063 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_night_vision.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_ring_of_night_vision" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_regeneration.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_regeneration.json new file mode 100644 index 000000000..953747dc0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_regeneration.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_ring_of_regeneration" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_resistance.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_resistance.json new file mode 100644 index 000000000..8dedbef6b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_resistance.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_ring_of_resistance" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_speed.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_speed.json new file mode 100644 index 000000000..69595cce5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_speed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_ring_of_speed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_strength.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_strength.json new file mode 100644 index 000000000..51f748db9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_strength.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_ring_of_strength" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_water_breathing.json b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_water_breathing.json new file mode 100644 index 000000000..d6fdbffee --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/advanced_ring_of_water_breathing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/advanced_ring_of_water_breathing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_ore.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_ore.json new file mode 100644 index 000000000..1c53b5009 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_ore" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/charcoal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/charcoal_block.json new file mode 100644 index 000000000..ddd3d5765 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/charcoal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/charcoal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/hopping_item_interface.json b/src/generated/resources/assets/actuallyadditions/models/item/hopping_item_interface.json new file mode 100644 index 000000000..5c2c2891e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/hopping_item_interface.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/hopping_item_interface" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_interface.json b/src/generated/resources/assets/actuallyadditions/models/item/item_interface.json new file mode 100644 index 000000000..c6ac7939c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/item_interface.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/item_interface" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_viewer.json b/src/generated/resources/assets/actuallyadditions/models/item/item_viewer.json deleted file mode 100644 index 20fb1ed83..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/item_viewer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/item_viewer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping.json b/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping.json deleted file mode 100644 index 8ae924b0e..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/item_viewer_hopping" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_fire_resistance.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_fire_resistance.json new file mode 100644 index 000000000..4d35fea81 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_fire_resistance.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_fire_resistance" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_haste.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_haste.json new file mode 100644 index 000000000..f2b5210f7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_haste.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_haste" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_invisibility.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_invisibility.json new file mode 100644 index 000000000..e4ede34c4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_invisibility.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_invisibility" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_jump_boost.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_jump_boost.json new file mode 100644 index 000000000..739d578d5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_jump_boost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_jump_boost" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_night_vision.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_night_vision.json new file mode 100644 index 000000000..2faacfbe0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_night_vision.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_night_vision" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_regeneration.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_regeneration.json new file mode 100644 index 000000000..e5de483d3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_regeneration.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_regeneration" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_resistance.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_resistance.json new file mode 100644 index 000000000..c4ab5f95a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_resistance.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_resistance" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_speed.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_speed.json new file mode 100644 index 000000000..f32ee7cdd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_speed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_speed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_strength.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_strength.json new file mode 100644 index 000000000..877430acd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_strength.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_strength" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ring_of_water_breathing.json b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_water_breathing.json new file mode 100644 index 000000000..bc2609bef --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ring_of_water_breathing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/ring_of_water_breathing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/hopping_item_interface.json b/src/generated/resources/data/actuallyadditions/recipes/hopping_item_interface.json new file mode 100644 index 000000000..7bc7da8aa --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/hopping_item_interface.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:item_interface" + } + ], + "result": { + "item": "actuallyadditions:hopping_item_interface" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/item_viewer.json b/src/generated/resources/data/actuallyadditions/recipes/item_interface.json similarity index 88% rename from src/generated/resources/data/actuallyadditions/recipes/item_viewer.json rename to src/generated/resources/data/actuallyadditions/recipes/item_interface.json index 8a51caaf2..56379c203 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/item_viewer.json +++ b/src/generated/resources/data/actuallyadditions/recipes/item_interface.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "actuallyadditions:item_viewer" + "item": "actuallyadditions:item_interface" } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/item_viewer_hopping.json b/src/generated/resources/data/actuallyadditions/recipes/item_viewer_hopping.json deleted file mode 100644 index bf6f55ead..000000000 --- a/src/generated/resources/data/actuallyadditions/recipes/item_viewer_hopping.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "actuallyadditions:item_viewer" - } - ], - "result": { - "item": "actuallyadditions:item_viewer_hopping" - } -} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java index 1248bbfb3..103fbc6ba 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java @@ -59,28 +59,28 @@ public class BlockRecipeGenerator extends RecipeProvider { //Shock Suppressor Recipe.shaped(ActuallyBlocks.SHOCK_SUPPRESSOR.getItem()) - .pattern("OAO", "ACA", "OAO") - .define('A', ActuallyItems.EMPOWERED_VOID_CRYSTAL.get()) - .define('O', Tags.Items.OBSIDIAN) - .define('C', ActuallyItems.ADVANCED_COIL.get()) - .save(consumer); + .pattern("OAO", "ACA", "OAO") + .define('A', ActuallyItems.EMPOWERED_VOID_CRYSTAL.get()) + .define('O', Tags.Items.OBSIDIAN) + .define('C', ActuallyItems.ADVANCED_COIL.get()) + .save(consumer); //Display Stand Recipe.shaped(ActuallyBlocks.DISPLAY_STAND.getItem()) - .pattern(" R ", "EEE", "GGG") - .define('R', ActuallyItems.ADVANCED_COIL.get()) - .define('E', ActuallyBlocks.ETHETIC_GREEN_BLOCK.get()) - .define('G', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get()) - .save(consumer); + .pattern(" R ", "EEE", "GGG") + .define('R', ActuallyItems.ADVANCED_COIL.get()) + .define('E', ActuallyBlocks.ETHETIC_GREEN_BLOCK.get()) + .define('G', ActuallyBlocks.ETHETIC_WHITE_BLOCK.get()) + .save(consumer); //Vertical Digger Recipe.shaped(ActuallyBlocks.VERTICAL_DIGGER.getItem()) - .pattern("IRI", "RCR", "IDI") - .define('R', Tags.Items.STORAGE_BLOCKS_REDSTONE) - .define('I', ActuallyBlocks.IRON_CASING.get()) - .define('C', ActuallyItems.EMPOWERED_VOID_CRYSTAL.get()) - .define('D', ActuallyTags.Items.DRILLS) - .save(consumer); + .pattern("IRI", "RCR", "IDI") + .define('R', Tags.Items.STORAGE_BLOCKS_REDSTONE) + .define('I', ActuallyBlocks.IRON_CASING.get()) + .define('C', ActuallyItems.EMPOWERED_VOID_CRYSTAL.get()) + .define('D', ActuallyTags.Items.DRILLS) + .save(consumer); //Black Quartz Wall Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), consumer); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java index 620b9e7fc..266f5b996 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java +++ b/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); //TODO hmm? + buildCubeAll(ActuallyBlocks.CHARCOAL_BLOCK); buildCubeAll(ActuallyBlocks.ENDER_CASING); buildCubeAll(ActuallyBlocks.ENDER_PEARL_BLOCK); buildCubeAll(ActuallyBlocks.IRON_CASING); standardBlock(ActuallyBlocks.LAVA_FACTORY_CASING); - //buildCubeAll(ActuallyBlocks.ORE_BLACK_QUARTZ); //TODO HMM + buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_ORE); buildCubeAll(ActuallyBlocks.WOOD_CASING); // Quartz diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java index ef6fe95bf..fe0d2bafb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java @@ -156,9 +156,9 @@ public final class ActuallyBlocks { // Interface Blocks public static final AABlockReg PLAYER_INTERFACE = new AABlockReg<>("player_interface", BlockPlayerInterface::new, (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityPlayerInterface::new); - public static final AABlockReg ITEM_INTERFACE = new AABlockReg<>("item_viewer", BlockItemInterface::new, + public static final AABlockReg ITEM_INTERFACE = new AABlockReg<>("item_interface", BlockItemInterface::new, (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityItemInterface::new); - public static final AABlockReg ITEM_INTERFACE_HOPPING = new AABlockReg<>("item_viewer_hopping", BlockItemInterfaceHopping::new, + public static final AABlockReg ITEM_INTERFACE_HOPPING = new AABlockReg<>("hopping_item_interface", BlockItemInterfaceHopping::new, (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityItemInterfaceHopping::new); // Phantom stuff diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java index 471230611..2480aea1e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ActuallyItems.java @@ -30,6 +30,7 @@ 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 ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ActuallyAdditions.MODID); @@ -163,9 +164,26 @@ public final class ActuallyItems { public static final RegistryObject LEAF_BLOWER = ITEMS.register("leaf_blower", () -> new ItemLeafBlower(false)); public static final RegistryObject ADVANCED_LEAF_BLOWER = ITEMS.register("advanced_leaf_blower", () -> new ItemLeafBlower(true)); - // TODO [port] flatten - //public static final RegistryObject POTION_RING = ITEMS.register("potion_ring", () -> new ItemPotionRing(false)); - //public static final RegistryObject POTION_RING_ADVANCED = ITEMS.register("potion_ring_advanced", () -> new ItemPotionRing(true)); + public static final RegistryObject RING_OF_SPEED = ITEMS.register("ring_of_speed", basicItem()); + public static final RegistryObject RING_OF_HASTE = ITEMS.register("ring_of_haste", basicItem()); + public static final RegistryObject RING_OF_STRENGTH = ITEMS.register("ring_of_strength", basicItem()); + public static final RegistryObject RING_OF_JUMP_BOOST = ITEMS.register("ring_of_jump_boost", basicItem()); + public static final RegistryObject RING_OF_REGENERATION = ITEMS.register("ring_of_regeneration", basicItem()); + public static final RegistryObject RING_OF_RESISTANCE = ITEMS.register("ring_of_resistance", basicItem()); + public static final RegistryObject RING_OF_FIRE_RESISTANCE = ITEMS.register("ring_of_fire_resistance", basicItem()); + public static final RegistryObject RING_OF_WATER_BREATHING = ITEMS.register("ring_of_water_breathing", basicItem()); + public static final RegistryObject RING_OF_INVISIBILITY = ITEMS.register("ring_of_invisibility", basicItem()); + public static final RegistryObject RING_OF_NIGHT_VISION = ITEMS.register("ring_of_night_vision", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_SPEED = ITEMS.register("advanced_ring_of_speed", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_HASTE = ITEMS.register("advanced_ring_of_haste", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_STRENGTH = ITEMS.register("advanced_ring_of_strength", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_JUMP_BOOST = ITEMS.register("advanced_ring_of_jump_boost", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_REGENERATION = ITEMS.register("advanced_ring_of_regeneration", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_RESISTANCE = ITEMS.register("advanced_ring_of_resistance", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_FIRE_RESISTANCE = ITEMS.register("advanced_ring_of_fire_resistance", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_WATER_BREATHING = ITEMS.register("advanced_ring_of_water_breathing", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_INVISIBILITY = ITEMS.register("advanced_ring_of_invisibility", basicItem()); + public static final RegistryObject ADVANCED_RING_OF_NIGHT_VISION = ITEMS.register("advanced_ring_of_night_vision", basicItem()); public static final RegistryObject HAIRY_BALL = ITEMS.register("hairy_ball", ItemHairBall::new); public static final RegistryObject COFFEE_BEANS = ITEMS.register("coffee_beans", ItemCoffeeBean::new); @@ -291,11 +309,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, @@ -308,6 +326,9 @@ 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 basicItem() { + return () -> new Item(defaultProps()); + } public static Item.Properties defaultProps() { return new Item.Properties().tab(ActuallyAdditions.GROUP); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java index 6c17619b1..633763961 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/ThePotionRings.java @@ -21,117 +21,105 @@ import net.minecraft.potion.Effects; public enum ThePotionRings { SPEED( - 8171462, - Effects.MOVEMENT_SPEED, - 0, - 1, - 10, - false, - Rarity.UNCOMMON, - new ItemStack(Items.SUGAR) + 8171462, + Effects.MOVEMENT_SPEED, + 0, + 1, + 10, + false, + Rarity.UNCOMMON, + new ItemStack(Items.SUGAR) ), - //Slowness HASTE( - 14270531, - Effects.DIG_SPEED, // todo: wrong - 0, - 1, - 10, - false, - Rarity.EPIC, - new ItemStack(Items.REPEATER) + 14270531, + Effects.DIG_SPEED, + 0, + 1, + 10, + false, + Rarity.EPIC, + new ItemStack(Items.REPEATER) ), - //Mining Fatigue STRENGTH( - 9643043, - Effects.DAMAGE_BOOST, // TODO: wrong? - 0, - 1, - 10, - false, - Rarity.RARE, - new ItemStack(Items.BLAZE_POWDER) + 9643043, + Effects.DAMAGE_BOOST, + 0, + 1, + 10, + false, + Rarity.RARE, + new ItemStack(Items.BLAZE_POWDER) ), - //Health (Not Happening) - //Damage JUMP_BOOST( - 7889559, - Effects.JUMP, - 0, - 1, - 10, - false, - Rarity.RARE, - new ItemStack(Blocks.PISTON) + 7889559, + Effects.JUMP, + 0, + 1, + 10, + false, + Rarity.RARE, + new ItemStack(Blocks.PISTON) ), - //Nausea REGEN( - 13458603, - Effects.REGENERATION, - 0, - 1, - 50, - true, - Rarity.RARE, - new ItemStack(Items.GHAST_TEAR) + 13458603, + Effects.REGENERATION, + 0, + 1, + 50, + true, + Rarity.RARE, + new ItemStack(Items.GHAST_TEAR) ), RESISTANCE( - 10044730, - Effects.DAMAGE_RESISTANCE, - 0, - 1, - 10, - false, - Rarity.EPIC, - new ItemStack(Items.SLIME_BALL) + 10044730, + Effects.DAMAGE_RESISTANCE, + 0, + 1, + 10, + false, + Rarity.EPIC, + new ItemStack(Items.SLIME_BALL) ), FIRE_RESISTANCE( - 14981690, - Effects.FIRE_RESISTANCE, - 0, - 0, - 10, - false, - Rarity.UNCOMMON, - new ItemStack(Items.MAGMA_CREAM) + 14981690, + Effects.FIRE_RESISTANCE, + 0, + 0, + 10, + false, + Rarity.UNCOMMON, + new ItemStack(Items.MAGMA_CREAM) ), WATER_BREATHING( - 3035801, - Effects.WATER_BREATHING, - 0, - 0, - 10, - false, - Rarity.RARE, - new ItemStack(Items.TROPICAL_FISH) + 3035801, + Effects.WATER_BREATHING, + 0, + 0, + 10, + false, + Rarity.RARE, + new ItemStack(Items.TROPICAL_FISH) ), INVISIBILITY( - 8356754, - Effects.INVISIBILITY, - 0, - 0, - 10, - false, - Rarity.EPIC, - new ItemStack(Items.FERMENTED_SPIDER_EYE) + 8356754, + Effects.INVISIBILITY, + 0, + 0, + 10, + false, + Rarity.EPIC, + new ItemStack(Items.FERMENTED_SPIDER_EYE) ), - //Blindness NIGHT_VISION( - 2039713, - Effects.NIGHT_VISION, - 0, - 0, - 300, - false, - Rarity.RARE, - new ItemStack(Items.GOLDEN_CARROT) + 2039713, + Effects.NIGHT_VISION, + 0, + 0, + 300, + false, + 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; diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantomface.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_itemface.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/phantomface.json rename to src/main/resources/assets/actuallyadditions/models/block/phantom_itemface.json diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_block.png new file mode 100644 index 0000000000000000000000000000000000000000..fa809bd8e8ef2eb52e8e1142ca10d144dba0b9ae GIT binary patch literal 3289 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 F`U@kPFKqw- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/ore_black_quartz.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_ore.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/ore_black_quartz.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_ore.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/charcoal.png b/src/main/resources/assets/actuallyadditions/textures/block/charcoal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/charcoal.png rename to src/main/resources/assets/actuallyadditions/textures/block/charcoal_block.png