diff --git a/aris_random_additions.mcreator b/aris_random_additions.mcreator index 8c11bd7..e70bf9d 100644 --- a/aris_random_additions.mcreator +++ b/aris_random_additions.mcreator @@ -1551,19 +1551,6 @@ }, "path": "~/Magma" }, - { - "name": "MagmaBricksRecipe", - "type": "recipe", - "compiles": true, - "locked_code": false, - "registry_name": "magma_bricks_recipe", - "metadata": { - "files": [ - "src/main/resources/data/aris_random_additions/recipes/magma_bricks_recipe.json" - ] - }, - "path": "~/Magma" - }, { "name": "MagmaBrickStairsRecipe", "type": "recipe", @@ -1882,6 +1869,7 @@ "metadata": { "files": [ "src/main/java/net/mcreator/arisrandomadditions/world/inventory/BedrockifierGUIMenu.java", + "src/main/java/net/mcreator/arisrandomadditions/network/BedrockifierGUIButtonMessage.java", "src/main/java/net/mcreator/arisrandomadditions/client/gui/BedrockifierGUIScreen.java" ] }, @@ -5103,6 +5091,755 @@ ] }, "path": "~/Bedrock" + }, + { + "name": "Orange", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "orange", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/item/OrangeItem.java", + "src/main/resources/assets/aris_random_additions/models/item/orange.json" + ] + }, + "path": "~/Orange" + }, + { + "name": "Mint", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "mint", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/item/MintItem.java", + "src/main/resources/assets/aris_random_additions/models/item/mint.json" + ] + }, + "path": "~/Mint" + }, + { + "name": "CanLid", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "can_lid", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/item/CanLidItem.java", + "src/main/resources/assets/aris_random_additions/models/item/can_lid.json" + ] + }, + "path": "~/Cans" + }, + { + "name": "EmptyCan", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "empty_can", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/item/EmptyCanItem.java", + "src/main/resources/assets/aris_random_additions/models/item/empty_can.json" + ] + }, + "path": "~/Cans" + }, + { + "name": "CanLidRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "can_lid_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/can_lid_recipe.json" + ] + }, + "path": "~/Cans" + }, + { + "name": "EmptyCanRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "empty_can_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/empty_can_recipe.json" + ] + }, + "path": "~/Cans" + }, + { + "name": "WaterCan", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "water_can", + "metadata": { + "files": [ + "src/main/resources/assets/aris_random_additions/models/item/water_can.json", + "src/main/java/net/mcreator/arisrandomadditions/item/WaterCanItem.java" + ] + }, + "path": "~/Cans" + }, + { + "name": "EmptyCanRightclickedOnBlock", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "empty_can_rightclicked_on_block", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/EmptyCanRightclickedOnBlockProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "x", + "type": "number" + }, + { + "name": "y", + "type": "number" + }, + { + "name": "z", + "type": "number" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Cans" + }, + { + "name": "CarbonatedWaterCan", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "carbonated_water_can", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/item/CarbonatedWaterCanItem.java", + "src/main/resources/assets/aris_random_additions/models/item/carbonated_water_can.json" + ] + }, + "path": "~/Cans" + }, + { + "name": "CarbonatedWaterCanRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "carbonated_water_can_recipe", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/CarbonatedWaterCanRecipeBrewingRecipe.java" + ] + }, + "path": "~/Cans" + }, + { + "name": "SweetenedCarbonatedWaterCan", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "sweetened_carbonated_water_can", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/item/SweetenedCarbonatedWaterCanItem.java", + "src/main/resources/assets/aris_random_additions/models/item/sweetened_carbonated_water_can.json" + ] + }, + "path": "~/Cans" + }, + { + "name": "SweetenedCarbonatedWaterCanRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "sweetened_carbonated_water_can_recipe", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/SweetenedCarbonatedWaterCanRecipeBrewingRecipe.java" + ] + }, + "path": "~/Cans" + }, + { + "name": "SweetenedCarbonatedWaterCanPlayerFinishesUsingItem", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "sweetened_carbonated_water_can_player_finishes_using_item", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/SweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Cans" + }, + { + "name": "MintSweetenedCarbonatedWaterCan", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "mint_sweetened_carbonated_water_can", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/item/MintSweetenedCarbonatedWaterCanItem.java", + "src/main/resources/assets/aris_random_additions/models/item/mint_sweetened_carbonated_water_can.json" + ] + }, + "path": "~/Cans" + }, + { + "name": "MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItem", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "mint_sweetened_carbonated_water_can_player_finishes_using_item", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Cans" + }, + { + "name": "MintSweetenedCarbonatedWaterCanRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "mint_sweetened_carbonated_water_can_recipe", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/MintSweetenedCarbonatedWaterCanRecipeBrewingRecipe.java" + ] + }, + "path": "~/Cans" + }, + { + "name": "OrangeSweetenedCarbonatedWaterCan", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "orange_sweetened_carbonated_water_can", + "metadata": { + "files": [ + "src/main/resources/assets/aris_random_additions/models/item/orange_sweetened_carbonated_water_can.json", + "src/main/java/net/mcreator/arisrandomadditions/item/OrangeSweetenedCarbonatedWaterCanItem.java" + ] + }, + "path": "~/Cans" + }, + { + "name": "OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItem", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "orange_sweetened_carbonated_water_can_player_finishes_using_item", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Cans" + }, + { + "name": "OrangeSweetenedCarbonatedWaterCanRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "orange_sweetened_carbonated_water_can_recipe", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/OrangeSweetenedCarbonatedWaterCanRecipeBrewingRecipe.java" + ] + }, + "path": "~/Cans" + }, + { + "name": "OakTreeLeavesLootTable", + "type": "loottable", + "compiles": true, + "locked_code": false, + "registry_name": "oak_tree_leaves_loot_table", + "metadata": { + "files": [ + "src/main/resources/data/minecraft/loot_tables/blocks/oak_leaves.json" + ] + }, + "path": "~/Orange" + }, + { + "name": "DarkOakTreeLeavesLootTable", + "type": "loottable", + "compiles": true, + "locked_code": false, + "registry_name": "dark_oak_tree_leaves_loot_table", + "metadata": { + "files": [ + "src/main/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json" + ] + }, + "path": "~/Orange" + }, + { + "name": "MintPlant", + "type": "plant", + "compiles": true, + "locked_code": false, + "registry_name": "mint_plant", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/block/MintPlantBlock.java", + "src/main/resources/assets/aris_random_additions/models/block/mint_plant.json", + "src/main/resources/data/aris_random_additions/forge/biome_modifier/mint_plant_biome_modifier.json", + "src/main/resources/data/aris_random_additions/worldgen/placed_feature/mint_plant.json", + "src/main/resources/data/aris_random_additions/worldgen/configured_feature/mint_plant.json", + "src/main/resources/assets/aris_random_additions/models/item/mint_plant.json", + "src/main/resources/assets/aris_random_additions/blockstates/mint_plant.json" + ] + }, + "path": "~/Mint" + }, + { + "name": "MintPlantFeature", + "type": "feature", + "compiles": true, + "locked_code": false, + "registry_name": "mint_plant_feature", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/forge/biome_modifier/mint_plant_feature_biome_modifier.json", + "src/main/resources/data/aris_random_additions/worldgen/configured_feature/mint_plant_feature.json", + "src/main/resources/data/aris_random_additions/worldgen/placed_feature/mint_plant_feature.json" + ] + }, + "path": "~/Mint" + }, + { + "name": "MintLeaves", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "mint_leaves", + "metadata": { + "files": [ + "src/main/resources/assets/aris_random_additions/models/item/mint_leaves.json", + "src/main/java/net/mcreator/arisrandomadditions/item/MintLeavesItem.java" + ] + }, + "path": "~/Mint" + }, + { + "name": "MintPlantLootTable", + "type": "loottable", + "compiles": true, + "locked_code": false, + "registry_name": "mint_plant_loot_table", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/loot_tables/blocks/mint_plant.json" + ] + }, + "path": "~/Mint" + }, + { + "name": "MintRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "mint_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/mint_recipe.json" + ] + }, + "path": "~/Mint" + }, + { + "name": "BrickierMagmaBricks", + "type": "block", + "compiles": true, + "locked_code": false, + "registry_name": "brickier_magma_bricks", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/block/BrickierMagmaBricksBlock.java", + "src/main/resources/assets/aris_random_additions/blockstates/brickier_magma_bricks.json", + "src/main/resources/data/aris_random_additions/loot_tables/blocks/brickier_magma_bricks.json", + "src/main/resources/assets/aris_random_additions/models/item/brickier_magma_bricks.json", + "src/main/resources/assets/aris_random_additions/models/block/brickier_magma_bricks.json" + ] + }, + "path": "~/Magma" + }, + { + "name": "BrickierMagmaBricksRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "brickier_magma_bricks_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/brickier_magma_bricks_recipe.json" + ] + }, + "path": "~/Magma" + }, + { + "name": "Socket", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "socket", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/item/SocketItem.java", + "src/main/resources/assets/aris_random_additions/models/item/socket.json" + ] + }, + "path": "~/Other" + }, + { + "name": "EndPortalFrameRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "end_portal_frame_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/end_portal_frame_recipe.json" + ] + }, + "path": "~/Other" + }, + { + "name": "SodaMachine", + "type": "block", + "compiles": true, + "locked_code": false, + "registry_name": "soda_machine", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/block/SodaMachineBlock.java", + "src/main/resources/assets/aris_random_additions/blockstates/soda_machine.json", + "src/main/resources/data/aris_random_additions/loot_tables/blocks/soda_machine.json", + "src/main/resources/assets/aris_random_additions/models/item/soda_machine.json", + "src/main/resources/assets/aris_random_additions/models/block/soda_machine.json" + ] + }, + "path": "~/Cans" + }, + { + "name": "GoldToken", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "gold_token", + "metadata": { + "files": [ + "src/main/resources/assets/aris_random_additions/models/item/gold_token.json", + "src/main/java/net/mcreator/arisrandomadditions/item/GoldTokenItem.java" + ] + }, + "path": "~/Other" + }, + { + "name": "GoldTokenRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "gold_token_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/gold_token_recipe.json" + ] + }, + "path": "~/Other" + }, + { + "name": "SodaMachineOnBlockRightClicked", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "soda_machine_on_block_right_clicked", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/SodaMachineOnBlockRightClickedProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "x", + "type": "number" + }, + { + "name": "y", + "type": "number" + }, + { + "name": "z", + "type": "number" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Cans" + }, + { + "name": "SodaMachineRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "soda_machine_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/soda_machine_recipe.json" + ] + }, + "path": "~/Cans" + }, + { + "name": "EndPortalFrameAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "end_portal_frame_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/end_portal_frame_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "VoidStarAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "void_star_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/void_star_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "OrichalcumAppleAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_apple_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/orichalcum_apple_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "VoidAppleAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "void_apple_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/void_apple_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "BedrockAppleAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "bedrock_apple_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/bedrock_apple_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "SweetenedCarbonatedWaterCanAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "sweetened_carbonated_water_can_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/sweetened_carbonated_water_can_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "MintSweetenedCarbonatedWaterCanAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "mint_sweetened_carbonated_water_can_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/mint_sweetened_carbonated_water_can_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "OrangeSweetenedCarbonatedWaterCanAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "orange_sweetened_carbonated_water_can_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/orange_sweetened_carbonated_water_can_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "WelcomeAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "welcome_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/welcome_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "WelcomeAdvancementGranter", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "welcome_advancement_granter", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/WelcomeAdvancementGranterProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Advancements" + }, + { + "name": "WelcomeAdvancementLootTable", + "type": "loottable", + "compiles": true, + "locked_code": false, + "registry_name": "welcome_advancement_loot_table", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/loot_tables/advancements/welcome_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "BedrockEaterAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "bedrock_eater_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/bedrock_eater_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "SodaMachineAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "soda_machine_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/soda_machine_advancement.json" + ] + }, + "path": "~/Advancements" + }, + { + "name": "SodaMachineRefusedAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "soda_machine_refused_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/soda_machine_refused_advancement.json" + ] + }, + "path": "~/Advancements" } ], "variable_elements": [], @@ -5137,6 +5874,7 @@ "Items.DIAMOND_PICKAXE" ], "BLOCKS:minecraft:mineable/pickaxe": [ + "~CUSTOM:BrickierMagmaBricks", "~CUSTOM:OrichalcumDeepslateOre", "~CUSTOM:EnditeBlock", "~CUSTOM:OrichalcumBlock", @@ -5212,6 +5950,7 @@ "painting.nims_random_bullshit.shit_painting.title": "Shit Painting", "entity.aris_random_additions.ghoul": "Ghoul", "item.aris_random_additions.void_star": "Void Star", + "block.aris_random_additions.soda_machine": "Soda Machine", "block.aris_random_additions.broken_glass": "Broken Glass", "item.aris_random_additions.ghoul_spawn_egg": "Ghoul Spawn Egg", "item.aris_random_additions.endite_armor_boots": "Endite Boots", @@ -5223,10 +5962,11 @@ "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", + "block.aris_random_additions.magma_brick_pressure_plate": "Beans and Cheese Pressure Plate", "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", + "advancements.orange_sweetened_carbonated_water_can_advancement.descr": "Drink an Orange Soda", "item.aris_random_additions.endite_pickaxe": "Endite Pickaxe", "advancements.endite_scythe_advancement.title": "Endbringer\u0027s Sharpest Tool", "painting.aris_random_additions.turd_painting.author": "Ari/nim", @@ -5242,18 +5982,23 @@ "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", + "item.aris_random_additions.orange_sweetened_carbonated_water_can": "Canned Orange Soda", "gui.nims_random_bullshit.mailbox_gui.outbox_y_coord": "0", "item.aris_random_additions.power_star": "Power Star", + "advancements.bedrock_eater_advancement.title": "Somehow, Being Made Of Bedrock Makes It More Replinishing. Yeah. I don\u0027t know.", "enchantment.nims_random_bullshit.ruining_enchantment": "Ruining", "advancements.endite_advancement.descr": "Obtain Endite", - "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", + "block.aris_random_additions.orange_wood_wood": "OrangeWood Wood", "advancements.orichalcum_katana_advancement.descr": "Obtain an Orichalcum Katana", "gui.nims_random_bullshit.bedrockifier_gui.button_empty": "-\u003e", "block.nims_random_bullshit.hexa_condensed_netherrack": "Hexa-condensed Netherrack", "enchantment.nims_random_bullshit.sundering_enchantment": "Sundering", - "block.aris_random_additions.magma_brick_slabs": "Magma Brick Slab", + "block.aris_random_additions.magma_brick_slabs": "Beans and Cheese Slab", + "item.aris_random_additions.gold_token": "Gold Token", + "advancements.orichalcum_apple_advancement.descr": "Eat an Orichalcum Apple", "item.nims_random_bullshit.sand_dust": "Sand Dust", "item.aris_random_additions.endite_sword": "Endite Sword", "item.nims_random_bullshit.magic_flesh": "Magic Flesh", @@ -5262,29 +6007,37 @@ "item.nims_random_bullshit.black_iron_ingot": "Black Iron Ingot", "item.aris_random_additions.void_apple": "Void Apple", "item.aris_random_additions.star_wand": "Star Wand", + "advancements.soda_machine_advancement.descr": "Feed a Gold Token to a Soda Machine", "item.nims_random_bullshit.pocket_lightning.description_0": "Spawns lightning wherever it lands.", "advancements.turd_advancement.title": "Crap!", "item.aris_random_additions.orichalcum_armor_chestplate": "Orichalcum Chestplate", "item.nims_random_bullshit.bedrock_eater": "Bedrock Eater", "item.aris_random_additions.orichalcum_armor_helmet.description_0": "Set Bonus: Speed, Jump Boost", + "item.aris_random_additions.socket": "Socket", "block.nims_random_bullshit.rubber_pressure_plate": "Rubber Pressure Plate", "block.aris_random_additions.redstone_brick_walls": "Redstone Brick Wall", "item.nims_random_bullshit.orichalcum_armor_leggings": "Orichalcum Leggings", "block.nims_random_bullshit.condensed_netherrack": "Condensed Netherrack", - "block.aris_random_additions.magma_brick_stairs": "Magma Brick Stairs", + "block.aris_random_additions.magma_brick_stairs": "Beans and Cheese Stairs", "block.nims_random_bullshit.magma_brick_slabs": "Magma Brick Slab", "block.aris_random_additions.orichalcum_deepslate_ore": "Orichalcum Deepslate Ore", "item.nims_random_bullshit.pocket_lightning": "Pocket Lightning", + "item.aris_random_additions.water_can": "Canned Water", "block.aris_random_additions.redstone_brick_stairs": "Redstone Brick Stairs", "item.aris_random_additions.orichalcum_shovel": "Orichalcum Shovel", "item.nims_random_bullshit.star_wand": "Star Wand", "item.nims_random_bullshit.orichalcum_axe": "Orichalcum Axe", "enchantment.nims_random_bullshit.passive_income_enchantment": "Passive Income", - "block.aris_random_additions.magma_brick_button": "Magma Brick Button", + "block.aris_random_additions.magma_brick_button": "Beans and Cheese Button", + "item.aris_random_additions.can_lid": "Can Lid", + "block.aris_random_additions.orange_wood_log": "OrangeWood Log", "item.aris_random_additions.bean": "Bean", + "block.aris_random_additions.orange_wood_fence_gate": "OrangeWood Fence Gate", + "item.aris_random_additions.mint_leaves": "Mint Leaves", "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", + "block.aris_random_additions.orange_wood_planks": "OrangeWood Planks", "advancements.grave_digger_advancement.descr": "Obtain Gravedigger", "effect.nims_random_bullshit.summoned_entity_effect": "Summoned Entity", "item.aris_random_additions.netherrackite": "Netherrackite Ingot", @@ -5298,15 +6051,17 @@ "gui.nims_random_bullshit.mailbox_gui.label_x": "X:", "item.nims_random_bullshit.orichalcum_armor_helmet": "Orichalcum Helmet", "death.attack.bleed_damage_type.item": "%1$s was bled to death by %2$s using %3$s", - "block.aris_random_additions.magma_bricks": "Magma Bricks", + "block.aris_random_additions.magma_bricks": "Beans and Cheese Block", "item.aris_random_additions.endite_axe": "Endite Axe", + "block.aris_random_additions.brickier_magma_bricks": "Beans and Cheese Bricks", + "advancements.void_apple_advancement.descr": "Eat a Void Apple", "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!", "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", + "block.aris_random_additions.magma_brick_walls": "Beans and Cheese Wall", "item.nims_random_bullshit.cheese": "Cheese", "item.aris_random_additions.snow_golem_question_mark": "Snow Golem...?", "item.nims_random_bullshit.netherrackite": "Netherrackite Ingot", @@ -5317,15 +6072,21 @@ "item.aris_random_additions.netherrackite_pickaxe": "Netherrackite Pickaxe", "item.aris_random_additions.netherrack_juice_bucket": "Netherrack Juice Bucket", "item.nims_random_bullshit.netherrackite_pickaxe.description_0": "Non-condensed netherracks broken by this pickaxe drop themselves an additional time.", + "advancements.sweetened_carbonated_water_can_advancement.descr": "Drink a Canned Soda", "effect.nims_random_bullshit.stinky_effect": "Stinky", "death.attack.bleed_damage_type": "%1$s bled to death", + "advancements.mint_sweetened_carbonated_water_can_advancement.descr": "Drink a Mint Soda", "advancements.tux_advancement.descr": "Obtain a Tux Spawn Egg", "item.aris_random_additions.gravedigger": "Gravedigger", + "block.aris_random_additions.orange_wood_pressure_plate": "OrangeWood Pressure Plate", "item.aris_random_additions.orichalcum": "Orichalcum", "block.nims_random_bullshit.ore_miner": "Ore Miner", "advancements.star_wand_advancement.descr": "Use a Star Wand", "item.aris_random_additions.netherrackite_pickaxe.description_0": "Non-condensed netherracks broken by this pickaxe drop themselves an additional time.", + "advancements.end_portal_frame_advancement.descr": "Craft an End Portal Frame", "advancements.endite_set_advancement.descr": "Wear a full armor set of Endite.", + "item.aris_random_additions.mint_sweetened_carbonated_water_can": "Canned Mint Soda", + "advancements.welcome_advancement.title": "Arira!", "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", @@ -5336,8 +6097,11 @@ "item.nims_random_bullshit.bedrock_pickaxe": "Bedrock Pickaxe", "item.aris_random_additions.endite_armor_chestplate.description_0": "Set Bonus: Resistance, Regeneration, Strength", "block.nims_random_bullshit.magma_brick_stairs": "Magma Brick Stairs", + "gui.aris_random_additions.bedrockifier_gui.button_empty": "-\u003e", + "advancements.bedrock_apple_advancement.descr": "Eat a Bedrock Apple", "advancements.bedrock_shard_advancement.descr": "Obtain Bedrock Shard", "block.aris_random_additions.quadra_condensed_netherrack": "Quadra-condensed Netherrack", + "block.aris_random_additions.orange_wood_slab": "OrangeWood Slab", "item.aris_random_additions.orichalcum_katana": "Orichalcum Katana", "item.aris_random_additions.orichalcum_armor_boots": "Orichalcum Heels", "item.aris_random_additions.endite_upgrade_smithing_template": "Endite Upgrade Template", @@ -5346,44 +6110,57 @@ "advancements.spawner_advancement.title": "It\u0027s spawnin\u0027 time!", "item.nims_random_bullshit.bedrock_shard": "Bedrock Shard", "item.aris_random_additions.orichalcum_armor_leggings": "Orichalcum Leggings", + "item.aris_random_additions.orange": "Orange", "item.aris_random_additions.iron_golem_question_mark": "Iron Golem...?", + "advancements.soda_machine_refused_advancement.title": "Attempted Soda Robbery", "item.nims_random_bullshit.orichalcum_armor_chestplate": "Orichalcum Chestplate", "item.aris_random_additions.bedrock_apple.description_0": "When consumed: Grants permanent creative flight.", "item.nims_random_bullshit.bean": "Bean", "effect.aris_random_additions.stinky_effect": "Stinky", "advancements.endite_hoe_advancement.descr": "Craft an Endite Hoe", + "advancements.void_star_advancement.descr": "Craft a Void Star", "item.aris_random_additions.orichalcum_armor_helmet": "Orichalcum Helmet", "enchantment.aris_random_additions.ruining_enchantment": "Ruining", "block.aris_random_additions.ore_miner": "Ore Miner", "block.aris_random_additions.condensed_netherrack": "Condensed Netherrack", "item.aris_random_additions.orichalcum_katana.description_0": "Right-Click: empower the blade, making your next attack cause bleeding DoT effect to the target for a duration.", + "item.aris_random_additions.empty_can": "Empty Can", "block.nims_random_bullshit.redstone_bricks": "Redstone Bricks", "item.nims_random_bullshit.iron_golem_question_mark": "Iron Golem...?", "item.aris_random_additions.golden_berries": "Golden Berries", "item.nims_random_bullshit.lapis_lazuli_nugget": "Lapis Lazuli Nugget", + "block.aris_random_additions.orange_wood_leaves": "OrangeWood Leaves", "item.aris_random_additions.star": "Star", "item.nims_random_bullshit.bedrock_sword": "Bedrock Sword", + "item.aris_random_additions.sweetened_carbonated_water_can": "Canned Soda", "item.nims_random_bullshit.wither_question_mark": "Wither...?", "advancements.block_eater_advancement.descr": "Eat a block with the Block Eater", "advancements.tux_advancement.title": "Tux!?", "item.nims_random_bullshit.gravedigger": "Gravedigger", "item.aris_random_additions.pocket_lightning": "Pocket Lightning", + "advancements.sweetened_carbonated_water_can_advancement.title": "Now That\u0027s The Good Stuff!", "item.aris_random_additions.night_vision_goggles_helmet": "Night Vision Goggles", "advancements.orichalcum_katana_advancement.title": "As Fierce As The Color", "item.aris_random_additions.cheese": "Cheese", "item.aris_random_additions.orichalcum_sword": "Orichalcum Sword", + "advancements.end_portal_frame_advancement.title": "You Shouldn\u0027t Have This...", "item.aris_random_additions.wand_of_resizing.description_0": "DISCLAIMER: Does not work with Origins that periodically reset your scale!", "advancements.endite_scythe_advancement.descr": "Craft an Endite Scythe", "item.aris_random_additions.block_eater": "Block Eater", "entity.nims_random_bullshit.tux": "Tux", "item.aris_random_additions.orichalcum_pickaxe": "Orichalcum Pickaxe", "block.nims_random_bullshit.bedrockifier": "Bedrockifier", + "advancements.orichalcum_apple_advancement.title": "Feelin\u0027 Cutesy And Furious", "effect.aris_random_additions.summoned_entity_effect": "Summoned Entity", "item.nims_random_bullshit.orichalcum": "Orichalcum", "item.aris_random_additions.orichalcum_armor_leggings.description_0": "Set Bonus: Speed, Jump Boost", + "block.aris_random_additions.orange_wood_fence": "OrangeWood Fence", "advancements.magic_egg_advancement.descr": "Obtain a Magic Egg", + "advancements.orange_sweetened_carbonated_water_can_advancement.title": "A Fantastic Beverage!", "item.aris_random_additions.orichalcum_apple.description_0": "When consumed: Grants 1 permanent bonus attack damage.", + "block.aris_random_additions.mint_plant": "Mint Plant", "advancements.endite_advancement.title": "Purple Butter", + "advancements.bedrock_eater_advancement.descr": "Eat a block with the Bedrock Eater", "entity.aris_random_additions.ari": "Ari", "item.nims_random_bullshit.night_vision_goggles_helmet": "Night Vision Goggles", "advancements.power_star_advancement.descr": "Craft a Power Star", @@ -5408,10 +6185,16 @@ "item.aris_random_additions.black_iron_ingot": "Black Iron Ingot", "item.aris_random_additions.endite_armor_helmet": "Endite Helmet", "advancements.endite_hoe_advancement.title": "Extremely Serious Dedication", + "advancements.void_star_advancement.title": "A Star Not Meant To Be", "block.nims_random_bullshit.magma_brick_walls": "Magma Brick Wall", "block.nims_random_bullshit.rave_block": "Rave Block", + "advancements.bedrock_apple_advancement.title": "Need A Dentist Appointment After This", + "advancements.mint_sweetened_carbonated_water_can_advancement.title": "Now That\u0027s The Good Stuff! - Minty Edition", "item.nims_random_bullshit.orichalcum_sword": "Orichalcum Sword", + "item.aris_random_additions.carbonated_water_can": "Canned Sparkling Water", "item.aris_random_additions.wand_of_resizing": "Wand Of Resizing", + "advancements.welcome_advancement.descr": "Play on a world with Ari\u0027s Random Additions installed for the first time", + "advancements.soda_machine_refused_advancement.descr": "You tried to get a Canned Soda for free, and FAILED. AHAHAHA!", "block.aris_random_additions.condensed_condensed_condensed_netherrack": "Condensed Condensed Condensed Netherrack", "advancements.star_wand_advancement.title": "Healius Absorbus!", "advancements.magic_egg_advancement.title": "Core of a Spawner", @@ -5425,6 +6208,7 @@ "advancements.endite_set_advancement.title": "Cover Me In Endermite", "advancements.bedrock_shard_advancement.title": "Unobtainium", "item.aris_random_additions.endite_armor_boots.description_0": "Set Bonus: Resistance, Regeneration, Strength", + "advancements.soda_machine_advancement.title": "It Doesn\u0027t Even Need To Be Restocked! It Just Dispenses Soda Out Of Thin Air!", "fluid.nims_random_bullshit.netherrack_juice": "Netherrack Juice", "item.nims_random_bullshit.wand_of_resizing.description_0": "DISCLAIMER: Does not work with Origins that periodically reset your scale!", "gui.nims_random_bullshit.mailbox_gui.outbox_z_coord": "0", @@ -5434,6 +6218,7 @@ "item.aris_random_additions.pocket_lightning.description_0": "Spawns lightning wherever it lands.", "item.nims_random_bullshit.netherrackite_pickaxe": "Netherrackite Pickaxe", "item.aris_random_additions.endite_armor_helmet.description_0": "Set Bonus: Resistance, Regeneration, Strength", + "block.aris_random_additions.orange_wood_stairs": "OrangeWood Stairs", "gui.aris_random_additions.bedrockifier_gui.label_bedrockifier": "Bedrockifier", "block.aris_random_additions.penta_condensed_netherrack": "Penta-condensed Netherrack", "item.nims_random_bullshit.orichalcum_hoe": "Orichalcum Hoe", @@ -5442,10 +6227,13 @@ "block.nims_random_bullshit.netherrack_juice": "Netherrack Juice", "fluid.aris_random_additions.netherrack_juice": "Netherrack Juice", "block.nims_random_bullshit.rubber_button": "Rubber Button", + "item.aris_random_additions.mint": "mint", + "block.aris_random_additions.orange_wood_button": "OrangeWood Button", "item.nims_random_bullshit.magic_egg": "Magic Egg", "block.aris_random_additions.redstone_bricks": "Redstone Bricks", "item.nims_random_bullshit.block_eater": "Block Eater", "item.aris_random_additions.lapis_lazuli_nugget": "Lapis Lazuli Nugget", + "advancements.void_apple_advancement.title": "It Certainly Is DeVOID Of Taste", "item.aris_random_additions.endite_armor_leggings": "Endite Leggings", "advancements.bedrock_advancement.title": "Unobtainium Block", "item.nims_random_bullshit.star": "Star", @@ -5538,13 +6326,25 @@ { "name": "Ari", "children": [] + }, + { + "name": "Cans", + "children": [] + }, + { + "name": "Orange", + "children": [] + }, + { + "name": "Mint", + "children": [] } ] }, "workspaceSettings": { "modid": "aris_random_additions", "modName": "Ari\u0027s Random Additions", - "version": "2.1.3", + "version": "2.2.0", "description": "Random Additions by Ari. Created with MCreator.", "author": "nimsolated, MCreator", "websiteURL": "https://mcreator.net", diff --git a/elements/BedrockAppleAdvancement.mod.json b/elements/BedrockAppleAdvancement.mod.json new file mode 100644 index 0000000..b5c82ab --- /dev/null +++ b/elements/BedrockAppleAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "Need A Dentist Appointment After This", + "achievementDescription": "Eat a Bedrock Apple", + "achievementIcon": { + "value": "CUSTOM:BedrockApple" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:BedrockAdvancement" + }, + "triggerxml": "CUSTOM:BedrockApple" + } +} \ No newline at end of file diff --git a/elements/BedrockEaterAdvancement.mod.json b/elements/BedrockEaterAdvancement.mod.json new file mode 100644 index 0000000..7b75a62 --- /dev/null +++ b/elements/BedrockEaterAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "Somehow, Being Made Of Bedrock Makes It More Replinishing. Yeah. I don't know.", + "achievementDescription": "Eat a block with the Bedrock Eater", + "achievementIcon": { + "value": "CUSTOM:BedrockEater" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:BlockEaterAdvancement" + }, + "triggerxml": "" + } +} \ No newline at end of file diff --git a/elements/BedrockEaterRightClick.mod.json b/elements/BedrockEaterRightClick.mod.json index 941b2bc..02756c3 100644 --- a/elements/BedrockEaterRightClick.mod.json +++ b/elements/BedrockEaterRightClick.mod.json @@ -2,6 +2,6 @@ "_fv": 73, "_type": "procedure", "definition": { - "procedurexml": "no_ext_triggerORBlocks.BEDROCKNEQ-1ADD6GTE20ADD3entity.generic.eatplayer0.50.84END_ROD41110.4300CUSTOM:BlockEaterAdvancementCUSTOM:BlockEaterAdvancement" + "procedurexml": "no_ext_triggerORBlocks.BEDROCKNEQ-1ADD6GTE20ADD3entity.generic.eatplayer0.50.84END_ROD41110.4300CUSTOM:BedrockEaterAdvancementCUSTOM:BedrockEaterAdvancement" } } \ No newline at end of file diff --git a/elements/BedrockShardAdvancement.mod.json b/elements/BedrockShardAdvancement.mod.json index 0e4ce26..91817a1 100644 --- a/elements/BedrockShardAdvancement.mod.json +++ b/elements/BedrockShardAdvancement.mod.json @@ -17,7 +17,7 @@ "rewardXP": 0, "achievementType": "challenge", "parent": { - "value": "No parent: root" + "value": "CUSTOM:WelcomeAdvancement" }, "triggerxml": "164CUSTOM:BedrockShard" } diff --git a/elements/Bedrockifier.mod.json b/elements/Bedrockifier.mod.json index e73c8b6..53dbe66 100644 --- a/elements/Bedrockifier.mod.json +++ b/elements/Bedrockifier.mod.json @@ -124,9 +124,6 @@ "isFluidTank": false, "fluidCapacity": 8000, "fluidRestrictions": [], - "onRedstoneOn": { - "name": "BedrockifierLogic" - }, "generateFeature": false, "restrictionBiomes": [], "blocksToReplace": [ diff --git a/elements/BedrockifierGUI.mod.json b/elements/BedrockifierGUI.mod.json index 99799e6..8e9b3c7 100644 --- a/elements/BedrockifierGUI.mod.json +++ b/elements/BedrockifierGUI.mod.json @@ -96,10 +96,16 @@ } }, { - "type": "image", + "type": "button", "data": { - "image": "right_arrow_sign.png", - "use1Xscale": false, + "name": "button_empty", + "text": "->", + "isUndecorated": false, + "onClick": { + "name": "BedrockifierLogic" + }, + "width": 35, + "height": 20, "x": 222, "y": 71, "locked": false diff --git a/elements/BedrockifierRecipe.mod.json b/elements/BedrockifierRecipe.mod.json index 826cc00..abc07eb 100644 --- a/elements/BedrockifierRecipe.mod.json +++ b/elements/BedrockifierRecipe.mod.json @@ -21,22 +21,22 @@ "value": "Blocks.BEDROCK" }, { - "value": "CUSTOM:CondensedCondensedCondensedNetherrack" + "value": "Blocks.BEDROCK" }, { "value": "CUSTOM:Cheese" }, { - "value": "CUSTOM:CondensedCondensedCondensedNetherrack" + "value": "Blocks.BEDROCK" }, { - "value": "CUSTOM:CondensedCondensedCondensedNetherrack" + "value": "Blocks.BEDROCK" }, { - "value": "CUSTOM:CondensedCondensedCondensedNetherrack" + "value": "Blocks.BEDROCK" }, { - "value": "CUSTOM:CondensedCondensedCondensedNetherrack" + "value": "Blocks.BEDROCK" } ], "recipeReturnStack": { diff --git a/elements/BlockEaterAdvancement.mod.json b/elements/BlockEaterAdvancement.mod.json index b8e328c..3886f4d 100644 --- a/elements/BlockEaterAdvancement.mod.json +++ b/elements/BlockEaterAdvancement.mod.json @@ -17,7 +17,7 @@ "rewardXP": 0, "achievementType": "challenge", "parent": { - "value": "No parent: root" + "value": "CUSTOM:WelcomeAdvancement" }, "triggerxml": "" } diff --git a/elements/BrickierMagmaBricks.mod.json b/elements/BrickierMagmaBricks.mod.json new file mode 100644 index 0000000..b1d03f1 --- /dev/null +++ b/elements/BrickierMagmaBricks.mod.json @@ -0,0 +1,137 @@ +{ + "_fv": 73, + "_type": "block", + "definition": { + "texture": "magma_bricks", + "textureTop": "magma_bricks", + "textureLeft": "magma_bricks", + "textureFront": "magma_bricks", + "textureRight": "magma_bricks", + "textureBack": "magma_bricks", + "renderType": 10, + "customModelName": "Normal", + "rotationMode": 0, + "enablePitch": false, + "emissiveRendering": false, + "displayFluidOverlay": false, + "itemTexture": "", + "particleTexture": "", + "tintType": "No tint", + "isItemTinted": false, + "hasTransparency": false, + "connectedSides": false, + "transparencyType": "SOLID", + "disableOffset": false, + "boundingBoxes": [ + { + "mx": 0.0, + "my": 0.0, + "mz": 0.0, + "Mx": 16.0, + "My": 16.0, + "Mz": 16.0, + "subtract": false + } + ], + "customProperties": [], + "name": "Beans and Cheese Bricks", + "specialInformation": { + "fixedValue": [] + }, + "hardness": 0.5, + "resistance": 0.5, + "hasGravity": false, + "isWaterloggable": false, + "creativeTabs": [ + { + "value": "BUILDING_BLOCKS" + } + ], + "destroyTool": "pickaxe", + "customDrop": { + "value": "" + }, + "dropAmount": 1, + "useLootTableForDrops": false, + "requiresCorrectTool": true, + "enchantPowerBonus": 0.0, + "plantsGrowOn": false, + "canRedstoneConnect": false, + "lightOpacity": 15, + "material": { + "value": "NONE" + }, + "tickRate": 0, + "tickRandomly": false, + "isReplaceable": false, + "canProvidePower": false, + "emittedRedstonePower": { + "fixedValue": 15.0 + }, + "colorOnMap": "ADOBE", + "creativePickItem": { + "value": "" + }, + "offsetType": "NONE", + "aiPathNodeType": "DEFAULT", + "flammability": 0, + "fireSpreadSpeed": 0, + "isLadder": false, + "slipperiness": 0.6, + "speedFactor": 1.0, + "jumpFactor": 1.0, + "reactionToPushing": "NORMAL", + "isNotColidable": false, + "isCustomSoundType": false, + "soundOnStep": { + "value": "STONE" + }, + "breakSound": { + "value": "" + }, + "fallSound": { + "value": "" + }, + "hitSound": { + "value": "" + }, + "placeSound": { + "value": "" + }, + "stepSound": { + "value": "" + }, + "luminance": 3, + "unbreakable": false, + "vanillaToolTier": "NONE", + "isBonemealable": false, + "hasInventory": false, + "openGUIOnRightClick": false, + "inventorySize": 9, + "inventoryStackSize": 64, + "inventoryDropWhenDestroyed": true, + "inventoryComparatorPower": true, + "inventoryOutSlotIDs": [], + "inventoryInSlotIDs": [], + "hasEnergyStorage": false, + "energyInitial": 0, + "energyCapacity": 400000, + "energyMaxReceive": 200, + "energyMaxExtract": 200, + "isFluidTank": false, + "fluidCapacity": 8000, + "fluidRestrictions": [], + "generateFeature": false, + "restrictionBiomes": [], + "blocksToReplace": [ + { + "value": "TAG:stone_ore_replaceables" + } + ], + "generationShape": "UNIFORM", + "frequencyPerChunks": 10, + "frequencyOnChunk": 16, + "minGenerateHeight": 0, + "maxGenerateHeight": 64 + } +} \ No newline at end of file diff --git a/elements/BrickierMagmaBricksRecipe.mod.json b/elements/BrickierMagmaBricksRecipe.mod.json new file mode 100644 index 0000000..c4bc992 --- /dev/null +++ b/elements/BrickierMagmaBricksRecipe.mod.json @@ -0,0 +1,22 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Stone cutting", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "stoneCuttingInputStack": { + "value": "CUSTOM:MagmaBricks" + }, + "stoneCuttingReturnStack": { + "value": "CUSTOM:BrickierMagmaBricks" + }, + "name": "brickier_magma_bricks_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/CanLid.mod.json b/elements/CanLid.mod.json new file mode 100644 index 0000000..c5e99b8 --- /dev/null +++ b/elements/CanLid.mod.json @@ -0,0 +1,63 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "can_lid", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Can Lid", + "rarity": "COMMON", + "creativeTabs": [ + { + "value": "MATERIALS" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 0, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": false, + "nutritionalValue": 4, + "saturation": 0.3, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": false, + "animation": "none", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/MagmaBricksRecipe.mod.json b/elements/CanLidRecipe.mod.json similarity index 70% rename from elements/MagmaBricksRecipe.mod.json rename to elements/CanLidRecipe.mod.json index 3302e38..5149856 100644 --- a/elements/MagmaBricksRecipe.mod.json +++ b/elements/CanLidRecipe.mod.json @@ -8,23 +8,23 @@ "cookingBookCategory": "MISC", "xpReward": 0.0, "cookingTime": 200, - "craftingBookCategory": "BUILDING", + "craftingBookCategory": "MISC", "recipeShapeless": false, "recipeSlots": [ { - "value": "Blocks.MAGMA" + "value": "Items.IRON_NUGGET" }, { - "value": "Blocks.MAGMA" + "value": "Items.IRON_NUGGET" }, { "value": "" }, { - "value": "Blocks.MAGMA" + "value": "" }, { - "value": "Blocks.MAGMA" + "value": "" }, { "value": "" @@ -40,9 +40,9 @@ } ], "recipeReturnStack": { - "value": "CUSTOM:MagmaBricks" + "value": "CUSTOM:CanLid" }, - "name": "magma_bricks_recipe", + "name": "can_lid_recipe", "namespace": "mod" } } \ No newline at end of file diff --git a/elements/CarbonatedWaterCan.mod.json b/elements/CarbonatedWaterCan.mod.json new file mode 100644 index 0000000..0fe2b92 --- /dev/null +++ b/elements/CarbonatedWaterCan.mod.json @@ -0,0 +1,63 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "carbonated_water_can", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Canned Sparkling Water", + "rarity": "COMMON", + "creativeTabs": [ + { + "value": "FOOD" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 32, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": true, + "nutritionalValue": 0, + "saturation": 0.0, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": true, + "animation": "drink", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/CarbonatedWaterCanRecipe.mod.json b/elements/CarbonatedWaterCanRecipe.mod.json new file mode 100644 index 0000000..b217ff6 --- /dev/null +++ b/elements/CarbonatedWaterCanRecipe.mod.json @@ -0,0 +1,25 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Brewing", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "brewingInputStack": { + "value": "CUSTOM:WaterCan" + }, + "brewingIngredientStack": { + "value": "Items.GUNPOWDER" + }, + "brewingReturnStack": { + "value": "CUSTOM:CarbonatedWaterCan" + }, + "name": "carbonated_water_can_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/CondensedNetherrackAdvancement.mod.json b/elements/CondensedNetherrackAdvancement.mod.json index 588dcde..9260e0e 100644 --- a/elements/CondensedNetherrackAdvancement.mod.json +++ b/elements/CondensedNetherrackAdvancement.mod.json @@ -17,7 +17,7 @@ "rewardXP": 0, "achievementType": "task", "parent": { - "value": "No parent: root" + "value": "CUSTOM:WelcomeAdvancement" }, "triggerxml": "164CUSTOM:CondensedNetherrack" } diff --git a/elements/DarkOakTreeLeavesLootTable.mod.json b/elements/DarkOakTreeLeavesLootTable.mod.json new file mode 100644 index 0000000..dada5d5 --- /dev/null +++ b/elements/DarkOakTreeLeavesLootTable.mod.json @@ -0,0 +1,122 @@ +{ + "_fv": 73, + "_type": "loottable", + "definition": { + "type": "Block", + "pools": [ + { + "minrolls": 1, + "maxrolls": 1, + "minbonusrolls": 1, + "maxbonusrolls": 1, + "hasbonusrolls": false, + "entries": [ + { + "type": "item", + "item": { + "value": "Items.STICK" + }, + "weight": 2, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": true, + "explosionDecay": false, + "silkTouchMode": 2 + }, + { + "type": "item", + "item": { + "value": "Blocks.AIR" + }, + "weight": 100, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": false, + "explosionDecay": false, + "silkTouchMode": 2 + } + ] + }, + { + "minrolls": 1, + "maxrolls": 1, + "minbonusrolls": 1, + "maxbonusrolls": 1, + "hasbonusrolls": false, + "entries": [ + { + "type": "item", + "item": { + "value": "Blocks.LEAVES2#1" + }, + "weight": 1, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": false, + "explosionDecay": false, + "silkTouchMode": 1 + } + ] + }, + { + "minrolls": 1, + "maxrolls": 1, + "minbonusrolls": 1, + "maxbonusrolls": 1, + "hasbonusrolls": false, + "entries": [ + { + "type": "item", + "item": { + "value": "Items.APPLE" + }, + "weight": 1, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": true, + "explosionDecay": false, + "silkTouchMode": 2 + }, + { + "type": "item", + "item": { + "value": "CUSTOM:Orange" + }, + "weight": 1, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": true, + "explosionDecay": false, + "silkTouchMode": 2 + }, + { + "type": "item", + "item": { + "value": "Blocks.AIR" + }, + "weight": 100, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": false, + "explosionDecay": false, + "silkTouchMode": 2 + } + ] + } + ], + "name": "blocks/dark_oak_leaves", + "namespace": "minecraft" + } +} \ No newline at end of file diff --git a/elements/EmptyCan.mod.json b/elements/EmptyCan.mod.json new file mode 100644 index 0000000..ac475c5 --- /dev/null +++ b/elements/EmptyCan.mod.json @@ -0,0 +1,66 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "empty_can", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Empty Can", + "rarity": "COMMON", + "creativeTabs": [ + { + "value": "MATERIALS" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 0, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "onRightClickedOnBlock": { + "name": "EmptyCanRightclickedOnBlock" + }, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": false, + "nutritionalValue": 4, + "saturation": 0.3, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": false, + "animation": "none", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/EmptyCanRecipe.mod.json b/elements/EmptyCanRecipe.mod.json new file mode 100644 index 0000000..9d5fff1 --- /dev/null +++ b/elements/EmptyCanRecipe.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": "Items.IRON_NUGGET" + }, + { + "value": "CUSTOM:CanLid" + }, + { + "value": "Items.IRON_NUGGET" + }, + { + "value": "Items.IRON_NUGGET" + }, + { + "value": "" + }, + { + "value": "Items.IRON_NUGGET" + }, + { + "value": "Items.IRON_NUGGET" + }, + { + "value": "Items.IRON_NUGGET" + }, + { + "value": "Items.IRON_NUGGET" + } + ], + "recipeReturnStack": { + "value": "CUSTOM:EmptyCan" + }, + "name": "empty_can_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/EmptyCanRightclickedOnBlock.mod.json b/elements/EmptyCanRightclickedOnBlock.mod.json new file mode 100644 index 0000000..57f394d --- /dev/null +++ b/elements/EmptyCanRightclickedOnBlock.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerBlocks.WATER_CAULDRONMINUS1CUSTOM:EmptyCanTRUECUSTOM:WaterCan0item.bottle.fillplayer0.851" + } +} \ No newline at end of file diff --git a/elements/EndPortalFrameAdvancement.mod.json b/elements/EndPortalFrameAdvancement.mod.json new file mode 100644 index 0000000..6d3826f --- /dev/null +++ b/elements/EndPortalFrameAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "You Shouldn't Have This...", + "achievementDescription": "Craft an End Portal Frame", + "achievementIcon": { + "value": "Blocks.END_PORTAL_FRAME" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:VoidStarAdvancement" + }, + "triggerxml": "164Blocks.END_PORTAL_FRAME" + } +} \ No newline at end of file diff --git a/elements/EndPortalFrameRecipe.mod.json b/elements/EndPortalFrameRecipe.mod.json new file mode 100644 index 0000000..a06afa9 --- /dev/null +++ b/elements/EndPortalFrameRecipe.mod.json @@ -0,0 +1,48 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Crafting", + "recipeRetstackSize": 3, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "BUILDING", + "recipeShapeless": false, + "recipeSlots": [ + { + "value": "" + }, + { + "value": "" + }, + { + "value": "" + }, + { + "value": "Blocks.CONCRETE#13" + }, + { + "value": "CUSTOM:Socket" + }, + { + "value": "Blocks.CONCRETE#13" + }, + { + "value": "Blocks.END_STONE" + }, + { + "value": "CUSTOM:VoidStar" + }, + { + "value": "Blocks.END_STONE" + } + ], + "recipeReturnStack": { + "value": "Blocks.END_PORTAL_FRAME" + }, + "name": "end_portal_frame_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/EnditeAdvancement.mod.json b/elements/EnditeAdvancement.mod.json index 6e48754..fe684d9 100644 --- a/elements/EnditeAdvancement.mod.json +++ b/elements/EnditeAdvancement.mod.json @@ -17,7 +17,7 @@ "rewardXP": 0, "achievementType": "goal", "parent": { - "value": "No parent: root" + "value": "CUSTOM:WelcomeAdvancement" }, "triggerxml": "164CUSTOM:EnditeIngot" } diff --git a/elements/GetPermanentStats.mod.json b/elements/GetPermanentStats.mod.json index 590cc67..9b6cd9a 100644 --- a/elements/GetPermanentStats.mod.json +++ b/elements/GetPermanentStats.mod.json @@ -2,7 +2,7 @@ "_fv": 73, "_type": "command", "definition": { - "commandName": "ari-get-permanent-stats", + "commandName": "arira-get-permanent-stats", "type": "STANDARD", "permissionLevel": "No requirement", "argsxml": "GetPermanentStatsCommandProcedure" diff --git a/elements/GoldToken.mod.json b/elements/GoldToken.mod.json new file mode 100644 index 0000000..4ddc37e --- /dev/null +++ b/elements/GoldToken.mod.json @@ -0,0 +1,63 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "gold_token", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Gold Token", + "rarity": "COMMON", + "creativeTabs": [ + { + "value": "MATERIALS" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 0, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": false, + "nutritionalValue": 4, + "saturation": 0.3, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": false, + "animation": "none", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/GoldTokenRecipe.mod.json b/elements/GoldTokenRecipe.mod.json new file mode 100644 index 0000000..e62630f --- /dev/null +++ b/elements/GoldTokenRecipe.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.GOLD_NUGGET" + }, + { + "value": "" + }, + { + "value": "Items.GOLD_NUGGET" + }, + { + "value": "Items.GOLD_INGOT" + }, + { + "value": "Items.GOLD_NUGGET" + }, + { + "value": "" + }, + { + "value": "Items.GOLD_NUGGET" + }, + { + "value": "" + } + ], + "recipeReturnStack": { + "value": "CUSTOM:GoldToken" + }, + "name": "gold_token_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/GraveDiggerAdvancement.mod.json b/elements/GraveDiggerAdvancement.mod.json index 8cccd3e..bbb5aef 100644 --- a/elements/GraveDiggerAdvancement.mod.json +++ b/elements/GraveDiggerAdvancement.mod.json @@ -17,7 +17,7 @@ "rewardXP": 0, "achievementType": "challenge", "parent": { - "value": "No parent: root" + "value": "CUSTOM:WelcomeAdvancement" }, "triggerxml": "164CUSTOM:Gravedigger" } diff --git a/elements/MagicEggAdvancement.mod.json b/elements/MagicEggAdvancement.mod.json index d71bf8d..179e1fe 100644 --- a/elements/MagicEggAdvancement.mod.json +++ b/elements/MagicEggAdvancement.mod.json @@ -17,7 +17,7 @@ "rewardXP": 0, "achievementType": "task", "parent": { - "value": "No parent: root" + "value": "CUSTOM:WelcomeAdvancement" }, "triggerxml": "164CUSTOM:MagicEgg" } diff --git a/elements/MagmaBrickButton.mod.json b/elements/MagmaBrickButton.mod.json index ed40745..c0b4758 100644 --- a/elements/MagmaBrickButton.mod.json +++ b/elements/MagmaBrickButton.mod.json @@ -35,7 +35,7 @@ } ], "customProperties": [], - "name": "Magma Brick Button", + "name": "Beans and Cheese Button", "specialInformation": { "fixedValue": [] }, diff --git a/elements/MagmaBrickPressurePlate.mod.json b/elements/MagmaBrickPressurePlate.mod.json index c97042f..33f3cb5 100644 --- a/elements/MagmaBrickPressurePlate.mod.json +++ b/elements/MagmaBrickPressurePlate.mod.json @@ -35,7 +35,7 @@ } ], "customProperties": [], - "name": "Magma Brick Pressure Plate", + "name": "Beans and Cheese Pressure Plate", "specialInformation": { "fixedValue": [] }, diff --git a/elements/MagmaBrickSlabs.mod.json b/elements/MagmaBrickSlabs.mod.json index d7f0fee..01c24d9 100644 --- a/elements/MagmaBrickSlabs.mod.json +++ b/elements/MagmaBrickSlabs.mod.json @@ -35,7 +35,7 @@ } ], "customProperties": [], - "name": "Magma Brick Slab", + "name": "Beans and Cheese Slab", "specialInformation": { "fixedValue": [] }, diff --git a/elements/MagmaBrickStairs.mod.json b/elements/MagmaBrickStairs.mod.json index a2e6983..a47b661 100644 --- a/elements/MagmaBrickStairs.mod.json +++ b/elements/MagmaBrickStairs.mod.json @@ -35,7 +35,7 @@ } ], "customProperties": [], - "name": "Magma Brick Stairs", + "name": "Beans and Cheese Stairs", "specialInformation": { "fixedValue": [] }, diff --git a/elements/MagmaBrickWalls.mod.json b/elements/MagmaBrickWalls.mod.json index e529517..3ebef76 100644 --- a/elements/MagmaBrickWalls.mod.json +++ b/elements/MagmaBrickWalls.mod.json @@ -35,7 +35,7 @@ } ], "customProperties": [], - "name": "Magma Brick Wall", + "name": "Beans and Cheese Wall", "specialInformation": { "fixedValue": [] }, diff --git a/elements/MagmaBricks.mod.json b/elements/MagmaBricks.mod.json index e49ec8f..02b9561 100644 --- a/elements/MagmaBricks.mod.json +++ b/elements/MagmaBricks.mod.json @@ -34,7 +34,7 @@ } ], "customProperties": [], - "name": "Magma Bricks", + "name": "Beans and Cheese Block", "specialInformation": { "fixedValue": [] }, diff --git a/elements/Mint.mod.json b/elements/Mint.mod.json new file mode 100644 index 0000000..6e8e756 --- /dev/null +++ b/elements/Mint.mod.json @@ -0,0 +1,63 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "mint", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "mint", + "rarity": "COMMON", + "creativeTabs": [ + { + "value": "FOOD" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 32, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": true, + "nutritionalValue": 0, + "saturation": 0.3, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": true, + "animation": "eat", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/MintLeaves.mod.json b/elements/MintLeaves.mod.json new file mode 100644 index 0000000..d249302 --- /dev/null +++ b/elements/MintLeaves.mod.json @@ -0,0 +1,63 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "mint_leaves", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Mint Leaves", + "rarity": "COMMON", + "creativeTabs": [ + { + "value": "MATERIALS" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 0, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": false, + "nutritionalValue": 4, + "saturation": 0.3, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": false, + "animation": "none", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/MintPlant.mod.json b/elements/MintPlant.mod.json new file mode 100644 index 0000000..5681d72 --- /dev/null +++ b/elements/MintPlant.mod.json @@ -0,0 +1,119 @@ +{ + "_fv": 73, + "_type": "plant", + "definition": { + "renderType": 12, + "texture": "mint_plant", + "textureBottom": "", + "customModelName": "Cross model", + "itemTexture": "", + "particleTexture": "", + "tintType": "No tint", + "isItemTinted": false, + "plantType": "normal", + "suspiciousStewEffect": "HASTE", + "suspiciousStewDuration": 200, + "secondaryTreeChance": 0.1, + "trees": [ + null, + null + ], + "flowerTrees": [ + null, + null + ], + "megaTrees": [ + null, + null + ], + "growapableSpawnType": "Plains", + "growapableMaxHeight": 3, + "customBoundingBox": false, + "disableOffset": false, + "boundingBoxes": [ + { + "mx": 0.0, + "my": 0.0, + "mz": 0.0, + "Mx": 16.0, + "My": 16.0, + "Mz": 16.0, + "subtract": false + } + ], + "name": "Mint Plant", + "specialInformation": { + "fixedValue": [] + }, + "creativeTabs": [ + { + "value": "DECORATIONS" + } + ], + "hardness": 0.0, + "resistance": 0.0, + "luminance": 0, + "unbreakable": false, + "isSolid": false, + "isWaterloggable": false, + "isCustomSoundType": false, + "soundOnStep": { + "value": "PLANT" + }, + "breakSound": { + "value": "" + }, + "stepSound": { + "value": "" + }, + "placeSound": { + "value": "" + }, + "hitSound": { + "value": "" + }, + "fallSound": { + "value": "" + }, + "useLootTableForDrops": true, + "customDrop": { + "value": "" + }, + "dropAmount": 1, + "forceTicking": false, + "emissiveRendering": false, + "hasTileEntity": false, + "isReplaceable": false, + "colorOnMap": "DEFAULT", + "creativePickItem": { + "value": "" + }, + "offsetType": "XZ", + "aiPathNodeType": "DEFAULT", + "flammability": 100, + "fireSpreadSpeed": 60, + "jumpFactor": 1.0, + "speedFactor": 1.0, + "canBePlacedOn": [], + "isBonemealable": false, + "frequencyOnChunks": 5, + "generateFeature": true, + "restrictionBiomes": [ + { + "value": "cherry_grove" + }, + { + "value": "jungle" + }, + { + "value": "jungle_edge" + }, + { + "value": "bamboo_jungle" + } + ], + "generationType": "Flower", + "patchSize": 64, + "generateAtAnyHeight": true + } +} \ No newline at end of file diff --git a/elements/MintPlantFeature.mod.json b/elements/MintPlantFeature.mod.json new file mode 100644 index 0000000..f6d3f97 --- /dev/null +++ b/elements/MintPlantFeature.mod.json @@ -0,0 +1,23 @@ +{ + "_fv": 73, + "_type": "feature", + "definition": { + "skipPlacement": false, + "generationStep": "VEGETAL_DECORATION", + "restrictionBiomes": [ + { + "value": "cherry_grove" + }, + { + "value": "jungle" + }, + { + "value": "jungle_edge" + }, + { + "value": "bamboo_jungle" + } + ], + "featurexml": "9673This block represents a block patch feature. The blocks will only generate in valid positions (for example, grass will never generate on a stone block).Patches of plants should be generated during the VEGETAL_DECORATION stage.CUSTOM:MintPlantThis is the block being placedThis condition is checked for every block that is being placed. Here we don't want tall grass to replace other blocks5This is so the patch only generates in some of the chunksWe then move each patch horizontally. This way they don't generate only in the corner of the chunkMOTION_BLOCKINGWe then move the patches at the highest motion blocking block, so that they generate on the surfaceWe add a biome filter, so that the patches don't generate outside of the current biome" + } +} \ No newline at end of file diff --git a/elements/MintPlantLootTable.mod.json b/elements/MintPlantLootTable.mod.json new file mode 100644 index 0000000..cb5cbb9 --- /dev/null +++ b/elements/MintPlantLootTable.mod.json @@ -0,0 +1,48 @@ +{ + "_fv": 73, + "_type": "loottable", + "definition": { + "type": "Block", + "pools": [ + { + "minrolls": 1, + "maxrolls": 1, + "minbonusrolls": 1, + "maxbonusrolls": 1, + "hasbonusrolls": false, + "entries": [ + { + "type": "item", + "item": { + "value": "CUSTOM:MintLeaves" + }, + "weight": 1, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": true, + "explosionDecay": false, + "silkTouchMode": 2 + }, + { + "type": "item", + "item": { + "value": "CUSTOM:MintPlant" + }, + "weight": 1, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": false, + "explosionDecay": false, + "silkTouchMode": 1 + } + ] + } + ], + "name": "blocks/mint_plant", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/MintRecipe.mod.json b/elements/MintRecipe.mod.json new file mode 100644 index 0000000..a9d5c92 --- /dev/null +++ b/elements/MintRecipe.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": "" + }, + { + "value": "" + }, + { + "value": "CUSTOM:MintLeaves" + }, + { + "value": "CUSTOM:MintLeaves" + }, + { + "value": "CUSTOM:MintLeaves" + }, + { + "value": "" + }, + { + "value": "" + }, + { + "value": "" + } + ], + "recipeReturnStack": { + "value": "CUSTOM:Mint" + }, + "name": "mint_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/MintSweetenedCarbonatedWaterCan.mod.json b/elements/MintSweetenedCarbonatedWaterCan.mod.json new file mode 100644 index 0000000..3a9bbce --- /dev/null +++ b/elements/MintSweetenedCarbonatedWaterCan.mod.json @@ -0,0 +1,66 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "mint_sweetened_carbonated_water_can", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Canned Mint Soda", + "rarity": "UNCOMMON", + "creativeTabs": [ + { + "value": "FOOD" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 32, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "onFinishUsingItem": { + "name": "MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItem" + }, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": true, + "nutritionalValue": 0, + "saturation": 0.0, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": true, + "animation": "drink", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/MintSweetenedCarbonatedWaterCanAdvancement.mod.json b/elements/MintSweetenedCarbonatedWaterCanAdvancement.mod.json new file mode 100644 index 0000000..25c7331 --- /dev/null +++ b/elements/MintSweetenedCarbonatedWaterCanAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "Now That's The Good Stuff! - Minty Edition", + "achievementDescription": "Drink a Mint Soda", + "achievementIcon": { + "value": "CUSTOM:MintSweetenedCarbonatedWaterCan" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:SweetenedCarbonatedWaterCanAdvancement" + }, + "triggerxml": "CUSTOM:MintSweetenedCarbonatedWaterCan" + } +} \ No newline at end of file diff --git a/elements/MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItem.mod.json b/elements/MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItem.mod.json new file mode 100644 index 0000000..9ca66b6 --- /dev/null +++ b/elements/MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItem.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerSPEED4600FALSEFALSEHASTE2600FALSEFALSESPEEDSLOWNESS0120FALSEFALSEMINING_FATIGUE0120FALSEFALSENAUSEA090FALSEFALSEWEAKNESS090FALSEFALSE" + } +} \ No newline at end of file diff --git a/elements/MintSweetenedCarbonatedWaterCanRecipe.mod.json b/elements/MintSweetenedCarbonatedWaterCanRecipe.mod.json new file mode 100644 index 0000000..f4b08a3 --- /dev/null +++ b/elements/MintSweetenedCarbonatedWaterCanRecipe.mod.json @@ -0,0 +1,25 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Brewing", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "brewingInputStack": { + "value": "CUSTOM:SweetenedCarbonatedWaterCan" + }, + "brewingIngredientStack": { + "value": "CUSTOM:Mint" + }, + "brewingReturnStack": { + "value": "CUSTOM:MintSweetenedCarbonatedWaterCan" + }, + "name": "mint_sweetened_carbonated_water_can_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/OakTreeLeavesLootTable.mod.json b/elements/OakTreeLeavesLootTable.mod.json new file mode 100644 index 0000000..758a4c2 --- /dev/null +++ b/elements/OakTreeLeavesLootTable.mod.json @@ -0,0 +1,122 @@ +{ + "_fv": 73, + "_type": "loottable", + "definition": { + "type": "Block", + "pools": [ + { + "minrolls": 1, + "maxrolls": 1, + "minbonusrolls": 1, + "maxbonusrolls": 1, + "hasbonusrolls": false, + "entries": [ + { + "type": "item", + "item": { + "value": "Items.STICK" + }, + "weight": 2, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": true, + "explosionDecay": false, + "silkTouchMode": 2 + }, + { + "type": "item", + "item": { + "value": "Blocks.AIR" + }, + "weight": 100, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": false, + "explosionDecay": false, + "silkTouchMode": 2 + } + ] + }, + { + "minrolls": 1, + "maxrolls": 1, + "minbonusrolls": 1, + "maxbonusrolls": 1, + "hasbonusrolls": false, + "entries": [ + { + "type": "item", + "item": { + "value": "Blocks.LEAVES#0" + }, + "weight": 1, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": false, + "explosionDecay": false, + "silkTouchMode": 1 + } + ] + }, + { + "minrolls": 1, + "maxrolls": 1, + "minbonusrolls": 1, + "maxbonusrolls": 1, + "hasbonusrolls": false, + "entries": [ + { + "type": "item", + "item": { + "value": "Items.APPLE" + }, + "weight": 1, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": true, + "explosionDecay": false, + "silkTouchMode": 2 + }, + { + "type": "item", + "item": { + "value": "CUSTOM:Orange" + }, + "weight": 1, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": true, + "explosionDecay": false, + "silkTouchMode": 2 + }, + { + "type": "item", + "item": { + "value": "Blocks.AIR" + }, + "weight": 100, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": false, + "explosionDecay": false, + "silkTouchMode": 2 + } + ] + } + ], + "name": "blocks/oak_leaves", + "namespace": "minecraft" + } +} \ No newline at end of file diff --git a/elements/Orange.mod.json b/elements/Orange.mod.json new file mode 100644 index 0000000..fc6cb72 --- /dev/null +++ b/elements/Orange.mod.json @@ -0,0 +1,63 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "orange", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Orange", + "rarity": "COMMON", + "creativeTabs": [ + { + "value": "FOOD" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 32, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": true, + "nutritionalValue": 3, + "saturation": 0.5, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": false, + "animation": "eat", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/OrangeSweetenedCarbonatedWaterCan.mod.json b/elements/OrangeSweetenedCarbonatedWaterCan.mod.json new file mode 100644 index 0000000..730973f --- /dev/null +++ b/elements/OrangeSweetenedCarbonatedWaterCan.mod.json @@ -0,0 +1,66 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "orange_sweetened_carbonated_water_can", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Canned Orange Soda", + "rarity": "UNCOMMON", + "creativeTabs": [ + { + "value": "FOOD" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 32, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "onFinishUsingItem": { + "name": "OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItem" + }, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": true, + "nutritionalValue": 1, + "saturation": 3.3, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": true, + "animation": "drink", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/OrangeSweetenedCarbonatedWaterCanAdvancement.mod.json b/elements/OrangeSweetenedCarbonatedWaterCanAdvancement.mod.json new file mode 100644 index 0000000..ee81718 --- /dev/null +++ b/elements/OrangeSweetenedCarbonatedWaterCanAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "A Fantastic Beverage!", + "achievementDescription": "Drink an Orange Soda", + "achievementIcon": { + "value": "CUSTOM:OrangeSweetenedCarbonatedWaterCan" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:SweetenedCarbonatedWaterCanAdvancement" + }, + "triggerxml": "CUSTOM:OrangeSweetenedCarbonatedWaterCan" + } +} \ No newline at end of file diff --git a/elements/OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItem.mod.json b/elements/OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItem.mod.json new file mode 100644 index 0000000..11fcc72 --- /dev/null +++ b/elements/OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItem.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerSPEED3500FALSEFALSEHASTE1500FALSEFALSESPEEDSLOWNESS0160FALSEFALSEMINING_FATIGUE0160FALSEFALSENAUSEA0110FALSEFALSEWEAKNESS0110FALSEFALSE" + } +} \ No newline at end of file diff --git a/elements/OrangeSweetenedCarbonatedWaterCanRecipe.mod.json b/elements/OrangeSweetenedCarbonatedWaterCanRecipe.mod.json new file mode 100644 index 0000000..1be6ba3 --- /dev/null +++ b/elements/OrangeSweetenedCarbonatedWaterCanRecipe.mod.json @@ -0,0 +1,25 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Brewing", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "brewingInputStack": { + "value": "CUSTOM:SweetenedCarbonatedWaterCan" + }, + "brewingIngredientStack": { + "value": "CUSTOM:Orange" + }, + "brewingReturnStack": { + "value": "CUSTOM:OrangeSweetenedCarbonatedWaterCan" + }, + "name": "orange_sweetened_carbonated_water_can_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/OrichalcumAdvancement.mod.json b/elements/OrichalcumAdvancement.mod.json index 8cc7f84..0922b6e 100644 --- a/elements/OrichalcumAdvancement.mod.json +++ b/elements/OrichalcumAdvancement.mod.json @@ -17,7 +17,7 @@ "rewardXP": 0, "achievementType": "goal", "parent": { - "value": "No parent: root" + "value": "CUSTOM:WelcomeAdvancement" }, "triggerxml": "164CUSTOM:Orichalcum" } diff --git a/elements/OrichalcumAppleAdvancement.mod.json b/elements/OrichalcumAppleAdvancement.mod.json new file mode 100644 index 0000000..4103eb4 --- /dev/null +++ b/elements/OrichalcumAppleAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "Feelin' Cutesy And Furious", + "achievementDescription": "Eat an Orichalcum Apple", + "achievementIcon": { + "value": "CUSTOM:OrichalcumApple" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:OrichalcumAdvancement" + }, + "triggerxml": "CUSTOM:OrichalcumApple" + } +} \ No newline at end of file diff --git a/elements/Socket.mod.json b/elements/Socket.mod.json new file mode 100644 index 0000000..bb142e9 --- /dev/null +++ b/elements/Socket.mod.json @@ -0,0 +1,63 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "socket", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Socket", + "rarity": "COMMON", + "creativeTabs": [ + { + "value": "MATERIALS" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 0, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": false, + "nutritionalValue": 4, + "saturation": 0.3, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": false, + "animation": "none", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/SodaMachine.mod.json b/elements/SodaMachine.mod.json new file mode 100644 index 0000000..afb03df --- /dev/null +++ b/elements/SodaMachine.mod.json @@ -0,0 +1,140 @@ +{ + "_fv": 73, + "_type": "block", + "definition": { + "texture": "soda_machine_base", + "textureTop": "soda_machine_base", + "textureLeft": "soda_machine_base", + "textureFront": "soda_machine_front", + "textureRight": "soda_machine_base", + "textureBack": "soda_machine_base", + "renderType": 10, + "customModelName": "Normal", + "rotationMode": 1, + "enablePitch": false, + "emissiveRendering": false, + "displayFluidOverlay": false, + "itemTexture": "", + "particleTexture": "", + "tintType": "No tint", + "isItemTinted": false, + "hasTransparency": false, + "connectedSides": false, + "transparencyType": "SOLID", + "disableOffset": false, + "boundingBoxes": [ + { + "mx": 0.0, + "my": 0.0, + "mz": 0.0, + "Mx": 16.0, + "My": 16.0, + "Mz": 16.0, + "subtract": false + } + ], + "customProperties": [], + "name": "Soda Machine", + "specialInformation": { + "fixedValue": [] + }, + "hardness": 1.0, + "resistance": 10.0, + "hasGravity": false, + "isWaterloggable": false, + "creativeTabs": [ + { + "value": "BUILDING_BLOCKS" + } + ], + "destroyTool": "Not specified", + "customDrop": { + "value": "" + }, + "dropAmount": 1, + "useLootTableForDrops": false, + "requiresCorrectTool": false, + "enchantPowerBonus": 0.0, + "plantsGrowOn": false, + "canRedstoneConnect": false, + "lightOpacity": 15, + "material": { + "value": "NONE" + }, + "tickRate": 0, + "tickRandomly": false, + "isReplaceable": false, + "canProvidePower": false, + "emittedRedstonePower": { + "fixedValue": 15.0 + }, + "colorOnMap": "DEFAULT", + "creativePickItem": { + "value": "" + }, + "offsetType": "NONE", + "aiPathNodeType": "DEFAULT", + "flammability": 0, + "fireSpreadSpeed": 0, + "isLadder": false, + "slipperiness": 0.6, + "speedFactor": 1.0, + "jumpFactor": 1.0, + "reactionToPushing": "NORMAL", + "isNotColidable": false, + "isCustomSoundType": false, + "soundOnStep": { + "value": "METAL" + }, + "breakSound": { + "value": "" + }, + "fallSound": { + "value": "" + }, + "hitSound": { + "value": "" + }, + "placeSound": { + "value": "" + }, + "stepSound": { + "value": "" + }, + "luminance": 0, + "unbreakable": false, + "vanillaToolTier": "NONE", + "isBonemealable": false, + "hasInventory": false, + "openGUIOnRightClick": false, + "inventorySize": 9, + "inventoryStackSize": 64, + "inventoryDropWhenDestroyed": true, + "inventoryComparatorPower": true, + "inventoryOutSlotIDs": [], + "inventoryInSlotIDs": [], + "hasEnergyStorage": false, + "energyInitial": 0, + "energyCapacity": 400000, + "energyMaxReceive": 200, + "energyMaxExtract": 200, + "isFluidTank": false, + "fluidCapacity": 8000, + "fluidRestrictions": [], + "onRightClicked": { + "name": "SodaMachineOnBlockRightClicked" + }, + "generateFeature": false, + "restrictionBiomes": [], + "blocksToReplace": [ + { + "value": "TAG:stone_ore_replaceables" + } + ], + "generationShape": "UNIFORM", + "frequencyPerChunks": 10, + "frequencyOnChunk": 16, + "minGenerateHeight": 0, + "maxGenerateHeight": 64 + } +} \ No newline at end of file diff --git a/elements/SodaMachineAdvancement.mod.json b/elements/SodaMachineAdvancement.mod.json new file mode 100644 index 0000000..2b896fb --- /dev/null +++ b/elements/SodaMachineAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "It Doesn't Even Need To Be Restocked! It Just Dispenses Soda Out Of Thin Air!", + "achievementDescription": "Feed a Gold Token to a Soda Machine", + "achievementIcon": { + "value": "CUSTOM:SodaMachine" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:SweetenedCarbonatedWaterCanAdvancement" + }, + "triggerxml": "" + } +} \ No newline at end of file diff --git a/elements/SodaMachineOnBlockRightClicked.mod.json b/elements/SodaMachineOnBlockRightClicked.mod.json new file mode 100644 index 0000000..600f88c --- /dev/null +++ b/elements/SodaMachineOnBlockRightClicked.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "sodaRollno_ext_triggerCUSTOM:GoldTokenMINUS1CUSTOM:GoldTokenlocal:sodaRollRANDOMLTlocal:sodaRoll0.33TRUECUSTOM:SweetenedCarbonatedWaterCan0LTlocal:sodaRoll0.67TRUECUSTOM:MintSweetenedCarbonatedWaterCan0TRUECUSTOM:OrangeSweetenedCarbonatedWaterCan0block.note.plingblock0.81.2CUSTOM:SodaMachineAdvancementCUSTOM:SodaMachineAdvancementblock.chest.lockedblock0.81.2§cSoda ain't free, ya know. You should feed the machine some Gold Tokens.TRUECUSTOM:SodaMachineRefusedAdvancementCUSTOM:SodaMachineRefusedAdvancement" + } +} \ No newline at end of file diff --git a/elements/SodaMachineRecipe.mod.json b/elements/SodaMachineRecipe.mod.json new file mode 100644 index 0000000..3ce1ff9 --- /dev/null +++ b/elements/SodaMachineRecipe.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": "Blocks.STAINED_GLASS_PANE#3" + }, + { + "value": "Items.NETHER_STAR" + }, + { + "value": "Blocks.STAINED_GLASS_PANE#13" + }, + { + "value": "Blocks.STAINED_GLASS_PANE#3" + }, + { + "value": "Blocks.IRON_BLOCK" + }, + { + "value": "Blocks.STONE_BUTTON" + }, + { + "value": "Blocks.STAINED_GLASS_PANE#3" + }, + { + "value": "Blocks.DISPENSER" + }, + { + "value": "CUSTOM:Socket" + } + ], + "recipeReturnStack": { + "value": "CUSTOM:SodaMachine" + }, + "name": "soda_machine_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/SodaMachineRefusedAdvancement.mod.json b/elements/SodaMachineRefusedAdvancement.mod.json new file mode 100644 index 0000000..6daef2b --- /dev/null +++ b/elements/SodaMachineRefusedAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "Attempted Soda Robbery", + "achievementDescription": "You tried to get a Canned Soda for free, and FAILED. AHAHAHA!", + "achievementIcon": { + "value": "Blocks.BARRIER" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:SweetenedCarbonatedWaterCanAdvancement" + }, + "triggerxml": "" + } +} \ No newline at end of file diff --git a/elements/SpawnerAdvancement.mod.json b/elements/SpawnerAdvancement.mod.json index cd6b931..81cfd50 100644 --- a/elements/SpawnerAdvancement.mod.json +++ b/elements/SpawnerAdvancement.mod.json @@ -17,7 +17,7 @@ "rewardXP": 0, "achievementType": "task", "parent": { - "value": "No parent: root" + "value": "CUSTOM:WelcomeAdvancement" }, "triggerxml": "164Blocks.MOB_SPAWNER" } diff --git a/elements/StarAdvancement.mod.json b/elements/StarAdvancement.mod.json index a105756..5eddeb1 100644 --- a/elements/StarAdvancement.mod.json +++ b/elements/StarAdvancement.mod.json @@ -17,7 +17,7 @@ "rewardXP": 0, "achievementType": "challenge", "parent": { - "value": "No parent: root" + "value": "CUSTOM:WelcomeAdvancement" }, "triggerxml": "164CUSTOM:Star" } diff --git a/elements/SweetenedCarbonatedWaterCan.mod.json b/elements/SweetenedCarbonatedWaterCan.mod.json new file mode 100644 index 0000000..0bba484 --- /dev/null +++ b/elements/SweetenedCarbonatedWaterCan.mod.json @@ -0,0 +1,66 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "sweetened_carbonated_water_can", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Canned Soda", + "rarity": "COMMON", + "creativeTabs": [ + { + "value": "FOOD" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 32, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "onFinishUsingItem": { + "name": "SweetenedCarbonatedWaterCanPlayerFinishesUsingItem" + }, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": true, + "nutritionalValue": 0, + "saturation": 0.0, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": true, + "animation": "drink", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/SweetenedCarbonatedWaterCanAdvancement.mod.json b/elements/SweetenedCarbonatedWaterCanAdvancement.mod.json new file mode 100644 index 0000000..a0be92e --- /dev/null +++ b/elements/SweetenedCarbonatedWaterCanAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "Now That's The Good Stuff!", + "achievementDescription": "Drink a Canned Soda", + "achievementIcon": { + "value": "CUSTOM:SweetenedCarbonatedWaterCan" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "goal", + "parent": { + "value": "CUSTOM:WelcomeAdvancement" + }, + "triggerxml": "CUSTOM:SweetenedCarbonatedWaterCan" + } +} \ No newline at end of file diff --git a/elements/SweetenedCarbonatedWaterCanPlayerFinishesUsingItem.mod.json b/elements/SweetenedCarbonatedWaterCanPlayerFinishesUsingItem.mod.json new file mode 100644 index 0000000..ce89a08 --- /dev/null +++ b/elements/SweetenedCarbonatedWaterCanPlayerFinishesUsingItem.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerSPEED2400FALSEFALSEHASTE0400FALSEFALSESPEEDSLOWNESS1200FALSEFALSEMINING_FATIGUE1200FALSEFALSENAUSEA0200FALSEFALSEWEAKNESS0200FALSEFALSE" + } +} \ No newline at end of file diff --git a/elements/SweetenedCarbonatedWaterCanRecipe.mod.json b/elements/SweetenedCarbonatedWaterCanRecipe.mod.json new file mode 100644 index 0000000..8418c39 --- /dev/null +++ b/elements/SweetenedCarbonatedWaterCanRecipe.mod.json @@ -0,0 +1,25 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Brewing", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "brewingInputStack": { + "value": "CUSTOM:CarbonatedWaterCan" + }, + "brewingIngredientStack": { + "value": "Items.SUGAR" + }, + "brewingReturnStack": { + "value": "CUSTOM:SweetenedCarbonatedWaterCan" + }, + "name": "sweetened_carbonated_water_can_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/TurdAdvancement.mod.json b/elements/TurdAdvancement.mod.json index e6a5903..02f473a 100644 --- a/elements/TurdAdvancement.mod.json +++ b/elements/TurdAdvancement.mod.json @@ -17,7 +17,7 @@ "rewardXP": 0, "achievementType": "challenge", "parent": { - "value": "No parent: root" + "value": "CUSTOM:WelcomeAdvancement" }, "triggerxml": "164CUSTOM:Turd" } diff --git a/elements/VoidAppleAdvancement.mod.json b/elements/VoidAppleAdvancement.mod.json new file mode 100644 index 0000000..b2ad409 --- /dev/null +++ b/elements/VoidAppleAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "It Certainly Is DeVOID Of Taste", + "achievementDescription": "Eat a Void Apple", + "achievementIcon": { + "value": "CUSTOM:VoidApple" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:VoidStarAdvancement" + }, + "triggerxml": "CUSTOM:VoidApple" + } +} \ No newline at end of file diff --git a/elements/VoidStarAdvancement.mod.json b/elements/VoidStarAdvancement.mod.json new file mode 100644 index 0000000..dd0ce74 --- /dev/null +++ b/elements/VoidStarAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "A Star Not Meant To Be", + "achievementDescription": "Craft a Void Star", + "achievementIcon": { + "value": "CUSTOM:VoidStar" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:EnditeAdvancement" + }, + "triggerxml": "164CUSTOM:VoidStar" + } +} \ No newline at end of file diff --git a/elements/WaterCan.mod.json b/elements/WaterCan.mod.json new file mode 100644 index 0000000..42fc163 --- /dev/null +++ b/elements/WaterCan.mod.json @@ -0,0 +1,63 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "water_can", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Canned Water", + "rarity": "COMMON", + "creativeTabs": [ + { + "value": "FOOD" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 32, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": false, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": false + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": true, + "nutritionalValue": 0, + "saturation": 0.0, + "eatResultItem": { + "value": "" + }, + "isMeat": false, + "isAlwaysEdible": true, + "animation": "drink", + "isMusicDisc": false, + "musicDiscMusic": { + "value": "" + }, + "musicDiscDescription": "", + "musicDiscLengthInTicks": 100, + "musicDiscAnalogOutput": 0 + } +} \ No newline at end of file diff --git a/elements/WelcomeAdvancement.mod.json b/elements/WelcomeAdvancement.mod.json new file mode 100644 index 0000000..8652b7d --- /dev/null +++ b/elements/WelcomeAdvancement.mod.json @@ -0,0 +1,26 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "Arira!", + "achievementDescription": "Play on a world with Ari's Random Additions installed for the first time", + "achievementIcon": { + "value": "Blocks.RED_FLOWER#0" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [ + "WelcomeAdvancementLootTable" + ], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "task", + "parent": { + "value": "No parent: root" + }, + "triggerxml": "" + } +} \ No newline at end of file diff --git a/elements/WelcomeAdvancementGranter.mod.json b/elements/WelcomeAdvancementGranter.mod.json new file mode 100644 index 0000000..526e28c --- /dev/null +++ b/elements/WelcomeAdvancementGranter.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "player_log_inCUSTOM:WelcomeAdvancementCUSTOM:WelcomeAdvancement" + } +} \ No newline at end of file diff --git a/elements/WelcomeAdvancementLootTable.mod.json b/elements/WelcomeAdvancementLootTable.mod.json new file mode 100644 index 0000000..93fdd83 --- /dev/null +++ b/elements/WelcomeAdvancementLootTable.mod.json @@ -0,0 +1,34 @@ +{ + "_fv": 73, + "_type": "loottable", + "definition": { + "type": "Advancement reward", + "pools": [ + { + "minrolls": 1, + "maxrolls": 1, + "minbonusrolls": 1, + "maxbonusrolls": 1, + "hasbonusrolls": false, + "entries": [ + { + "type": "item", + "item": { + "value": "Blocks.RED_FLOWER#0" + }, + "weight": 1, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": false, + "explosionDecay": false, + "silkTouchMode": 0 + } + ] + } + ], + "name": "advancements/welcome_advancement", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/arisrandomadditions/block/BedrockifierBlock.java b/src/main/java/net/mcreator/arisrandomadditions/block/BedrockifierBlock.java index 6b4267b..51863b6 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/block/BedrockifierBlock.java +++ b/src/main/java/net/mcreator/arisrandomadditions/block/BedrockifierBlock.java @@ -32,7 +32,6 @@ import net.minecraft.core.Direction; import net.minecraft.core.BlockPos; import net.mcreator.arisrandomadditions.world.inventory.BedrockifierGUIMenu; -import net.mcreator.arisrandomadditions.procedures.BedrockifierLogicProcedure; import net.mcreator.arisrandomadditions.block.entity.BedrockifierBlockEntity; import io.netty.buffer.Unpooled; @@ -69,14 +68,6 @@ public class BedrockifierBlock extends Block implements EntityBlock { return state.rotate(mirrorIn.getRotation(state.getValue(FACING))); } - @Override - public void neighborChanged(BlockState blockstate, Level world, BlockPos pos, Block neighborBlock, BlockPos fromPos, boolean moving) { - super.neighborChanged(blockstate, world, pos, neighborBlock, fromPos, moving); - if (world.getBestNeighborSignal(pos) > 0) { - BedrockifierLogicProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ()); - } - } - @Override public InteractionResult use(BlockState blockstate, Level world, BlockPos pos, Player entity, InteractionHand hand, BlockHitResult hit) { super.use(blockstate, world, pos, entity, hand, hit); diff --git a/src/main/java/net/mcreator/arisrandomadditions/block/BrickierMagmaBricksBlock.java b/src/main/java/net/mcreator/arisrandomadditions/block/BrickierMagmaBricksBlock.java new file mode 100644 index 0000000..bdc03c3 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/block/BrickierMagmaBricksBlock.java @@ -0,0 +1,23 @@ + +package net.mcreator.arisrandomadditions.block; + +import org.checkerframework.checker.units.qual.s; + +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.core.BlockPos; + +public class BrickierMagmaBricksBlock extends Block { + public BrickierMagmaBricksBlock() { + super(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_ORANGE).sound(SoundType.STONE).strength(0.5f).lightLevel(s -> 3).requiresCorrectToolForDrops()); + } + + @Override + public int getLightBlock(BlockState state, BlockGetter worldIn, BlockPos pos) { + return 15; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/block/MintPlantBlock.java b/src/main/java/net/mcreator/arisrandomadditions/block/MintPlantBlock.java new file mode 100644 index 0000000..2f325ff --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/block/MintPlantBlock.java @@ -0,0 +1,34 @@ + +package net.mcreator.arisrandomadditions.block; + +import net.minecraft.world.level.material.PushReaction; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.FlowerBlock; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; + +public class MintPlantBlock extends FlowerBlock { + public MintPlantBlock() { + super(() -> MobEffects.DIG_SPEED, 200, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).sound(SoundType.GRASS).instabreak().noCollission().offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY)); + } + + @Override + public int getEffectDuration() { + return 200; + } + + @Override + public int getFlammability(BlockState state, BlockGetter world, BlockPos pos, Direction face) { + return 100; + } + + @Override + public int getFireSpreadSpeed(BlockState state, BlockGetter world, BlockPos pos, Direction face) { + return 60; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/block/SodaMachineBlock.java b/src/main/java/net/mcreator/arisrandomadditions/block/SodaMachineBlock.java new file mode 100644 index 0000000..84a7491 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/block/SodaMachineBlock.java @@ -0,0 +1,70 @@ + +package net.mcreator.arisrandomadditions.block; + +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.level.block.state.properties.DirectionProperty; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.Rotation; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.InteractionHand; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; + +import net.mcreator.arisrandomadditions.procedures.SodaMachineOnBlockRightClickedProcedure; + +public class SodaMachineBlock extends Block { + public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING; + + public SodaMachineBlock() { + super(BlockBehaviour.Properties.of().sound(SoundType.METAL).strength(1f, 10f)); + this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); + } + + @Override + public int getLightBlock(BlockState state, BlockGetter worldIn, BlockPos pos) { + return 15; + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + super.createBlockStateDefinition(builder); + builder.add(FACING); + } + + @Override + public BlockState getStateForPlacement(BlockPlaceContext context) { + return super.getStateForPlacement(context).setValue(FACING, context.getHorizontalDirection().getOpposite()); + } + + public BlockState rotate(BlockState state, Rotation rot) { + return state.setValue(FACING, rot.rotate(state.getValue(FACING))); + } + + public BlockState mirror(BlockState state, Mirror mirrorIn) { + return state.rotate(mirrorIn.getRotation(state.getValue(FACING))); + } + + @Override + public InteractionResult use(BlockState blockstate, Level world, BlockPos pos, Player entity, InteractionHand hand, BlockHitResult hit) { + super.use(blockstate, world, pos, entity, hand, hit); + int x = pos.getX(); + int y = pos.getY(); + int z = pos.getZ(); + double hitX = hit.getLocation().x; + double hitY = hit.getLocation().y; + double hitZ = hit.getLocation().z; + Direction direction = hit.getDirection(); + SodaMachineOnBlockRightClickedProcedure.execute(world, x, y, z, entity); + return InteractionResult.SUCCESS; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/client/gui/BedrockifierGUIScreen.java b/src/main/java/net/mcreator/arisrandomadditions/client/gui/BedrockifierGUIScreen.java index 123b6d4..d706e38 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/client/gui/BedrockifierGUIScreen.java +++ b/src/main/java/net/mcreator/arisrandomadditions/client/gui/BedrockifierGUIScreen.java @@ -7,9 +7,12 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.resources.ResourceLocation; import net.minecraft.network.chat.Component; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.GuiGraphics; import net.mcreator.arisrandomadditions.world.inventory.BedrockifierGUIMenu; +import net.mcreator.arisrandomadditions.network.BedrockifierGUIButtonMessage; +import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; import java.util.HashMap; @@ -20,6 +23,7 @@ public class BedrockifierGUIScreen extends AbstractContainerScreen { + if (true) { + ArisRandomAdditionsMod.PACKET_HANDLER.sendToServer(new BedrockifierGUIButtonMessage(0, x, y, z)); + BedrockifierGUIButtonMessage.handleButtonAction(entity, 0, x, y, z); + } + }).bounds(this.leftPos + 96, this.topPos + 34, 35, 20).build(); + guistate.put("button:button_empty", button_empty); + this.addRenderableWidget(button_empty); } } diff --git a/src/main/java/net/mcreator/arisrandomadditions/command/GetPermanentStatsCommand.java b/src/main/java/net/mcreator/arisrandomadditions/command/GetPermanentStatsCommand.java index 359174f..bb53456 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/command/GetPermanentStatsCommand.java +++ b/src/main/java/net/mcreator/arisrandomadditions/command/GetPermanentStatsCommand.java @@ -18,7 +18,7 @@ import net.mcreator.arisrandomadditions.procedures.GetPermanentStatsCommandProce public class GetPermanentStatsCommand { @SubscribeEvent public static void registerCommand(RegisterCommandsEvent event) { - event.getDispatcher().register(Commands.literal("ari-get-permanent-stats") + event.getDispatcher().register(Commands.literal("arira-get-permanent-stats") .executes(arguments -> { Level world = arguments.getSource().getUnsidedLevel(); diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModBlocks.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModBlocks.java index 65aaf6e..73f8d1a 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModBlocks.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModBlocks.java @@ -10,6 +10,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraft.world.level.block.Block; +import net.mcreator.arisrandomadditions.block.SodaMachineBlock; import net.mcreator.arisrandomadditions.block.RedstoneBricksBlock; import net.mcreator.arisrandomadditions.block.RedstoneBrickWallsBlock; import net.mcreator.arisrandomadditions.block.RedstoneBrickStairsBlock; @@ -22,6 +23,7 @@ import net.mcreator.arisrandomadditions.block.OrichalcumDeepslateOreBlock; import net.mcreator.arisrandomadditions.block.OrichalcumBlockBlock; import net.mcreator.arisrandomadditions.block.OreMinerBlock; import net.mcreator.arisrandomadditions.block.NetherrackJuiceBlock; +import net.mcreator.arisrandomadditions.block.MintPlantBlock; import net.mcreator.arisrandomadditions.block.MagmaBricksBlock; import net.mcreator.arisrandomadditions.block.MagmaBrickWallsBlock; import net.mcreator.arisrandomadditions.block.MagmaBrickStairsBlock; @@ -34,6 +36,7 @@ import net.mcreator.arisrandomadditions.block.CondensedNetherrackBlock; import net.mcreator.arisrandomadditions.block.CondensedCondensedNetherrackBlock; import net.mcreator.arisrandomadditions.block.CondensedCondensedCondensedNetherrackBlock; import net.mcreator.arisrandomadditions.block.BrokenGlassBlock; +import net.mcreator.arisrandomadditions.block.BrickierMagmaBricksBlock; import net.mcreator.arisrandomadditions.block.BedrockifierBlock; import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; @@ -64,6 +67,9 @@ public class ArisRandomAdditionsModBlocks { public static final RegistryObject RAVE_BLOCK = REGISTRY.register("rave_block", () -> new RaveBlockBlock()); public static final RegistryObject ENDITE_BLOCK = REGISTRY.register("endite_block", () -> new EnditeBlockBlock()); public static final RegistryObject ORICHALCUM_DEEPSLATE_ORE = REGISTRY.register("orichalcum_deepslate_ore", () -> new OrichalcumDeepslateOreBlock()); + public static final RegistryObject MINT_PLANT = REGISTRY.register("mint_plant", () -> new MintPlantBlock()); + public static final RegistryObject BRICKIER_MAGMA_BRICKS = REGISTRY.register("brickier_magma_bricks", () -> new BrickierMagmaBricksBlock()); + public static final RegistryObject SODA_MACHINE = REGISTRY.register("soda_machine", () -> new SodaMachineBlock()); // Start of user code block custom blocks // End of user code block custom blocks } diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java index 6fa718f..71b8088 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java @@ -14,13 +14,16 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.BlockItem; import net.mcreator.arisrandomadditions.item.WitherQuestionMarkItem; +import net.mcreator.arisrandomadditions.item.WaterCanItem; import net.mcreator.arisrandomadditions.item.WandOfResizingItem; import net.mcreator.arisrandomadditions.item.WandOfDrainingItem; import net.mcreator.arisrandomadditions.item.VoidStarItem; import net.mcreator.arisrandomadditions.item.VoidAppleItem; import net.mcreator.arisrandomadditions.item.TurdItem; +import net.mcreator.arisrandomadditions.item.SweetenedCarbonatedWaterCanItem; import net.mcreator.arisrandomadditions.item.StarWandItem; import net.mcreator.arisrandomadditions.item.StarItem; +import net.mcreator.arisrandomadditions.item.SocketItem; import net.mcreator.arisrandomadditions.item.SnowGolemQuestionMarkItem; import net.mcreator.arisrandomadditions.item.SandDustItem; import net.mcreator.arisrandomadditions.item.PowerStarItem; @@ -34,10 +37,15 @@ import net.mcreator.arisrandomadditions.item.OrichalcumHoeItem; import net.mcreator.arisrandomadditions.item.OrichalcumAxeItem; import net.mcreator.arisrandomadditions.item.OrichalcumArmorItem; import net.mcreator.arisrandomadditions.item.OrichalcumAppleItem; +import net.mcreator.arisrandomadditions.item.OrangeSweetenedCarbonatedWaterCanItem; +import net.mcreator.arisrandomadditions.item.OrangeItem; import net.mcreator.arisrandomadditions.item.NightVisionGogglesItem; import net.mcreator.arisrandomadditions.item.NetherrackitePickaxeItem; import net.mcreator.arisrandomadditions.item.NetherrackiteItem; import net.mcreator.arisrandomadditions.item.NetherrackJuiceItem; +import net.mcreator.arisrandomadditions.item.MintSweetenedCarbonatedWaterCanItem; +import net.mcreator.arisrandomadditions.item.MintLeavesItem; +import net.mcreator.arisrandomadditions.item.MintItem; import net.mcreator.arisrandomadditions.item.MagicFleshItem; import net.mcreator.arisrandomadditions.item.MagicEggItem; import net.mcreator.arisrandomadditions.item.MagicDustItem; @@ -45,6 +53,7 @@ import net.mcreator.arisrandomadditions.item.LapisLazuliNuggetItem; import net.mcreator.arisrandomadditions.item.IronGolemQuestionMarkItem; import net.mcreator.arisrandomadditions.item.GravediggerItem; import net.mcreator.arisrandomadditions.item.GoldenBerriesItem; +import net.mcreator.arisrandomadditions.item.GoldTokenItem; import net.mcreator.arisrandomadditions.item.EnditeUpgradeSmithingTemplateItem; import net.mcreator.arisrandomadditions.item.EnditeSwordItem; import net.mcreator.arisrandomadditions.item.EnditeShovelItem; @@ -54,8 +63,11 @@ import net.mcreator.arisrandomadditions.item.EnditeIngotItem; import net.mcreator.arisrandomadditions.item.EnditeHoeItem; import net.mcreator.arisrandomadditions.item.EnditeAxeItem; import net.mcreator.arisrandomadditions.item.EnditeArmorItem; +import net.mcreator.arisrandomadditions.item.EmptyCanItem; import net.mcreator.arisrandomadditions.item.ChorusEyeItem; import net.mcreator.arisrandomadditions.item.CheeseItem; +import net.mcreator.arisrandomadditions.item.CarbonatedWaterCanItem; +import net.mcreator.arisrandomadditions.item.CanLidItem; import net.mcreator.arisrandomadditions.item.BlockEaterItem; import net.mcreator.arisrandomadditions.item.BlackIronIngotItem; import net.mcreator.arisrandomadditions.item.BedrockUpgradeTemplateItem; @@ -154,6 +166,21 @@ public class ArisRandomAdditionsModItems { public static final RegistryObject VOID_APPLE = REGISTRY.register("void_apple", () -> new VoidAppleItem()); public static final RegistryObject ORICHALCUM_APPLE = REGISTRY.register("orichalcum_apple", () -> new OrichalcumAppleItem()); public static final RegistryObject BEDROCK_APPLE = REGISTRY.register("bedrock_apple", () -> new BedrockAppleItem()); + public static final RegistryObject ORANGE = REGISTRY.register("orange", () -> new OrangeItem()); + public static final RegistryObject MINT = REGISTRY.register("mint", () -> new MintItem()); + public static final RegistryObject CAN_LID = REGISTRY.register("can_lid", () -> new CanLidItem()); + public static final RegistryObject EMPTY_CAN = REGISTRY.register("empty_can", () -> new EmptyCanItem()); + public static final RegistryObject WATER_CAN = REGISTRY.register("water_can", () -> new WaterCanItem()); + public static final RegistryObject CARBONATED_WATER_CAN = REGISTRY.register("carbonated_water_can", () -> new CarbonatedWaterCanItem()); + public static final RegistryObject SWEETENED_CARBONATED_WATER_CAN = REGISTRY.register("sweetened_carbonated_water_can", () -> new SweetenedCarbonatedWaterCanItem()); + public static final RegistryObject MINT_SWEETENED_CARBONATED_WATER_CAN = REGISTRY.register("mint_sweetened_carbonated_water_can", () -> new MintSweetenedCarbonatedWaterCanItem()); + public static final RegistryObject ORANGE_SWEETENED_CARBONATED_WATER_CAN = REGISTRY.register("orange_sweetened_carbonated_water_can", () -> new OrangeSweetenedCarbonatedWaterCanItem()); + public static final RegistryObject MINT_PLANT = block(ArisRandomAdditionsModBlocks.MINT_PLANT); + public static final RegistryObject MINT_LEAVES = REGISTRY.register("mint_leaves", () -> new MintLeavesItem()); + public static final RegistryObject BRICKIER_MAGMA_BRICKS = block(ArisRandomAdditionsModBlocks.BRICKIER_MAGMA_BRICKS); + public static final RegistryObject SOCKET = REGISTRY.register("socket", () -> new SocketItem()); + public static final RegistryObject SODA_MACHINE = block(ArisRandomAdditionsModBlocks.SODA_MACHINE); + public static final RegistryObject GOLD_TOKEN = REGISTRY.register("gold_token", () -> new GoldTokenItem()); // Start of user code block custom items // End of user code block custom items diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModMenus.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModMenus.java index 18bae79..7167bd7 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModMenus.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModMenus.java @@ -7,82 +7,18 @@ package net.mcreator.arisrandomadditions.init; import net.minecraftforge.registries.RegistryObject; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.network.PacketDistributor; -import net.minecraftforge.network.NetworkEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.common.extensions.IForgeMenuType; import net.minecraft.world.inventory.MenuType; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.network.chat.Component; -import net.minecraft.network.FriendlyByteBuf; import net.mcreator.arisrandomadditions.world.inventory.TurdGUIMenu; import net.mcreator.arisrandomadditions.world.inventory.OreMinerGUIMenu; import net.mcreator.arisrandomadditions.world.inventory.BedrockifierGUIMenu; import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; -import javax.annotation.Nullable; - -import java.util.function.Supplier; - -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class ArisRandomAdditionsModMenus { public static final DeferredRegister> REGISTRY = DeferredRegister.create(ForgeRegistries.MENU_TYPES, ArisRandomAdditionsMod.MODID); public static final RegistryObject> ORE_MINER_GUI = REGISTRY.register("ore_miner_gui", () -> IForgeMenuType.create(OreMinerGUIMenu::new)); public static final RegistryObject> BEDROCKIFIER_GUI = REGISTRY.register("bedrockifier_gui", () -> IForgeMenuType.create(BedrockifierGUIMenu::new)); public static final RegistryObject> TURD_GUI = REGISTRY.register("turd_gui", () -> IForgeMenuType.create(TurdGUIMenu::new)); - - public static void setText(String boxname, String value, @Nullable ServerPlayer player) { - if (player != null) { - ArisRandomAdditionsMod.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> player), new GuiSyncMessage(boxname, value)); - } else { - ArisRandomAdditionsMod.PACKET_HANDLER.send(PacketDistributor.ALL.noArg(), new GuiSyncMessage(boxname, value)); - } - } - - public static class GuiSyncMessage { - private final String textboxid; - private final String data; - - public GuiSyncMessage(FriendlyByteBuf buffer) { - this.textboxid = buffer.readComponent().getString(); - this.data = buffer.readComponent().getString(); - } - - public GuiSyncMessage(String textboxid, String data) { - this.textboxid = textboxid; - this.data = data; - } - - public static void buffer(GuiSyncMessage message, FriendlyByteBuf buffer) { - buffer.writeComponent(Component.literal(message.textboxid)); - buffer.writeComponent(Component.literal(message.data)); - } - - public static void handleData(GuiSyncMessage message, Supplier contextSupplier) { - NetworkEvent.Context context = contextSupplier.get(); - context.enqueueWork(() -> { - if (!context.getDirection().getReceptionSide().isServer()) { - ArisRandomAdditionsModScreens.handleTextBoxMessage(message); - } - }); - context.setPacketHandled(true); - } - - String editbox() { - return this.textboxid; - } - - String value() { - return this.data; - } - } - - @SubscribeEvent - public static void init(FMLCommonSetupEvent event) { - ArisRandomAdditionsMod.addNetworkMessage(GuiSyncMessage.class, GuiSyncMessage::buffer, GuiSyncMessage::new, GuiSyncMessage::handleData); - } } diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModScreens.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModScreens.java index a151a5e..1a29b84 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModScreens.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModScreens.java @@ -9,18 +9,12 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.api.distmarker.Dist; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.MenuScreens; -import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.Minecraft; -import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModMenus.GuiSyncMessage; import net.mcreator.arisrandomadditions.client.gui.TurdGUIScreen; import net.mcreator.arisrandomadditions.client.gui.OreMinerGUIScreen; import net.mcreator.arisrandomadditions.client.gui.BedrockifierGUIScreen; -import java.util.HashMap; - @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class ArisRandomAdditionsModScreens { @SubscribeEvent @@ -31,21 +25,4 @@ public class ArisRandomAdditionsModScreens { MenuScreens.register(ArisRandomAdditionsModMenus.TURD_GUI.get(), TurdGUIScreen::new); }); } - - static void handleTextBoxMessage(GuiSyncMessage message) { - String editbox = message.editbox(); - String value = message.value(); - Screen currentScreen = Minecraft.getInstance().screen; - if (currentScreen instanceof WidgetScreen sc) { - HashMap widgets = sc.getWidgets(); - Object obj = widgets.get("text:" + editbox); - if (obj instanceof EditBox box) { - box.setValue(value); - } - } - } - - public interface WidgetScreen { - HashMap getWidgets(); - } } diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java index 5b580fa..610b392 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java @@ -38,6 +38,8 @@ public class ArisRandomAdditionsModTabs { tabData.accept(ArisRandomAdditionsModBlocks.RAVE_BLOCK.get().asItem()); tabData.accept(ArisRandomAdditionsModBlocks.ENDITE_BLOCK.get().asItem()); tabData.accept(ArisRandomAdditionsModBlocks.ORICHALCUM_DEEPSLATE_ORE.get().asItem()); + tabData.accept(ArisRandomAdditionsModBlocks.BRICKIER_MAGMA_BRICKS.get().asItem()); + tabData.accept(ArisRandomAdditionsModBlocks.SODA_MACHINE.get().asItem()); } else if (tabData.getTabKey() == CreativeModeTabs.TOOLS_AND_UTILITIES) { tabData.accept(ArisRandomAdditionsModItems.BLOCK_EATER.get()); tabData.accept(ArisRandomAdditionsModItems.NETHERRACKITE_PICKAXE.get()); @@ -76,6 +78,11 @@ public class ArisRandomAdditionsModTabs { tabData.accept(ArisRandomAdditionsModItems.CHORUS_EYE.get()); tabData.accept(ArisRandomAdditionsModItems.POWER_STAR.get()); tabData.accept(ArisRandomAdditionsModItems.VOID_STAR.get()); + tabData.accept(ArisRandomAdditionsModItems.CAN_LID.get()); + tabData.accept(ArisRandomAdditionsModItems.EMPTY_CAN.get()); + tabData.accept(ArisRandomAdditionsModItems.MINT_LEAVES.get()); + tabData.accept(ArisRandomAdditionsModItems.SOCKET.get()); + tabData.accept(ArisRandomAdditionsModItems.GOLD_TOKEN.get()); } else if (tabData.getTabKey() == CreativeModeTabs.FOOD_AND_DRINKS) { tabData.accept(ArisRandomAdditionsModItems.MAGIC_FLESH.get()); tabData.accept(ArisRandomAdditionsModItems.GOLDEN_BERRIES.get()); @@ -84,6 +91,13 @@ public class ArisRandomAdditionsModTabs { tabData.accept(ArisRandomAdditionsModItems.VOID_APPLE.get()); tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_APPLE.get()); tabData.accept(ArisRandomAdditionsModItems.BEDROCK_APPLE.get()); + tabData.accept(ArisRandomAdditionsModItems.ORANGE.get()); + tabData.accept(ArisRandomAdditionsModItems.MINT.get()); + tabData.accept(ArisRandomAdditionsModItems.WATER_CAN.get()); + tabData.accept(ArisRandomAdditionsModItems.CARBONATED_WATER_CAN.get()); + tabData.accept(ArisRandomAdditionsModItems.SWEETENED_CARBONATED_WATER_CAN.get()); + tabData.accept(ArisRandomAdditionsModItems.MINT_SWEETENED_CARBONATED_WATER_CAN.get()); + tabData.accept(ArisRandomAdditionsModItems.ORANGE_SWEETENED_CARBONATED_WATER_CAN.get()); } else if (tabData.getTabKey() == CreativeModeTabs.FUNCTIONAL_BLOCKS) { tabData.accept(ArisRandomAdditionsModBlocks.ORE_MINER.get().asItem()); tabData.accept(ArisRandomAdditionsModBlocks.BEDROCKIFIER.get().asItem()); @@ -114,6 +128,8 @@ public class ArisRandomAdditionsModTabs { tabData.accept(ArisRandomAdditionsModItems.ENDITE_ARMOR_BOOTS.get()); tabData.accept(ArisRandomAdditionsModItems.ENDITE_SCYTHE.get()); tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_KATANA.get()); + } else if (tabData.getTabKey() == CreativeModeTabs.NATURAL_BLOCKS) { + tabData.accept(ArisRandomAdditionsModBlocks.MINT_PLANT.get().asItem()); } } } diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/CanLidItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/CanLidItem.java new file mode 100644 index 0000000..ca497d8 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/CanLidItem.java @@ -0,0 +1,11 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Item; + +public class CanLidItem extends Item { + public CanLidItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/CarbonatedWaterCanItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/CarbonatedWaterCanItem.java new file mode 100644 index 0000000..c13c84a --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/CarbonatedWaterCanItem.java @@ -0,0 +1,19 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Item; +import net.minecraft.world.food.FoodProperties; + +public class CarbonatedWaterCanItem extends Item { + public CarbonatedWaterCanItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON).food((new FoodProperties.Builder()).nutrition(0).saturationMod(0f).alwaysEat().build())); + } + + @Override + public UseAnim getUseAnimation(ItemStack itemstack) { + return UseAnim.DRINK; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/EmptyCanItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/EmptyCanItem.java new file mode 100644 index 0000000..ce2ce57 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/EmptyCanItem.java @@ -0,0 +1,22 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Item; +import net.minecraft.world.InteractionResult; + +import net.mcreator.arisrandomadditions.procedures.EmptyCanRightclickedOnBlockProcedure; + +public class EmptyCanItem extends Item { + public EmptyCanItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + } + + @Override + public InteractionResult useOn(UseOnContext context) { + super.useOn(context); + EmptyCanRightclickedOnBlockProcedure.execute(context.getLevel(), context.getClickedPos().getX(), context.getClickedPos().getY(), context.getClickedPos().getZ(), context.getPlayer()); + return InteractionResult.SUCCESS; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/GoldTokenItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/GoldTokenItem.java new file mode 100644 index 0000000..220e598 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/GoldTokenItem.java @@ -0,0 +1,11 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Item; + +public class GoldTokenItem extends Item { + public GoldTokenItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/MintItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/MintItem.java new file mode 100644 index 0000000..0bc0219 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/MintItem.java @@ -0,0 +1,12 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Item; +import net.minecraft.world.food.FoodProperties; + +public class MintItem extends Item { + public MintItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON).food((new FoodProperties.Builder()).nutrition(0).saturationMod(0.3f).alwaysEat().build())); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/MintLeavesItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/MintLeavesItem.java new file mode 100644 index 0000000..74d5411 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/MintLeavesItem.java @@ -0,0 +1,11 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Item; + +public class MintLeavesItem extends Item { + public MintLeavesItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/MintSweetenedCarbonatedWaterCanItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/MintSweetenedCarbonatedWaterCanItem.java new file mode 100644 index 0000000..7c3db37 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/MintSweetenedCarbonatedWaterCanItem.java @@ -0,0 +1,33 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.level.Level; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Item; +import net.minecraft.world.food.FoodProperties; +import net.minecraft.world.entity.LivingEntity; + +import net.mcreator.arisrandomadditions.procedures.MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure; + +public class MintSweetenedCarbonatedWaterCanItem extends Item { + public MintSweetenedCarbonatedWaterCanItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.UNCOMMON).food((new FoodProperties.Builder()).nutrition(0).saturationMod(0f).alwaysEat().build())); + } + + @Override + public UseAnim getUseAnimation(ItemStack itemstack) { + return UseAnim.DRINK; + } + + @Override + public ItemStack finishUsingItem(ItemStack itemstack, Level world, LivingEntity entity) { + ItemStack retval = super.finishUsingItem(itemstack, world, entity); + double x = entity.getX(); + double y = entity.getY(); + double z = entity.getZ(); + MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.execute(world, entity); + return retval; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/OrangeItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/OrangeItem.java new file mode 100644 index 0000000..3689d0f --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/OrangeItem.java @@ -0,0 +1,12 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Item; +import net.minecraft.world.food.FoodProperties; + +public class OrangeItem extends Item { + public OrangeItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON).food((new FoodProperties.Builder()).nutrition(3).saturationMod(0.5f).build())); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/OrangeSweetenedCarbonatedWaterCanItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/OrangeSweetenedCarbonatedWaterCanItem.java new file mode 100644 index 0000000..b5e2afe --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/OrangeSweetenedCarbonatedWaterCanItem.java @@ -0,0 +1,33 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.level.Level; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Item; +import net.minecraft.world.food.FoodProperties; +import net.minecraft.world.entity.LivingEntity; + +import net.mcreator.arisrandomadditions.procedures.OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure; + +public class OrangeSweetenedCarbonatedWaterCanItem extends Item { + public OrangeSweetenedCarbonatedWaterCanItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.UNCOMMON).food((new FoodProperties.Builder()).nutrition(1).saturationMod(3.3f).alwaysEat().build())); + } + + @Override + public UseAnim getUseAnimation(ItemStack itemstack) { + return UseAnim.DRINK; + } + + @Override + public ItemStack finishUsingItem(ItemStack itemstack, Level world, LivingEntity entity) { + ItemStack retval = super.finishUsingItem(itemstack, world, entity); + double x = entity.getX(); + double y = entity.getY(); + double z = entity.getZ(); + OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.execute(world, entity); + return retval; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/SocketItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/SocketItem.java new file mode 100644 index 0000000..373ed97 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/SocketItem.java @@ -0,0 +1,11 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Item; + +public class SocketItem extends Item { + public SocketItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON)); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/SweetenedCarbonatedWaterCanItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/SweetenedCarbonatedWaterCanItem.java new file mode 100644 index 0000000..42422ab --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/SweetenedCarbonatedWaterCanItem.java @@ -0,0 +1,33 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.level.Level; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Item; +import net.minecraft.world.food.FoodProperties; +import net.minecraft.world.entity.LivingEntity; + +import net.mcreator.arisrandomadditions.procedures.SweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure; + +public class SweetenedCarbonatedWaterCanItem extends Item { + public SweetenedCarbonatedWaterCanItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON).food((new FoodProperties.Builder()).nutrition(0).saturationMod(0f).alwaysEat().build())); + } + + @Override + public UseAnim getUseAnimation(ItemStack itemstack) { + return UseAnim.DRINK; + } + + @Override + public ItemStack finishUsingItem(ItemStack itemstack, Level world, LivingEntity entity) { + ItemStack retval = super.finishUsingItem(itemstack, world, entity); + double x = entity.getX(); + double y = entity.getY(); + double z = entity.getZ(); + SweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.execute(world, entity); + return retval; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/WaterCanItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/WaterCanItem.java new file mode 100644 index 0000000..f5426a7 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/WaterCanItem.java @@ -0,0 +1,19 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Item; +import net.minecraft.world.food.FoodProperties; + +public class WaterCanItem extends Item { + public WaterCanItem() { + super(new Item.Properties().stacksTo(64).rarity(Rarity.COMMON).food((new FoodProperties.Builder()).nutrition(0).saturationMod(0f).alwaysEat().build())); + } + + @Override + public UseAnim getUseAnimation(ItemStack itemstack) { + return UseAnim.DRINK; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/network/BedrockifierGUIButtonMessage.java b/src/main/java/net/mcreator/arisrandomadditions/network/BedrockifierGUIButtonMessage.java new file mode 100644 index 0000000..ccbfe7d --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/network/BedrockifierGUIButtonMessage.java @@ -0,0 +1,75 @@ + +package net.mcreator.arisrandomadditions.network; + +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +import net.minecraft.world.level.Level; +import net.minecraft.world.entity.player.Player; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.core.BlockPos; + +import net.mcreator.arisrandomadditions.world.inventory.BedrockifierGUIMenu; +import net.mcreator.arisrandomadditions.procedures.BedrockifierLogicProcedure; +import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; + +import java.util.function.Supplier; +import java.util.HashMap; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +public class BedrockifierGUIButtonMessage { + private final int buttonID, x, y, z; + + public BedrockifierGUIButtonMessage(FriendlyByteBuf buffer) { + this.buttonID = buffer.readInt(); + this.x = buffer.readInt(); + this.y = buffer.readInt(); + this.z = buffer.readInt(); + } + + public BedrockifierGUIButtonMessage(int buttonID, int x, int y, int z) { + this.buttonID = buttonID; + this.x = x; + this.y = y; + this.z = z; + } + + public static void buffer(BedrockifierGUIButtonMessage message, FriendlyByteBuf buffer) { + buffer.writeInt(message.buttonID); + buffer.writeInt(message.x); + buffer.writeInt(message.y); + buffer.writeInt(message.z); + } + + public static void handler(BedrockifierGUIButtonMessage message, Supplier contextSupplier) { + NetworkEvent.Context context = contextSupplier.get(); + context.enqueueWork(() -> { + Player entity = context.getSender(); + int buttonID = message.buttonID; + int x = message.x; + int y = message.y; + int z = message.z; + handleButtonAction(entity, buttonID, x, y, z); + }); + context.setPacketHandled(true); + } + + public static void handleButtonAction(Player entity, int buttonID, int x, int y, int z) { + Level world = entity.level(); + HashMap guistate = BedrockifierGUIMenu.guistate; + // security measure to prevent arbitrary chunk generation + if (!world.hasChunkAt(new BlockPos(x, y, z))) + return; + if (buttonID == 0) { + + BedrockifierLogicProcedure.execute(world, x, y, z); + } + } + + @SubscribeEvent + public static void registerMessage(FMLCommonSetupEvent event) { + ArisRandomAdditionsMod.addNetworkMessage(BedrockifierGUIButtonMessage.class, BedrockifierGUIButtonMessage::buffer, BedrockifierGUIButtonMessage::new, BedrockifierGUIButtonMessage::handler); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/BedrockEaterRightClickProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/BedrockEaterRightClickProcedure.java index 8c3c011..b99b2fe 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/procedures/BedrockEaterRightClickProcedure.java +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/BedrockEaterRightClickProcedure.java @@ -41,9 +41,9 @@ public class BedrockEaterRightClickProcedure { if (entity instanceof Player _player) _player.getCooldowns().addCooldown(itemstack.getItem(), 300); if (!(entity instanceof ServerPlayer _plr13 && _plr13.level() instanceof ServerLevel - && _plr13.getAdvancements().getOrStartProgress(_plr13.server.getAdvancements().getAdvancement(new ResourceLocation("aris_random_additions:block_eater_advancement"))).isDone())) { + && _plr13.getAdvancements().getOrStartProgress(_plr13.server.getAdvancements().getAdvancement(new ResourceLocation("aris_random_additions:bedrock_eater_advancement"))).isDone())) { if (entity instanceof ServerPlayer _player) { - Advancement _adv = _player.server.getAdvancements().getAdvancement(new ResourceLocation("aris_random_additions:block_eater_advancement")); + Advancement _adv = _player.server.getAdvancements().getAdvancement(new ResourceLocation("aris_random_additions:bedrock_eater_advancement")); AdvancementProgress _ap = _player.getAdvancements().getOrStartProgress(_adv); if (!_ap.isDone()) { for (String criteria : _ap.getRemainingCriteria()) diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/EmptyCanRightclickedOnBlockProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/EmptyCanRightclickedOnBlockProcedure.java new file mode 100644 index 0000000..e55ff2c --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/EmptyCanRightclickedOnBlockProcedure.java @@ -0,0 +1,49 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraftforge.registries.ForgeRegistries; + +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.Level; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.InteractionHand; +import net.minecraft.sounds.SoundSource; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.BlockPos; + +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModItems; + +public class EmptyCanRightclickedOnBlockProcedure { + public static void execute(LevelAccessor world, double x, double y, double z, Entity entity) { + if (entity == null) + return; + if (!world.isClientSide()) { + if ((world.getBlockState(BlockPos.containing(x, y, z))).getBlock() == Blocks.WATER_CAULDRON) { + if (entity instanceof LivingEntity _entity) { + ItemStack _setstack = new ItemStack(ArisRandomAdditionsModItems.EMPTY_CAN.get()).copy(); + _setstack.setCount((int) ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getCount() - 1)); + _entity.setItemInHand(InteractionHand.MAIN_HAND, _setstack); + if (_entity instanceof Player _player) + _player.getInventory().setChanged(); + } + if (world instanceof ServerLevel _level) { + ItemEntity entityToSpawn = new ItemEntity(_level, (entity.getX()), (entity.getY()), (entity.getZ()), new ItemStack(ArisRandomAdditionsModItems.WATER_CAN.get())); + entityToSpawn.setPickUpDelay(0); + _level.addFreshEntity(entityToSpawn); + } + if (world instanceof Level _level) { + if (!_level.isClientSide()) { + _level.playSound(null, BlockPos.containing(x, y, z), ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("item.bottle.fill")), SoundSource.PLAYERS, (float) 0.85, 1); + } else { + _level.playLocalSound(x, y, z, ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("item.bottle.fill")), SoundSource.PLAYERS, (float) 0.85, 1, false); + } + } + } + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java new file mode 100644 index 0000000..7684077 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java @@ -0,0 +1,32 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.effect.MobEffectInstance; + +import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; + +public class MintSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure { + public static void execute(LevelAccessor world, Entity entity) { + if (entity == null) + return; + if (!world.isClientSide()) { + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 600, 4, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.DIG_SPEED, 600, 2, false, false)); + ArisRandomAdditionsMod.queueServerWork(entity instanceof LivingEntity _livEnt && _livEnt.hasEffect(MobEffects.MOVEMENT_SPEED) ? _livEnt.getEffect(MobEffects.MOVEMENT_SPEED).getDuration() : 0, () -> { + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 120, 0, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.DIG_SLOWDOWN, 120, 0, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 90, 0, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.WEAKNESS, 90, 0, false, false)); + }); + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java new file mode 100644 index 0000000..ce2042c --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java @@ -0,0 +1,32 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.effect.MobEffectInstance; + +import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; + +public class OrangeSweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure { + public static void execute(LevelAccessor world, Entity entity) { + if (entity == null) + return; + if (!world.isClientSide()) { + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 500, 3, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.DIG_SPEED, 500, 1, false, false)); + ArisRandomAdditionsMod.queueServerWork(entity instanceof LivingEntity _livEnt && _livEnt.hasEffect(MobEffects.MOVEMENT_SPEED) ? _livEnt.getEffect(MobEffects.MOVEMENT_SPEED).getDuration() : 0, () -> { + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 160, 0, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.DIG_SLOWDOWN, 160, 0, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 110, 0, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.WEAKNESS, 110, 0, false, false)); + }); + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/SodaMachineOnBlockRightClickedProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/SodaMachineOnBlockRightClickedProcedure.java new file mode 100644 index 0000000..d813485 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/SodaMachineOnBlockRightClickedProcedure.java @@ -0,0 +1,100 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraftforge.registries.ForgeRegistries; + +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.Level; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.InteractionHand; +import net.minecraft.sounds.SoundSource; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.network.chat.Component; +import net.minecraft.core.BlockPos; +import net.minecraft.advancements.AdvancementProgress; +import net.minecraft.advancements.Advancement; + +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModItems; + +public class SodaMachineOnBlockRightClickedProcedure { + public static void execute(LevelAccessor world, double x, double y, double z, Entity entity) { + if (entity == null) + return; + double sodaRoll = 0; + if (!world.isClientSide()) { + if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == ArisRandomAdditionsModItems.GOLD_TOKEN.get()) { + if (entity instanceof LivingEntity _entity) { + ItemStack _setstack = new ItemStack(ArisRandomAdditionsModItems.GOLD_TOKEN.get()).copy(); + _setstack.setCount((int) ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getCount() - 1)); + _entity.setItemInHand(InteractionHand.MAIN_HAND, _setstack); + if (_entity instanceof Player _player) + _player.getInventory().setChanged(); + } + sodaRoll = Math.random(); + if (sodaRoll < 0.33) { + if (world instanceof ServerLevel _level) { + ItemEntity entityToSpawn = new ItemEntity(_level, (entity.getX()), (entity.getY()), (entity.getZ()), new ItemStack(ArisRandomAdditionsModItems.SWEETENED_CARBONATED_WATER_CAN.get())); + entityToSpawn.setPickUpDelay(0); + _level.addFreshEntity(entityToSpawn); + } + } else if (sodaRoll < 0.67) { + if (world instanceof ServerLevel _level) { + ItemEntity entityToSpawn = new ItemEntity(_level, (entity.getX()), (entity.getY()), (entity.getZ()), new ItemStack(ArisRandomAdditionsModItems.MINT_SWEETENED_CARBONATED_WATER_CAN.get())); + entityToSpawn.setPickUpDelay(0); + _level.addFreshEntity(entityToSpawn); + } + } else { + if (world instanceof ServerLevel _level) { + ItemEntity entityToSpawn = new ItemEntity(_level, (entity.getX()), (entity.getY()), (entity.getZ()), new ItemStack(ArisRandomAdditionsModItems.ORANGE_SWEETENED_CARBONATED_WATER_CAN.get())); + entityToSpawn.setPickUpDelay(0); + _level.addFreshEntity(entityToSpawn); + } + } + if (world instanceof Level _level) { + if (!_level.isClientSide()) { + _level.playSound(null, BlockPos.containing(x, y, z), ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.note_block.pling")), SoundSource.BLOCKS, (float) 0.8, (float) 1.2); + } else { + _level.playLocalSound(x, y, z, ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.note_block.pling")), SoundSource.BLOCKS, (float) 0.8, (float) 1.2, false); + } + } + if (!(entity instanceof ServerPlayer _plr19 && _plr19.level() instanceof ServerLevel + && _plr19.getAdvancements().getOrStartProgress(_plr19.server.getAdvancements().getAdvancement(new ResourceLocation("aris_random_additions:soda_machine_advancement"))).isDone())) { + if (entity instanceof ServerPlayer _player) { + Advancement _adv = _player.server.getAdvancements().getAdvancement(new ResourceLocation("aris_random_additions:soda_machine_advancement")); + AdvancementProgress _ap = _player.getAdvancements().getOrStartProgress(_adv); + if (!_ap.isDone()) { + for (String criteria : _ap.getRemainingCriteria()) + _player.getAdvancements().award(_adv, criteria); + } + } + } + } else { + if (world instanceof Level _level) { + if (!_level.isClientSide()) { + _level.playSound(null, BlockPos.containing(x, y, z), ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.chest.locked")), SoundSource.BLOCKS, (float) 0.8, (float) 1.2); + } else { + _level.playLocalSound(x, y, z, ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.chest.locked")), SoundSource.BLOCKS, (float) 0.8, (float) 1.2, false); + } + } + if (entity instanceof Player _player && !_player.level().isClientSide()) + _player.displayClientMessage(Component.literal("\u00A7cSoda ain't free, ya know. You should feed the machine some Gold Tokens."), true); + if (!(entity instanceof ServerPlayer _plr23 && _plr23.level() instanceof ServerLevel + && _plr23.getAdvancements().getOrStartProgress(_plr23.server.getAdvancements().getAdvancement(new ResourceLocation("aris_random_additions:soda_machine_refused_advancement"))).isDone())) { + if (entity instanceof ServerPlayer _player) { + Advancement _adv = _player.server.getAdvancements().getAdvancement(new ResourceLocation("aris_random_additions:soda_machine_refused_advancement")); + AdvancementProgress _ap = _player.getAdvancements().getOrStartProgress(_adv); + if (!_ap.isDone()) { + for (String criteria : _ap.getRemainingCriteria()) + _player.getAdvancements().award(_adv, criteria); + } + } + } + } + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/SweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/SweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java new file mode 100644 index 0000000..1def958 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/SweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure.java @@ -0,0 +1,32 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.effect.MobEffectInstance; + +import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; + +public class SweetenedCarbonatedWaterCanPlayerFinishesUsingItemProcedure { + public static void execute(LevelAccessor world, Entity entity) { + if (entity == null) + return; + if (!world.isClientSide()) { + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 400, 2, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.DIG_SPEED, 400, 0, false, false)); + ArisRandomAdditionsMod.queueServerWork(entity instanceof LivingEntity _livEnt && _livEnt.hasEffect(MobEffects.MOVEMENT_SPEED) ? _livEnt.getEffect(MobEffects.MOVEMENT_SPEED).getDuration() : 0, () -> { + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 200, 1, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.DIG_SLOWDOWN, 200, 1, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 200, 0, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.WEAKNESS, 200, 0, false, false)); + }); + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/WelcomeAdvancementGranterProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/WelcomeAdvancementGranterProcedure.java new file mode 100644 index 0000000..9c19fd5 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/WelcomeAdvancementGranterProcedure.java @@ -0,0 +1,46 @@ +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.PlayerEvent; + +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.entity.Entity; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.advancements.AdvancementProgress; +import net.minecraft.advancements.Advancement; + +import javax.annotation.Nullable; + +@Mod.EventBusSubscriber +public class WelcomeAdvancementGranterProcedure { + @SubscribeEvent + public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { + execute(event, event.getEntity().level(), 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 instanceof ServerPlayer _plr1 && _plr1.level() instanceof ServerLevel + && _plr1.getAdvancements().getOrStartProgress(_plr1.server.getAdvancements().getAdvancement(new ResourceLocation("aris_random_additions:welcome_advancement"))).isDone())) { + if (entity instanceof ServerPlayer _player) { + Advancement _adv = _player.server.getAdvancements().getAdvancement(new ResourceLocation("aris_random_additions:welcome_advancement")); + AdvancementProgress _ap = _player.getAdvancements().getOrStartProgress(_adv); + if (!_ap.isDone()) { + for (String criteria : _ap.getRemainingCriteria()) + _player.getAdvancements().award(_adv, criteria); + } + } + } + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/CarbonatedWaterCanRecipeBrewingRecipe.java b/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/CarbonatedWaterCanRecipeBrewingRecipe.java new file mode 100644 index 0000000..9bb6404 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/CarbonatedWaterCanRecipeBrewingRecipe.java @@ -0,0 +1,40 @@ + +package net.mcreator.arisrandomadditions.recipes.brewing; + +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.common.brewing.IBrewingRecipe; +import net.minecraftforge.common.brewing.BrewingRecipeRegistry; + +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.ItemStack; + +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModItems; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +public class CarbonatedWaterCanRecipeBrewingRecipe implements IBrewingRecipe { + @SubscribeEvent + public static void init(FMLCommonSetupEvent event) { + event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(new CarbonatedWaterCanRecipeBrewingRecipe())); + } + + @Override + public boolean isInput(ItemStack input) { + return Ingredient.of(new ItemStack(ArisRandomAdditionsModItems.WATER_CAN.get())).test(input); + } + + @Override + public boolean isIngredient(ItemStack ingredient) { + return Ingredient.of(new ItemStack(Items.GUNPOWDER)).test(ingredient); + } + + @Override + public ItemStack getOutput(ItemStack input, ItemStack ingredient) { + if (isInput(input) && isIngredient(ingredient)) { + return new ItemStack(ArisRandomAdditionsModItems.CARBONATED_WATER_CAN.get()); + } + return ItemStack.EMPTY; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/MintSweetenedCarbonatedWaterCanRecipeBrewingRecipe.java b/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/MintSweetenedCarbonatedWaterCanRecipeBrewingRecipe.java new file mode 100644 index 0000000..2d8a779 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/MintSweetenedCarbonatedWaterCanRecipeBrewingRecipe.java @@ -0,0 +1,39 @@ + +package net.mcreator.arisrandomadditions.recipes.brewing; + +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.common.brewing.IBrewingRecipe; +import net.minecraftforge.common.brewing.BrewingRecipeRegistry; + +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.ItemStack; + +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModItems; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +public class MintSweetenedCarbonatedWaterCanRecipeBrewingRecipe implements IBrewingRecipe { + @SubscribeEvent + public static void init(FMLCommonSetupEvent event) { + event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(new MintSweetenedCarbonatedWaterCanRecipeBrewingRecipe())); + } + + @Override + public boolean isInput(ItemStack input) { + return Ingredient.of(new ItemStack(ArisRandomAdditionsModItems.SWEETENED_CARBONATED_WATER_CAN.get())).test(input); + } + + @Override + public boolean isIngredient(ItemStack ingredient) { + return Ingredient.of(new ItemStack(ArisRandomAdditionsModItems.MINT.get())).test(ingredient); + } + + @Override + public ItemStack getOutput(ItemStack input, ItemStack ingredient) { + if (isInput(input) && isIngredient(ingredient)) { + return new ItemStack(ArisRandomAdditionsModItems.MINT_SWEETENED_CARBONATED_WATER_CAN.get()); + } + return ItemStack.EMPTY; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/OrangeSweetenedCarbonatedWaterCanRecipeBrewingRecipe.java b/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/OrangeSweetenedCarbonatedWaterCanRecipeBrewingRecipe.java new file mode 100644 index 0000000..afc7682 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/OrangeSweetenedCarbonatedWaterCanRecipeBrewingRecipe.java @@ -0,0 +1,39 @@ + +package net.mcreator.arisrandomadditions.recipes.brewing; + +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.common.brewing.IBrewingRecipe; +import net.minecraftforge.common.brewing.BrewingRecipeRegistry; + +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.ItemStack; + +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModItems; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +public class OrangeSweetenedCarbonatedWaterCanRecipeBrewingRecipe implements IBrewingRecipe { + @SubscribeEvent + public static void init(FMLCommonSetupEvent event) { + event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(new OrangeSweetenedCarbonatedWaterCanRecipeBrewingRecipe())); + } + + @Override + public boolean isInput(ItemStack input) { + return Ingredient.of(new ItemStack(ArisRandomAdditionsModItems.SWEETENED_CARBONATED_WATER_CAN.get())).test(input); + } + + @Override + public boolean isIngredient(ItemStack ingredient) { + return Ingredient.of(new ItemStack(ArisRandomAdditionsModItems.ORANGE.get())).test(ingredient); + } + + @Override + public ItemStack getOutput(ItemStack input, ItemStack ingredient) { + if (isInput(input) && isIngredient(ingredient)) { + return new ItemStack(ArisRandomAdditionsModItems.ORANGE_SWEETENED_CARBONATED_WATER_CAN.get()); + } + return ItemStack.EMPTY; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/SweetenedCarbonatedWaterCanRecipeBrewingRecipe.java b/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/SweetenedCarbonatedWaterCanRecipeBrewingRecipe.java new file mode 100644 index 0000000..ecb6505 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/recipes/brewing/SweetenedCarbonatedWaterCanRecipeBrewingRecipe.java @@ -0,0 +1,40 @@ + +package net.mcreator.arisrandomadditions.recipes.brewing; + +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.common.brewing.IBrewingRecipe; +import net.minecraftforge.common.brewing.BrewingRecipeRegistry; + +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.ItemStack; + +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModItems; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +public class SweetenedCarbonatedWaterCanRecipeBrewingRecipe implements IBrewingRecipe { + @SubscribeEvent + public static void init(FMLCommonSetupEvent event) { + event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(new SweetenedCarbonatedWaterCanRecipeBrewingRecipe())); + } + + @Override + public boolean isInput(ItemStack input) { + return Ingredient.of(new ItemStack(ArisRandomAdditionsModItems.CARBONATED_WATER_CAN.get())).test(input); + } + + @Override + public boolean isIngredient(ItemStack ingredient) { + return Ingredient.of(new ItemStack(Items.SUGAR)).test(ingredient); + } + + @Override + public ItemStack getOutput(ItemStack input, ItemStack ingredient) { + if (isInput(input) && isIngredient(ingredient)) { + return new ItemStack(ArisRandomAdditionsModItems.SWEETENED_CARBONATED_WATER_CAN.get()); + } + return ItemStack.EMPTY; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/world/inventory/BedrockifierGUIMenu.java b/src/main/java/net/mcreator/arisrandomadditions/world/inventory/BedrockifierGUIMenu.java index a8c400e..4f63446 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/world/inventory/BedrockifierGUIMenu.java +++ b/src/main/java/net/mcreator/arisrandomadditions/world/inventory/BedrockifierGUIMenu.java @@ -80,9 +80,13 @@ public class BedrockifierGUIMenu extends AbstractContainerMenu implements Suppli } this.customSlots.put(0, this.addSlot(new SlotItemHandler(internal, 0, 16, 35) { private final int slot = 0; + private int x = BedrockifierGUIMenu.this.x; + private int y = BedrockifierGUIMenu.this.y; })); this.customSlots.put(1, this.addSlot(new SlotItemHandler(internal, 1, 70, 35) { private final int slot = 1; + private int x = BedrockifierGUIMenu.this.x; + private int y = BedrockifierGUIMenu.this.y; @Override public boolean mayPlace(ItemStack stack) { @@ -91,6 +95,8 @@ public class BedrockifierGUIMenu extends AbstractContainerMenu implements Suppli })); this.customSlots.put(2, this.addSlot(new SlotItemHandler(internal, 2, 142, 35) { private final int slot = 2; + private int x = BedrockifierGUIMenu.this.x; + private int y = BedrockifierGUIMenu.this.y; @Override public boolean mayPlace(ItemStack stack) { diff --git a/src/main/java/net/mcreator/arisrandomadditions/world/inventory/OreMinerGUIMenu.java b/src/main/java/net/mcreator/arisrandomadditions/world/inventory/OreMinerGUIMenu.java index a3616a1..93d6403 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/world/inventory/OreMinerGUIMenu.java +++ b/src/main/java/net/mcreator/arisrandomadditions/world/inventory/OreMinerGUIMenu.java @@ -81,6 +81,8 @@ public class OreMinerGUIMenu extends AbstractContainerMenu implements Supplier