diff --git a/aris_random_additions.mcreator b/aris_random_additions.mcreator index 1f748fb..0b0401f 100644 --- a/aris_random_additions.mcreator +++ b/aris_random_additions.mcreator @@ -9,8 +9,8 @@ "metadata": { "files": [ "src/main/resources/assets/aris_random_additions/blockstates/condensed_netherrack.json", - "src/main/java/net/mcreator/arisrandomadditions/block/CondensedNetherrackBlock.java", "src/main/resources/assets/aris_random_additions/models/item/condensed_netherrack.json", + "src/main/java/net/mcreator/arisrandomadditions/block/CondensedNetherrackBlock.java", "src/main/resources/assets/aris_random_additions/models/block/condensed_netherrack.json", "src/main/resources/data/aris_random_additions/loot_tables/blocks/condensed_netherrack.json" ] @@ -25,11 +25,11 @@ "registry_name": "condensed_condensed_netherrack", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/block/condensed_condensed_netherrack.json", - "src/main/resources/assets/aris_random_additions/blockstates/condensed_condensed_netherrack.json", "src/main/java/net/mcreator/arisrandomadditions/block/CondensedCondensedNetherrackBlock.java", + "src/main/resources/assets/aris_random_additions/blockstates/condensed_condensed_netherrack.json", "src/main/resources/data/aris_random_additions/loot_tables/blocks/condensed_condensed_netherrack.json", - "src/main/resources/assets/aris_random_additions/models/item/condensed_condensed_netherrack.json" + "src/main/resources/assets/aris_random_additions/models/item/condensed_condensed_netherrack.json", + "src/main/resources/assets/aris_random_additions/models/block/condensed_condensed_netherrack.json" ] }, "path": "~/Netherracks" @@ -42,10 +42,10 @@ "registry_name": "condensed_condensed_condensed_netherrack", "metadata": { "files": [ - "src/main/resources/data/aris_random_additions/loot_tables/blocks/condensed_condensed_condensed_netherrack.json", "src/main/resources/assets/aris_random_additions/blockstates/condensed_condensed_condensed_netherrack.json", "src/main/java/net/mcreator/arisrandomadditions/block/CondensedCondensedCondensedNetherrackBlock.java", "src/main/resources/assets/aris_random_additions/models/item/condensed_condensed_condensed_netherrack.json", + "src/main/resources/data/aris_random_additions/loot_tables/blocks/condensed_condensed_condensed_netherrack.json", "src/main/resources/assets/aris_random_additions/models/block/condensed_condensed_condensed_netherrack.json" ] }, @@ -137,8 +137,8 @@ "registry_name": "block_eater", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/item/BlockEaterItem.java", - "src/main/resources/assets/aris_random_additions/models/item/block_eater.json" + "src/main/resources/assets/aris_random_additions/models/item/block_eater.json", + "src/main/java/net/mcreator/arisrandomadditions/item/BlockEaterItem.java" ] }, "path": "~/Netherracks" @@ -239,15 +239,15 @@ "registry_name": "broken_glass", "metadata": { "files": [ + "src/main/resources/data/aris_random_additions/loot_tables/blocks/broken_glass.json", "src/main/resources/assets/aris_random_additions/models/block/broken_glass_side.json", "src/main/resources/assets/aris_random_additions/blockstates/broken_glass.json", "src/main/resources/assets/aris_random_additions/models/block/broken_glass_side_alt.json", - "src/main/resources/data/aris_random_additions/loot_tables/blocks/broken_glass.json", "src/main/resources/assets/aris_random_additions/models/block/broken_glass_noside_alt.json", - "src/main/resources/assets/aris_random_additions/models/item/broken_glass.json", - "src/main/resources/assets/aris_random_additions/models/block/broken_glass_noside.json", "src/main/resources/assets/aris_random_additions/models/block/broken_glass_post.json", - "src/main/java/net/mcreator/arisrandomadditions/block/BrokenGlassBlock.java" + "src/main/java/net/mcreator/arisrandomadditions/block/BrokenGlassBlock.java", + "src/main/resources/assets/aris_random_additions/models/item/broken_glass.json", + "src/main/resources/assets/aris_random_additions/models/block/broken_glass_noside.json" ] }, "path": "~/Other" @@ -273,11 +273,11 @@ "registry_name": "quadra_condensed_netherrack", "metadata": { "files": [ + "src/main/resources/assets/aris_random_additions/models/item/quadra_condensed_netherrack.json", "src/main/resources/assets/aris_random_additions/models/block/quadra_condensed_netherrack.json", "src/main/java/net/mcreator/arisrandomadditions/block/QuadraCondensedNetherrackBlock.java", - "src/main/resources/assets/aris_random_additions/models/item/quadra_condensed_netherrack.json", - "src/main/resources/data/aris_random_additions/loot_tables/blocks/quadra_condensed_netherrack.json", - "src/main/resources/assets/aris_random_additions/blockstates/quadra_condensed_netherrack.json" + "src/main/resources/assets/aris_random_additions/blockstates/quadra_condensed_netherrack.json", + "src/main/resources/data/aris_random_additions/loot_tables/blocks/quadra_condensed_netherrack.json" ] }, "path": "~/Netherracks" @@ -290,8 +290,8 @@ "registry_name": "netherrackite_pickaxe", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/netherrackite_pickaxe.json", - "src/main/java/net/mcreator/arisrandomadditions/item/NetherrackitePickaxeItem.java" + "src/main/java/net/mcreator/arisrandomadditions/item/NetherrackitePickaxeItem.java", + "src/main/resources/assets/aris_random_additions/models/item/netherrackite_pickaxe.json" ] }, "path": "~/Netherracks" @@ -370,11 +370,11 @@ "registry_name": "penta_condensed_netherrack", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/block/PentaCondensedNetherrackBlock.java", "src/main/resources/assets/aris_random_additions/models/item/penta_condensed_netherrack.json", - "src/main/resources/data/aris_random_additions/loot_tables/blocks/penta_condensed_netherrack.json", + "src/main/java/net/mcreator/arisrandomadditions/block/PentaCondensedNetherrackBlock.java", + "src/main/resources/assets/aris_random_additions/blockstates/penta_condensed_netherrack.json", "src/main/resources/assets/aris_random_additions/models/block/penta_condensed_netherrack.json", - "src/main/resources/assets/aris_random_additions/blockstates/penta_condensed_netherrack.json" + "src/main/resources/data/aris_random_additions/loot_tables/blocks/penta_condensed_netherrack.json" ] }, "path": "~/Netherracks" @@ -414,8 +414,8 @@ "metadata": { "files": [ "src/main/resources/data/aris_random_additions/loot_tables/blocks/hexa_condensed_netherrack.json", - "src/main/resources/assets/aris_random_additions/models/block/hexa_condensed_netherrack.json", "src/main/resources/assets/aris_random_additions/blockstates/hexa_condensed_netherrack.json", + "src/main/resources/assets/aris_random_additions/models/block/hexa_condensed_netherrack.json", "src/main/java/net/mcreator/arisrandomadditions/block/HexaCondensedNetherrackBlock.java", "src/main/resources/assets/aris_random_additions/models/item/hexa_condensed_netherrack.json" ] @@ -505,8 +505,8 @@ "registry_name": "lapis_lazuli_nugget", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/lapis_lazuli_nugget.json", - "src/main/java/net/mcreator/arisrandomadditions/item/LapisLazuliNuggetItem.java" + "src/main/java/net/mcreator/arisrandomadditions/item/LapisLazuliNuggetItem.java", + "src/main/resources/assets/aris_random_additions/models/item/lapis_lazuli_nugget.json" ] }, "path": "~/Lapis" @@ -750,8 +750,8 @@ "registry_name": "ore_miner_gui", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/world/inventory/OreMinerGUIMenu.java", - "src/main/java/net/mcreator/arisrandomadditions/client/gui/OreMinerGUIScreen.java" + "src/main/java/net/mcreator/arisrandomadditions/client/gui/OreMinerGUIScreen.java", + "src/main/java/net/mcreator/arisrandomadditions/world/inventory/OreMinerGUIMenu.java" ] }, "path": "~/OreMiner" @@ -797,12 +797,12 @@ "registry_name": "ore_miner", "metadata": { "files": [ - "src/main/resources/data/aris_random_additions/loot_tables/blocks/ore_miner.json", - "src/main/resources/assets/aris_random_additions/models/block/ore_miner.json", - "src/main/java/net/mcreator/arisrandomadditions/block/OreMinerBlock.java", "src/main/resources/assets/aris_random_additions/models/item/ore_miner.json", - "src/main/java/net/mcreator/arisrandomadditions/block/entity/OreMinerBlockEntity.java", - "src/main/resources/assets/aris_random_additions/blockstates/ore_miner.json" + "src/main/java/net/mcreator/arisrandomadditions/block/OreMinerBlock.java", + "src/main/resources/assets/aris_random_additions/models/block/ore_miner.json", + "src/main/resources/data/aris_random_additions/loot_tables/blocks/ore_miner.json", + "src/main/resources/assets/aris_random_additions/blockstates/ore_miner.json", + "src/main/java/net/mcreator/arisrandomadditions/block/entity/OreMinerBlockEntity.java" ] }, "path": "~/OreMiner" @@ -841,9 +841,9 @@ "registry_name": "ghoul", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/client/renderer/GhoulRenderer.java", + "src/main/java/net/mcreator/arisrandomadditions/entity/GhoulEntity.java", "src/main/resources/assets/aris_random_additions/models/item/ghoul_spawn_egg.json", - "src/main/java/net/mcreator/arisrandomadditions/entity/GhoulEntity.java" + "src/main/java/net/mcreator/arisrandomadditions/client/renderer/GhoulRenderer.java" ] }, "path": "~/Gravedigger" @@ -887,8 +887,8 @@ "registry_name": "gravedigger", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/gravedigger.json", - "src/main/java/net/mcreator/arisrandomadditions/item/GravediggerItem.java" + "src/main/java/net/mcreator/arisrandomadditions/item/GravediggerItem.java", + "src/main/resources/assets/aris_random_additions/models/item/gravedigger.json" ] }, "path": "~/Gravedigger" @@ -1117,13 +1117,13 @@ "registry_name": "netherrack_juice", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/blockstates/netherrack_juice.json", - "src/main/java/net/mcreator/arisrandomadditions/fluid/NetherrackJuiceFluid.java", "src/main/java/net/mcreator/arisrandomadditions/item/NetherrackJuiceItem.java", "src/main/resources/assets/aris_random_additions/models/item/netherrack_juice_bucket.json", + "src/main/java/net/mcreator/arisrandomadditions/fluid/NetherrackJuiceFluid.java", "src/main/java/net/mcreator/arisrandomadditions/block/NetherrackJuiceBlock.java", - "src/main/resources/assets/aris_random_additions/models/block/netherrack_juice.json", - "src/main/java/net/mcreator/arisrandomadditions/fluid/types/NetherrackJuiceFluidType.java" + "src/main/resources/assets/aris_random_additions/blockstates/netherrack_juice.json", + "src/main/java/net/mcreator/arisrandomadditions/fluid/types/NetherrackJuiceFluidType.java", + "src/main/resources/assets/aris_random_additions/models/block/netherrack_juice.json" ] }, "path": "~/Netherracks" @@ -1194,8 +1194,8 @@ "metadata": { "files": [ "src/main/resources/assets/aris_random_additions/models/item/tux_spawn_egg.json", - "src/main/java/net/mcreator/arisrandomadditions/client/renderer/TuxRenderer.java", - "src/main/java/net/mcreator/arisrandomadditions/entity/TuxEntity.java" + "src/main/java/net/mcreator/arisrandomadditions/entity/TuxEntity.java", + "src/main/java/net/mcreator/arisrandomadditions/client/renderer/TuxRenderer.java" ] }, "path": "~/Tux" @@ -1372,11 +1372,11 @@ "registry_name": "redstone_bricks", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/block/redstone_bricks.json", "src/main/resources/data/aris_random_additions/loot_tables/blocks/redstone_bricks.json", + "src/main/java/net/mcreator/arisrandomadditions/block/RedstoneBricksBlock.java", "src/main/resources/assets/aris_random_additions/blockstates/redstone_bricks.json", "src/main/resources/assets/aris_random_additions/models/item/redstone_bricks.json", - "src/main/java/net/mcreator/arisrandomadditions/block/RedstoneBricksBlock.java" + "src/main/resources/assets/aris_random_additions/models/block/redstone_bricks.json" ] }, "path": "~/Redstone" @@ -1389,13 +1389,13 @@ "registry_name": "redstone_brick_stairs", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/redstone_brick_stairs.json", - "src/main/resources/assets/aris_random_additions/blockstates/redstone_brick_stairs.json", - "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_stairs.json", - "src/main/resources/data/aris_random_additions/loot_tables/blocks/redstone_brick_stairs.json", - "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_stairs_inner.json", "src/main/java/net/mcreator/arisrandomadditions/block/RedstoneBrickStairsBlock.java", - "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_stairs_outer.json" + "src/main/resources/data/aris_random_additions/loot_tables/blocks/redstone_brick_stairs.json", + "src/main/resources/assets/aris_random_additions/models/item/redstone_brick_stairs.json", + "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_stairs_outer.json", + "src/main/resources/assets/aris_random_additions/blockstates/redstone_brick_stairs.json", + "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_stairs_inner.json", + "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_stairs.json" ] }, "path": "~/Redstone" @@ -1409,11 +1409,11 @@ "metadata": { "files": [ "src/main/resources/data/aris_random_additions/loot_tables/blocks/redstone_brick_slabs.json", - "src/main/java/net/mcreator/arisrandomadditions/block/RedstoneBrickSlabsBlock.java", - "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_slabs_full.json", "src/main/resources/assets/aris_random_additions/models/item/redstone_brick_slabs.json", - "src/main/resources/assets/aris_random_additions/blockstates/redstone_brick_slabs.json", + "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_slabs_full.json", + "src/main/java/net/mcreator/arisrandomadditions/block/RedstoneBrickSlabsBlock.java", "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_slabs_top.json", + "src/main/resources/assets/aris_random_additions/blockstates/redstone_brick_slabs.json", "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_slabs.json" ] }, @@ -1428,12 +1428,12 @@ "metadata": { "files": [ "src/main/resources/data/aris_random_additions/loot_tables/blocks/redstone_brick_walls.json", - "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_walls_post.json", - "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_walls_side_tall.json", "src/main/java/net/mcreator/arisrandomadditions/block/RedstoneBrickWallsBlock.java", "src/main/resources/assets/aris_random_additions/models/item/redstone_brick_walls.json", - "src/main/resources/assets/aris_random_additions/blockstates/redstone_brick_walls.json", + "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_walls_side_tall.json", + "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_walls_post.json", "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_walls_inventory.json", + "src/main/resources/assets/aris_random_additions/blockstates/redstone_brick_walls.json", "src/main/resources/assets/aris_random_additions/models/block/redstone_brick_walls.json" ] }, @@ -1447,9 +1447,9 @@ "registry_name": "magma_bricks", "metadata": { "files": [ + "src/main/resources/assets/aris_random_additions/models/item/magma_bricks.json", "src/main/resources/assets/aris_random_additions/models/block/magma_bricks.json", "src/main/java/net/mcreator/arisrandomadditions/block/MagmaBricksBlock.java", - "src/main/resources/assets/aris_random_additions/models/item/magma_bricks.json", "src/main/resources/data/aris_random_additions/loot_tables/blocks/magma_bricks.json", "src/main/resources/assets/aris_random_additions/blockstates/magma_bricks.json" ] @@ -1465,12 +1465,12 @@ "metadata": { "files": [ "src/main/resources/assets/aris_random_additions/models/block/magma_brick_stairs_inner.json", + "src/main/resources/assets/aris_random_additions/models/block/magma_brick_stairs.json", "src/main/resources/data/aris_random_additions/loot_tables/blocks/magma_brick_stairs.json", "src/main/resources/assets/aris_random_additions/models/block/magma_brick_stairs_outer.json", - "src/main/resources/assets/aris_random_additions/blockstates/magma_brick_stairs.json", "src/main/resources/assets/aris_random_additions/models/item/magma_brick_stairs.json", - "src/main/resources/assets/aris_random_additions/models/block/magma_brick_stairs.json", - "src/main/java/net/mcreator/arisrandomadditions/block/MagmaBrickStairsBlock.java" + "src/main/java/net/mcreator/arisrandomadditions/block/MagmaBrickStairsBlock.java", + "src/main/resources/assets/aris_random_additions/blockstates/magma_brick_stairs.json" ] }, "path": "~/Magma" @@ -1483,13 +1483,13 @@ "registry_name": "magma_brick_slabs", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/block/MagmaBrickSlabsBlock.java", "src/main/resources/data/aris_random_additions/loot_tables/blocks/magma_brick_slabs.json", "src/main/resources/assets/aris_random_additions/blockstates/magma_brick_slabs.json", + "src/main/resources/assets/aris_random_additions/models/item/magma_brick_slabs.json", "src/main/resources/assets/aris_random_additions/models/block/magma_brick_slabs.json", "src/main/resources/assets/aris_random_additions/models/block/magma_brick_slabs_full.json", - "src/main/resources/assets/aris_random_additions/models/item/magma_brick_slabs.json", - "src/main/resources/assets/aris_random_additions/models/block/magma_brick_slabs_top.json" + "src/main/resources/assets/aris_random_additions/models/block/magma_brick_slabs_top.json", + "src/main/java/net/mcreator/arisrandomadditions/block/MagmaBrickSlabsBlock.java" ] }, "path": "~/Magma" @@ -1503,13 +1503,13 @@ "metadata": { "files": [ "src/main/resources/data/aris_random_additions/loot_tables/blocks/magma_brick_walls.json", - "src/main/resources/assets/aris_random_additions/blockstates/magma_brick_walls.json", - "src/main/resources/assets/aris_random_additions/models/block/magma_brick_walls.json", "src/main/resources/assets/aris_random_additions/models/item/magma_brick_walls.json", + "src/main/resources/assets/aris_random_additions/models/block/magma_brick_walls.json", + "src/main/resources/assets/aris_random_additions/models/block/magma_brick_walls_side_tall.json", "src/main/java/net/mcreator/arisrandomadditions/block/MagmaBrickWallsBlock.java", "src/main/resources/assets/aris_random_additions/models/block/magma_brick_walls_post.json", - "src/main/resources/assets/aris_random_additions/models/block/magma_brick_walls_side_tall.json", - "src/main/resources/assets/aris_random_additions/models/block/magma_brick_walls_inventory.json" + "src/main/resources/assets/aris_random_additions/models/block/magma_brick_walls_inventory.json", + "src/main/resources/assets/aris_random_additions/blockstates/magma_brick_walls.json" ] }, "path": "~/Magma" @@ -1522,11 +1522,11 @@ "registry_name": "magma_brick_pressure_plate", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/block/magma_brick_pressure_plate.json", - "src/main/resources/data/aris_random_additions/loot_tables/blocks/magma_brick_pressure_plate.json", "src/main/resources/assets/aris_random_additions/models/item/magma_brick_pressure_plate.json", "src/main/resources/assets/aris_random_additions/blockstates/magma_brick_pressure_plate.json", "src/main/resources/assets/aris_random_additions/models/block/magma_brick_pressure_plate_down.json", + "src/main/resources/data/aris_random_additions/loot_tables/blocks/magma_brick_pressure_plate.json", + "src/main/resources/assets/aris_random_additions/models/block/magma_brick_pressure_plate.json", "src/main/java/net/mcreator/arisrandomadditions/block/MagmaBrickPressurePlateBlock.java" ] }, @@ -1540,13 +1540,13 @@ "registry_name": "magma_brick_button", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/block/MagmaBrickButtonBlock.java", - "src/main/resources/data/aris_random_additions/loot_tables/blocks/magma_brick_button.json", - "src/main/resources/assets/aris_random_additions/models/block/magma_brick_button_inventory.json", - "src/main/resources/assets/aris_random_additions/blockstates/magma_brick_button.json", "src/main/resources/assets/aris_random_additions/models/block/magma_brick_button_pressed.json", + "src/main/resources/assets/aris_random_additions/models/block/magma_brick_button_inventory.json", + "src/main/resources/assets/aris_random_additions/models/block/magma_brick_button.json", + "src/main/resources/data/aris_random_additions/loot_tables/blocks/magma_brick_button.json", + "src/main/java/net/mcreator/arisrandomadditions/block/MagmaBrickButtonBlock.java", "src/main/resources/assets/aris_random_additions/models/item/magma_brick_button.json", - "src/main/resources/assets/aris_random_additions/models/block/magma_brick_button.json" + "src/main/resources/assets/aris_random_additions/blockstates/magma_brick_button.json" ] }, "path": "~/Magma" @@ -1689,8 +1689,8 @@ "registry_name": "bean", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/bean.json", - "src/main/java/net/mcreator/arisrandomadditions/item/BeanItem.java" + "src/main/java/net/mcreator/arisrandomadditions/item/BeanItem.java", + "src/main/resources/assets/aris_random_additions/models/item/bean.json" ] }, "path": "~/Other" @@ -1859,11 +1859,11 @@ "registry_name": "bedrockifier", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/bedrockifier.json", "src/main/java/net/mcreator/arisrandomadditions/block/entity/BedrockifierBlockEntity.java", - "src/main/resources/data/aris_random_additions/loot_tables/blocks/bedrockifier.json", "src/main/resources/assets/aris_random_additions/blockstates/bedrockifier.json", + "src/main/resources/data/aris_random_additions/loot_tables/blocks/bedrockifier.json", "src/main/java/net/mcreator/arisrandomadditions/block/BedrockifierBlock.java", + "src/main/resources/assets/aris_random_additions/models/item/bedrockifier.json", "src/main/resources/assets/aris_random_additions/models/block/bedrockifier.json" ] }, @@ -1904,8 +1904,8 @@ "registry_name": "magic_egg", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/item/MagicEggItem.java", - "src/main/resources/assets/aris_random_additions/models/item/magic_egg.json" + "src/main/resources/assets/aris_random_additions/models/item/magic_egg.json", + "src/main/java/net/mcreator/arisrandomadditions/item/MagicEggItem.java" ] }, "path": "~/SpawnEggs" @@ -1931,8 +1931,8 @@ "registry_name": "wither_question_mark", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/wither_question_mark.json", - "src/main/java/net/mcreator/arisrandomadditions/item/WitherQuestionMarkItem.java" + "src/main/java/net/mcreator/arisrandomadditions/item/WitherQuestionMarkItem.java", + "src/main/resources/assets/aris_random_additions/models/item/wither_question_mark.json" ] }, "path": "~/SpawnEggs" @@ -2440,8 +2440,8 @@ "registry_name": "snow_golem_question_mark", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/item/SnowGolemQuestionMarkItem.java", - "src/main/resources/assets/aris_random_additions/models/item/snow_golem_question_mark.json" + "src/main/resources/assets/aris_random_additions/models/item/snow_golem_question_mark.json", + "src/main/java/net/mcreator/arisrandomadditions/item/SnowGolemQuestionMarkItem.java" ] }, "path": "~/SpawnEggs" @@ -2573,8 +2573,8 @@ "registry_name": "orichalcum", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/orichalcum.json", - "src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumItem.java" + "src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumItem.java", + "src/main/resources/assets/aris_random_additions/models/item/orichalcum.json" ] }, "path": "~/Orichalcum" @@ -2588,13 +2588,13 @@ "metadata": { "files": [ "src/main/java/net/mcreator/arisrandomadditions/block/OrichalcumOreBlock.java", - "src/main/resources/assets/aris_random_additions/blockstates/orichalcum_ore.json", - "src/main/resources/data/aris_random_additions/loot_tables/blocks/orichalcum_ore.json", - "src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_ore.json", "src/main/resources/assets/aris_random_additions/models/item/orichalcum_ore.json", + "src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_ore.json", + "src/main/resources/assets/aris_random_additions/blockstates/orichalcum_ore.json", + "src/main/resources/assets/aris_random_additions/models/block/orichalcum_ore.json", "src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_ore_biome_modifier.json", "src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_ore.json", - "src/main/resources/assets/aris_random_additions/models/block/orichalcum_ore.json" + "src/main/resources/data/aris_random_additions/loot_tables/blocks/orichalcum_ore.json" ] }, "path": "~/Orichalcum" @@ -2607,11 +2607,11 @@ "registry_name": "orichalcum_block", "metadata": { "files": [ - "src/main/resources/data/aris_random_additions/loot_tables/blocks/orichalcum_block.json", - "src/main/resources/assets/aris_random_additions/models/block/orichalcum_block.json", "src/main/resources/assets/aris_random_additions/models/item/orichalcum_block.json", + "src/main/java/net/mcreator/arisrandomadditions/block/OrichalcumBlockBlock.java", "src/main/resources/assets/aris_random_additions/blockstates/orichalcum_block.json", - "src/main/java/net/mcreator/arisrandomadditions/block/OrichalcumBlockBlock.java" + "src/main/resources/data/aris_random_additions/loot_tables/blocks/orichalcum_block.json", + "src/main/resources/assets/aris_random_additions/models/block/orichalcum_block.json" ] }, "path": "~/Orichalcum" @@ -2691,8 +2691,8 @@ "registry_name": "orichalcum_sword", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumSwordItem.java", - "src/main/resources/assets/aris_random_additions/models/item/orichalcum_sword.json" + "src/main/resources/assets/aris_random_additions/models/item/orichalcum_sword.json", + "src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumSwordItem.java" ] }, "path": "~/Orichalcum" @@ -2798,11 +2798,11 @@ "registry_name": "orichalcum_armor", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/orichalcum_armor_boots.json", "src/main/resources/assets/aris_random_additions/models/item/orichalcum_armor_chestplate.json", "src/main/resources/assets/aris_random_additions/models/item/orichalcum_armor_leggings.json", "src/main/resources/assets/aris_random_additions/models/item/orichalcum_armor_helmet.json", - "src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumArmorItem.java" + "src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumArmorItem.java", + "src/main/resources/assets/aris_random_additions/models/item/orichalcum_armor_boots.json" ] }, "path": "~/Orichalcum" @@ -2867,8 +2867,8 @@ "registry_name": "orichalcum_feature", "metadata": { "files": [ - "src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_feature_biome_modifier.json", "src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_feature.json", + "src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_feature_biome_modifier.json", "src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_feature.json" ] }, @@ -2927,8 +2927,8 @@ "registry_name": "bedrock_shard", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/bedrock_shard.json", - "src/main/java/net/mcreator/arisrandomadditions/item/BedrockShardItem.java" + "src/main/java/net/mcreator/arisrandomadditions/item/BedrockShardItem.java", + "src/main/resources/assets/aris_random_additions/models/item/bedrock_shard.json" ] }, "path": "~/Bedrock" @@ -3304,8 +3304,8 @@ "registry_name": "pocket_lightning", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/item/PocketLightningItem.java", - "src/main/resources/assets/aris_random_additions/models/item/pocket_lightning.json" + "src/main/resources/assets/aris_random_additions/models/item/pocket_lightning.json", + "src/main/java/net/mcreator/arisrandomadditions/item/PocketLightningItem.java" ] }, "path": "~/PocketLightning" @@ -3595,10 +3595,10 @@ "metadata": { "files": [ "src/main/java/net/mcreator/arisrandomadditions/block/RaveBlockBlock.java", - "src/main/resources/assets/aris_random_additions/models/item/rave_block.json", - "src/main/resources/assets/aris_random_additions/models/block/rave_block.json", "src/main/resources/data/aris_random_additions/loot_tables/blocks/rave_block.json", - "src/main/resources/assets/aris_random_additions/blockstates/rave_block.json" + "src/main/resources/assets/aris_random_additions/models/block/rave_block.json", + "src/main/resources/assets/aris_random_additions/blockstates/rave_block.json", + "src/main/resources/assets/aris_random_additions/models/item/rave_block.json" ] }, "path": "~/Other" @@ -3612,10 +3612,10 @@ "metadata": { "files": [ "src/main/resources/assets/aris_random_additions/models/block/rave_block_states_blockstate_0.json", - "src/main/resources/assets/aris_random_additions/models/block/rave_block_states_blockstate_3.json", "src/main/resources/assets/aris_random_additions/models/block/rave_block_states_blockstate_1.json", - "src/main/resources/assets/aris_random_additions/models/block/rave_block_states_blockstate_4.json", - "src/main/resources/assets/aris_random_additions/models/block/rave_block_states_blockstate_2.json" + "src/main/resources/assets/aris_random_additions/models/block/rave_block_states_blockstate_2.json", + "src/main/resources/assets/aris_random_additions/models/block/rave_block_states_blockstate_3.json", + "src/main/resources/assets/aris_random_additions/models/block/rave_block_states_blockstate_4.json" ] }, "path": "~/Other" @@ -3676,8 +3676,8 @@ "registry_name": "turd", "metadata": { "files": [ - "src/main/resources/assets/aris_random_additions/models/item/turd.json", - "src/main/java/net/mcreator/arisrandomadditions/item/TurdItem.java" + "src/main/java/net/mcreator/arisrandomadditions/item/TurdItem.java", + "src/main/resources/assets/aris_random_additions/models/item/turd.json" ] }, "path": "~/Turd" @@ -3742,8 +3742,8 @@ "registry_name": "turd_gui", "metadata": { "files": [ - "src/main/java/net/mcreator/arisrandomadditions/world/inventory/TurdGUIMenu.java", - "src/main/java/net/mcreator/arisrandomadditions/client/gui/TurdGUIScreen.java" + "src/main/java/net/mcreator/arisrandomadditions/client/gui/TurdGUIScreen.java", + "src/main/java/net/mcreator/arisrandomadditions/world/inventory/TurdGUIMenu.java" ] }, "path": "~/Turd" @@ -3797,6 +3797,108 @@ ] }, "path": "~/Advancements" + }, + { + "name": "LifeMendingEnchantment", + "type": "enchantment", + "compiles": true, + "locked_code": false, + "registry_name": "life_mending_enchantment", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/enchantment/LifeMendingEnchantmentEnchantment.java" + ] + }, + "path": "~/Other" + }, + { + "name": "LifeMendingProcedure", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "life_mending_procedure", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/LifeMendingProcedureProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Other" + }, + { + "name": "WandOfDraining", + "type": "tool", + "compiles": true, + "locked_code": false, + "registry_name": "wand_of_draining", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/item/WandOfDrainingItem.java", + "src/main/resources/assets/aris_random_additions/models/item/wand_of_draining.json" + ] + }, + "path": "~/Other" + }, + { + "name": "WandOfDrainingRightclicked", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "wand_of_draining_rightclicked", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/WandOfDrainingRightclickedProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "itemstack", + "type": "itemstack" + }, + { + "name": "x", + "type": "number" + }, + { + "name": "y", + "type": "number" + }, + { + "name": "z", + "type": "number" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Other" + }, + { + "name": "WandOfDrainingRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "wand_of_draining_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/wand_of_draining_recipe.json" + ] + }, + "path": "~/Other" } ], "variable_elements": [], @@ -3811,6 +3913,7 @@ "~CUSTOM:Bedrockifier" ], "ITEMS:minecraft:pickaxes": [ + "~CUSTOM:WandOfDraining", "~CUSTOM:WandOfResizing", "~CUSTOM:OrichalcumPickaxe", "~CUSTOM:BedrockPickaxe", @@ -3887,8 +3990,8 @@ "language_map": { "en_us": { "advancements.condensed_netherrack_advancement.descr": "Condense Netherrack for the first time", - "item.nims_random_bullshit.magic_dust": "Magic Dust", "block.nims_random_bullshit.penta_condensed_netherrack": "Penta-condensed Netherrack", + "item.nims_random_bullshit.magic_dust": "Magic Dust", "item.nims_random_bullshit.orichalcum_armor_boots": "Orichalcum Boots", "block.nims_random_bullshit.magma_brick_button": "Magma Brick Button", "painting.nims_random_bullshit.shit_painting.title": "Shit Painting", @@ -3897,15 +4000,15 @@ "item.aris_random_additions.ghoul_spawn_egg": "Ghoul Spawn Egg", "gui.aris_random_additions.turd_gui.label_uh_ohh_stinky": "UH OHH!!! STINKY!!! UH OHH!!! STINKY!!! UH OHH!!! STINKY!!! UH OHH!!! STINKY!!! ", "item.aris_random_additions.bedrock_shard": "Bedrock Shard", - "advancements.grave_digger_advancement.title": "We Must Dig!", "item.aris_random_additions.bedrock_upgrade_template": "Bedrock Upgrade Template", + "advancements.grave_digger_advancement.title": "We Must Dig!", "block.nims_random_bullshit.orichalcum_block": "Block of Orichalcum", "block.nims_random_bullshit.rubber_slab": "Rubber Slab", - "item.nims_random_bullshit.bedrock_upgrade_template": "Bedrock Upgrade Template", "block.aris_random_additions.magma_brick_pressure_plate": "Magma Brick Pressure Plate", + "item.nims_random_bullshit.bedrock_upgrade_template": "Bedrock Upgrade Template", "advancements.orichalcum_set_advancement.descr": "Wear a full armor set of Orichalcum.", - "block.nims_random_bullshit.orichalcum_ore": "Orichalcum Ore", "block.aris_random_additions.condensed_condensed_netherrack": "Condensed Condensed Netherrack", + "block.nims_random_bullshit.orichalcum_ore": "Orichalcum Ore", "painting.aris_random_additions.turd_painting.author": "Ari/nim", "item.nims_random_bullshit.wand_of_resizing": "Wand Of Resizing", "item.nims_random_bullshit.gravedigger.description_1": "We must dig!", @@ -3914,13 +4017,14 @@ "block.aris_random_additions.hexa_condensed_netherrack": "Hexa-condensed Netherrack", "item.aris_random_additions.bedrock_sword": "Bedrock Sword", "item.aris_random_additions.orichalcum_hoe": "Orichalcum Hoe", + "item.aris_random_additions.wand_of_draining": "Wand Of Draining", "enchantment.aris_random_additions.passive_income_enchantment": "Passive Income", "item.aris_random_additions.sand_dust": "Sand Dust", "block.aris_random_additions.orichalcum_block": "Block of Orichalcum", "gui.nims_random_bullshit.mailbox_gui.outbox_y_coord": "0", "enchantment.nims_random_bullshit.ruining_enchantment": "Ruining", - "block.nims_random_bullshit.condensed_condensed_netherrack": "Condensed Condensed Netherrack", "advancements.netherrack_juice_advancement.descr": "Obtain Netherrack Juice", + "block.nims_random_bullshit.condensed_condensed_netherrack": "Condensed Condensed Netherrack", "block.nims_random_bullshit.quadra_condensed_netherrack": "Quadra-condensed Netherrack", "gui.nims_random_bullshit.bedrockifier_gui.button_empty": "-\u003e", "block.nims_random_bullshit.hexa_condensed_netherrack": "Hexa-condensed Netherrack", @@ -3953,8 +4057,8 @@ "block.nims_random_bullshit.broken_glass": "Broken Glass", "block.nims_random_bullshit.redstone_brick_walls": "Redstone Brick Wall", "item.aris_random_additions.tux_spawn_egg": "Tux Spawn Egg", - "effect.nims_random_bullshit.summoned_entity_effect": "Summoned Entity", "advancements.grave_digger_advancement.descr": "Obtain Gravedigger", + "effect.nims_random_bullshit.summoned_entity_effect": "Summoned Entity", "item.aris_random_additions.netherrackite": "Netherrackite Ingot", "advancements.orichalcum_advancement.title": "Folly Red", "item.nims_random_bullshit.ghoul_spawn_egg": "Ghoul Spawn Egg", @@ -3966,8 +4070,8 @@ "block.aris_random_additions.magma_bricks": "Magma Bricks", "item.nims_random_bullshit.snow_golem_question_mark": "Snow Golem...?", "item.aris_random_additions.gravedigger.description_0": "Right-Click on soul sand or soul soil to use them, summoning a ghoul that attacks hostile mobs.", - "advancements.bedrock_advancement.descr": "Obtain Bedrock", "item.aris_random_additions.gravedigger.description_1": "We must dig!", + "advancements.bedrock_advancement.descr": "Obtain Bedrock", "item.nims_random_bullshit.orichalcum_shovel": "Orichalcum Shovel", "block.nims_random_bullshit.redstone_brick_stairs": "Redstone Brick Stairs", "block.aris_random_additions.magma_brick_walls": "Magma Brick Wall", @@ -3989,6 +4093,7 @@ "block.nims_random_bullshit.condensed_condensed_condensed_netherrack": "Condensed Condensed Condensed Netherrack", "item.aris_random_additions.magic_egg": "Magic Egg", "entity.nims_random_bullshit.ghoul": "Ghoul", + "enchantment.aris_random_additions.life_mending_enchantment": "Life Mending", "block.aris_random_additions.redstone_brick_slabs": "Redstone Brick Slab", "advancements.star_advancement.descr": "Obtain a Star", "item.nims_random_bullshit.bedrock_pickaxe": "Bedrock Pickaxe", @@ -4158,7 +4263,7 @@ "workspaceSettings": { "modid": "aris_random_additions", "modName": "Ari\u0027s Random Additions", - "version": "2.0.0", + "version": "2.0.1", "description": "Random Additions by Ari. Created with MCreator.", "author": "nimsolated, MCreator", "websiteURL": "https://mcreator.net", @@ -4169,7 +4274,6 @@ "dependencies": [], "dependants": [], "mcreatorDependencies": [ - "photon", "pehkui" ], "currentGenerator": "forge-1.20.1", diff --git a/elements/BedrockSword.mod.json b/elements/BedrockSword.mod.json index 96f6b2b..b994f83 100644 --- a/elements/BedrockSword.mod.json +++ b/elements/BedrockSword.mod.json @@ -14,7 +14,7 @@ }, "creativeTabs": [ { - "value": "TOOLS" + "value": "COMBAT" } ], "efficiency": 4.0, diff --git a/elements/LifeMendingEnchantment.mod.json b/elements/LifeMendingEnchantment.mod.json new file mode 100644 index 0000000..e03296e --- /dev/null +++ b/elements/LifeMendingEnchantment.mod.json @@ -0,0 +1,26 @@ +{ + "_fv": 73, + "_type": "enchantment", + "definition": { + "name": "Life Mending", + "supportedSlots": "any", + "weight": 1, + "anvilCost": 1, + "maxLevel": 1, + "damageModifier": 0, + "incompatibleEnchantments": [ + { + "value": "MENDING" + } + ], + "supportedItems": [ + { + "value": "TAG:minecraft:enchantable/equippable" + } + ], + "isTreasureEnchantment": false, + "isCurse": false, + "canGenerateInLootTables": true, + "canVillagerTrade": true + } +} \ No newline at end of file diff --git a/elements/LifeMendingProcedure.mod.json b/elements/LifeMendingProcedure.mod.json new file mode 100644 index 0000000..ba1dc03 --- /dev/null +++ b/elements/LifeMendingProcedure.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "player_right_click_itemANDANDCUSTOM:LifeMendingEnchantmentANDGT1AND201MAGICMINUS30" + } +} \ No newline at end of file diff --git a/elements/TotemOfUndyingRecipe.mod.json b/elements/TotemOfUndyingRecipe.mod.json index 4c88e10..4943406 100644 --- a/elements/TotemOfUndyingRecipe.mod.json +++ b/elements/TotemOfUndyingRecipe.mod.json @@ -33,7 +33,7 @@ "value": "" }, { - "value": "CUSTOM:Shit" + "value": "CUSTOM:Turd" }, { "value": "" diff --git a/elements/WandOfDraining.mod.json b/elements/WandOfDraining.mod.json new file mode 100644 index 0000000..4e49b91 --- /dev/null +++ b/elements/WandOfDraining.mod.json @@ -0,0 +1,38 @@ +{ + "_fv": 73, + "_type": "tool", + "definition": { + "toolType": "Special", + "renderType": 0, + "blockingRenderType": 0, + "texture": "wand_of_draining", + "customModelName": "Normal", + "blockingModelName": "Normal blocking", + "name": "Wand Of Draining", + "specialInformation": { + "fixedValue": [] + }, + "creativeTabs": [ + { + "value": "COMBAT" + } + ], + "efficiency": 2.0, + "attackSpeed": 1.0, + "enchantability": 1, + "damageVsEntity": 0.0, + "usageCount": 0, + "glowCondition": { + "fixedValue": false + }, + "repairItems": [], + "immuneToFire": true, + "blockDropsTier": "WOOD", + "blocksAffected": [], + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "onRightClickedInAir": { + "name": "WandOfDrainingRightclicked" + } + } +} \ No newline at end of file diff --git a/elements/WandOfDrainingRecipe.mod.json b/elements/WandOfDrainingRecipe.mod.json new file mode 100644 index 0000000..4be93e1 --- /dev/null +++ b/elements/WandOfDrainingRecipe.mod.json @@ -0,0 +1,48 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Crafting", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "recipeSlots": [ + { + "value": "" + }, + { + "value": "Items.SKULL#1" + }, + { + "value": "Items.NETHER_STAR" + }, + { + "value": "" + }, + { + "value": "Items.STICK" + }, + { + "value": "Items.SKULL#1" + }, + { + "value": "Items.STICK" + }, + { + "value": "" + }, + { + "value": "" + } + ], + "recipeReturnStack": { + "value": "CUSTOM:WandOfDraining" + }, + "name": "wand_of_draining_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/WandOfDrainingRightclicked.mod.json b/elements/WandOfDrainingRightclicked.mod.json new file mode 100644 index 0000000..e8638bb --- /dev/null +++ b/elements/WandOfDrainingRightclicked.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "rightClickedEntityno_ext_triggerlocal:rightClickedEntityEntityLivingNONEOUTLINE5NONEOUTLINE5NONEOUTLINE54ANDlocal:rightClickedEntity10block.portal.ambientplayer0.852MULTIPLYlocal:rightClickedEntity0.03local:rightClickedEntityMAGICADDMULTIPLYlocal:rightClickedEntity0.03" + } +} \ No newline at end of file diff --git a/mcreator.gradle b/mcreator.gradle index de7de4d..8559f5b 100644 --- a/mcreator.gradle +++ b/mcreator.gradle @@ -1,31 +1,3 @@ -repositories { - maven { - url = 'https://cursemaven.com/' - } -} -minecraft { -runs { - client { - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - } - - server { - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - } - data { - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - } - } -} -dependencies { - implementation fg.deobf("curse.maven:photon-871522:7381162") - implementation fg.deobf("curse.maven:ldlib-626676:7412415") -} - - repositories { maven { url = "https://jitpack.io" diff --git a/src/main/java/net/mcreator/arisrandomadditions/enchantment/LifeMendingEnchantmentEnchantment.java b/src/main/java/net/mcreator/arisrandomadditions/enchantment/LifeMendingEnchantmentEnchantment.java new file mode 100644 index 0000000..ca45609 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/enchantment/LifeMendingEnchantmentEnchantment.java @@ -0,0 +1,32 @@ + +package net.mcreator.arisrandomadditions.enchantment; + +import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.world.item.enchantment.EnchantmentCategory; +import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.entity.EquipmentSlot; + +import java.util.List; + +public class LifeMendingEnchantmentEnchantment extends Enchantment { + private static final EnchantmentCategory ENCHANTMENT_CATEGORY = EnchantmentCategory.WEARABLE; + + public LifeMendingEnchantmentEnchantment() { + super(Enchantment.Rarity.VERY_RARE, ENCHANTMENT_CATEGORY, EquipmentSlot.values()); + } + + @Override + public int getMinCost(int level) { + return 1 + level * 10; + } + + @Override + public int getMaxCost(int level) { + return 6 + level * 10; + } + + @Override + protected boolean checkCompatibility(Enchantment enchantment) { + return super.checkCompatibility(enchantment) && !List.of(Enchantments.MENDING).contains(enchantment); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModEnchantments.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModEnchantments.java index e8fe071..a32905a 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModEnchantments.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModEnchantments.java @@ -13,6 +13,7 @@ import net.minecraft.world.item.enchantment.Enchantment; import net.mcreator.arisrandomadditions.enchantment.SunderingEnchantmentEnchantment; import net.mcreator.arisrandomadditions.enchantment.RuiningEnchantmentEnchantment; import net.mcreator.arisrandomadditions.enchantment.PassiveIncomeEnchantmentEnchantment; +import net.mcreator.arisrandomadditions.enchantment.LifeMendingEnchantmentEnchantment; import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; public class ArisRandomAdditionsModEnchantments { @@ -20,4 +21,5 @@ public class ArisRandomAdditionsModEnchantments { public static final RegistryObject PASSIVE_INCOME_ENCHANTMENT = REGISTRY.register("passive_income_enchantment", () -> new PassiveIncomeEnchantmentEnchantment()); public static final RegistryObject RUINING_ENCHANTMENT = REGISTRY.register("ruining_enchantment", () -> new RuiningEnchantmentEnchantment()); public static final RegistryObject SUNDERING_ENCHANTMENT = REGISTRY.register("sundering_enchantment", () -> new SunderingEnchantmentEnchantment()); + public static final RegistryObject LIFE_MENDING_ENCHANTMENT = REGISTRY.register("life_mending_enchantment", () -> new LifeMendingEnchantmentEnchantment()); } diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java index d820491..5ce9bd1 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java @@ -15,6 +15,7 @@ import net.minecraft.world.item.BlockItem; import net.mcreator.arisrandomadditions.item.WitherQuestionMarkItem; import net.mcreator.arisrandomadditions.item.WandOfResizingItem; +import net.mcreator.arisrandomadditions.item.WandOfDrainingItem; import net.mcreator.arisrandomadditions.item.TurdItem; import net.mcreator.arisrandomadditions.item.StarWandItem; import net.mcreator.arisrandomadditions.item.StarItem; @@ -114,6 +115,7 @@ public class ArisRandomAdditionsModItems { public static final RegistryObject BLACK_IRON_INGOT = REGISTRY.register("black_iron_ingot", () -> new BlackIronIngotItem()); public static final RegistryObject RAVE_BLOCK = block(ArisRandomAdditionsModBlocks.RAVE_BLOCK); public static final RegistryObject TURD = REGISTRY.register("turd", () -> new TurdItem()); + public static final RegistryObject WAND_OF_DRAINING = REGISTRY.register("wand_of_draining", () -> new WandOfDrainingItem()); // Start of user code block custom items // End of user code block custom items diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java index fd9aaf1..f87d093 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java @@ -43,7 +43,6 @@ public class ArisRandomAdditionsModTabs { tabData.accept(ArisRandomAdditionsModItems.STAR_WAND.get()); tabData.accept(ArisRandomAdditionsModItems.NETHERRACK_JUICE_BUCKET.get()); tabData.accept(ArisRandomAdditionsModItems.BEDROCK_PICKAXE.get()); - tabData.accept(ArisRandomAdditionsModItems.BEDROCK_SWORD.get()); tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_PICKAXE.get()); tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_AXE.get()); tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_SHOVEL.get()); @@ -84,12 +83,14 @@ public class ArisRandomAdditionsModTabs { tabData.accept(ArisRandomAdditionsModBlocks.MAGMA_BRICK_PRESSURE_PLATE.get().asItem()); tabData.accept(ArisRandomAdditionsModBlocks.MAGMA_BRICK_BUTTON.get().asItem()); } else if (tabData.getTabKey() == CreativeModeTabs.COMBAT) { + tabData.accept(ArisRandomAdditionsModItems.BEDROCK_SWORD.get()); tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_SWORD.get()); tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_ARMOR_HELMET.get()); tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_ARMOR_CHESTPLATE.get()); tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_ARMOR_LEGGINGS.get()); tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_ARMOR_BOOTS.get()); tabData.accept(ArisRandomAdditionsModItems.NIGHT_VISION_GOGGLES_HELMET.get()); + tabData.accept(ArisRandomAdditionsModItems.WAND_OF_DRAINING.get()); } } } diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/WandOfDrainingItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/WandOfDrainingItem.java new file mode 100644 index 0000000..bc4ef1a --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/WandOfDrainingItem.java @@ -0,0 +1,68 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.Level; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Item; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.InteractionHand; +import net.minecraft.core.BlockPos; + +import net.mcreator.arisrandomadditions.procedures.WandOfDrainingRightclickedProcedure; + +import com.google.common.collect.Multimap; +import com.google.common.collect.ImmutableMultimap; + +public class WandOfDrainingItem extends Item { + public WandOfDrainingItem() { + super(new Item.Properties().durability(0).fireResistant()); + } + + @Override + public float getDestroySpeed(ItemStack itemstack, BlockState blockstate) { + return 1; + } + + @Override + public boolean mineBlock(ItemStack itemstack, Level world, BlockState blockstate, BlockPos pos, LivingEntity entity) { + itemstack.hurtAndBreak(1, entity, i -> i.broadcastBreakEvent(EquipmentSlot.MAINHAND)); + return true; + } + + @Override + public boolean hurtEnemy(ItemStack itemstack, LivingEntity entity, LivingEntity sourceentity) { + itemstack.hurtAndBreak(2, entity, i -> i.broadcastBreakEvent(EquipmentSlot.MAINHAND)); + return true; + } + + @Override + public InteractionResultHolder use(Level world, Player entity, InteractionHand hand) { + InteractionResultHolder ar = super.use(world, entity, hand); + WandOfDrainingRightclickedProcedure.execute(world, entity.getX(), entity.getY(), entity.getZ(), entity, ar.getObject()); + return ar; + } + + @Override + public int getEnchantmentValue() { + return 1; + } + + @Override + public Multimap getDefaultAttributeModifiers(EquipmentSlot equipmentSlot) { + if (equipmentSlot == EquipmentSlot.MAINHAND) { + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + builder.putAll(super.getDefaultAttributeModifiers(equipmentSlot)); + builder.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(BASE_ATTACK_DAMAGE_UUID, "Tool modifier", -1f, AttributeModifier.Operation.ADDITION)); + builder.put(Attributes.ATTACK_SPEED, new AttributeModifier(BASE_ATTACK_SPEED_UUID, "Tool modifier", -3, AttributeModifier.Operation.ADDITION)); + return builder.build(); + } + return super.getDefaultAttributeModifiers(equipmentSlot); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/LifeMendingProcedureProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/LifeMendingProcedureProcedure.java new file mode 100644 index 0000000..ecebf78 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/LifeMendingProcedureProcedure.java @@ -0,0 +1,49 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; + +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.item.enchantment.EnchantmentHelper; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.damagesource.DamageTypes; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.core.registries.Registries; + +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModEnchantments; + +import javax.annotation.Nullable; + +@Mod.EventBusSubscriber +public class LifeMendingProcedureProcedure { + @SubscribeEvent + public static void onRightClickItem(PlayerInteractEvent.RightClickItem event) { + if (event.getHand() != event.getEntity().getUsedItemHand()) + return; + execute(event, event.getLevel(), event.getEntity()); + } + + public static void execute(LevelAccessor world, Entity entity) { + execute(null, world, entity); + } + + private static void execute(@Nullable Event event, LevelAccessor world, Entity entity) { + if (entity == null) + return; + if (!world.isClientSide()) { + if (entity.isShiftKeyDown() && EnchantmentHelper.getItemEnchantmentLevel(ArisRandomAdditionsModEnchantments.LIFE_MENDING_ENCHANTMENT.get(), (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY)) != 0 + && (entity instanceof LivingEntity _livEnt ? _livEnt.getHealth() : -1) > 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).isDamaged() + && !(entity instanceof Player _plrCldCheck8 && _plrCldCheck8.getCooldowns().isOnCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem()))) { + if (entity instanceof Player _player) + _player.getCooldowns().addCooldown((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem(), 20); + entity.hurt(new DamageSource(world.registryAccess().registryOrThrow(Registries.DAMAGE_TYPE).getHolderOrThrow(DamageTypes.MAGIC)), 1); + (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).setDamageValue((int) ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getDamageValue() - 30)); + } + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/WandOfDrainingRightclickedProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/WandOfDrainingRightclickedProcedure.java new file mode 100644 index 0000000..cb0e8ae --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/WandOfDrainingRightclickedProcedure.java @@ -0,0 +1,60 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraftforge.registries.ForgeRegistries; + +import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.damagesource.DamageTypes; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.sounds.SoundSource; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.registries.Registries; +import net.minecraft.core.BlockPos; + +import java.util.Comparator; + +public class WandOfDrainingRightclickedProcedure { + public static void execute(LevelAccessor world, double x, double y, double z, Entity entity, ItemStack itemstack) { + if (entity == null) + return; + Entity rightClickedEntity = null; + if (!world.isClientSide()) { + rightClickedEntity = (Entity) world.getEntitiesOfClass(LivingEntity.class, + AABB.ofSize( + new Vec3((entity.level().clip(new ClipContext(entity.getEyePosition(1f), entity.getEyePosition(1f).add(entity.getViewVector(1f).scale(5)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity)).getBlockPos().getX()), + (entity.level().clip(new ClipContext(entity.getEyePosition(1f), entity.getEyePosition(1f).add(entity.getViewVector(1f).scale(5)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity)).getBlockPos().getY()), + (entity.level().clip(new ClipContext(entity.getEyePosition(1f), entity.getEyePosition(1f).add(entity.getViewVector(1f).scale(5)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity)).getBlockPos().getZ())), + 4, 4, 4), + e -> true).stream().sorted(new Object() { + Comparator compareDistOf(double _x, double _y, double _z) { + return Comparator.comparingDouble(_entcnd -> _entcnd.distanceToSqr(_x, _y, _z)); + } + }.compareDistOf((entity.level().clip(new ClipContext(entity.getEyePosition(1f), entity.getEyePosition(1f).add(entity.getViewVector(1f).scale(5)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity)).getBlockPos().getX()), + (entity.level().clip(new ClipContext(entity.getEyePosition(1f), entity.getEyePosition(1f).add(entity.getViewVector(1f).scale(5)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity)).getBlockPos().getY()), + (entity.level().clip(new ClipContext(entity.getEyePosition(1f), entity.getEyePosition(1f).add(entity.getViewVector(1f).scale(5)), ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity)).getBlockPos().getZ()))) + .findFirst().orElse(null); + if (!(rightClickedEntity == null) && !(entity instanceof Player _plrCldCheck7 && _plrCldCheck7.getCooldowns().isOnCooldown(itemstack.getItem()))) { + if (entity instanceof Player _player) + _player.getCooldowns().addCooldown(itemstack.getItem(), 10); + if (world instanceof Level _level) { + if (!_level.isClientSide()) { + _level.playSound(null, BlockPos.containing(x, y, z), ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.portal.ambient")), SoundSource.PLAYERS, (float) 0.85, 2); + } else { + _level.playLocalSound(x, y, z, ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.portal.ambient")), SoundSource.PLAYERS, (float) 0.85, 2, false); + } + } + rightClickedEntity.hurt(new DamageSource(world.registryAccess().registryOrThrow(Registries.DAMAGE_TYPE).getHolderOrThrow(DamageTypes.MAGIC)), + (float) ((rightClickedEntity instanceof LivingEntity _livEnt ? _livEnt.getMaxHealth() : -1) * 0.03)); + if (entity instanceof LivingEntity _entity) + _entity.setHealth((float) ((entity instanceof LivingEntity _livEnt ? _livEnt.getHealth() : -1) + (rightClickedEntity instanceof LivingEntity _livEnt ? _livEnt.getMaxHealth() : -1) * 0.03)); + } + } + } +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index b94ab47..a2e2ffd 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -4,7 +4,7 @@ license="Academic Free License v3.0" [[mods]] modId="aris_random_additions" -version="2.0.0" +version="2.0.1" displayName="Ari's Random Additions" displayURL="https://mcreator.net" logoFile="logo.png" @@ -23,12 +23,6 @@ description="Random Additions by Ari. Created with MCreator." side="BOTH" -[[dependencies.aris_random_additions]] - modId="photon" - mandatory=false - versionRange="[0,)" - ordering="NONE" - side="BOTH" [[dependencies.aris_random_additions]] modId="pehkui" mandatory=false diff --git a/src/main/resources/assets/aris_random_additions/lang/en_us.json b/src/main/resources/assets/aris_random_additions/lang/en_us.json index f0ccc6f..1bdcd8a 100644 --- a/src/main/resources/assets/aris_random_additions/lang/en_us.json +++ b/src/main/resources/assets/aris_random_additions/lang/en_us.json @@ -1,7 +1,7 @@ { "advancements.condensed_netherrack_advancement.descr": "Condense Netherrack for the first time", - "item.nims_random_bullshit.magic_dust": "Magic Dust", "block.nims_random_bullshit.penta_condensed_netherrack": "Penta-condensed Netherrack", + "item.nims_random_bullshit.magic_dust": "Magic Dust", "item.nims_random_bullshit.orichalcum_armor_boots": "Orichalcum Boots", "block.nims_random_bullshit.magma_brick_button": "Magma Brick Button", "painting.nims_random_bullshit.shit_painting.title": "Shit Painting", @@ -10,15 +10,15 @@ "item.aris_random_additions.ghoul_spawn_egg": "Ghoul Spawn Egg", "gui.aris_random_additions.turd_gui.label_uh_ohh_stinky": "UH OHH!!! STINKY!!! UH OHH!!! STINKY!!! UH OHH!!! STINKY!!! UH OHH!!! STINKY!!! ", "item.aris_random_additions.bedrock_shard": "Bedrock Shard", - "advancements.grave_digger_advancement.title": "We Must Dig!", "item.aris_random_additions.bedrock_upgrade_template": "Bedrock Upgrade Template", + "advancements.grave_digger_advancement.title": "We Must Dig!", "block.nims_random_bullshit.orichalcum_block": "Block of Orichalcum", "block.nims_random_bullshit.rubber_slab": "Rubber Slab", - "item.nims_random_bullshit.bedrock_upgrade_template": "Bedrock Upgrade Template", "block.aris_random_additions.magma_brick_pressure_plate": "Magma Brick Pressure Plate", + "item.nims_random_bullshit.bedrock_upgrade_template": "Bedrock Upgrade Template", "advancements.orichalcum_set_advancement.descr": "Wear a full armor set of Orichalcum.", - "block.nims_random_bullshit.orichalcum_ore": "Orichalcum Ore", "block.aris_random_additions.condensed_condensed_netherrack": "Condensed Condensed Netherrack", + "block.nims_random_bullshit.orichalcum_ore": "Orichalcum Ore", "painting.aris_random_additions.turd_painting.author": "Ari/nim", "item.nims_random_bullshit.wand_of_resizing": "Wand Of Resizing", "item.nims_random_bullshit.gravedigger.description_1": "We must dig!", @@ -27,13 +27,14 @@ "block.aris_random_additions.hexa_condensed_netherrack": "Hexa-condensed Netherrack", "item.aris_random_additions.bedrock_sword": "Bedrock Sword", "item.aris_random_additions.orichalcum_hoe": "Orichalcum Hoe", + "item.aris_random_additions.wand_of_draining": "Wand Of Draining", "enchantment.aris_random_additions.passive_income_enchantment": "Passive Income", "item.aris_random_additions.sand_dust": "Sand Dust", "block.aris_random_additions.orichalcum_block": "Block of Orichalcum", "gui.nims_random_bullshit.mailbox_gui.outbox_y_coord": "0", "enchantment.nims_random_bullshit.ruining_enchantment": "Ruining", - "block.nims_random_bullshit.condensed_condensed_netherrack": "Condensed Condensed Netherrack", "advancements.netherrack_juice_advancement.descr": "Obtain Netherrack Juice", + "block.nims_random_bullshit.condensed_condensed_netherrack": "Condensed Condensed Netherrack", "block.nims_random_bullshit.quadra_condensed_netherrack": "Quadra-condensed Netherrack", "gui.nims_random_bullshit.bedrockifier_gui.button_empty": "-\u003e", "block.nims_random_bullshit.hexa_condensed_netherrack": "Hexa-condensed Netherrack", @@ -66,8 +67,8 @@ "block.nims_random_bullshit.broken_glass": "Broken Glass", "block.nims_random_bullshit.redstone_brick_walls": "Redstone Brick Wall", "item.aris_random_additions.tux_spawn_egg": "Tux Spawn Egg", - "effect.nims_random_bullshit.summoned_entity_effect": "Summoned Entity", "advancements.grave_digger_advancement.descr": "Obtain Gravedigger", + "effect.nims_random_bullshit.summoned_entity_effect": "Summoned Entity", "item.aris_random_additions.netherrackite": "Netherrackite Ingot", "advancements.orichalcum_advancement.title": "Folly Red", "item.nims_random_bullshit.ghoul_spawn_egg": "Ghoul Spawn Egg", @@ -79,8 +80,8 @@ "block.aris_random_additions.magma_bricks": "Magma Bricks", "item.nims_random_bullshit.snow_golem_question_mark": "Snow Golem...?", "item.aris_random_additions.gravedigger.description_0": "Right-Click on soul sand or soul soil to use them, summoning a ghoul that attacks hostile mobs.", - "advancements.bedrock_advancement.descr": "Obtain Bedrock", "item.aris_random_additions.gravedigger.description_1": "We must dig!", + "advancements.bedrock_advancement.descr": "Obtain Bedrock", "item.nims_random_bullshit.orichalcum_shovel": "Orichalcum Shovel", "block.nims_random_bullshit.redstone_brick_stairs": "Redstone Brick Stairs", "block.aris_random_additions.magma_brick_walls": "Magma Brick Wall", @@ -102,6 +103,7 @@ "block.nims_random_bullshit.condensed_condensed_condensed_netherrack": "Condensed Condensed Condensed Netherrack", "item.aris_random_additions.magic_egg": "Magic Egg", "entity.nims_random_bullshit.ghoul": "Ghoul", + "enchantment.aris_random_additions.life_mending_enchantment": "Life Mending", "block.aris_random_additions.redstone_brick_slabs": "Redstone Brick Slab", "advancements.star_advancement.descr": "Obtain a Star", "item.nims_random_bullshit.bedrock_pickaxe": "Bedrock Pickaxe", diff --git a/src/main/resources/assets/aris_random_additions/textures/item/wand_of_draining.png b/src/main/resources/assets/aris_random_additions/textures/item/wand_of_draining.png new file mode 100644 index 0000000..bc17e37 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/wand_of_draining.png differ diff --git a/src/main/resources/data/aris_random_additions/recipes/totem_of_undying_recipe.json b/src/main/resources/data/aris_random_additions/recipes/totem_of_undying_recipe.json index 998bd3a..79f68c1 100644 --- a/src/main/resources/data/aris_random_additions/recipes/totem_of_undying_recipe.json +++ b/src/main/resources/data/aris_random_additions/recipes/totem_of_undying_recipe.json @@ -6,7 +6,7 @@ "item": "minecraft:totem_of_undying" }, { - "item": "aris_random_additions:deleted_mod_element" + "item": "aris_random_additions:turd" } ], "result": { diff --git a/src/main/resources/data/aris_random_additions/recipes/wand_of_draining_recipe.json b/src/main/resources/data/aris_random_additions/recipes/wand_of_draining_recipe.json new file mode 100644 index 0000000..a05c90b --- /dev/null +++ b/src/main/resources/data/aris_random_additions/recipes/wand_of_draining_recipe.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " ab", + " ca", + "c " + ], + "key": { + "a": { + "item": "minecraft:wither_skeleton_skull" + }, + "b": { + "item": "minecraft:nether_star" + }, + "c": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "aris_random_additions:wand_of_draining", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/pickaxes.json b/src/main/resources/data/minecraft/tags/items/pickaxes.json index 0139093..9a7f5b6 100644 --- a/src/main/resources/data/minecraft/tags/items/pickaxes.json +++ b/src/main/resources/data/minecraft/tags/items/pickaxes.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "aris_random_additions:wand_of_draining", "aris_random_additions:wand_of_resizing", "aris_random_additions:orichalcum_pickaxe", "aris_random_additions:bedrock_pickaxe",