From e35264aa0d155fdd6633dfff72950eaf4580c696 Mon Sep 17 00:00:00 2001 From: direwolf20 <39863894+Direwolf20-MC@users.noreply.github.com> Date: Wed, 28 Feb 2024 21:19:23 -0500 Subject: [PATCH] Added Raw Blazegold --- .../2f572324d4ae438eed6ef1c4961027be07f7d2fe | 4 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 5 +- .../69ee5e809dff011efe049b68501078221ca37cb0 | 6 +- .../8202586f691eec5ad0bb88d13a278951d0c130fb | 4 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 12 ++-- .../a1a2ec2da1e0c65903879d2c88015afc97528c8f | 4 +- .../blockstates/raw_blazegold_ore.json | 7 +++ .../assets/justdirethings/lang/en_us.json | 4 +- .../models/block/raw_blazegold_ore.json | 7 +++ .../models/item/raw_blazegold.json | 6 ++ .../models/item/raw_blazegold_ore.json | 3 + ...{ferricore_raw.json => raw_ferricore.json} | 0 .../recipes/misc/blazegold_ingot_smelted.json | 34 +++++++++++ .../recipes/misc/ferricore_ingot_smelted.json | 2 +- ....json => raw_blazegold_ore-goospread.json} | 4 +- .../loot_tables/blocks/raw_blazegold_ore.json | 54 ++++++++++++++++++ .../loot_tables/blocks/raw_ferricore_ore.json | 2 +- .../recipes/blazegold_ingot_smelted.json | 10 ++++ .../recipes/ferricore_ingot_smelted.json | 2 +- ....json => raw_blazegold_ore-goospread.json} | 2 +- .../tags/blocks/mineable/pickaxe.json | 3 +- .../blocks/resources/RawBlazegoldOre.java | 15 +++++ .../{FerricoreRaw.java => RawBlazegold.java} | 4 +- .../common/items/resources/RawFerricore.java | 9 +++ .../justdirethings/datagen/BlockStates.java | 1 + .../justdirethings/datagen/BlockTags.java | 2 + .../justdirethings/datagen/ItemModels.java | 6 +- .../datagen/LanguageProvider.java | 6 +- .../justdirethings/datagen/LootTables.java | 10 +++- .../justdirethings/datagen/Recipes.java | 12 ++-- .../justdirethings/setup/Registration.java | 11 +++- .../textures/block/raw_blazegold_ore.png | Bin 0 -> 627 bytes .../textures/item/raw_blazegold.png | Bin 0 -> 260 bytes 33 files changed, 215 insertions(+), 36 deletions(-) create mode 100644 src/generated/resources/assets/justdirethings/blockstates/raw_blazegold_ore.json create mode 100644 src/generated/resources/assets/justdirethings/models/block/raw_blazegold_ore.json create mode 100644 src/generated/resources/assets/justdirethings/models/item/raw_blazegold.json create mode 100644 src/generated/resources/assets/justdirethings/models/item/raw_blazegold_ore.json rename src/generated/resources/assets/justdirethings/models/item/{ferricore_raw.json => raw_ferricore.json} (100%) create mode 100644 src/generated/resources/data/justdirethings/advancements/recipes/misc/blazegold_ingot_smelted.json rename src/generated/resources/data/justdirethings/advancements/recipes/misc/{blazegold_block-goospread.json => raw_blazegold_ore-goospread.json} (82%) create mode 100644 src/generated/resources/data/justdirethings/loot_tables/blocks/raw_blazegold_ore.json create mode 100644 src/generated/resources/data/justdirethings/recipes/blazegold_ingot_smelted.json rename src/generated/resources/data/justdirethings/recipes/{blazegold_block-goospread.json => raw_blazegold_ore-goospread.json} (81%) create mode 100644 src/main/java/com/direwolf20/justdirethings/common/blocks/resources/RawBlazegoldOre.java rename src/main/java/com/direwolf20/justdirethings/common/items/resources/{FerricoreRaw.java => RawBlazegold.java} (67%) create mode 100644 src/main/java/com/direwolf20/justdirethings/common/items/resources/RawFerricore.java create mode 100644 src/main/resources/assets/justdirethings/textures/block/raw_blazegold_ore.png create mode 100644 src/main/resources/assets/justdirethings/textures/item/raw_blazegold.png diff --git a/src/generated/resources/.cache/2f572324d4ae438eed6ef1c4961027be07f7d2fe b/src/generated/resources/.cache/2f572324d4ae438eed6ef1c4961027be07f7d2fe index a9a7e11d..5b797ed6 100644 --- a/src/generated/resources/.cache/2f572324d4ae438eed6ef1c4961027be07f7d2fe +++ b/src/generated/resources/.cache/2f572324d4ae438eed6ef1c4961027be07f7d2fe @@ -1,3 +1,3 @@ -// 1.20.4 2024-02-28T16:35:48.8266354 JustDireThings Tags -f4b7ee8e8135c282b2c52bf2dad098ac76c666e9 data/minecraft/tags/blocks/mineable/pickaxe.json +// 1.20.4 2024-02-28T21:04:17.6216664 JustDireThings Tags +dff9db68e86925ee97c0161c983644c87debb3c3 data/minecraft/tags/blocks/mineable/pickaxe.json 11232a655ecdf0e32c632d145759b8a0de2e09fa data/minecraft/tags/blocks/mineable/shovel.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 3c937c38..a30add41 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,7 +1,8 @@ -// 1.20.4 2024-02-28T17:15:26.8011117 Loot Tables +// 1.20.4 2024-02-28T21:04:17.6261703 Loot Tables 16a0ab61513717ab1cb8c1df9718722a643d9728 data/justdirethings/loot_tables/blocks/blazegold_block.json 1374ed53b2d6c1462b64a99f3ca1b290388d36c5 data/justdirethings/loot_tables/blocks/ferricore_block.json 9d62cc762313305bbe032473310bafd15bcdb8bd data/justdirethings/loot_tables/blocks/gooblock_tier1.json 7e92782ed4881463b836c32c2504d92fee72cbfb data/justdirethings/loot_tables/blocks/gooblock_tier2.json fcef2a947be7443c277f0bc8a7ac5379f2084822 data/justdirethings/loot_tables/blocks/goopatternblock.json -af64563b94925676515ac80e8244ce9f2d09210b data/justdirethings/loot_tables/blocks/raw_ferricore_ore.json +8358a340790581bc3bdaeb54fc65a001c2f76e27 data/justdirethings/loot_tables/blocks/raw_blazegold_ore.json +554c12dc93850baa65ce201f6c276c90708d76fa data/justdirethings/loot_tables/blocks/raw_ferricore_ore.json diff --git a/src/generated/resources/.cache/69ee5e809dff011efe049b68501078221ca37cb0 b/src/generated/resources/.cache/69ee5e809dff011efe049b68501078221ca37cb0 index 80a3fbdf..96a514c9 100644 --- a/src/generated/resources/.cache/69ee5e809dff011efe049b68501078221ca37cb0 +++ b/src/generated/resources/.cache/69ee5e809dff011efe049b68501078221ca37cb0 @@ -1,11 +1,13 @@ -// 1.20.4 2024-02-28T17:15:26.7986098 Item Models: justdirethings +// 1.20.4 2024-02-28T21:05:57.3037979 Item Models: justdirethings 6396fb6e503760080534bc26337236d4d09a4cb8 assets/justdirethings/models/item/blazegold_block.json b0950f50f6a6d742e497a6275b3ee049055b941d assets/justdirethings/models/item/blazegold_ingot.json 6c85011e764ec697b9be64a2f7fc12ddacf56f74 assets/justdirethings/models/item/ferricore_block.json 759ac9a72139623d3d7933c1b72eea98d1a30748 assets/justdirethings/models/item/ferricore_ingot.json -dd859b0b386ad41b819dc6e7d46a8979373ef257 assets/justdirethings/models/item/ferricore_raw.json af62c31381c904f86fde9370e374e01d828fa643 assets/justdirethings/models/item/fuel_canister.json 2ec271fed6a1fb15d49837326283ca1f0e269689 assets/justdirethings/models/item/gooblock_tier1.json 8e2f93de57bf331b80c25882febe5601d1b9d26a assets/justdirethings/models/item/gooblock_tier2.json 3f50e98f22d6abc6b3edab6c01b82deec145ec78 assets/justdirethings/models/item/pocket_generator.json +d8ea68a75b8b49f7765e715d62ad23c2f1939281 assets/justdirethings/models/item/raw_blazegold.json +0eb4cfb03ddec169426214f46beb6f8781ce9421 assets/justdirethings/models/item/raw_blazegold_ore.json +dd859b0b386ad41b819dc6e7d46a8979373ef257 assets/justdirethings/models/item/raw_ferricore.json 97542b1def735985bb9c9ea40bfb51992ea786e3 assets/justdirethings/models/item/raw_ferricore_ore.json diff --git a/src/generated/resources/.cache/8202586f691eec5ad0bb88d13a278951d0c130fb b/src/generated/resources/.cache/8202586f691eec5ad0bb88d13a278951d0c130fb index 78427541..bba2d9d5 100644 --- a/src/generated/resources/.cache/8202586f691eec5ad0bb88d13a278951d0c130fb +++ b/src/generated/resources/.cache/8202586f691eec5ad0bb88d13a278951d0c130fb @@ -1,2 +1,2 @@ -// 1.20.4 2024-02-28T17:15:26.8006113 Languages: en_us for mod: justdirethings -840120fa358026e5cb3ec8262bd685a206af59f6 assets/justdirethings/lang/en_us.json +// 1.20.4 2024-02-28T21:04:17.6251698 Languages: en_us for mod: justdirethings +c161a881ff193941393f219f67267e95cd9ce648 assets/justdirethings/lang/en_us.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 1f223395..e89a9df5 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,23 +1,25 @@ -// 1.20.4 2024-02-28T17:17:45.5332277 Recipes +// 1.20.4 2024-02-28T21:04:17.6266707 Recipes a7b97214b98dd1f7bba73e89704509570fff39b1 data/justdirethings/advancements/recipes/building_blocks/blazegold_ingot.json 4bbe1508cce69937d4eb2942ba175688025552e0 data/justdirethings/advancements/recipes/building_blocks/ferricore_ingot.json -10722b37102209b5c18a250c0ad58feccf89c2e9 data/justdirethings/advancements/recipes/misc/blazegold_block-goospread.json b8a171d51deb8fb20aa73d4747d32466b2ed95db data/justdirethings/advancements/recipes/misc/blazegold_block.json +1c0b7bb7dc6b14386108c451d13c96e92f315e2f data/justdirethings/advancements/recipes/misc/blazegold_ingot_smelted.json df9153e85c7cd7b9b2ba0347624ed9cbd5963b2b data/justdirethings/advancements/recipes/misc/ferricore_block.json -601bcf0afb24d10401a25a7fc61d922552b1b730 data/justdirethings/advancements/recipes/misc/ferricore_ingot_smelted.json +7862023f7a4c7c942c6ea97af356664df4e8ee29 data/justdirethings/advancements/recipes/misc/ferricore_ingot_smelted.json 08a464b9106de5bf0e3d81194dc205ed42ef7db4 data/justdirethings/advancements/recipes/misc/fuel_canister.json 40cce3bcf79345790efed77343905f6e29a3e0aa data/justdirethings/advancements/recipes/misc/gooblock_tier1.json 47100c90c790bbe1cd08e412e3bb7d4f19c961da data/justdirethings/advancements/recipes/misc/gooblock_tier2.json 591f2dd8d997ccead841061e70aedc4a4984a60d data/justdirethings/advancements/recipes/misc/pocket_generator.json +8b754485663be06dd091f1b221d0523bfacca088 data/justdirethings/advancements/recipes/misc/raw_blazegold_ore-goospread.json 2e7f18748d1dfb5082ff77aa180c979e16a032e5 data/justdirethings/advancements/recipes/misc/raw_ferricore_ore-goospread.json -4cb8fc7db4317b10a3bde4de30868c2034e60ef9 data/justdirethings/recipes/blazegold_block-goospread.json 65c9338e15965cd0721ba91f51d216bbad04bbdf data/justdirethings/recipes/blazegold_block.json 9c7a43a1edd52034d612078073184ea06f9e637e data/justdirethings/recipes/blazegold_ingot.json +82b776d5e708a496d968bc9ef55ab2d5f89d4fc6 data/justdirethings/recipes/blazegold_ingot_smelted.json c06a5a5eebf086901080a64ea86a7a6dee08c9b5 data/justdirethings/recipes/ferricore_block.json 558075e165773346d831b6cd09e7d6001db3a342 data/justdirethings/recipes/ferricore_ingot.json -9d4da64f52a1c4c4facca00858cac4096628f6c7 data/justdirethings/recipes/ferricore_ingot_smelted.json +7334cc702fe2ef68e0590903e0cdc47e047379d4 data/justdirethings/recipes/ferricore_ingot_smelted.json be43fb76c8ff5e0964f378abece4cf4d77ecd06e data/justdirethings/recipes/fuel_canister.json 291d1d5894c21e8f05454c13674e98e249af83c1 data/justdirethings/recipes/gooblock_tier1.json e5917a0e540128bfbb34b7c27c9bbefcb791b043 data/justdirethings/recipes/gooblock_tier2.json f3525c90d81a757a6c44f0b1b15164ea62867e29 data/justdirethings/recipes/pocket_generator.json +e6b824e89c9b85c5e91b2d1a1dc00d63dcb23e0e data/justdirethings/recipes/raw_blazegold_ore-goospread.json dbd8a27f78b0f2ecc66f7d582fbfead734671b26 data/justdirethings/recipes/raw_ferricore_ore-goospread.json diff --git a/src/generated/resources/.cache/a1a2ec2da1e0c65903879d2c88015afc97528c8f b/src/generated/resources/.cache/a1a2ec2da1e0c65903879d2c88015afc97528c8f index b020b19f..3c41035b 100644 --- a/src/generated/resources/.cache/a1a2ec2da1e0c65903879d2c88015afc97528c8f +++ b/src/generated/resources/.cache/a1a2ec2da1e0c65903879d2c88015afc97528c8f @@ -1,9 +1,10 @@ -// 1.20.4 2024-02-28T16:52:11.6114855 Block States: justdirethings +// 1.20.4 2024-02-28T21:04:17.6241684 Block States: justdirethings e5976480ed9485e0bae43d4edde0c8aecaabe8a5 assets/justdirethings/blockstates/blazegold_block.json 81a237aa7f50c82d19f0cbf52a672edf3d805e23 assets/justdirethings/blockstates/ferricore_block.json 5a4cd222f3bde8915594a1363e2758ee5208517c assets/justdirethings/blockstates/gooblock_tier1.json cc1d5dd5cf3cdaf4e89a9b0dae5372b43c27b88c assets/justdirethings/blockstates/gooblock_tier2.json 2c7ba1dbdfd5b10ee0de988f03472b4af57f9378 assets/justdirethings/blockstates/goopatternblock.json +a684d58dade9e2961c5c6b994704e43321dd2d30 assets/justdirethings/blockstates/raw_blazegold_ore.json a7d2fa74c5e65b5a5f46b68932e99144d08123ee assets/justdirethings/blockstates/raw_ferricore_ore.json 9bd3946cfa107459786529b2af21eb125a901fb7 assets/justdirethings/models/block/blazegold_block.json 183c8ed95d7386a12307a44d3ff68f4085961ed3 assets/justdirethings/models/block/ferricore_block.json @@ -21,4 +22,5 @@ de99198085ba7892b69b20c7fba7574aa387c99b assets/justdirethings/models/block/goop 1017892293e8c2c1fbd6668493696513da801921 assets/justdirethings/models/block/goopatternblock7.json 7c4b15daa716408edd217af3bdd5f4d40a507116 assets/justdirethings/models/block/goopatternblock8.json a8285d4ea09e26951b3019b6e96a43d3d4654269 assets/justdirethings/models/block/goopatternblock9.json +934652a811b9657b7fc80acc101da40b37d14315 assets/justdirethings/models/block/raw_blazegold_ore.json 382857a602e9f295c8e682db8c4cbc5299701263 assets/justdirethings/models/block/raw_ferricore_ore.json diff --git a/src/generated/resources/assets/justdirethings/blockstates/raw_blazegold_ore.json b/src/generated/resources/assets/justdirethings/blockstates/raw_blazegold_ore.json new file mode 100644 index 00000000..7b8bfd56 --- /dev/null +++ b/src/generated/resources/assets/justdirethings/blockstates/raw_blazegold_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "justdirethings:block/raw_blazegold_ore" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/justdirethings/lang/en_us.json b/src/generated/resources/assets/justdirethings/lang/en_us.json index 6b4989e0..1ebf4bd0 100644 --- a/src/generated/resources/assets/justdirethings/lang/en_us.json +++ b/src/generated/resources/assets/justdirethings/lang/en_us.json @@ -3,12 +3,14 @@ "block.justdirethings.ferricore_block": "Ferricore Block", "block.justdirethings.gooblock_tier1": "Primogel Goo", "block.justdirethings.gooblock_tier2": "Blazebloom Goo", + "block.justdirethings.raw_blazegold_ore": "Raw Blazegold Ore", "block.justdirethings.raw_ferricore_ore": "Raw Ferricore Ore", "item.justdirethings.blazegold_ingot": "Blazegold Ingot", "item.justdirethings.ferricore_ingot": "Ferricore Ingot", - "item.justdirethings.ferricore_raw": "Raw Ferricore", "item.justdirethings.fuel_canister": "Fuel Canister", "item.justdirethings.pocket_generator": "Pocket Generator", + "item.justdirethings.raw_blazegold": "Raw Blazegold", + "item.justdirethings.raw_ferricore": "Raw Ferricore", "itemGroup.DeferredHolder{ResourceKey[minecraft:creative_mode_tab / justdirethings:justdirethings]}": "Just Dire Things", "justdirethings.fuelcanisteramt": "Cook time (ticks): %d", "justdirethings.fuelcanisteramtstack": "Stack Cook time (ticks): %d", diff --git a/src/generated/resources/assets/justdirethings/models/block/raw_blazegold_ore.json b/src/generated/resources/assets/justdirethings/models/block/raw_blazegold_ore.json new file mode 100644 index 00000000..f8634faa --- /dev/null +++ b/src/generated/resources/assets/justdirethings/models/block/raw_blazegold_ore.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "justdirethings:block/raw_blazegold_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/justdirethings/models/item/raw_blazegold.json b/src/generated/resources/assets/justdirethings/models/item/raw_blazegold.json new file mode 100644 index 00000000..eda15b6d --- /dev/null +++ b/src/generated/resources/assets/justdirethings/models/item/raw_blazegold.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "justdirethings:item/raw_blazegold" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/justdirethings/models/item/raw_blazegold_ore.json b/src/generated/resources/assets/justdirethings/models/item/raw_blazegold_ore.json new file mode 100644 index 00000000..ffcfcf45 --- /dev/null +++ b/src/generated/resources/assets/justdirethings/models/item/raw_blazegold_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "justdirethings:block/raw_blazegold_ore" +} \ No newline at end of file diff --git a/src/generated/resources/assets/justdirethings/models/item/ferricore_raw.json b/src/generated/resources/assets/justdirethings/models/item/raw_ferricore.json similarity index 100% rename from src/generated/resources/assets/justdirethings/models/item/ferricore_raw.json rename to src/generated/resources/assets/justdirethings/models/item/raw_ferricore.json diff --git a/src/generated/resources/data/justdirethings/advancements/recipes/misc/blazegold_ingot_smelted.json b/src/generated/resources/data/justdirethings/advancements/recipes/misc/blazegold_ingot_smelted.json new file mode 100644 index 00000000..9283c3c4 --- /dev/null +++ b/src/generated/resources/data/justdirethings/advancements/recipes/misc/blazegold_ingot_smelted.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blazegold_raw": { + "conditions": { + "items": [ + { + "items": [ + "justdirethings:raw_blazegold" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "justdirethings:blazegold_ingot_smelted" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_blazegold_raw" + ] + ], + "rewards": { + "recipes": [ + "justdirethings:blazegold_ingot_smelted" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/justdirethings/advancements/recipes/misc/ferricore_ingot_smelted.json b/src/generated/resources/data/justdirethings/advancements/recipes/misc/ferricore_ingot_smelted.json index 8ed9df11..b7bfc1b2 100644 --- a/src/generated/resources/data/justdirethings/advancements/recipes/misc/ferricore_ingot_smelted.json +++ b/src/generated/resources/data/justdirethings/advancements/recipes/misc/ferricore_ingot_smelted.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "justdirethings:ferricore_raw" + "justdirethings:raw_ferricore" ] } ] diff --git a/src/generated/resources/data/justdirethings/advancements/recipes/misc/blazegold_block-goospread.json b/src/generated/resources/data/justdirethings/advancements/recipes/misc/raw_blazegold_ore-goospread.json similarity index 82% rename from src/generated/resources/data/justdirethings/advancements/recipes/misc/blazegold_block-goospread.json rename to src/generated/resources/data/justdirethings/advancements/recipes/misc/raw_blazegold_ore-goospread.json index 55bb22e9..de9da86c 100644 --- a/src/generated/resources/data/justdirethings/advancements/recipes/misc/blazegold_block-goospread.json +++ b/src/generated/resources/data/justdirethings/advancements/recipes/misc/raw_blazegold_ore-goospread.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "justdirethings:blazegold_block-goospread" + "recipe": "justdirethings:raw_blazegold_ore-goospread" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "justdirethings:blazegold_block-goospread" + "justdirethings:raw_blazegold_ore-goospread" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/justdirethings/loot_tables/blocks/raw_blazegold_ore.json b/src/generated/resources/data/justdirethings/loot_tables/blocks/raw_blazegold_ore.json new file mode 100644 index 00000000..f4be8dc3 --- /dev/null +++ b/src/generated/resources/data/justdirethings/loot_tables/blocks/raw_blazegold_ore.json @@ -0,0 +1,54 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "justdirethings:raw_blazegold_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "justdirethings:raw_blazegold" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "justdirethings:blocks/raw_blazegold_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/justdirethings/loot_tables/blocks/raw_ferricore_ore.json b/src/generated/resources/data/justdirethings/loot_tables/blocks/raw_ferricore_ore.json index e568cbec..d1e65234 100644 --- a/src/generated/resources/data/justdirethings/loot_tables/blocks/raw_ferricore_ore.json +++ b/src/generated/resources/data/justdirethings/loot_tables/blocks/raw_ferricore_ore.json @@ -42,7 +42,7 @@ "function": "minecraft:explosion_decay" } ], - "name": "justdirethings:ferricore_raw" + "name": "justdirethings:raw_ferricore" } ] } diff --git a/src/generated/resources/data/justdirethings/recipes/blazegold_ingot_smelted.json b/src/generated/resources/data/justdirethings/recipes/blazegold_ingot_smelted.json new file mode 100644 index 00000000..455fa5b2 --- /dev/null +++ b/src/generated/resources/data/justdirethings/recipes/blazegold_ingot_smelted.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 400, + "experience": 1.0, + "ingredient": { + "item": "justdirethings:raw_blazegold" + }, + "result": "justdirethings:blazegold_ingot" +} \ No newline at end of file diff --git a/src/generated/resources/data/justdirethings/recipes/ferricore_ingot_smelted.json b/src/generated/resources/data/justdirethings/recipes/ferricore_ingot_smelted.json index 95a39456..5973aa07 100644 --- a/src/generated/resources/data/justdirethings/recipes/ferricore_ingot_smelted.json +++ b/src/generated/resources/data/justdirethings/recipes/ferricore_ingot_smelted.json @@ -4,7 +4,7 @@ "cookingtime": 400, "experience": 1.0, "ingredient": { - "item": "justdirethings:ferricore_raw" + "item": "justdirethings:raw_ferricore" }, "result": "justdirethings:ferricore_ingot" } \ No newline at end of file diff --git a/src/generated/resources/data/justdirethings/recipes/blazegold_block-goospread.json b/src/generated/resources/data/justdirethings/recipes/raw_blazegold_ore-goospread.json similarity index 81% rename from src/generated/resources/data/justdirethings/recipes/blazegold_block-goospread.json rename to src/generated/resources/data/justdirethings/recipes/raw_blazegold_ore-goospread.json index 54dd40da..cf57a2af 100644 --- a/src/generated/resources/data/justdirethings/recipes/blazegold_block-goospread.json +++ b/src/generated/resources/data/justdirethings/recipes/raw_blazegold_ore-goospread.json @@ -6,7 +6,7 @@ "Name": "minecraft:gold_block" }, "output": { - "Name": "justdirethings:blazegold_block" + "Name": "justdirethings:raw_blazegold_ore" }, "tierRequirement": 2 } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index d30ce504..18d8387c 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -2,6 +2,7 @@ "values": [ "justdirethings:ferricore_block", "justdirethings:raw_ferricore_ore", - "justdirethings:blazegold_block" + "justdirethings:blazegold_block", + "justdirethings:raw_blazegold_ore" ] } \ No newline at end of file diff --git a/src/main/java/com/direwolf20/justdirethings/common/blocks/resources/RawBlazegoldOre.java b/src/main/java/com/direwolf20/justdirethings/common/blocks/resources/RawBlazegoldOre.java new file mode 100644 index 00000000..c131b60e --- /dev/null +++ b/src/main/java/com/direwolf20/justdirethings/common/blocks/resources/RawBlazegoldOre.java @@ -0,0 +1,15 @@ +package com.direwolf20.justdirethings.common.blocks.resources; + +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; + +public class RawBlazegoldOre extends Block { + public RawBlazegoldOre() { + super(Properties.of() + .sound(SoundType.AMETHYST) + .requiresCorrectToolForDrops() + .noOcclusion() + .strength(5.0F, 6.0F) + ); + } +} diff --git a/src/main/java/com/direwolf20/justdirethings/common/items/resources/FerricoreRaw.java b/src/main/java/com/direwolf20/justdirethings/common/items/resources/RawBlazegold.java similarity index 67% rename from src/main/java/com/direwolf20/justdirethings/common/items/resources/FerricoreRaw.java rename to src/main/java/com/direwolf20/justdirethings/common/items/resources/RawBlazegold.java index e690f78b..40b142ff 100644 --- a/src/main/java/com/direwolf20/justdirethings/common/items/resources/FerricoreRaw.java +++ b/src/main/java/com/direwolf20/justdirethings/common/items/resources/RawBlazegold.java @@ -2,8 +2,8 @@ import net.minecraft.world.item.Item; -public class FerricoreRaw extends Item { - public FerricoreRaw() { +public class RawBlazegold extends Item { + public RawBlazegold() { super(new Properties()); } } diff --git a/src/main/java/com/direwolf20/justdirethings/common/items/resources/RawFerricore.java b/src/main/java/com/direwolf20/justdirethings/common/items/resources/RawFerricore.java new file mode 100644 index 00000000..ab08515a --- /dev/null +++ b/src/main/java/com/direwolf20/justdirethings/common/items/resources/RawFerricore.java @@ -0,0 +1,9 @@ +package com.direwolf20.justdirethings.common.items.resources; + +import net.minecraft.world.item.Item; + +public class RawFerricore extends Item { + public RawFerricore() { + super(new Properties()); + } +} diff --git a/src/main/java/com/direwolf20/justdirethings/datagen/BlockStates.java b/src/main/java/com/direwolf20/justdirethings/datagen/BlockStates.java index 8797c926..0f3d39e8 100644 --- a/src/main/java/com/direwolf20/justdirethings/datagen/BlockStates.java +++ b/src/main/java/com/direwolf20/justdirethings/datagen/BlockStates.java @@ -24,6 +24,7 @@ protected void registerStatesAndModels() { simpleBlock(Registration.FerricoreBlock.get(), models().cubeAll(Registration.FerricoreBlock_ITEM.getId().getPath(), blockTexture(Registration.FerricoreBlock.get()))); simpleBlock(Registration.RawFerricoreOre.get(), models().cubeAll(Registration.RawFerricoreOre_ITEM.getId().getPath(), blockTexture(Registration.RawFerricoreOre.get())).renderType("translucent")); simpleBlock(Registration.BlazeGoldBlock.get(), models().cubeAll(Registration.BlazeGoldBlock_ITEM.getId().getPath(), blockTexture(Registration.BlazeGoldBlock.get()))); + simpleBlock(Registration.RawBlazegoldOre.get(), models().cubeAll(Registration.RawBlazegoldOre_ITEM.getId().getPath(), blockTexture(Registration.RawBlazegoldOre.get())).renderType("translucent")); patternBlock(); } diff --git a/src/main/java/com/direwolf20/justdirethings/datagen/BlockTags.java b/src/main/java/com/direwolf20/justdirethings/datagen/BlockTags.java index f9f92aa8..d663922b 100644 --- a/src/main/java/com/direwolf20/justdirethings/datagen/BlockTags.java +++ b/src/main/java/com/direwolf20/justdirethings/datagen/BlockTags.java @@ -28,6 +28,8 @@ protected void addTags(HolderLookup.Provider provider) { .add(Registration.RawFerricoreOre.get()); tag(net.minecraft.tags.BlockTags.MINEABLE_WITH_PICKAXE) .add(Registration.BlazeGoldBlock.get()); + tag(net.minecraft.tags.BlockTags.MINEABLE_WITH_PICKAXE) + .add(Registration.RawBlazegoldOre.get()); } @Override diff --git a/src/main/java/com/direwolf20/justdirethings/datagen/ItemModels.java b/src/main/java/com/direwolf20/justdirethings/datagen/ItemModels.java index f8016dca..4b820da3 100644 --- a/src/main/java/com/direwolf20/justdirethings/datagen/ItemModels.java +++ b/src/main/java/com/direwolf20/justdirethings/datagen/ItemModels.java @@ -19,12 +19,14 @@ protected void registerModels() { withExistingParent(Registration.FerricoreBlock_ITEM.getId().getPath(), modLoc("block/ferricore_block")); withExistingParent(Registration.RawFerricoreOre_ITEM.getId().getPath(), modLoc("block/raw_ferricore_ore")); withExistingParent(Registration.BlazeGoldBlock_ITEM.getId().getPath(), modLoc("block/blazegold_block")); + withExistingParent(Registration.RawBlazegoldOre_ITEM.getId().getPath(), modLoc("block/raw_blazegold_ore")); //Item items singleTexture(Registration.Fuel_Canister.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/fuel_canister")); singleTexture(Registration.Pocket_Generator.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/pocketgenerator")); - singleTexture(Registration.FerricoreRaw.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/raw_ferricore")); + singleTexture(Registration.RawFerricore.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/raw_ferricore")); singleTexture(Registration.FerricoreIngot.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/ferricore_ingot")); - singleTexture(Registration.BlazeGoldIngot.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/blazegold_ingot")); + singleTexture(Registration.RawBlazegold.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/raw_blazegold")); + singleTexture(Registration.BlazegoldIngot.getId().getPath(), mcLoc("item/generated"), "layer0", modLoc("item/blazegold_ingot")); } } diff --git a/src/main/java/com/direwolf20/justdirethings/datagen/LanguageProvider.java b/src/main/java/com/direwolf20/justdirethings/datagen/LanguageProvider.java index 3c133614..2e8f0f2f 100644 --- a/src/main/java/com/direwolf20/justdirethings/datagen/LanguageProvider.java +++ b/src/main/java/com/direwolf20/justdirethings/datagen/LanguageProvider.java @@ -23,6 +23,7 @@ protected void addTranslations() { add(Registration.FerricoreBlock.get(), "Ferricore Block"); add(Registration.RawFerricoreOre.get(), "Raw Ferricore Ore"); add(Registration.BlazeGoldBlock.get(), "Blazegold Block"); + add(Registration.RawBlazegoldOre.get(), "Raw Blazegold Ore"); //Items add(Registration.Fuel_Canister.get(), "Fuel Canister"); @@ -30,8 +31,9 @@ protected void addTranslations() { //Resources add(Registration.FerricoreIngot.get(), "Ferricore Ingot"); - add(Registration.FerricoreRaw.get(), "Raw Ferricore"); - add(Registration.BlazeGoldIngot.get(), "Blazegold Ingot"); + add(Registration.RawFerricore.get(), "Raw Ferricore"); + add(Registration.BlazegoldIngot.get(), "Blazegold Ingot"); + add(Registration.RawBlazegold.get(), "Raw Blazegold"); //Misc add("justdirethings.shiftmoreinfo", "Hold Shift for details"); diff --git a/src/main/java/com/direwolf20/justdirethings/datagen/LootTables.java b/src/main/java/com/direwolf20/justdirethings/datagen/LootTables.java index 33ed5dad..2f8c8e1c 100644 --- a/src/main/java/com/direwolf20/justdirethings/datagen/LootTables.java +++ b/src/main/java/com/direwolf20/justdirethings/datagen/LootTables.java @@ -25,7 +25,15 @@ protected void generate() { Registration.RawFerricoreOre.get(), this.applyExplosionDecay( Registration.RawFerricoreOre.get(), - LootItem.lootTableItem(Registration.FerricoreRaw.get()) + LootItem.lootTableItem(Registration.RawFerricore.get()) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(4.0F, 5.0F))) + ) + )); + add(Registration.RawBlazegoldOre.get(), createSilkTouchDispatchTable( + Registration.RawBlazegoldOre.get(), + this.applyExplosionDecay( + Registration.RawBlazegoldOre.get(), + LootItem.lootTableItem(Registration.RawBlazegold.get()) .apply(SetItemCountFunction.setCount(UniformGenerator.between(4.0F, 5.0F))) ) )); diff --git a/src/main/java/com/direwolf20/justdirethings/datagen/Recipes.java b/src/main/java/com/direwolf20/justdirethings/datagen/Recipes.java index 9279c165..3ae18963 100644 --- a/src/main/java/com/direwolf20/justdirethings/datagen/Recipes.java +++ b/src/main/java/com/direwolf20/justdirethings/datagen/Recipes.java @@ -73,20 +73,24 @@ protected void buildRecipes(RecipeOutput consumer) { .group("justdirethings") .unlockedBy("has_goo_block_t1", InventoryChangeTrigger.TriggerInstance.hasItems(Registration.GooBlock_Tier1_ITEM.get())) .save(consumer); - GooSpreadRecipeBuilder.shapeless(new ResourceLocation(JustDireThings.MODID, "dire_gold_block"), Blocks.GOLD_BLOCK.defaultBlockState(), Registration.BlazeGoldBlock.get().defaultBlockState(), 2, 2400) + GooSpreadRecipeBuilder.shapeless(new ResourceLocation(JustDireThings.MODID, "dire_gold_block"), Blocks.GOLD_BLOCK.defaultBlockState(), Registration.RawBlazegoldOre.get().defaultBlockState(), 2, 2400) .group("justdirethings") .unlockedBy("has_goo_block_t2", InventoryChangeTrigger.TriggerInstance.hasItems(Registration.GooBlock_Tier2_ITEM.get())) .save(consumer); //Smelting - SimpleCookingRecipeBuilder.smelting(Ingredient.of(Registration.FerricoreRaw.get()), RecipeCategory.MISC, + SimpleCookingRecipeBuilder.smelting(Ingredient.of(Registration.RawFerricore.get()), RecipeCategory.MISC, Registration.FerricoreIngot.get(), 1.0f, 400) - .unlockedBy("has_ferricore_raw", inventoryTrigger(ItemPredicate.Builder.item().of(Registration.FerricoreRaw.get()).build())) + .unlockedBy("has_ferricore_raw", inventoryTrigger(ItemPredicate.Builder.item().of(Registration.RawFerricore.get()).build())) .save(consumer, new ResourceLocation(JustDireThings.MODID, "ferricore_ingot_smelted")); + SimpleCookingRecipeBuilder.smelting(Ingredient.of(Registration.RawBlazegold.get()), RecipeCategory.MISC, + Registration.BlazegoldIngot.get(), 1.0f, 400) + .unlockedBy("has_blazegold_raw", inventoryTrigger(ItemPredicate.Builder.item().of(Registration.RawBlazegold.get()).build())) + .save(consumer, new ResourceLocation(JustDireThings.MODID, "blazegold_ingot_smelted")); //Resource Conversions nineBlockStorageRecipes(consumer, RecipeCategory.MISC, Registration.FerricoreIngot.get(), RecipeCategory.BUILDING_BLOCKS, Registration.FerricoreBlock.get(), Registration.FerricoreIngot.getId().getNamespace() + ":" + Registration.FerricoreIngot.getId().getPath(), "justdirethings", Registration.FerricoreBlock.getId().getNamespace() + ":" + Registration.FerricoreBlock.getId().getPath(), "justdirethings"); - nineBlockStorageRecipes(consumer, RecipeCategory.MISC, Registration.BlazeGoldIngot.get(), RecipeCategory.BUILDING_BLOCKS, Registration.BlazeGoldBlock.get(), Registration.BlazeGoldIngot.getId().getNamespace() + ":" + Registration.BlazeGoldIngot.getId().getPath(), "justdirethings", Registration.BlazeGoldBlock.getId().getNamespace() + ":" + Registration.BlazeGoldBlock.getId().getPath(), "justdirethings"); + nineBlockStorageRecipes(consumer, RecipeCategory.MISC, Registration.BlazegoldIngot.get(), RecipeCategory.BUILDING_BLOCKS, Registration.BlazeGoldBlock.get(), Registration.BlazegoldIngot.getId().getNamespace() + ":" + Registration.BlazegoldIngot.getId().getPath(), "justdirethings", Registration.BlazeGoldBlock.getId().getNamespace() + ":" + Registration.BlazeGoldBlock.getId().getPath(), "justdirethings"); } } diff --git a/src/main/java/com/direwolf20/justdirethings/setup/Registration.java b/src/main/java/com/direwolf20/justdirethings/setup/Registration.java index 376467b7..1a949ff0 100644 --- a/src/main/java/com/direwolf20/justdirethings/setup/Registration.java +++ b/src/main/java/com/direwolf20/justdirethings/setup/Registration.java @@ -8,6 +8,7 @@ import com.direwolf20.justdirethings.common.blocks.gooblocks.GooPatternBlock; import com.direwolf20.justdirethings.common.blocks.resources.BlazeGoldBlock; import com.direwolf20.justdirethings.common.blocks.resources.FerricoreBlock; +import com.direwolf20.justdirethings.common.blocks.resources.RawBlazegoldOre; import com.direwolf20.justdirethings.common.blocks.resources.RawFerricoreOre; import com.direwolf20.justdirethings.common.containers.FuelCanisterContainer; import com.direwolf20.justdirethings.common.containers.PocketGeneratorContainer; @@ -15,7 +16,8 @@ import com.direwolf20.justdirethings.common.items.PocketGenerator; import com.direwolf20.justdirethings.common.items.resources.BlazeGoldIngot; import com.direwolf20.justdirethings.common.items.resources.FerricoreIngot; -import com.direwolf20.justdirethings.common.items.resources.FerricoreRaw; +import com.direwolf20.justdirethings.common.items.resources.RawBlazegold; +import com.direwolf20.justdirethings.common.items.resources.RawFerricore; import com.direwolf20.justdirethings.datagen.recipes.GooSpreadRecipe; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; @@ -79,6 +81,8 @@ public static void init(IEventBus eventBus) { public static final DeferredHolder RawFerricoreOre_ITEM = ITEMS.register("raw_ferricore_ore", () -> new BlockItem(RawFerricoreOre.get(), new Item.Properties())); public static final DeferredHolder BlazeGoldBlock = BLOCKS.register("blazegold_block", BlazeGoldBlock::new); public static final DeferredHolder BlazeGoldBlock_ITEM = ITEMS.register("blazegold_block", () -> new BlockItem(BlazeGoldBlock.get(), new Item.Properties())); + public static final DeferredHolder RawBlazegoldOre = BLOCKS.register("raw_blazegold_ore", RawBlazegoldOre::new); + public static final DeferredHolder RawBlazegoldOre_ITEM = ITEMS.register("raw_blazegold_ore", () -> new BlockItem(RawBlazegoldOre.get(), new Item.Properties())); //BlockEntities (Not TileEntities - Honest) public static final DeferredHolder, BlockEntityType> GooBlockBE_Tier1 = BLOCK_ENTITIES.register("gooblock_tier1", () -> BlockEntityType.Builder.of(GooBlockBE_Tier1::new, GooBlock_Tier1.get()).build(null)); @@ -91,8 +95,9 @@ public static void init(IEventBus eventBus) { //Items - Resources public static final DeferredHolder FerricoreIngot = ITEMS.register("ferricore_ingot", FerricoreIngot::new); - public static final DeferredHolder FerricoreRaw = ITEMS.register("ferricore_raw", FerricoreRaw::new); - public static final DeferredHolder BlazeGoldIngot = ITEMS.register("blazegold_ingot", BlazeGoldIngot::new); + public static final DeferredHolder RawFerricore = ITEMS.register("raw_ferricore", RawFerricore::new); + public static final DeferredHolder BlazegoldIngot = ITEMS.register("blazegold_ingot", BlazeGoldIngot::new); + public static final DeferredHolder RawBlazegold = ITEMS.register("raw_blazegold", RawBlazegold::new); //Containers public static final DeferredHolder, MenuType> FuelCanister_Container = CONTAINERS.register("fuelcanister", diff --git a/src/main/resources/assets/justdirethings/textures/block/raw_blazegold_ore.png b/src/main/resources/assets/justdirethings/textures/block/raw_blazegold_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..e6730ce15fc1a5c4c06d9e29d2b49c1435c42a7f GIT binary patch literal 627 zcmV-(0*w8MP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0tiV&K~y+TZBsF5 zQ&AMXKYo)o36_L_L&+dTGKkPx9TY?|R9$s&C}e26RLIc5;dg7ZT)K5#2Ch<#r=lXP*)7vD!{=!*c7cQpnTS27n5=Pi^?{XKy2SG{k+>#o zFqvWzGIXwZE3Y7?^G|9(~dJOw~XGPg>H+Wus`G&SOqfB-aw(EhXEBzkSS{!8) zoCZ@l-z5V#zGbZ7O3pQrckAlD_94YdquJn-;ft)jSRcV2`aO`>h5qA&iRf!4Hd1MYHbXm1MQ1<;r)Mxc zKoJON4^DYsPI8fu0cj!DAfsdXdPW)LNS%G}f0G|+7=B`8f+qb&BdgSx}kNf}o%(*9lGDU4$tAP}INswRge=uN>@@94e z3UL;AL>4nJ@ErzW#^d=bQhyLonx-%Btu%db(Ng@cEAyhY*1FC>3mH6J{an^LB{Ts5+Am+E literal 0 HcmV?d00001