diff --git a/aris_random_additions.mcreator b/aris_random_additions.mcreator index 80c7623..3bd7758 100644 --- a/aris_random_additions.mcreator +++ b/aris_random_additions.mcreator @@ -3918,7 +3918,7 @@ "src/main/resources/data/aris_random_additions/forge/biome_modifier/ari_biome_modifier.json" ] }, - "path": "~/Other" + "path": "~/Ari" }, { "name": "AriSpawnEggRecipe", @@ -3963,7 +3963,7 @@ } ] }, - "path": "~/Other" + "path": "~/Ari" }, { "name": "SweetBladeEnchantment", @@ -4797,6 +4797,312 @@ ] }, "path": "~/Advancements" + }, + { + "name": "OrichalcumDeepslateOre", + "type": "block", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_deepslate_ore", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/block/OrichalcumDeepslateOreBlock.java", + "src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_deepslate_ore_biome_modifier.json", + "src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_deepslate_ore.json", + "src/main/resources/assets/aris_random_additions/blockstates/orichalcum_deepslate_ore.json", + "src/main/resources/assets/aris_random_additions/models/item/orichalcum_deepslate_ore.json", + "src/main/resources/assets/aris_random_additions/models/block/orichalcum_deepslate_ore.json", + "src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_deepslate_ore.json", + "src/main/resources/data/aris_random_additions/loot_tables/blocks/orichalcum_deepslate_ore.json" + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "OrichalcumDeepslateFeature", + "type": "feature", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_deepslate_feature", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_deepslate_feature_biome_modifier.json", + "src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_deepslate_feature.json", + "src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_deepslate_feature.json" + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "VoidStar", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "void_star", + "metadata": { + "files": [ + "src/main/resources/assets/aris_random_additions/models/item/void_star.json", + "src/main/java/net/mcreator/arisrandomadditions/item/VoidStarItem.java" + ] + }, + "path": "~/Endite" + }, + { + "name": "VoidStarRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "void_star_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/void_star_recipe.json" + ] + }, + "path": "~/Endite" + }, + { + "name": "AriLootTable", + "type": "loottable", + "compiles": true, + "locked_code": false, + "registry_name": "ari_loot_table", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/loot_tables/entities/ari.json" + ] + }, + "path": "~/Ari" + }, + { + "name": "NotchAppleRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "notch_apple_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/notch_apple_recipe.json" + ] + }, + "path": "~/Other" + }, + { + "name": "VoidApple", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "void_apple", + "metadata": { + "files": [ + "src/main/resources/assets/aris_random_additions/models/item/void_apple.json", + "src/main/java/net/mcreator/arisrandomadditions/item/VoidAppleItem.java" + ] + }, + "path": "~/Endite" + }, + { + "name": "VoidAppleRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "void_apple_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/void_apple_recipe.json" + ] + }, + "path": "~/Endite" + }, + { + "name": "VoidApplePlayerFinishesUsingItem", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "void_apple_player_finishes_using_item", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/VoidApplePlayerFinishesUsingItemProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Endite" + }, + { + "name": "PlayerRespawnUpdatePermanentAttributeMods", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "player_respawn_update_permanent_attribute_mods", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/PlayerRespawnUpdatePermanentAttributeModsProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Other" + }, + { + "name": "OrichalcumApplePlayerFinishesUsingItem", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_apple_player_finishes_using_item", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumApplePlayerFinishesUsingItemProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "OrichalcumApple", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_apple", + "metadata": { + "files": [ + "src/main/resources/assets/aris_random_additions/models/item/orichalcum_apple.json", + "src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumAppleItem.java" + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "GetPermanentStatsCommandProcedure", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "get_permanent_stats_command_procedure", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/GetPermanentStatsCommandProcedureProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + } + ] + }, + "path": "~/Other" + }, + { + "name": "GetPermanentStats", + "type": "command", + "compiles": true, + "locked_code": false, + "registry_name": "get_permanent_stats", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/command/GetPermanentStatsCommand.java" + ] + }, + "path": "~/Other" + }, + { + "name": "OrichalcumAppleRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_apple_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/orichalcum_apple_recipe.json" + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "EnditeUpgradeSmithingTemplateRecipe2", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "endite_upgrade_smithing_template_recipe_2", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/endite_upgrade_smithing_template_recipe_2.json" + ] + }, + "path": "~/Endite" + }, + { + "name": "BedrockApple", + "type": "item", + "compiles": true, + "locked_code": false, + "registry_name": "bedrock_apple", + "metadata": { + "files": [ + "src/main/resources/assets/aris_random_additions/models/item/bedrock_apple.json", + "src/main/java/net/mcreator/arisrandomadditions/item/BedrockAppleItem.java" + ] + }, + "path": "~/Bedrock" + }, + { + "name": "BedrockApplePlayerFinishesUsingItem", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "bedrock_apple_player_finishes_using_item", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/BedrockApplePlayerFinishesUsingItemProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Bedrock" + }, + { + "name": "BedrockAppleRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "bedrock_apple_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/bedrock_apple_recipe.json" + ] + }, + "path": "~/Bedrock" } ], "variable_elements": [], @@ -4806,6 +5112,7 @@ "~CUSTOM:NetherrackJuice" ], "BLOCKS:minecraft:needs_diamond_tool": [ + "~CUSTOM:OrichalcumDeepslateOre", "~CUSTOM:EnditeBlock", "~CUSTOM:OrichalcumBlock", "~CUSTOM:OrichalcumOre", @@ -4830,6 +5137,7 @@ "Items.DIAMOND_PICKAXE" ], "BLOCKS:minecraft:mineable/pickaxe": [ + "~CUSTOM:OrichalcumDeepslateOre", "~CUSTOM:EnditeBlock", "~CUSTOM:OrichalcumBlock", "~CUSTOM:OrichalcumOre", @@ -4903,6 +5211,7 @@ "block.nims_random_bullshit.magma_brick_button": "Magma Brick Button", "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.broken_glass": "Broken Glass", "item.aris_random_additions.ghoul_spawn_egg": "Ghoul Spawn Egg", "item.aris_random_additions.endite_armor_boots": "Endite Boots", @@ -4928,8 +5237,8 @@ "block.aris_random_additions.hexa_condensed_netherrack": "Hexa-condensed Netherrack", "item.aris_random_additions.bedrock_sword": "Bedrock Sword", "item.aris_random_additions.orichalcum_hoe": "Orichalcum Hoe", - "block.aris_random_additions.endite_block": "Block of Endite", "item.aris_random_additions.wand_of_draining": "Wand Of Draining", + "block.aris_random_additions.endite_block": "Block of Endite", "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", @@ -4937,8 +5246,8 @@ "item.aris_random_additions.power_star": "Power Star", "enchantment.nims_random_bullshit.ruining_enchantment": "Ruining", "advancements.endite_advancement.descr": "Obtain Endite", - "advancements.netherrack_juice_advancement.descr": "Obtain Netherrack Juice", "block.nims_random_bullshit.condensed_condensed_netherrack": "Condensed Condensed Netherrack", + "advancements.netherrack_juice_advancement.descr": "Obtain Netherrack Juice", "block.nims_random_bullshit.quadra_condensed_netherrack": "Quadra-condensed Netherrack", "advancements.orichalcum_katana_advancement.descr": "Obtain an Orichalcum Katana", "gui.nims_random_bullshit.bedrockifier_gui.button_empty": "-\u003e", @@ -4951,6 +5260,7 @@ "item.nims_random_bullshit.golden_berries": "Golden Berries", "item.nims_random_bullshit.netherrack_juice_bucket": "Netherrack Juice Bucket", "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", "item.nims_random_bullshit.pocket_lightning.description_0": "Spawns lightning wherever it lands.", "advancements.turd_advancement.title": "Crap!", @@ -4963,6 +5273,7 @@ "block.nims_random_bullshit.condensed_netherrack": "Condensed Netherrack", "block.aris_random_additions.magma_brick_stairs": "Magma Brick 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", "block.aris_random_additions.redstone_brick_stairs": "Redstone Brick Stairs", "item.aris_random_additions.orichalcum_shovel": "Orichalcum Shovel", @@ -5020,6 +5331,7 @@ "entity.nims_random_bullshit.ghoul": "Ghoul", "enchantment.aris_random_additions.life_mending_enchantment": "Life Mending", "block.aris_random_additions.redstone_brick_slabs": "Redstone Brick Slab", + "item.aris_random_additions.orichalcum_apple": "Orichalcum Apple", "advancements.star_advancement.descr": "Obtain a Star", "item.nims_random_bullshit.bedrock_pickaxe": "Bedrock Pickaxe", "item.aris_random_additions.endite_armor_chestplate.description_0": "Set Bonus: Resistance, Regeneration, Strength", @@ -5027,7 +5339,7 @@ "advancements.bedrock_shard_advancement.descr": "Obtain Bedrock Shard", "block.aris_random_additions.quadra_condensed_netherrack": "Quadra-condensed Netherrack", "item.aris_random_additions.orichalcum_katana": "Orichalcum Katana", - "item.aris_random_additions.orichalcum_armor_boots": "Orichalcum Boots", + "item.aris_random_additions.orichalcum_armor_boots": "Orichalcum Heels", "item.aris_random_additions.endite_upgrade_smithing_template": "Endite Upgrade Template", "item.aris_random_additions.bedrock_eater": "Bedrock Eater", "advancements.orichalcum_advancement.descr": "Obtain Orichalcum", @@ -5036,6 +5348,7 @@ "item.aris_random_additions.orichalcum_armor_leggings": "Orichalcum Leggings", "item.aris_random_additions.iron_golem_question_mark": "Iron Golem...?", "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", @@ -5069,6 +5382,7 @@ "item.nims_random_bullshit.orichalcum": "Orichalcum", "item.aris_random_additions.orichalcum_armor_leggings.description_0": "Set Bonus: Speed, Jump Boost", "advancements.magic_egg_advancement.descr": "Obtain a Magic Egg", + "item.aris_random_additions.orichalcum_apple.description_0": "When consumed: Grants 1 permanent bonus attack damage.", "advancements.endite_advancement.title": "Purple Butter", "entity.aris_random_additions.ari": "Ari", "item.nims_random_bullshit.night_vision_goggles_helmet": "Night Vision Goggles", @@ -5078,8 +5392,10 @@ "item.aris_random_additions.endite_hoe": "Endite Hoe", "block.aris_random_additions.rave_block": "Rave Block", "advancements.orichalcum_set_advancement.title": "Cover Me In Folly Red", + "item.aris_random_additions.bedrock_apple": "Bedrock Apple", "gui.nims_random_bullshit.ore_miner_gui.button_mine": "Mine", "item.aris_random_additions.endite_scythe": "Endite Scythe", + "item.aris_random_additions.void_apple.description_0": "When consumed: Grants 2 permanent bonus max health.", "advancements.star_advancement.title": "A Star Meant To Be", "effect.aris_random_additions.bleed_effect": "Bleeding", "painting.nims_random_bullshit.shit_painting.author": "nim", @@ -5218,13 +5534,17 @@ { "name": "Enchantments", "children": [] + }, + { + "name": "Ari", + "children": [] } ] }, "workspaceSettings": { "modid": "aris_random_additions", "modName": "Ari\u0027s Random Additions", - "version": "2.1.1", + "version": "2.1.2", "description": "Random Additions by Ari. Created with MCreator.", "author": "nimsolated, MCreator", "websiteURL": "https://mcreator.net", diff --git a/elements/Ari.mod.json b/elements/Ari.mod.json index 0663002..25f14dc 100644 --- a/elements/Ari.mod.json +++ b/elements/Ari.mod.json @@ -102,7 +102,7 @@ "immuneToWither": false, "immuneToDragonBreath": false, "mobDrop": { - "value": "CUSTOM:Orichalcum" + "value": "" }, "livingSound": { "value": "block.amethyst_block.chime" diff --git a/elements/AriLootTable.mod.json b/elements/AriLootTable.mod.json new file mode 100644 index 0000000..7fc051d --- /dev/null +++ b/elements/AriLootTable.mod.json @@ -0,0 +1,48 @@ +{ + "_fv": 73, + "_type": "loottable", + "definition": { + "type": "Entity", + "pools": [ + { + "minrolls": 1, + "maxrolls": 1, + "minbonusrolls": 1, + "maxbonusrolls": 1, + "hasbonusrolls": false, + "entries": [ + { + "type": "item", + "item": { + "value": "CUSTOM:Orichalcum" + }, + "weight": 16, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": false, + "explosionDecay": false, + "silkTouchMode": 0 + }, + { + "type": "item", + "item": { + "value": "Blocks.AIR" + }, + "weight": 300, + "minCount": 1, + "maxCount": 1, + "minEnchantmentLevel": 0, + "maxEnchantmentLevel": 0, + "affectedByFortune": false, + "explosionDecay": false, + "silkTouchMode": 0 + } + ] + } + ], + "name": "entities/ari", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/BedrockApple.mod.json b/elements/BedrockApple.mod.json new file mode 100644 index 0000000..d979070 --- /dev/null +++ b/elements/BedrockApple.mod.json @@ -0,0 +1,68 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "bedrock_apple", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Bedrock Apple", + "rarity": "EPIC", + "creativeTabs": [ + { + "value": "FOOD" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 32, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": true, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [ + "When consumed: Grants permanent creative flight." + ] + }, + "glowCondition": { + "fixedValue": true + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "onFinishUsingItem": { + "name": "BedrockApplePlayerFinishesUsingItem" + }, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": true, + "nutritionalValue": 20, + "saturation": 4.0, + "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/BedrockApplePlayerFinishesUsingItem.mod.json b/elements/BedrockApplePlayerFinishesUsingItem.mod.json new file mode 100644 index 0000000..145ed17 --- /dev/null +++ b/elements/BedrockApplePlayerFinishesUsingItem.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerBLINDNESS02000FALSEFALSEDARKNESS02000FALSEFALSEWITHER0100FALSEFALSEEntityPlayerPermanentCreativeFlight1EQPermanentCreativeFlight1§8Bedrock Apple §rgranted you Creative Flight!FALSE" + } +} \ No newline at end of file diff --git a/elements/BedrockAppleRecipe.mod.json b/elements/BedrockAppleRecipe.mod.json new file mode 100644 index 0000000..e8bec09 --- /dev/null +++ b/elements/BedrockAppleRecipe.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.BEDROCK" + }, + { + "value": "Blocks.BEDROCK" + }, + { + "value": "Blocks.BEDROCK" + }, + { + "value": "Blocks.BEDROCK" + }, + { + "value": "Items.GOLDEN_APPLE#1" + }, + { + "value": "Blocks.BEDROCK" + }, + { + "value": "Blocks.BEDROCK" + }, + { + "value": "Blocks.BEDROCK" + }, + { + "value": "Blocks.BEDROCK" + } + ], + "recipeReturnStack": { + "value": "CUSTOM:BedrockApple" + }, + "name": "bedrock_apple_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/BleedEffectOnEffectActiveTick.mod.json b/elements/BleedEffectOnEffectActiveTick.mod.json index 8e8b786..7e592b0 100644 --- a/elements/BleedEffectOnEffectActiveTick.mod.json +++ b/elements/BleedEffectOnEffectActiveTick.mod.json @@ -2,6 +2,6 @@ "_fv": 73, "_type": "procedure", "definition": { - "procedurexml": "no_ext_trigger101CUSTOM:BleedDamageTypeCUSTOM:BleedingParticles3ADD10.50.50.50" + "procedurexml": "no_ext_trigger101CUSTOM:BleedDamageTypeCUSTOM:BleedingParticles3ADD10.330.330.330" } } \ No newline at end of file diff --git a/elements/EnditeArmor.mod.json b/elements/EnditeArmor.mod.json index 3e1fb2a..992e9ca 100644 --- a/elements/EnditeArmor.mod.json +++ b/elements/EnditeArmor.mod.json @@ -3,9 +3,9 @@ "_type": "armor", "definition": { "enableHelmet": true, - "textureHelmet": "endite_head", + "textureHelmet": "endite_helmet", "enableBody": true, - "textureBody": "endite_body", + "textureBody": "endite_chestplate", "enableLeggings": true, "textureLeggings": "endite_leggings", "enableBoots": true, @@ -104,7 +104,7 @@ "toughness": 5.0, "knockbackResistance": 0.25, "equipSound": { - "value": "" + "value": "item.armor.equip_netherite" }, "repairItems": [ { diff --git a/elements/EnditeIngotRecipe.mod.json b/elements/EnditeIngotRecipe.mod.json index b52ff10..9f6364b 100644 --- a/elements/EnditeIngotRecipe.mod.json +++ b/elements/EnditeIngotRecipe.mod.json @@ -17,7 +17,7 @@ "value": "Items.SHULKER_SHELL" }, "smithingInputTemplateStack": { - "value": "CUSTOM:PowerStar" + "value": "CUSTOM:VoidStar" }, "smithingReturnStack": { "value": "CUSTOM:EnditeIngot" diff --git a/elements/EnditeUpgradeSmithingTemplateRecipe2.mod.json b/elements/EnditeUpgradeSmithingTemplateRecipe2.mod.json new file mode 100644 index 0000000..0361f84 --- /dev/null +++ b/elements/EnditeUpgradeSmithingTemplateRecipe2.mod.json @@ -0,0 +1,48 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Crafting", + "recipeRetstackSize": 2, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "recipeSlots": [ + { + "value": "CUSTOM:Orichalcum" + }, + { + "value": "CUSTOM:EnditeUpgradeSmithingTemplate" + }, + { + "value": "CUSTOM:Orichalcum" + }, + { + "value": "CUSTOM:Orichalcum" + }, + { + "value": "CUSTOM:ChorusEye" + }, + { + "value": "CUSTOM:Orichalcum" + }, + { + "value": "CUSTOM:Orichalcum" + }, + { + "value": "CUSTOM:Orichalcum" + }, + { + "value": "CUSTOM:Orichalcum" + } + ], + "recipeReturnStack": { + "value": "CUSTOM:EnditeUpgradeSmithingTemplate" + }, + "name": "endite_upgrade_smithing_template_recipe_2", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/GetPermanentStats.mod.json b/elements/GetPermanentStats.mod.json new file mode 100644 index 0000000..590cc67 --- /dev/null +++ b/elements/GetPermanentStats.mod.json @@ -0,0 +1,10 @@ +{ + "_fv": 73, + "_type": "command", + "definition": { + "commandName": "ari-get-permanent-stats", + "type": "STANDARD", + "permissionLevel": "No requirement", + "argsxml": "GetPermanentStatsCommandProcedure" + } +} \ No newline at end of file diff --git a/elements/GetPermanentStatsCommandProcedure.mod.json b/elements/GetPermanentStatsCommandProcedure.mod.json new file mode 100644 index 0000000..d246ab7 --- /dev/null +++ b/elements/GetPermanentStatsCommandProcedure.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerPermanent Bonus Max Health: PermanentBonusMaxHealthPermanent Bonus Attack Damage: PermanentBonusAttackDamagePermanent Creative Flight: PermanentCreativeFlightFALSE" + } +} \ No newline at end of file diff --git a/elements/GoldenBerries.mod.json b/elements/GoldenBerries.mod.json index f3cc3e3..55bda78 100644 --- a/elements/GoldenBerries.mod.json +++ b/elements/GoldenBerries.mod.json @@ -40,7 +40,7 @@ "shootConstantly": false, "rangedItemChargesPower": false, "projectile": { - "value": "CUSTOM:ShitProjectile" + "value": "CUSTOM:PocketLightningProjectile" }, "projectileDisableAmmoCheck": false, "isFood": true, diff --git a/elements/MagicFlesh.mod.json b/elements/MagicFlesh.mod.json index f945160..71506b0 100644 --- a/elements/MagicFlesh.mod.json +++ b/elements/MagicFlesh.mod.json @@ -52,7 +52,7 @@ "eatResultItem": { "value": "" }, - "isMeat": false, + "isMeat": true, "isAlwaysEdible": true, "animation": "eat", "isMusicDisc": false, diff --git a/elements/NotchAppleRecipe.mod.json b/elements/NotchAppleRecipe.mod.json new file mode 100644 index 0000000..cb5f82c --- /dev/null +++ b/elements/NotchAppleRecipe.mod.json @@ -0,0 +1,28 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Smithing", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "smithingInputStack": { + "value": "Items.GOLDEN_APPLE#0" + }, + "smithingInputAdditionStack": { + "value": "Items.NETHER_STAR" + }, + "smithingInputTemplateStack": { + "value": "Blocks.GOLD_BLOCK" + }, + "smithingReturnStack": { + "value": "Items.GOLDEN_APPLE#1" + }, + "name": "notch_apple_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/Orichalcum.mod.json b/elements/Orichalcum.mod.json index da09a74..7ae84b1 100644 --- a/elements/Orichalcum.mod.json +++ b/elements/Orichalcum.mod.json @@ -3,7 +3,7 @@ "_type": "item", "definition": { "renderType": 0, - "texture": "orichalcum_gem", + "texture": "orichalcum", "customModelName": "Normal", "customProperties": {}, "states": [], @@ -40,7 +40,7 @@ "shootConstantly": false, "rangedItemChargesPower": false, "projectile": { - "value": "CUSTOM:ShitProjectile" + "value": "CUSTOM:PocketLightningProjectile" }, "projectileDisableAmmoCheck": false, "isFood": false, diff --git a/elements/OrichalcumApple.mod.json b/elements/OrichalcumApple.mod.json new file mode 100644 index 0000000..2672d61 --- /dev/null +++ b/elements/OrichalcumApple.mod.json @@ -0,0 +1,68 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "orichalcum_apple", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Orichalcum Apple", + "rarity": "EPIC", + "creativeTabs": [ + { + "value": "FOOD" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 32, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": true, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [ + "When consumed: Grants 1 permanent bonus attack damage." + ] + }, + "glowCondition": { + "fixedValue": true + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "onFinishUsingItem": { + "name": "OrichalcumApplePlayerFinishesUsingItem" + }, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": true, + "nutritionalValue": 9, + "saturation": 0.9, + "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/OrichalcumApplePlayerFinishesUsingItem.mod.json b/elements/OrichalcumApplePlayerFinishesUsingItem.mod.json new file mode 100644 index 0000000..be09e25 --- /dev/null +++ b/elements/OrichalcumApplePlayerFinishesUsingItem.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerJUMP_BOOST11200TRUETRUESPEED11200TRUETRUEATTACK_DAMAGEADDATTACK_DAMAGE1PermanentBonusAttackDamageADDPermanentBonusAttackDamage1EntityPlayer§dOrichalcum Apple §rgranted you bonus Attack Damage!FALSE" + } +} \ No newline at end of file diff --git a/elements/OrichalcumAppleRecipe.mod.json b/elements/OrichalcumAppleRecipe.mod.json new file mode 100644 index 0000000..8232030 --- /dev/null +++ b/elements/OrichalcumAppleRecipe.mod.json @@ -0,0 +1,28 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Smithing", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "smithingInputStack": { + "value": "Items.GOLDEN_APPLE#1" + }, + "smithingInputAdditionStack": { + "value": "CUSTOM:PowerStar" + }, + "smithingInputTemplateStack": { + "value": "CUSTOM:OrichalcumBlock" + }, + "smithingReturnStack": { + "value": "CUSTOM:OrichalcumApple" + }, + "name": "orichalcum_apple_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/OrichalcumArmor.mod.json b/elements/OrichalcumArmor.mod.json index 9f1ab59..06fb6eb 100644 --- a/elements/OrichalcumArmor.mod.json +++ b/elements/OrichalcumArmor.mod.json @@ -3,13 +3,13 @@ "_type": "armor", "definition": { "enableHelmet": true, - "textureHelmet": "orichalcum_head", + "textureHelmet": "orichalcum_helmat", "enableBody": true, - "textureBody": "orichalcum_body", + "textureBody": "orichalcum_chestplate", "enableLeggings": true, "textureLeggings": "orichalcum_leggings", "enableBoots": true, - "textureBoots": "orichalcum_boots", + "textureBoots": "orichalcum_heels", "onBootsTick": { "name": "OrichalcumArmorBootsTickEvent" }, @@ -18,11 +18,11 @@ "value": "COMBAT" } ], - "armorTextureFile": "orichalcum_armor", + "armorTextureFile": "orichalcum", "helmetName": "Orichalcum Helmet", "bodyName": "Orichalcum Chestplate", "leggingsName": "Orichalcum Leggings", - "bootsName": "Orichalcum Boots", + "bootsName": "Orichalcum Heels", "helmetSpecialInformation": { "fixedValue": [ "Set Bonus: Speed, Jump Boost" diff --git a/elements/OrichalcumBlock.mod.json b/elements/OrichalcumBlock.mod.json index 0c3d129..834f23d 100644 --- a/elements/OrichalcumBlock.mod.json +++ b/elements/OrichalcumBlock.mod.json @@ -2,7 +2,7 @@ "_fv": 73, "_type": "block", "definition": { - "texture": "orichalcum_ore_block", + "texture": "orichalcum_block", "textureTop": "", "textureLeft": "", "textureFront": "", @@ -59,7 +59,7 @@ "canRedstoneConnect": false, "lightOpacity": 15, "material": { - "value": "IRON" + "value": "NONE" }, "tickRate": 0, "tickRandomly": false, diff --git a/elements/OrichalcumDeepslateFeature.mod.json b/elements/OrichalcumDeepslateFeature.mod.json new file mode 100644 index 0000000..9467808 --- /dev/null +++ b/elements/OrichalcumDeepslateFeature.mod.json @@ -0,0 +1,14 @@ +{ + "_fv": 73, + "_type": "feature", + "definition": { + "skipPlacement": false, + "generationStep": "UNDERGROUND_ORES", + "restrictionBiomes": [ + { + "value": "#minecraft:is_overworld" + } + ], + "featurexml": "30Blocks.DEEPSLATECUSTOM:OrichalcumDeepslateOre-648" + } +} \ No newline at end of file diff --git a/elements/OrichalcumDeepslateOre.mod.json b/elements/OrichalcumDeepslateOre.mod.json new file mode 100644 index 0000000..8d5bc2f --- /dev/null +++ b/elements/OrichalcumDeepslateOre.mod.json @@ -0,0 +1,144 @@ +{ + "_fv": 73, + "_type": "block", + "definition": { + "texture": "orichalcum_deeplsate_ore", + "textureTop": "", + "textureLeft": "", + "textureFront": "", + "textureRight": "", + "textureBack": "", + "renderType": 11, + "customModelName": "Single texture", + "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": "Orichalcum Deepslate Ore", + "specialInformation": { + "fixedValue": [] + }, + "hardness": 17.0, + "resistance": 20.157, + "hasGravity": false, + "isWaterloggable": false, + "creativeTabs": [ + { + "value": "BUILDING_BLOCKS" + } + ], + "destroyTool": "pickaxe", + "customDrop": { + "value": "CUSTOM:Orichalcum" + }, + "dropAmount": 1, + "useLootTableForDrops": false, + "requiresCorrectTool": true, + "enchantPowerBonus": 0.0, + "plantsGrowOn": false, + "canRedstoneConnect": false, + "lightOpacity": 15, + "material": { + "value": "ROCK" + }, + "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": "STONE" + }, + "breakSound": { + "value": "" + }, + "fallSound": { + "value": "" + }, + "hitSound": { + "value": "" + }, + "placeSound": { + "value": "" + }, + "stepSound": { + "value": "" + }, + "luminance": 0, + "unbreakable": false, + "vanillaToolTier": "DIAMOND", + "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": true, + "restrictionBiomes": [ + { + "value": "#is_overworld" + } + ], + "blocksToReplace": [ + { + "value": "Blocks.STONE" + }, + { + "value": "Blocks.DEEPSLATE" + } + ], + "generationShape": "UNIFORM", + "frequencyPerChunks": 3, + "frequencyOnChunk": 2, + "minGenerateHeight": -64, + "maxGenerateHeight": 8 + } +} \ No newline at end of file diff --git a/elements/OrichalcumFeature.mod.json b/elements/OrichalcumFeature.mod.json index 5424b7b..d47f022 100644 --- a/elements/OrichalcumFeature.mod.json +++ b/elements/OrichalcumFeature.mod.json @@ -9,6 +9,6 @@ "value": "#minecraft:is_overworld" } ], - "featurexml": "30stone_ore_replaceablesCUSTOM:OrichalcumOre-66" + "featurexml": "30stone_ore_replaceablesCUSTOM:OrichalcumOre826" } } \ No newline at end of file diff --git a/elements/OrichalcumOre.mod.json b/elements/OrichalcumOre.mod.json index 5e4ee5b..e0a1954 100644 --- a/elements/OrichalcumOre.mod.json +++ b/elements/OrichalcumOre.mod.json @@ -135,7 +135,7 @@ "generationShape": "UNIFORM", "frequencyPerChunks": 3, "frequencyOnChunk": 2, - "minGenerateHeight": -6, - "maxGenerateHeight": 6 + "minGenerateHeight": 8, + "maxGenerateHeight": 26 } } \ No newline at end of file diff --git a/elements/PlayerRespawnUpdatePermanentAttributeMods.mod.json b/elements/PlayerRespawnUpdatePermanentAttributeMods.mod.json new file mode 100644 index 0000000..2161f83 --- /dev/null +++ b/elements/PlayerRespawnUpdatePermanentAttributeMods.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "player_respawn4ATTACK_DAMAGEADDATTACK_DAMAGEPermanentBonusAttackDamageMAX_HEALTHADDMAX_HEALTHPermanentBonusMaxHealthEQPermanentCreativeFlight1" + } +} \ No newline at end of file diff --git a/elements/VoidApple.mod.json b/elements/VoidApple.mod.json new file mode 100644 index 0000000..271315c --- /dev/null +++ b/elements/VoidApple.mod.json @@ -0,0 +1,68 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "void_apple", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Void Apple", + "rarity": "EPIC", + "creativeTabs": [ + { + "value": "FOOD" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 32, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": true, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [ + "When consumed: Grants 2 permanent bonus max health." + ] + }, + "glowCondition": { + "fixedValue": true + }, + "inventorySize": 9, + "inventoryStackSize": 64, + "onFinishUsingItem": { + "name": "VoidApplePlayerFinishesUsingItem" + }, + "enableRanged": false, + "shootConstantly": false, + "rangedItemChargesPower": false, + "projectile": { + "value": "CUSTOM:PocketLightningProjectile" + }, + "projectileDisableAmmoCheck": false, + "isFood": true, + "nutritionalValue": 16, + "saturation": 1.6, + "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/VoidApplePlayerFinishesUsingItem.mod.json b/elements/VoidApplePlayerFinishesUsingItem.mod.json new file mode 100644 index 0000000..eb6c39e --- /dev/null +++ b/elements/VoidApplePlayerFinishesUsingItem.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerABSORPTION21600TRUETRUESATURATION21600TRUETRUEMAX_HEALTHADDMAX_HEALTH2PermanentBonusMaxHealthADDPermanentBonusMaxHealth2EntityPlayer§5Void Apple §rgranted you bonus Max Health!FALSE" + } +} \ No newline at end of file diff --git a/elements/VoidAppleRecipe.mod.json b/elements/VoidAppleRecipe.mod.json new file mode 100644 index 0000000..16f16af --- /dev/null +++ b/elements/VoidAppleRecipe.mod.json @@ -0,0 +1,28 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Smithing", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "smithingInputStack": { + "value": "Items.GOLDEN_APPLE#1" + }, + "smithingInputAdditionStack": { + "value": "CUSTOM:VoidStar" + }, + "smithingInputTemplateStack": { + "value": "CUSTOM:EnditeUpgradeSmithingTemplate" + }, + "smithingReturnStack": { + "value": "CUSTOM:VoidApple" + }, + "name": "void_apple_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/VoidStar.mod.json b/elements/VoidStar.mod.json new file mode 100644 index 0000000..ee5c687 --- /dev/null +++ b/elements/VoidStar.mod.json @@ -0,0 +1,63 @@ +{ + "_fv": 73, + "_type": "item", + "definition": { + "renderType": 0, + "texture": "void_star", + "customModelName": "Normal", + "customProperties": {}, + "states": [], + "name": "Void Star", + "rarity": "EPIC", + "creativeTabs": [ + { + "value": "MATERIALS" + } + ], + "stackSize": 64, + "enchantability": 0, + "useDuration": 0, + "toolType": 1.0, + "damageCount": 0, + "recipeRemainder": { + "value": "" + }, + "destroyAnyBlock": false, + "immuneToFire": true, + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "enableMeleeDamage": false, + "damageVsEntity": 0.0, + "specialInformation": { + "fixedValue": [] + }, + "glowCondition": { + "fixedValue": true + }, + "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/VoidStarRecipe.mod.json b/elements/VoidStarRecipe.mod.json new file mode 100644 index 0000000..bd61d25 --- /dev/null +++ b/elements/VoidStarRecipe.mod.json @@ -0,0 +1,28 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Smithing", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "smithingInputStack": { + "value": "CUSTOM:PowerStar" + }, + "smithingInputAdditionStack": { + "value": "CUSTOM:ChorusEye" + }, + "smithingInputTemplateStack": { + "value": "CUSTOM:EnditeUpgradeSmithingTemplate" + }, + "smithingReturnStack": { + "value": "CUSTOM:VoidStar" + }, + "name": "void_star_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/arisrandomadditions/block/OrichalcumDeepslateOreBlock.java b/src/main/java/net/mcreator/arisrandomadditions/block/OrichalcumDeepslateOreBlock.java new file mode 100644 index 0000000..b87fde2 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/block/OrichalcumDeepslateOreBlock.java @@ -0,0 +1,21 @@ + +package net.mcreator.arisrandomadditions.block; + +import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; +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 OrichalcumDeepslateOreBlock extends Block { + public OrichalcumDeepslateOreBlock() { + super(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.STONE).strength(17f, 20.157f).requiresCorrectToolForDrops()); + } + + @Override + public int getLightBlock(BlockState state, BlockGetter worldIn, BlockPos pos) { + return 15; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/command/GetPermanentStatsCommand.java b/src/main/java/net/mcreator/arisrandomadditions/command/GetPermanentStatsCommand.java new file mode 100644 index 0000000..359174f --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/command/GetPermanentStatsCommand.java @@ -0,0 +1,39 @@ + +package net.mcreator.arisrandomadditions.command; + +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.event.RegisterCommandsEvent; +import net.minecraftforge.common.util.FakePlayerFactory; + +import net.minecraft.world.level.Level; +import net.minecraft.world.entity.Entity; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.core.Direction; +import net.minecraft.commands.Commands; + +import net.mcreator.arisrandomadditions.procedures.GetPermanentStatsCommandProcedureProcedure; + +@Mod.EventBusSubscriber +public class GetPermanentStatsCommand { + @SubscribeEvent + public static void registerCommand(RegisterCommandsEvent event) { + event.getDispatcher().register(Commands.literal("ari-get-permanent-stats") + + .executes(arguments -> { + Level world = arguments.getSource().getUnsidedLevel(); + double x = arguments.getSource().getPosition().x(); + double y = arguments.getSource().getPosition().y(); + double z = arguments.getSource().getPosition().z(); + Entity entity = arguments.getSource().getEntity(); + if (entity == null && world instanceof ServerLevel _servLevel) + entity = FakePlayerFactory.getMinecraft(_servLevel); + Direction direction = Direction.DOWN; + if (entity != null) + direction = entity.getDirection(); + + GetPermanentStatsCommandProcedureProcedure.execute(entity); + return 0; + })); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/entity/AriEntity.java b/src/main/java/net/mcreator/arisrandomadditions/entity/AriEntity.java index bed8994..0544b36 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/entity/AriEntity.java +++ b/src/main/java/net/mcreator/arisrandomadditions/entity/AriEntity.java @@ -103,11 +103,6 @@ public class AriEntity extends Monster { return -0.35D; } - protected void dropCustomDeathLoot(DamageSource source, int looting, boolean recentlyHitIn) { - super.dropCustomDeathLoot(source, looting, recentlyHitIn); - this.spawnAtLocation(new ItemStack(ArisRandomAdditionsModItems.ORICHALCUM.get())); - } - @Override public SoundEvent getAmbientSound() { return ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.amethyst_block.chime")); diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModBlocks.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModBlocks.java index a7f256b..65aaf6e 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModBlocks.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModBlocks.java @@ -18,6 +18,7 @@ import net.mcreator.arisrandomadditions.block.RaveBlockBlock; import net.mcreator.arisrandomadditions.block.QuadraCondensedNetherrackBlock; import net.mcreator.arisrandomadditions.block.PentaCondensedNetherrackBlock; import net.mcreator.arisrandomadditions.block.OrichalcumOreBlock; +import net.mcreator.arisrandomadditions.block.OrichalcumDeepslateOreBlock; import net.mcreator.arisrandomadditions.block.OrichalcumBlockBlock; import net.mcreator.arisrandomadditions.block.OreMinerBlock; import net.mcreator.arisrandomadditions.block.NetherrackJuiceBlock; @@ -62,6 +63,7 @@ public class ArisRandomAdditionsModBlocks { public static final RegistryObject ORICHALCUM_BLOCK = REGISTRY.register("orichalcum_block", () -> new OrichalcumBlockBlock()); 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()); // 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 958b1b1..6fa718f 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java @@ -16,6 +16,8 @@ import net.minecraft.world.item.BlockItem; import net.mcreator.arisrandomadditions.item.WitherQuestionMarkItem; import net.mcreator.arisrandomadditions.item.WandOfResizingItem; import net.mcreator.arisrandomadditions.item.WandOfDrainingItem; +import net.mcreator.arisrandomadditions.item.VoidStarItem; +import net.mcreator.arisrandomadditions.item.VoidAppleItem; import net.mcreator.arisrandomadditions.item.TurdItem; import net.mcreator.arisrandomadditions.item.StarWandItem; import net.mcreator.arisrandomadditions.item.StarItem; @@ -31,6 +33,7 @@ import net.mcreator.arisrandomadditions.item.OrichalcumItem; 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.NightVisionGogglesItem; import net.mcreator.arisrandomadditions.item.NetherrackitePickaxeItem; import net.mcreator.arisrandomadditions.item.NetherrackiteItem; @@ -60,6 +63,7 @@ import net.mcreator.arisrandomadditions.item.BedrockSwordItem; import net.mcreator.arisrandomadditions.item.BedrockShardItem; import net.mcreator.arisrandomadditions.item.BedrockPickaxeItem; import net.mcreator.arisrandomadditions.item.BedrockEaterItem; +import net.mcreator.arisrandomadditions.item.BedrockAppleItem; import net.mcreator.arisrandomadditions.item.BeanItem; import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; @@ -145,6 +149,11 @@ public class ArisRandomAdditionsModItems { public static final RegistryObject POWER_STAR = REGISTRY.register("power_star", () -> new PowerStarItem()); public static final RegistryObject ENDITE_SCYTHE = REGISTRY.register("endite_scythe", () -> new EnditeScytheItem()); public static final RegistryObject ORICHALCUM_KATANA = REGISTRY.register("orichalcum_katana", () -> new OrichalcumKatanaItem()); + public static final RegistryObject ORICHALCUM_DEEPSLATE_ORE = block(ArisRandomAdditionsModBlocks.ORICHALCUM_DEEPSLATE_ORE); + public static final RegistryObject VOID_STAR = REGISTRY.register("void_star", () -> new VoidStarItem()); + 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()); // Start of user code block custom items // End of user code block custom items diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java index 6900739..5b580fa 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java @@ -37,6 +37,7 @@ public class ArisRandomAdditionsModTabs { tabData.accept(ArisRandomAdditionsModBlocks.ORICHALCUM_BLOCK.get().asItem()); tabData.accept(ArisRandomAdditionsModBlocks.RAVE_BLOCK.get().asItem()); tabData.accept(ArisRandomAdditionsModBlocks.ENDITE_BLOCK.get().asItem()); + tabData.accept(ArisRandomAdditionsModBlocks.ORICHALCUM_DEEPSLATE_ORE.get().asItem()); } else if (tabData.getTabKey() == CreativeModeTabs.TOOLS_AND_UTILITIES) { tabData.accept(ArisRandomAdditionsModItems.BLOCK_EATER.get()); tabData.accept(ArisRandomAdditionsModItems.NETHERRACKITE_PICKAXE.get()); @@ -74,11 +75,15 @@ public class ArisRandomAdditionsModTabs { tabData.accept(ArisRandomAdditionsModItems.ENDITE_UPGRADE_SMITHING_TEMPLATE.get()); tabData.accept(ArisRandomAdditionsModItems.CHORUS_EYE.get()); tabData.accept(ArisRandomAdditionsModItems.POWER_STAR.get()); + tabData.accept(ArisRandomAdditionsModItems.VOID_STAR.get()); } else if (tabData.getTabKey() == CreativeModeTabs.FOOD_AND_DRINKS) { tabData.accept(ArisRandomAdditionsModItems.MAGIC_FLESH.get()); tabData.accept(ArisRandomAdditionsModItems.GOLDEN_BERRIES.get()); tabData.accept(ArisRandomAdditionsModItems.BEAN.get()); tabData.accept(ArisRandomAdditionsModItems.CHEESE.get()); + tabData.accept(ArisRandomAdditionsModItems.VOID_APPLE.get()); + tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_APPLE.get()); + tabData.accept(ArisRandomAdditionsModItems.BEDROCK_APPLE.get()); } else if (tabData.getTabKey() == CreativeModeTabs.FUNCTIONAL_BLOCKS) { tabData.accept(ArisRandomAdditionsModBlocks.ORE_MINER.get().asItem()); tabData.accept(ArisRandomAdditionsModBlocks.BEDROCKIFIER.get().asItem()); diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/BedrockAppleItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/BedrockAppleItem.java new file mode 100644 index 0000000..4b76073 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/BedrockAppleItem.java @@ -0,0 +1,46 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; + +import net.minecraft.world.level.Level; +import net.minecraft.world.item.TooltipFlag; +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.minecraft.network.chat.Component; + +import net.mcreator.arisrandomadditions.procedures.BedrockApplePlayerFinishesUsingItemProcedure; + +import java.util.List; + +public class BedrockAppleItem extends Item { + public BedrockAppleItem() { + super(new Item.Properties().stacksTo(64).fireResistant().rarity(Rarity.EPIC).food((new FoodProperties.Builder()).nutrition(20).saturationMod(4f).alwaysEat().build())); + } + + @Override + @OnlyIn(Dist.CLIENT) + public boolean isFoil(ItemStack itemstack) { + return true; + } + + @Override + public void appendHoverText(ItemStack itemstack, Level level, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, level, list, flag); + list.add(Component.translatable("item.aris_random_additions.bedrock_apple.description_0")); + } + + @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(); + BedrockApplePlayerFinishesUsingItemProcedure.execute(world, entity); + return retval; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/EnditeArmorItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/EnditeArmorItem.java index 2ca3042..8f7e197 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/item/EnditeArmorItem.java +++ b/src/main/java/net/mcreator/arisrandomadditions/item/EnditeArmorItem.java @@ -1,6 +1,8 @@ package net.mcreator.arisrandomadditions.item; +import net.minecraftforge.registries.ForgeRegistries; + import net.minecraft.world.level.Level; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.TooltipFlag; @@ -11,8 +13,8 @@ import net.minecraft.world.item.ArmorItem; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.Entity; -import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundEvent; +import net.minecraft.resources.ResourceLocation; import net.minecraft.network.chat.Component; import net.mcreator.arisrandomadditions.procedures.EnditeArmorBootsTickEventProcedure; @@ -42,7 +44,7 @@ public abstract class EnditeArmorItem extends ArmorItem { @Override public SoundEvent getEquipSound() { - return SoundEvents.EMPTY; + return ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("item.armor.equip_netherite")); } @Override diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/MagicFleshItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/MagicFleshItem.java index 3c8de92..1379f85 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/item/MagicFleshItem.java +++ b/src/main/java/net/mcreator/arisrandomadditions/item/MagicFleshItem.java @@ -12,7 +12,7 @@ import net.mcreator.arisrandomadditions.procedures.MagicFleshOnPlayerStoppedUsin public class MagicFleshItem extends Item { public MagicFleshItem() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.UNCOMMON).food((new FoodProperties.Builder()).nutrition(4).saturationMod(0.2f).alwaysEat().build())); + super(new Item.Properties().stacksTo(64).rarity(Rarity.UNCOMMON).food((new FoodProperties.Builder()).nutrition(4).saturationMod(0.2f).alwaysEat().meat().build())); } @Override diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumAppleItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumAppleItem.java new file mode 100644 index 0000000..8d49b93 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumAppleItem.java @@ -0,0 +1,46 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; + +import net.minecraft.world.level.Level; +import net.minecraft.world.item.TooltipFlag; +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.minecraft.network.chat.Component; + +import net.mcreator.arisrandomadditions.procedures.OrichalcumApplePlayerFinishesUsingItemProcedure; + +import java.util.List; + +public class OrichalcumAppleItem extends Item { + public OrichalcumAppleItem() { + super(new Item.Properties().stacksTo(64).fireResistant().rarity(Rarity.EPIC).food((new FoodProperties.Builder()).nutrition(9).saturationMod(0.9f).alwaysEat().build())); + } + + @Override + @OnlyIn(Dist.CLIENT) + public boolean isFoil(ItemStack itemstack) { + return true; + } + + @Override + public void appendHoverText(ItemStack itemstack, Level level, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, level, list, flag); + list.add(Component.translatable("item.aris_random_additions.orichalcum_apple.description_0")); + } + + @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(); + OrichalcumApplePlayerFinishesUsingItemProcedure.execute(world, entity); + return retval; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumArmorItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumArmorItem.java index b13ca85..bd163db 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumArmorItem.java +++ b/src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumArmorItem.java @@ -82,7 +82,7 @@ public abstract class OrichalcumArmorItem extends ArmorItem { @Override public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlot slot, String type) { - return "aris_random_additions:textures/models/armor/orichalcum_armor_layer_1.png"; + return "aris_random_additions:textures/models/armor/orichalcum_layer_1.png"; } } @@ -99,7 +99,7 @@ public abstract class OrichalcumArmorItem extends ArmorItem { @Override public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlot slot, String type) { - return "aris_random_additions:textures/models/armor/orichalcum_armor_layer_1.png"; + return "aris_random_additions:textures/models/armor/orichalcum_layer_1.png"; } } @@ -116,7 +116,7 @@ public abstract class OrichalcumArmorItem extends ArmorItem { @Override public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlot slot, String type) { - return "aris_random_additions:textures/models/armor/orichalcum_armor_layer_2.png"; + return "aris_random_additions:textures/models/armor/orichalcum_layer_2.png"; } } @@ -133,7 +133,7 @@ public abstract class OrichalcumArmorItem extends ArmorItem { @Override public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlot slot, String type) { - return "aris_random_additions:textures/models/armor/orichalcum_armor_layer_1.png"; + return "aris_random_additions:textures/models/armor/orichalcum_layer_1.png"; } @Override diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/VoidAppleItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/VoidAppleItem.java new file mode 100644 index 0000000..4ad6854 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/VoidAppleItem.java @@ -0,0 +1,46 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; + +import net.minecraft.world.level.Level; +import net.minecraft.world.item.TooltipFlag; +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.minecraft.network.chat.Component; + +import net.mcreator.arisrandomadditions.procedures.VoidApplePlayerFinishesUsingItemProcedure; + +import java.util.List; + +public class VoidAppleItem extends Item { + public VoidAppleItem() { + super(new Item.Properties().stacksTo(64).fireResistant().rarity(Rarity.EPIC).food((new FoodProperties.Builder()).nutrition(16).saturationMod(1.6f).alwaysEat().build())); + } + + @Override + @OnlyIn(Dist.CLIENT) + public boolean isFoil(ItemStack itemstack) { + return true; + } + + @Override + public void appendHoverText(ItemStack itemstack, Level level, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, level, list, flag); + list.add(Component.translatable("item.aris_random_additions.void_apple.description_0")); + } + + @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(); + VoidApplePlayerFinishesUsingItemProcedure.execute(world, entity); + return retval; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/VoidStarItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/VoidStarItem.java new file mode 100644 index 0000000..e608665 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/VoidStarItem.java @@ -0,0 +1,21 @@ + +package net.mcreator.arisrandomadditions.item; + +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; + +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Item; + +public class VoidStarItem extends Item { + public VoidStarItem() { + super(new Item.Properties().stacksTo(64).fireResistant().rarity(Rarity.EPIC)); + } + + @Override + @OnlyIn(Dist.CLIENT) + public boolean isFoil(ItemStack itemstack) { + return true; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/BedrockApplePlayerFinishesUsingItemProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/BedrockApplePlayerFinishesUsingItemProcedure.java new file mode 100644 index 0000000..b3c3ed3 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/BedrockApplePlayerFinishesUsingItemProcedure.java @@ -0,0 +1,51 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraft.world.scores.criteria.ObjectiveCriteria; +import net.minecraft.world.scores.Scoreboard; +import net.minecraft.world.scores.Objective; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.entity.player.Player; +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.minecraft.network.chat.Component; + +public class BedrockApplePlayerFinishesUsingItemProcedure { + 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.BLINDNESS, 2000, 0, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.DARKNESS, 2000, 0, false, false)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.WITHER, 100, 0, false, false)); + if (entity instanceof Player) { + { + Entity _ent = entity; + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective("PermanentCreativeFlight"); + if (_so == null) + _so = _sc.addObjective("PermanentCreativeFlight", ObjectiveCriteria.DUMMY, Component.literal("PermanentCreativeFlight"), ObjectiveCriteria.RenderType.INTEGER); + _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).setScore(1); + } + if (entity instanceof Player _player) { + _player.getAbilities().mayfly = (new Object() { + public int getScore(String score, Entity _ent) { + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective(score); + if (_so != null) + return _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).getScore(); + return 0; + } + }.getScore("PermanentCreativeFlight", entity) == 1); + _player.onUpdateAbilities(); + } + if (entity instanceof Player _player && !_player.level().isClientSide()) + _player.displayClientMessage(Component.literal("\u00A78Bedrock Apple \u00A7rgranted you Creative Flight!"), false); + } + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/BleedEffectOnEffectActiveTickProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/BleedEffectOnEffectActiveTickProcedure.java index 01c6016..b233dda 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/procedures/BleedEffectOnEffectActiveTickProcedure.java +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/BleedEffectOnEffectActiveTickProcedure.java @@ -20,7 +20,7 @@ public class BleedEffectOnEffectActiveTickProcedure { ArisRandomAdditionsMod.queueServerWork(10, () -> { entity.hurt(new DamageSource(world.registryAccess().registryOrThrow(Registries.DAMAGE_TYPE).getHolderOrThrow(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("aris_random_additions:bleed_damage_type")))), 1); if (world instanceof ServerLevel _level) - _level.sendParticles((SimpleParticleType) (ArisRandomAdditionsModParticleTypes.BLEEDING_PARTICLES.get()), x, (y + 1), z, 3, 0.5, 0.5, 0.5, 0); + _level.sendParticles((SimpleParticleType) (ArisRandomAdditionsModParticleTypes.BLEEDING_PARTICLES.get()), x, (y + 1), z, 3, 0.33, 0.33, 0.33, 0); }); } } diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/GetPermanentStatsCommandProcedureProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/GetPermanentStatsCommandProcedureProcedure.java new file mode 100644 index 0000000..3887846 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/GetPermanentStatsCommandProcedureProcedure.java @@ -0,0 +1,40 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraft.world.scores.Scoreboard; +import net.minecraft.world.scores.Objective; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.Entity; +import net.minecraft.network.chat.Component; + +public class GetPermanentStatsCommandProcedureProcedure { + public static void execute(Entity entity) { + if (entity == null) + return; + if (entity instanceof Player _player && !_player.level().isClientSide()) + _player.displayClientMessage(Component.literal(("Permanent Bonus Max Health: " + (new Object() { + public int getScore(String score, Entity _ent) { + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective(score); + if (_so != null) + return _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).getScore(); + return 0; + } + }.getScore("PermanentBonusMaxHealth", entity)) + "\n" + "Permanent Bonus Attack Damage: " + (new Object() { + public int getScore(String score, Entity _ent) { + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective(score); + if (_so != null) + return _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).getScore(); + return 0; + } + }.getScore("PermanentBonusAttackDamage", entity)) + "\n" + "Permanent Creative Flight: " + (new Object() { + public int getScore(String score, Entity _ent) { + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective(score); + if (_so != null) + return _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).getScore(); + return 0; + } + }.getScore("PermanentCreativeFlight", entity)))), false); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumApplePlayerFinishesUsingItemProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumApplePlayerFinishesUsingItemProcedure.java new file mode 100644 index 0000000..74738cf --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumApplePlayerFinishesUsingItemProcedure.java @@ -0,0 +1,49 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraft.world.scores.criteria.ObjectiveCriteria; +import net.minecraft.world.scores.Scoreboard; +import net.minecraft.world.scores.Objective; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.ai.attributes.Attributes; +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.minecraft.network.chat.Component; + +public class OrichalcumApplePlayerFinishesUsingItemProcedure { + 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.JUMP, 1200, 1, true, true)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 1200, 1, true, true)); + if (entity instanceof LivingEntity _livingEntity4 && _livingEntity4.getAttributes().hasAttribute(Attributes.ATTACK_DAMAGE)) + _livingEntity4.getAttribute(Attributes.ATTACK_DAMAGE) + .setBaseValue(((entity instanceof LivingEntity _livingEntity3 && _livingEntity3.getAttributes().hasAttribute(Attributes.ATTACK_DAMAGE) ? _livingEntity3.getAttribute(Attributes.ATTACK_DAMAGE).getBaseValue() : 0) + 1)); + { + Entity _ent = entity; + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective("PermanentBonusAttackDamage"); + if (_so == null) + _so = _sc.addObjective("PermanentBonusAttackDamage", ObjectiveCriteria.DUMMY, Component.literal("PermanentBonusAttackDamage"), ObjectiveCriteria.RenderType.INTEGER); + _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).setScore((int) (new Object() { + public int getScore(String score, Entity _ent) { + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective(score); + if (_so != null) + return _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).getScore(); + return 0; + } + }.getScore("PermanentBonusAttackDamage", entity) + 1)); + } + if (entity instanceof Player) { + if (entity instanceof Player _player && !_player.level().isClientSide()) + _player.displayClientMessage(Component.literal("\u00A7dOrichalcum Apple \u00A7rgranted you bonus Attack Damage!"), false); + } + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/PlayerRespawnUpdatePermanentAttributeModsProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/PlayerRespawnUpdatePermanentAttributeModsProcedure.java new file mode 100644 index 0000000..716c980 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/PlayerRespawnUpdatePermanentAttributeModsProcedure.java @@ -0,0 +1,73 @@ +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.scores.Scoreboard; +import net.minecraft.world.scores.Objective; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; + +import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; + +import javax.annotation.Nullable; + +@Mod.EventBusSubscriber +public class PlayerRespawnUpdatePermanentAttributeModsProcedure { + @SubscribeEvent + public static void onPlayerRespawned(PlayerEvent.PlayerRespawnEvent 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()) { + ArisRandomAdditionsMod.queueServerWork(4, () -> { + if (entity instanceof LivingEntity _livingEntity3 && _livingEntity3.getAttributes().hasAttribute(Attributes.ATTACK_DAMAGE)) + _livingEntity3.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue( + ((entity instanceof LivingEntity _livingEntity1 && _livingEntity1.getAttributes().hasAttribute(Attributes.ATTACK_DAMAGE) ? _livingEntity1.getAttribute(Attributes.ATTACK_DAMAGE).getBaseValue() : 0) + new Object() { + public int getScore(String score, Entity _ent) { + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective(score); + if (_so != null) + return _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).getScore(); + return 0; + } + }.getScore("PermanentBonusAttackDamage", entity))); + if (entity instanceof LivingEntity _livingEntity6 && _livingEntity6.getAttributes().hasAttribute(Attributes.MAX_HEALTH)) + _livingEntity6.getAttribute(Attributes.MAX_HEALTH) + .setBaseValue(((entity instanceof LivingEntity _livingEntity4 && _livingEntity4.getAttributes().hasAttribute(Attributes.MAX_HEALTH) ? _livingEntity4.getAttribute(Attributes.MAX_HEALTH).getBaseValue() : 0) + new Object() { + public int getScore(String score, Entity _ent) { + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective(score); + if (_so != null) + return _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).getScore(); + return 0; + } + }.getScore("PermanentBonusMaxHealth", entity))); + if (entity instanceof Player _player) { + _player.getAbilities().mayfly = (new Object() { + public int getScore(String score, Entity _ent) { + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective(score); + if (_so != null) + return _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).getScore(); + return 0; + } + }.getScore("PermanentCreativeFlight", entity) == 1); + _player.onUpdateAbilities(); + } + }); + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/VoidApplePlayerFinishesUsingItemProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/VoidApplePlayerFinishesUsingItemProcedure.java new file mode 100644 index 0000000..2214d11 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/VoidApplePlayerFinishesUsingItemProcedure.java @@ -0,0 +1,49 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraft.world.scores.criteria.ObjectiveCriteria; +import net.minecraft.world.scores.Scoreboard; +import net.minecraft.world.scores.Objective; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.ai.attributes.Attributes; +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.minecraft.network.chat.Component; + +public class VoidApplePlayerFinishesUsingItemProcedure { + 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.ABSORPTION, 1600, 2, true, true)); + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(MobEffects.SATURATION, 1600, 2, true, true)); + if (entity instanceof LivingEntity _livingEntity4 && _livingEntity4.getAttributes().hasAttribute(Attributes.MAX_HEALTH)) + _livingEntity4.getAttribute(Attributes.MAX_HEALTH) + .setBaseValue(((entity instanceof LivingEntity _livingEntity3 && _livingEntity3.getAttributes().hasAttribute(Attributes.MAX_HEALTH) ? _livingEntity3.getAttribute(Attributes.MAX_HEALTH).getBaseValue() : 0) + 2)); + { + Entity _ent = entity; + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective("PermanentBonusMaxHealth"); + if (_so == null) + _so = _sc.addObjective("PermanentBonusMaxHealth", ObjectiveCriteria.DUMMY, Component.literal("PermanentBonusMaxHealth"), ObjectiveCriteria.RenderType.INTEGER); + _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).setScore((int) (new Object() { + public int getScore(String score, Entity _ent) { + Scoreboard _sc = _ent.level().getScoreboard(); + Objective _so = _sc.getObjective(score); + if (_so != null) + return _sc.getOrCreatePlayerScore(_ent.getScoreboardName(), _so).getScore(); + return 0; + } + }.getScore("PermanentBonusMaxHealth", entity) + 2)); + } + if (entity instanceof Player) { + if (entity instanceof Player _player && !_player.level().isClientSide()) + _player.displayClientMessage(Component.literal("\u00A75Void Apple \u00A7rgranted you bonus Max Health!"), false); + } + } + } +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index c757ab7..4169893 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -4,7 +4,7 @@ license="MIT License" [[mods]] modId="aris_random_additions" -version="2.1.1" +version="2.1.2" displayName="Ari's Random Additions" displayURL="https://mcreator.net" logoFile="logo.png" diff --git a/src/main/resources/assets/aris_random_additions/blockstates/orichalcum_deepslate_ore.json b/src/main/resources/assets/aris_random_additions/blockstates/orichalcum_deepslate_ore.json new file mode 100644 index 0000000..879bfc5 --- /dev/null +++ b/src/main/resources/assets/aris_random_additions/blockstates/orichalcum_deepslate_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "aris_random_additions:block/orichalcum_deepslate_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/aris_random_additions/lang/en_us.json b/src/main/resources/assets/aris_random_additions/lang/en_us.json index c1a5ae9..ee81fd4 100644 --- a/src/main/resources/assets/aris_random_additions/lang/en_us.json +++ b/src/main/resources/assets/aris_random_additions/lang/en_us.json @@ -6,6 +6,7 @@ "block.nims_random_bullshit.magma_brick_button": "Magma Brick Button", "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.broken_glass": "Broken Glass", "item.aris_random_additions.ghoul_spawn_egg": "Ghoul Spawn Egg", "item.aris_random_additions.endite_armor_boots": "Endite Boots", @@ -31,8 +32,8 @@ "block.aris_random_additions.hexa_condensed_netherrack": "Hexa-condensed Netherrack", "item.aris_random_additions.bedrock_sword": "Bedrock Sword", "item.aris_random_additions.orichalcum_hoe": "Orichalcum Hoe", - "block.aris_random_additions.endite_block": "Block of Endite", "item.aris_random_additions.wand_of_draining": "Wand Of Draining", + "block.aris_random_additions.endite_block": "Block of Endite", "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", @@ -40,8 +41,8 @@ "item.aris_random_additions.power_star": "Power Star", "enchantment.nims_random_bullshit.ruining_enchantment": "Ruining", "advancements.endite_advancement.descr": "Obtain Endite", - "advancements.netherrack_juice_advancement.descr": "Obtain Netherrack Juice", "block.nims_random_bullshit.condensed_condensed_netherrack": "Condensed Condensed Netherrack", + "advancements.netherrack_juice_advancement.descr": "Obtain Netherrack Juice", "block.nims_random_bullshit.quadra_condensed_netherrack": "Quadra-condensed Netherrack", "advancements.orichalcum_katana_advancement.descr": "Obtain an Orichalcum Katana", "gui.nims_random_bullshit.bedrockifier_gui.button_empty": "-\u003e", @@ -54,6 +55,7 @@ "item.nims_random_bullshit.golden_berries": "Golden Berries", "item.nims_random_bullshit.netherrack_juice_bucket": "Netherrack Juice Bucket", "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", "item.nims_random_bullshit.pocket_lightning.description_0": "Spawns lightning wherever it lands.", "advancements.turd_advancement.title": "Crap!", @@ -66,6 +68,7 @@ "block.nims_random_bullshit.condensed_netherrack": "Condensed Netherrack", "block.aris_random_additions.magma_brick_stairs": "Magma Brick 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", "block.aris_random_additions.redstone_brick_stairs": "Redstone Brick Stairs", "item.aris_random_additions.orichalcum_shovel": "Orichalcum Shovel", @@ -123,6 +126,7 @@ "entity.nims_random_bullshit.ghoul": "Ghoul", "enchantment.aris_random_additions.life_mending_enchantment": "Life Mending", "block.aris_random_additions.redstone_brick_slabs": "Redstone Brick Slab", + "item.aris_random_additions.orichalcum_apple": "Orichalcum Apple", "advancements.star_advancement.descr": "Obtain a Star", "item.nims_random_bullshit.bedrock_pickaxe": "Bedrock Pickaxe", "item.aris_random_additions.endite_armor_chestplate.description_0": "Set Bonus: Resistance, Regeneration, Strength", @@ -130,7 +134,7 @@ "advancements.bedrock_shard_advancement.descr": "Obtain Bedrock Shard", "block.aris_random_additions.quadra_condensed_netherrack": "Quadra-condensed Netherrack", "item.aris_random_additions.orichalcum_katana": "Orichalcum Katana", - "item.aris_random_additions.orichalcum_armor_boots": "Orichalcum Boots", + "item.aris_random_additions.orichalcum_armor_boots": "Orichalcum Heels", "item.aris_random_additions.endite_upgrade_smithing_template": "Endite Upgrade Template", "item.aris_random_additions.bedrock_eater": "Bedrock Eater", "advancements.orichalcum_advancement.descr": "Obtain Orichalcum", @@ -139,6 +143,7 @@ "item.aris_random_additions.orichalcum_armor_leggings": "Orichalcum Leggings", "item.aris_random_additions.iron_golem_question_mark": "Iron Golem...?", "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", @@ -172,6 +177,7 @@ "item.nims_random_bullshit.orichalcum": "Orichalcum", "item.aris_random_additions.orichalcum_armor_leggings.description_0": "Set Bonus: Speed, Jump Boost", "advancements.magic_egg_advancement.descr": "Obtain a Magic Egg", + "item.aris_random_additions.orichalcum_apple.description_0": "When consumed: Grants 1 permanent bonus attack damage.", "advancements.endite_advancement.title": "Purple Butter", "entity.aris_random_additions.ari": "Ari", "item.nims_random_bullshit.night_vision_goggles_helmet": "Night Vision Goggles", @@ -181,8 +187,10 @@ "item.aris_random_additions.endite_hoe": "Endite Hoe", "block.aris_random_additions.rave_block": "Rave Block", "advancements.orichalcum_set_advancement.title": "Cover Me In Folly Red", + "item.aris_random_additions.bedrock_apple": "Bedrock Apple", "gui.nims_random_bullshit.ore_miner_gui.button_mine": "Mine", "item.aris_random_additions.endite_scythe": "Endite Scythe", + "item.aris_random_additions.void_apple.description_0": "When consumed: Grants 2 permanent bonus max health.", "advancements.star_advancement.title": "A Star Meant To Be", "effect.aris_random_additions.bleed_effect": "Bleeding", "painting.nims_random_bullshit.shit_painting.author": "nim", diff --git a/src/main/resources/assets/aris_random_additions/models/block/orichalcum_block.json b/src/main/resources/assets/aris_random_additions/models/block/orichalcum_block.json index 95ab2fa..669aa2d 100644 --- a/src/main/resources/assets/aris_random_additions/models/block/orichalcum_block.json +++ b/src/main/resources/assets/aris_random_additions/models/block/orichalcum_block.json @@ -1,8 +1,8 @@ { "parent": "block/cube_all", "textures": { - "all": "aris_random_additions:block/orichalcum_ore_block", - "particle": "aris_random_additions:block/orichalcum_ore_block" + "all": "aris_random_additions:block/orichalcum_block", + "particle": "aris_random_additions:block/orichalcum_block" }, "render_type": "solid" } \ No newline at end of file diff --git a/src/main/resources/assets/aris_random_additions/models/block/orichalcum_deepslate_ore.json b/src/main/resources/assets/aris_random_additions/models/block/orichalcum_deepslate_ore.json new file mode 100644 index 0000000..9a523f1 --- /dev/null +++ b/src/main/resources/assets/aris_random_additions/models/block/orichalcum_deepslate_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "aris_random_additions:block/orichalcum_deeplsate_ore", + "particle": "aris_random_additions:block/orichalcum_deeplsate_ore" + }, + "render_type": "solid" +} \ No newline at end of file diff --git a/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_block.png b/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_block.png new file mode 100644 index 0000000..d576635 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_block.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_deeplsate_ore.png b/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_deeplsate_ore.png new file mode 100644 index 0000000..e9340c8 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_deeplsate_ore.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_ore.png b/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_ore.png index 480792b..0b91872 100644 Binary files a/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_ore.png and b/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_ore.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_ore_block.png b/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_ore_block.png deleted file mode 100644 index 6394c16..0000000 Binary files a/src/main/resources/assets/aris_random_additions/textures/block/orichalcum_ore_block.png and /dev/null differ diff --git a/src/main/resources/assets/aris_random_additions/textures/entities/ari.png b/src/main/resources/assets/aris_random_additions/textures/entities/ari.png index 5d990ed..2d97ebd 100644 Binary files a/src/main/resources/assets/aris_random_additions/textures/entities/ari.png and b/src/main/resources/assets/aris_random_additions/textures/entities/ari.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/bedrock_apple.png b/src/main/resources/assets/aris_random_additions/textures/item/bedrock_apple.png new file mode 100644 index 0000000..c7e3c76 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/bedrock_apple.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/endite_body.png b/src/main/resources/assets/aris_random_additions/textures/item/endite_body.png deleted file mode 100644 index 771cd3d..0000000 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/endite_body.png and /dev/null differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/endite_boots.png b/src/main/resources/assets/aris_random_additions/textures/item/endite_boots.png index d5c086f..7e42f0b 100644 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/endite_boots.png and b/src/main/resources/assets/aris_random_additions/textures/item/endite_boots.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/endite_chestplate.png b/src/main/resources/assets/aris_random_additions/textures/item/endite_chestplate.png new file mode 100644 index 0000000..b93a032 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/endite_chestplate.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/endite_head.png b/src/main/resources/assets/aris_random_additions/textures/item/endite_head.png deleted file mode 100644 index effba86..0000000 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/endite_head.png and /dev/null differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/endite_helmet.png b/src/main/resources/assets/aris_random_additions/textures/item/endite_helmet.png new file mode 100644 index 0000000..51adb75 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/endite_helmet.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/endite_leggings.png b/src/main/resources/assets/aris_random_additions/textures/item/endite_leggings.png index 48a66af..d093359 100644 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/endite_leggings.png and b/src/main/resources/assets/aris_random_additions/textures/item/endite_leggings.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum.png new file mode 100644 index 0000000..cdcf8cc Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_apple.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_apple.png new file mode 100644 index 0000000..7b5069e Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_apple.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_axe.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_axe.png index 4f8077e..964a533 100644 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_axe.png and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_axe.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_body.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_body.png deleted file mode 100644 index 078fc05..0000000 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_body.png and /dev/null differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_boots.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_boots.png deleted file mode 100644 index bc3acf1..0000000 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_boots.png and /dev/null differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_chestplate.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_chestplate.png new file mode 100644 index 0000000..59f1d4b Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_chestplate.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_gem.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_gem.png deleted file mode 100644 index 7bb5a4b..0000000 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_gem.png and /dev/null differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_head.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_head.png deleted file mode 100644 index eb18b85..0000000 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_head.png and /dev/null differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_heels.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_heels.png new file mode 100644 index 0000000..52f3df9 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_heels.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_helmat.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_helmat.png new file mode 100644 index 0000000..15f43e7 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_helmat.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_hoe.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_hoe.png index 6a366a2..1e8b4da 100644 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_hoe.png and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_hoe.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_leggings.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_leggings.png index 951312c..b64802e 100644 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_leggings.png and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_leggings.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_pickaxe.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_pickaxe.png index 4f7be70..da7e594 100644 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_pickaxe.png and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_pickaxe.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_shovel.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_shovel.png index 1730779..404b685 100644 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_shovel.png and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_shovel.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_sword.png b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_sword.png index 372d5b0..53ac0be 100644 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_sword.png and b/src/main/resources/assets/aris_random_additions/textures/item/orichalcum_sword.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/void_apple.png b/src/main/resources/assets/aris_random_additions/textures/item/void_apple.png new file mode 100644 index 0000000..c0dd5ff Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/void_apple.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/void_star.png b/src/main/resources/assets/aris_random_additions/textures/item/void_star.png new file mode 100644 index 0000000..b7be33c Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/void_star.png differ diff --git a/src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_deepslate_feature_biome_modifier.json b/src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_deepslate_feature_biome_modifier.json new file mode 100644 index 0000000..527540b --- /dev/null +++ b/src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_deepslate_feature_biome_modifier.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#minecraft:is_overworld", + "features": "aris_random_additions:orichalcum_deepslate_feature", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_deepslate_ore_biome_modifier.json b/src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_deepslate_ore_biome_modifier.json new file mode 100644 index 0000000..46b67d0 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/forge/biome_modifier/orichalcum_deepslate_ore_biome_modifier.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#is_overworld", + "features": "aris_random_additions:orichalcum_deepslate_ore", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/loot_tables/blocks/orichalcum_deepslate_ore.json b/src/main/resources/data/aris_random_additions/loot_tables/blocks/orichalcum_deepslate_ore.json new file mode 100644 index 0000000..171fff5 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/loot_tables/blocks/orichalcum_deepslate_ore.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "random_sequence": "aris_random_additions:blocks/orichalcum_deepslate_ore", + "pools": [ + { + "rolls": 1.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "aris_random_additions:orichalcum" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/loot_tables/entities/ari.json b/src/main/resources/data/aris_random_additions/loot_tables/entities/ari.json new file mode 100644 index 0000000..6303cd2 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/loot_tables/entities/ari.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "aris_random_additions:orichalcum", + "weight": 16, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:air", + "weight": 300, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "aris_random_additions:entities/ari" +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/recipes/bedrock_apple_recipe.json b/src/main/resources/data/aris_random_additions/recipes/bedrock_apple_recipe.json new file mode 100644 index 0000000..708ef13 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/recipes/bedrock_apple_recipe.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "minecraft:bedrock" + }, + "b": { + "item": "minecraft:enchanted_golden_apple" + } + }, + "result": { + "item": "aris_random_additions:bedrock_apple", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/recipes/endite_ingot_recipe.json b/src/main/resources/data/aris_random_additions/recipes/endite_ingot_recipe.json index 06000f6..f8384c6 100644 --- a/src/main/resources/data/aris_random_additions/recipes/endite_ingot_recipe.json +++ b/src/main/resources/data/aris_random_additions/recipes/endite_ingot_recipe.json @@ -1,7 +1,7 @@ { "type": "minecraft:smithing_transform", "template": { - "item": "aris_random_additions:power_star" + "item": "aris_random_additions:void_star" }, "base": { "item": "minecraft:netherite_ingot" diff --git a/src/main/resources/data/aris_random_additions/recipes/endite_upgrade_smithing_template_recipe_2.json b/src/main/resources/data/aris_random_additions/recipes/endite_upgrade_smithing_template_recipe_2.json new file mode 100644 index 0000000..48292b1 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/recipes/endite_upgrade_smithing_template_recipe_2.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aba", + "aca", + "aaa" + ], + "key": { + "a": { + "item": "aris_random_additions:orichalcum" + }, + "b": { + "item": "aris_random_additions:endite_upgrade_smithing_template" + }, + "c": { + "item": "aris_random_additions:chorus_eye" + } + }, + "result": { + "item": "aris_random_additions:endite_upgrade_smithing_template", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/recipes/notch_apple_recipe.json b/src/main/resources/data/aris_random_additions/recipes/notch_apple_recipe.json new file mode 100644 index 0000000..827c936 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/recipes/notch_apple_recipe.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smithing_transform", + "template": { + "item": "minecraft:gold_block" + }, + "base": { + "item": "minecraft:golden_apple" + }, + "addition": { + "item": "minecraft:nether_star" + }, + "result": { + "item": "minecraft:enchanted_golden_apple" + } +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/recipes/orichalcum_apple_recipe.json b/src/main/resources/data/aris_random_additions/recipes/orichalcum_apple_recipe.json new file mode 100644 index 0000000..a1c59b0 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/recipes/orichalcum_apple_recipe.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smithing_transform", + "template": { + "item": "aris_random_additions:orichalcum_block" + }, + "base": { + "item": "minecraft:enchanted_golden_apple" + }, + "addition": { + "item": "aris_random_additions:power_star" + }, + "result": { + "item": "aris_random_additions:orichalcum_apple" + } +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/recipes/void_apple_recipe.json b/src/main/resources/data/aris_random_additions/recipes/void_apple_recipe.json new file mode 100644 index 0000000..6ba2ac4 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/recipes/void_apple_recipe.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smithing_transform", + "template": { + "item": "aris_random_additions:endite_upgrade_smithing_template" + }, + "base": { + "item": "minecraft:enchanted_golden_apple" + }, + "addition": { + "item": "aris_random_additions:void_star" + }, + "result": { + "item": "aris_random_additions:void_apple" + } +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/recipes/void_star_recipe.json b/src/main/resources/data/aris_random_additions/recipes/void_star_recipe.json new file mode 100644 index 0000000..4a00765 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/recipes/void_star_recipe.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smithing_transform", + "template": { + "item": "aris_random_additions:endite_upgrade_smithing_template" + }, + "base": { + "item": "aris_random_additions:power_star" + }, + "addition": { + "item": "aris_random_additions:chorus_eye" + }, + "result": { + "item": "aris_random_additions:void_star" + } +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_deepslate_feature.json b/src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_deepslate_feature.json new file mode 100644 index 0000000..6ee245e --- /dev/null +++ b/src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_deepslate_feature.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:scattered_ore", + "config": { + "size": 3, + "discard_chance_on_air_exposure": 0, + "targets": [ + { + "target": { + "predicate_type": "block_match", + "block": "minecraft:deepslate" + }, + "state": { + "Name": "aris_random_additions:orichalcum_deepslate_ore" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_deepslate_ore.json b/src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_deepslate_ore.json new file mode 100644 index 0000000..ab1c47b --- /dev/null +++ b/src/main/resources/data/aris_random_additions/worldgen/configured_feature/orichalcum_deepslate_ore.json @@ -0,0 +1,32 @@ +{ + "type": "minecraft:ore", + "config": { + "size": 2, + "discard_chance_on_air_exposure": 0, + "targets": [ + { + "target": { + "predicate_type": "tag_match", + "tag": "forge:stone" + }, + "state": { + "Name": "aris_random_additions:orichalcum_deepslate_ore" + } + }, + { + "target": { + "predicate_type": "blockstate_match", + "block_state": { + "Name": "minecraft:deepslate", + "Properties": { + "axis": "y" + } + } + }, + "state": { + "Name": "aris_random_additions:orichalcum_deepslate_ore" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_deepslate_feature.json b/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_deepslate_feature.json new file mode 100644 index 0000000..2a8e0ab --- /dev/null +++ b/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_deepslate_feature.json @@ -0,0 +1,17 @@ +{ + "feature": "aris_random_additions:orichalcum_deepslate_feature", + "placement": [ + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": -64 + }, + "max_inclusive": { + "absolute": 8 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_deepslate_ore.json b/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_deepslate_ore.json new file mode 100644 index 0000000..862cd28 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_deepslate_ore.json @@ -0,0 +1,27 @@ +{ + "feature": "aris_random_additions:orichalcum_deepslate_ore", + "placement": [ + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": -64 + }, + "max_inclusive": { + "absolute": 8 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_feature.json b/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_feature.json index 67e334b..2f0b550 100644 --- a/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_feature.json +++ b/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_feature.json @@ -6,10 +6,10 @@ "height": { "type": "minecraft:uniform", "min_inclusive": { - "absolute": -6 + "absolute": 8 }, "max_inclusive": { - "absolute": 6 + "absolute": 26 } } } diff --git a/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_ore.json b/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_ore.json index a4f5ece..46d9605 100644 --- a/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_ore.json +++ b/src/main/resources/data/aris_random_additions/worldgen/placed_feature/orichalcum_ore.json @@ -13,10 +13,10 @@ "height": { "type": "minecraft:uniform", "min_inclusive": { - "absolute": -6 + "absolute": 8 }, "max_inclusive": { - "absolute": 6 + "absolute": 26 } } }, diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 1edbdda..337f657 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "aris_random_additions:orichalcum_deepslate_ore", "aris_random_additions:endite_block", "aris_random_additions:orichalcum_block", "aris_random_additions:orichalcum_ore", diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json index 162973b..1f776a4 100644 --- a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "aris_random_additions:orichalcum_deepslate_ore", "aris_random_additions:endite_block", "aris_random_additions:orichalcum_block", "aris_random_additions:orichalcum_ore",