diff --git a/aris_random_additions.mcreator b/aris_random_additions.mcreator index bdeeb01..80c7623 100644 --- a/aris_random_additions.mcreator +++ b/aris_random_additions.mcreator @@ -206,7 +206,7 @@ "src/main/java/net/mcreator/arisrandomadditions/enchantment/PassiveIncomeEnchantmentEnchantment.java" ] }, - "path": "~/Other" + "path": "~/Enchantments" }, { "name": "PassiveIncomeProcedure", @@ -229,7 +229,7 @@ } ] }, - "path": "~/Other" + "path": "~/Enchantments" }, { "name": "BrokenGlass", @@ -3413,7 +3413,7 @@ "src/main/java/net/mcreator/arisrandomadditions/enchantment/RuiningEnchantmentEnchantment.java" ] }, - "path": "~/Other" + "path": "~/Enchantments" }, { "name": "RuiningProcedure", @@ -3444,7 +3444,7 @@ } ] }, - "path": "~/Other" + "path": "~/Enchantments" }, { "name": "SunderingEnchantment", @@ -3457,7 +3457,7 @@ "src/main/java/net/mcreator/arisrandomadditions/enchantment/SunderingEnchantmentEnchantment.java" ] }, - "path": "~/Other" + "path": "~/Enchantments" }, { "name": "SunderingProcedure", @@ -3488,7 +3488,7 @@ } ] }, - "path": "~/Other" + "path": "~/Enchantments" }, { "name": "NightVisionGoggles", @@ -3813,7 +3813,7 @@ "src/main/java/net/mcreator/arisrandomadditions/enchantment/LifeMendingEnchantmentEnchantment.java" ] }, - "path": "~/Other" + "path": "~/Enchantments" }, { "name": "LifeMendingProcedure", @@ -3836,7 +3836,7 @@ } ] }, - "path": "~/Other" + "path": "~/Enchantments" }, { "name": "WandOfDraining", @@ -3976,7 +3976,7 @@ "src/main/java/net/mcreator/arisrandomadditions/enchantment/SweetBladeEnchantmentEnchantment.java" ] }, - "path": "~/Other" + "path": "~/Enchantments" }, { "name": "SweetBladeProcedure", @@ -4011,7 +4011,7 @@ } ] }, - "path": "~/Other" + "path": "~/Enchantments" }, { "name": "EnditeIngot", @@ -4584,6 +4584,219 @@ ] }, "path": "~/Advancements" + }, + { + "name": "OrichalcumKatana", + "type": "tool", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_katana", + "metadata": { + "files": [ + "src/main/resources/assets/aris_random_additions/models/item/orichalcum_katana.json", + "src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumKatanaItem.java" + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "BleedDamageType", + "type": "damagetype", + "compiles": true, + "locked_code": false, + "registry_name": "bleed_damage_type", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/damage_type/bleed_damage_type.json" + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "BleedEffect", + "type": "potioneffect", + "compiles": true, + "locked_code": false, + "registry_name": "bleed_effect", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/potion/BleedEffectMobEffect.java" + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "BleedingParticles", + "type": "particle", + "compiles": true, + "locked_code": false, + "registry_name": "bleeding_particles", + "metadata": { + "files": [ + "src/main/resources/assets/aris_random_additions/particles/bleeding_particles.json", + "src/main/java/net/mcreator/arisrandomadditions/client/particle/BleedingParticlesParticle.java" + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "BleedEffectOnEffectActiveTick", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "bleed_effect_on_effect_active_tick", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/BleedEffectOnEffectActiveTickProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "x", + "type": "number" + }, + { + "name": "y", + "type": "number" + }, + { + "name": "z", + "type": "number" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "OrichalcumKatanaLivingEntityIsHitWithTool", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_katana_living_entity_is_hit_with_tool", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaLivingEntityIsHitWithToolProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "itemstack", + "type": "itemstack" + }, + { + "name": "x", + "type": "number" + }, + { + "name": "y", + "type": "number" + }, + { + "name": "z", + "type": "number" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "OrichalcumKatanaRightclicked", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_katana_rightclicked", + "metadata": { + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaRightclickedProcedure.java" + ], + "dependencies": [ + { + "name": "entity", + "type": "entity" + }, + { + "name": "itemstack", + "type": "itemstack" + }, + { + "name": "x", + "type": "number" + }, + { + "name": "y", + "type": "number" + }, + { + "name": "z", + "type": "number" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "OrichalcumKatanaHasItemGlowingEffect", + "type": "procedure", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_katana_has_item_glowing_effect", + "metadata": { + "return_type": "logic", + "files": [ + "src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaHasItemGlowingEffectProcedure.java" + ], + "dependencies": [ + { + "name": "itemstack", + "type": "itemstack" + } + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "OrichalcumKatanaRecipe", + "type": "recipe", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_katana_recipe", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/recipes/orichalcum_katana_recipe.json" + ] + }, + "path": "~/Orichalcum" + }, + { + "name": "OrichalcumKatanaAdvancement", + "type": "achievement", + "compiles": true, + "locked_code": false, + "registry_name": "orichalcum_katana_advancement", + "metadata": { + "files": [ + "src/main/resources/data/aris_random_additions/advancements/orichalcum_katana_advancement.json" + ] + }, + "path": "~/Advancements" } ], "variable_elements": [], @@ -4658,6 +4871,7 @@ "CUSTOM:MagicFlesh" ], "ITEMS:minecraft:swords": [ + "~CUSTOM:OrichalcumKatana", "~CUSTOM:EnditeSword", "~CUSTOM:OrichalcumSword", "~CUSTOM:BedrockSword" @@ -4694,8 +4908,8 @@ "item.aris_random_additions.endite_armor_boots": "Endite Boots", "gui.aris_random_additions.turd_gui.label_uh_ohh_stinky": "UH OHH!!! STINKY!!! UH OHH!!! STINKY!!! UH OHH!!! STINKY!!! UH OHH!!! STINKY!!! ", "item.aris_random_additions.bedrock_shard": "Bedrock Shard", - "item.aris_random_additions.bedrock_upgrade_template": "Bedrock Upgrade Template", "advancements.grave_digger_advancement.title": "We Must Dig!", + "item.aris_random_additions.bedrock_upgrade_template": "Bedrock Upgrade Template", "item.aris_random_additions.endite_ingot": "Endite", "block.nims_random_bullshit.orichalcum_block": "Block of Orichalcum", "block.nims_random_bullshit.rubber_slab": "Rubber Slab", @@ -4726,6 +4940,7 @@ "advancements.netherrack_juice_advancement.descr": "Obtain Netherrack Juice", "block.nims_random_bullshit.condensed_condensed_netherrack": "Condensed Condensed Netherrack", "block.nims_random_bullshit.quadra_condensed_netherrack": "Quadra-condensed Netherrack", + "advancements.orichalcum_katana_advancement.descr": "Obtain an Orichalcum Katana", "gui.nims_random_bullshit.bedrockifier_gui.button_empty": "-\u003e", "block.nims_random_bullshit.hexa_condensed_netherrack": "Hexa-condensed Netherrack", "enchantment.nims_random_bullshit.sundering_enchantment": "Sundering", @@ -4771,6 +4986,7 @@ "item.nims_random_bullshit.tux_spawn_egg": "Tux Spawn Egg", "gui.nims_random_bullshit.mailbox_gui.label_x": "X:", "item.nims_random_bullshit.orichalcum_armor_helmet": "Orichalcum Helmet", + "death.attack.bleed_damage_type.item": "%1$s was bled to death by %2$s using %3$s", "block.aris_random_additions.magma_bricks": "Magma Bricks", "item.aris_random_additions.endite_axe": "Endite Axe", "item.nims_random_bullshit.snow_golem_question_mark": "Snow Golem...?", @@ -4791,6 +5007,7 @@ "item.aris_random_additions.netherrack_juice_bucket": "Netherrack Juice Bucket", "item.nims_random_bullshit.netherrackite_pickaxe.description_0": "Non-condensed netherracks broken by this pickaxe drop themselves an additional time.", "effect.nims_random_bullshit.stinky_effect": "Stinky", + "death.attack.bleed_damage_type": "%1$s bled to death", "advancements.tux_advancement.descr": "Obtain a Tux Spawn Egg", "item.aris_random_additions.gravedigger": "Gravedigger", "item.aris_random_additions.orichalcum": "Orichalcum", @@ -4809,6 +5026,7 @@ "block.nims_random_bullshit.magma_brick_stairs": "Magma Brick Stairs", "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.endite_upgrade_smithing_template": "Endite Upgrade Template", "item.aris_random_additions.bedrock_eater": "Bedrock Eater", @@ -4825,6 +5043,7 @@ "enchantment.aris_random_additions.ruining_enchantment": "Ruining", "block.aris_random_additions.ore_miner": "Ore Miner", "block.aris_random_additions.condensed_netherrack": "Condensed Netherrack", + "item.aris_random_additions.orichalcum_katana.description_0": "Right-Click: empower the blade, making your next attack cause bleeding DoT effect to the target for a duration.", "block.nims_random_bullshit.redstone_bricks": "Redstone Bricks", "item.nims_random_bullshit.iron_golem_question_mark": "Iron Golem...?", "item.aris_random_additions.golden_berries": "Golden Berries", @@ -4837,6 +5056,7 @@ "item.nims_random_bullshit.gravedigger": "Gravedigger", "item.aris_random_additions.pocket_lightning": "Pocket Lightning", "item.aris_random_additions.night_vision_goggles_helmet": "Night Vision Goggles", + "advancements.orichalcum_katana_advancement.title": "As Fierce As The Color", "item.aris_random_additions.cheese": "Cheese", "item.aris_random_additions.orichalcum_sword": "Orichalcum Sword", "item.aris_random_additions.wand_of_resizing.description_0": "DISCLAIMER: Does not work with Origins that periodically reset your scale!", @@ -4861,11 +5081,13 @@ "gui.nims_random_bullshit.ore_miner_gui.button_mine": "Mine", "item.aris_random_additions.endite_scythe": "Endite Scythe", "advancements.star_advancement.title": "A Star Meant To Be", + "effect.aris_random_additions.bleed_effect": "Bleeding", "painting.nims_random_bullshit.shit_painting.author": "nim", "gui.nims_random_bullshit.mailbox_gui.outbox_x_coord": "0", "block.nims_random_bullshit.rubber_fence": "Rubber Fence", "advancements.turd_advancement.descr": "Turd", "advancements.condensed_netherrack_advancement.title": "Rackin\u0027 Em Up!", + "death.attack.bleed_damage_type.player": "%1$s bled to death whilst trying to escape %2$s", "item.aris_random_additions.magic_flesh": "Magic Flesh", "item.aris_random_additions.black_iron_ingot": "Black Iron Ingot", "item.aris_random_additions.endite_armor_helmet": "Endite Helmet", @@ -4992,13 +5214,17 @@ { "name": "Endite", "children": [] + }, + { + "name": "Enchantments", + "children": [] } ] }, "workspaceSettings": { "modid": "aris_random_additions", "modName": "Ari\u0027s Random Additions", - "version": "2.1.0", + "version": "2.1.1", "description": "Random Additions by Ari. Created with MCreator.", "author": "nimsolated, MCreator", "websiteURL": "https://mcreator.net", diff --git a/elements/BleedDamageType.mod.json b/elements/BleedDamageType.mod.json new file mode 100644 index 0000000..498061e --- /dev/null +++ b/elements/BleedDamageType.mod.json @@ -0,0 +1,12 @@ +{ + "_fv": 73, + "_type": "damagetype", + "definition": { + "exhaustion": 0.1, + "scaling": "never", + "effects": "hurt", + "normalDeathMessage": "%1$s bled to death", + "itemDeathMessage": "%1$s was bled to death by %2$s using %3$s", + "playerDeathMessage": "%1$s bled to death whilst trying to escape %2$s" + } +} \ No newline at end of file diff --git a/elements/BleedEffect.mod.json b/elements/BleedEffect.mod.json new file mode 100644 index 0000000..e488739 --- /dev/null +++ b/elements/BleedEffect.mod.json @@ -0,0 +1,23 @@ +{ + "_fv": 73, + "_type": "potioneffect", + "definition": { + "effectName": "Bleeding", + "icon": "bleed", + "color": { + "value": -65536, + "falpha": 0.0 + }, + "isInstant": false, + "mobEffectCategory": "HARMFUL", + "renderStatusInInventory": true, + "renderStatusInHUD": true, + "isCuredByMilk": false, + "isProtectedByTotem": true, + "isCuredbyHoney": false, + "modifiers": [], + "onActiveTick": { + "name": "BleedEffectOnEffectActiveTick" + } + } +} \ No newline at end of file diff --git a/elements/BleedEffectOnEffectActiveTick.mod.json b/elements/BleedEffectOnEffectActiveTick.mod.json new file mode 100644 index 0000000..8e8b786 --- /dev/null +++ b/elements/BleedEffectOnEffectActiveTick.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_trigger101CUSTOM:BleedDamageTypeCUSTOM:BleedingParticles3ADD10.50.50.50" + } +} \ No newline at end of file diff --git a/elements/BleedingParticles.mod.json b/elements/BleedingParticles.mod.json new file mode 100644 index 0000000..e2e0b18 --- /dev/null +++ b/elements/BleedingParticles.mod.json @@ -0,0 +1,23 @@ +{ + "_fv": 73, + "_type": "particle", + "definition": { + "texture": "bleed", + "animate": false, + "frameDuration": 1, + "width": 0.2, + "height": 0.2, + "scale": { + "fixedValue": 1.0 + }, + "speedFactor": 0.0, + "gravity": 0.5, + "maxAge": 9, + "maxAgeDiff": 0, + "angularVelocity": 0.0, + "angularAcceleration": 0.0, + "canCollide": true, + "alwaysShow": false, + "renderType": "OPAQUE" + } +} \ No newline at end of file diff --git a/elements/EnditeScythe.mod.json b/elements/EnditeScythe.mod.json index f21aac7..010fa26 100644 --- a/elements/EnditeScythe.mod.json +++ b/elements/EnditeScythe.mod.json @@ -30,7 +30,11 @@ "glowCondition": { "fixedValue": false }, - "repairItems": [], + "repairItems": [ + { + "value": "CUSTOM:EnditeIngot" + } + ], "immuneToFire": true, "blockDropsTier": "NETHERITE", "blocksAffected": [], diff --git a/elements/OrichalcumKatana.mod.json b/elements/OrichalcumKatana.mod.json new file mode 100644 index 0000000..027332e --- /dev/null +++ b/elements/OrichalcumKatana.mod.json @@ -0,0 +1,48 @@ +{ + "_fv": 73, + "_type": "tool", + "definition": { + "toolType": "Sword", + "renderType": 1, + "blockingRenderType": 0, + "texture": "fui3yrci82rvvussfiy99rur112f32jxj28", + "customModelName": "orichalcum_katana:default", + "blockingModelName": "Normal blocking", + "name": "Orichalcum Katana", + "specialInformation": { + "fixedValue": [ + "Right-Click: empower the blade, making your next attack cause bleeding DoT effect to the target for a duration." + ] + }, + "creativeTabs": [ + { + "value": "COMBAT" + } + ], + "efficiency": 12.0, + "attackSpeed": 1.9, + "enchantability": 22, + "damageVsEntity": 9.0, + "usageCount": 2032, + "glowCondition": { + "fixedValue": false, + "name": "OrichalcumKatanaHasItemGlowingEffect" + }, + "repairItems": [ + { + "value": "CUSTOM:Orichalcum" + } + ], + "immuneToFire": true, + "blockDropsTier": "DIAMOND", + "blocksAffected": [], + "stayInGridWhenCrafting": false, + "damageOnCrafting": false, + "onRightClickedInAir": { + "name": "OrichalcumKatanaRightclicked" + }, + "onEntityHitWith": { + "name": "OrichalcumKatanaLivingEntityIsHitWithTool" + } + } +} \ No newline at end of file diff --git a/elements/OrichalcumKatanaAdvancement.mod.json b/elements/OrichalcumKatanaAdvancement.mod.json new file mode 100644 index 0000000..26bc20b --- /dev/null +++ b/elements/OrichalcumKatanaAdvancement.mod.json @@ -0,0 +1,24 @@ +{ + "_fv": 73, + "_type": "achievement", + "definition": { + "achievementName": "As Fierce As The Color", + "achievementDescription": "Obtain an Orichalcum Katana", + "achievementIcon": { + "value": "CUSTOM:OrichalcumKatana" + }, + "background": "Default", + "disableDisplay": false, + "showPopup": true, + "announceToChat": true, + "hideIfNotCompleted": false, + "rewardLoot": [], + "rewardRecipes": [], + "rewardXP": 0, + "achievementType": "challenge", + "parent": { + "value": "CUSTOM:OrichalcumAdvancement" + }, + "triggerxml": "164CUSTOM:OrichalcumKatana" + } +} \ No newline at end of file diff --git a/elements/OrichalcumKatanaHasItemGlowingEffect.mod.json b/elements/OrichalcumKatanaHasItemGlowingEffect.mod.json new file mode 100644 index 0000000..cac5708 --- /dev/null +++ b/elements/OrichalcumKatanaHasItemGlowingEffect.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerEQnextAttackBleedsTRUETRUEFALSE" + } +} \ No newline at end of file diff --git a/elements/OrichalcumKatanaLivingEntityIsHitWithTool.mod.json b/elements/OrichalcumKatanaLivingEntityIsHitWithTool.mod.json new file mode 100644 index 0000000..aabccb0 --- /dev/null +++ b/elements/OrichalcumKatanaLivingEntityIsHitWithTool.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerANDEQnextAttackBleedsTRUEnextAttackBleedsFALSEblock.amethyst_block.hitplayer0.661.36CUSTOM:BleedEffect0100FALSEFALSE30" + } +} \ No newline at end of file diff --git a/elements/OrichalcumKatanaRecipe.mod.json b/elements/OrichalcumKatanaRecipe.mod.json new file mode 100644 index 0000000..467c0e6 --- /dev/null +++ b/elements/OrichalcumKatanaRecipe.mod.json @@ -0,0 +1,48 @@ +{ + "_fv": 73, + "_type": "recipe", + "definition": { + "recipeType": "Crafting", + "recipeRetstackSize": 1, + "group": "", + "cookingBookCategory": "MISC", + "xpReward": 0.0, + "cookingTime": 200, + "craftingBookCategory": "MISC", + "recipeShapeless": false, + "recipeSlots": [ + { + "value": "" + }, + { + "value": "CUSTOM:OrichalcumSword" + }, + { + "value": "" + }, + { + "value": "" + }, + { + "value": "CUSTOM:PowerStar" + }, + { + "value": "" + }, + { + "value": "" + }, + { + "value": "Items.STICK" + }, + { + "value": "" + } + ], + "recipeReturnStack": { + "value": "CUSTOM:OrichalcumKatana" + }, + "name": "orichalcum_katana_recipe", + "namespace": "mod" + } +} \ No newline at end of file diff --git a/elements/OrichalcumKatanaRightclicked.mod.json b/elements/OrichalcumKatanaRightclicked.mod.json new file mode 100644 index 0000000..bf5c18c --- /dev/null +++ b/elements/OrichalcumKatanaRightclicked.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 73, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggerANDEQnextAttackBleedsFALSE13block.amethyst_block.resonateplayer0.661.36nextAttackBleedsTRUE" + } +} \ No newline at end of file diff --git a/models/orichalcum_katana.json b/models/orichalcum_katana.json new file mode 100644 index 0000000..52a43f7 --- /dev/null +++ b/models/orichalcum_katana.json @@ -0,0 +1,114 @@ +{ + "format_version": "1.21.11", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "blade", + "1": "hilt", + "particle": "blade" + }, + "elements": [ + { + "from": [7, 0, 7], + "to": [9, 8.0625, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 8], "texture": "#1"}, + "east": {"uv": [2, 0, 4, 8], "texture": "#1"}, + "south": {"uv": [4, 0, 6, 8], "texture": "#1"}, + "west": {"uv": [6, 0, 8, 8], "texture": "#1"}, + "up": {"uv": [11, 9, 9, 7], "texture": "#1"}, + "down": {"uv": [11, 9, 9, 11], "texture": "#1"} + } + }, + { + "from": [6.28125, 8.0625, 6.21875], + "to": [9.78125, 10.0625, 9.71875], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, 0, 7.5]}, + "faces": { + "north": {"uv": [3, 8, 6, 10], "texture": "#1"}, + "east": {"uv": [8, 3, 11, 5], "texture": "#1"}, + "south": {"uv": [8, 5, 11, 7], "texture": "#1"}, + "west": {"uv": [6, 8, 9, 10], "texture": "#1"}, + "up": {"uv": [3, 11, 0, 8], "texture": "#1"}, + "down": {"uv": [11, 0, 8, 3], "texture": "#1"} + } + }, + { + "from": [7.96875, 31.0625, 7.84375], + "to": [8.15625, 31.90625, 8.84375], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, 0, 8]}, + "faces": { + "north": {"uv": [2.5, 4.5, 3, 5], "texture": "#0"}, + "east": {"uv": [3, 4.5, 3.5, 5], "texture": "#0"}, + "south": {"uv": [4.5, 3, 5, 3.5], "texture": "#0"}, + "west": {"uv": [3.5, 4.5, 4, 5], "texture": "#0"}, + "up": {"uv": [5, 4, 4.5, 3.5], "texture": "#0"}, + "down": {"uv": [5, 4, 4.5, 4.5], "texture": "#0"} + } + }, + { + "from": [8, 10.0625, 6.84375], + "to": [8.1875, 31.0625, 7.84375], + "rotation": {"angle": 0, "axis": "y", "origin": [8.9375, 0, 7]}, + "faces": { + "north": {"uv": [0, 0, 0.5, 10.5], "texture": "#0"}, + "east": {"uv": [0.5, 0, 1, 10.5], "texture": "#0"}, + "south": {"uv": [1, 0, 1.5, 10.5], "texture": "#0"}, + "west": {"uv": [1.5, 0, 2, 10.5], "texture": "#0"}, + "up": {"uv": [5, 5, 4.5, 4.5], "texture": "#0"}, + "down": {"uv": [5.5, 0, 5, 0.5], "texture": "#0"} + } + }, + { + "from": [7.96875, 10.03125, 7.84375], + "to": [8.15625, 19.03125, 8.84375], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, 0, 8]}, + "faces": { + "north": {"uv": [2, 0, 2.5, 4.5], "texture": "#0"}, + "east": {"uv": [2.5, 0, 3, 4.5], "texture": "#0"}, + "south": {"uv": [3, 0, 3.5, 4.5], "texture": "#0"}, + "west": {"uv": [3.5, 0, 4, 4.5], "texture": "#0"}, + "up": {"uv": [5.5, 1, 5, 0.5], "texture": "#0"}, + "down": {"uv": [5.5, 1, 5, 1.5], "texture": "#0"} + } + }, + { + "from": [7.96875, 25.0625, 7.84375], + "to": [8.15625, 31.0625, 8.84375], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9375, 0, 8]}, + "faces": { + "north": {"uv": [4, 0, 4.5, 3], "texture": "#0"}, + "east": {"uv": [4, 3, 4.5, 6], "texture": "#0"}, + "south": {"uv": [4.5, 0, 5, 3], "texture": "#0"}, + "west": {"uv": [2, 4.5, 2.5, 7.5], "texture": "#0"}, + "up": {"uv": [5.5, 2, 5, 1.5], "texture": "#0"}, + "down": {"uv": [5.5, 2, 5, 2.5], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "katana", + "origin": [0, 8.0625, 6.90625], + "scope": 0, + "color": 0, + "children": [ + { + "name": "hilt", + "origin": [0, 8.0625, 6.90625], + "scope": 0, + "color": 0, + "children": [0, 1] + }, + { + "name": "blade", + "origin": [0.96875, 25.0625, 5.9375], + "scope": 0, + "color": 0, + "children": [2, 3, 4, 5] + } + ] + } + ] +} \ No newline at end of file diff --git a/models/orichalcum_katana.json.textures b/models/orichalcum_katana.json.textures new file mode 100644 index 0000000..86f0b3e --- /dev/null +++ b/models/orichalcum_katana.json.textures @@ -0,0 +1,11 @@ +{ + "mappings": { + "default": { + "map": { + "0": "blade", + "1": "hilt" + }, + "name": "default" + } + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/arisrandomadditions/ArisRandomAdditionsMod.java b/src/main/java/net/mcreator/arisrandomadditions/ArisRandomAdditionsMod.java index 90c904c..4bae035 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/ArisRandomAdditionsMod.java +++ b/src/main/java/net/mcreator/arisrandomadditions/ArisRandomAdditionsMod.java @@ -18,6 +18,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.network.FriendlyByteBuf; import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModTabs; +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModParticleTypes; import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModPaintings; import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModMobEffects; import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModMenus; @@ -59,6 +60,7 @@ public class ArisRandomAdditionsMod { ArisRandomAdditionsModMobEffects.REGISTRY.register(bus); ArisRandomAdditionsModPaintings.REGISTRY.register(bus); + ArisRandomAdditionsModParticleTypes.REGISTRY.register(bus); ArisRandomAdditionsModMenus.REGISTRY.register(bus); ArisRandomAdditionsModFluids.REGISTRY.register(bus); diff --git a/src/main/java/net/mcreator/arisrandomadditions/client/particle/BleedingParticlesParticle.java b/src/main/java/net/mcreator/arisrandomadditions/client/particle/BleedingParticlesParticle.java new file mode 100644 index 0000000..e09ca85 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/client/particle/BleedingParticlesParticle.java @@ -0,0 +1,57 @@ + +package net.mcreator.arisrandomadditions.client.particle; + +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; + +import net.minecraft.core.particles.SimpleParticleType; +import net.minecraft.client.particle.TextureSheetParticle; +import net.minecraft.client.particle.SpriteSet; +import net.minecraft.client.particle.ParticleRenderType; +import net.minecraft.client.particle.ParticleProvider; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.multiplayer.ClientLevel; + +@OnlyIn(Dist.CLIENT) +public class BleedingParticlesParticle extends TextureSheetParticle { + public static BleedingParticlesParticleProvider provider(SpriteSet spriteSet) { + return new BleedingParticlesParticleProvider(spriteSet); + } + + public static class BleedingParticlesParticleProvider implements ParticleProvider { + private final SpriteSet spriteSet; + + public BleedingParticlesParticleProvider(SpriteSet spriteSet) { + this.spriteSet = spriteSet; + } + + public Particle createParticle(SimpleParticleType typeIn, ClientLevel worldIn, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { + return new BleedingParticlesParticle(worldIn, x, y, z, xSpeed, ySpeed, zSpeed, this.spriteSet); + } + } + + private final SpriteSet spriteSet; + + protected BleedingParticlesParticle(ClientLevel world, double x, double y, double z, double vx, double vy, double vz, SpriteSet spriteSet) { + super(world, x, y, z); + this.spriteSet = spriteSet; + this.setSize(0.2f, 0.2f); + this.lifetime = 9; + this.gravity = 0.5f; + this.hasPhysics = true; + this.xd = vx * 0; + this.yd = vy * 0; + this.zd = vz * 0; + this.pickSprite(spriteSet); + } + + @Override + public ParticleRenderType getRenderType() { + return ParticleRenderType.PARTICLE_SHEET_OPAQUE; + } + + @Override + public void tick() { + super.tick(); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java index 8a8a1ee..958b1b1 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModItems.java @@ -26,6 +26,7 @@ import net.mcreator.arisrandomadditions.item.PocketLightningItem; import net.mcreator.arisrandomadditions.item.OrichalcumSwordItem; import net.mcreator.arisrandomadditions.item.OrichalcumShovelItem; import net.mcreator.arisrandomadditions.item.OrichalcumPickaxeItem; +import net.mcreator.arisrandomadditions.item.OrichalcumKatanaItem; import net.mcreator.arisrandomadditions.item.OrichalcumItem; import net.mcreator.arisrandomadditions.item.OrichalcumHoeItem; import net.mcreator.arisrandomadditions.item.OrichalcumAxeItem; @@ -143,6 +144,7 @@ public class ArisRandomAdditionsModItems { public static final RegistryObject CHORUS_EYE = REGISTRY.register("chorus_eye", () -> new ChorusEyeItem()); 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()); // Start of user code block custom items // End of user code block custom items diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModMobEffects.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModMobEffects.java index 33366fd..c2792c2 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModMobEffects.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModMobEffects.java @@ -13,6 +13,7 @@ import net.minecraft.world.effect.MobEffect; import net.mcreator.arisrandomadditions.potion.TheEndOfYourMiseryEffectMobEffect; import net.mcreator.arisrandomadditions.potion.SummonedEntityEffectMobEffect; import net.mcreator.arisrandomadditions.potion.StinkyEffectMobEffect; +import net.mcreator.arisrandomadditions.potion.BleedEffectMobEffect; import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; public class ArisRandomAdditionsModMobEffects { @@ -20,4 +21,5 @@ public class ArisRandomAdditionsModMobEffects { public static final RegistryObject STINKY_EFFECT = REGISTRY.register("stinky_effect", () -> new StinkyEffectMobEffect()); public static final RegistryObject SUMMONED_ENTITY_EFFECT = REGISTRY.register("summoned_entity_effect", () -> new SummonedEntityEffectMobEffect()); public static final RegistryObject THE_END_OF_YOUR_MISERY_EFFECT = REGISTRY.register("the_end_of_your_misery_effect", () -> new TheEndOfYourMiseryEffectMobEffect()); + public static final RegistryObject BLEED_EFFECT = REGISTRY.register("bleed_effect", () -> new BleedEffectMobEffect()); } diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModParticleTypes.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModParticleTypes.java new file mode 100644 index 0000000..717966d --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModParticleTypes.java @@ -0,0 +1,19 @@ + +/* + * MCreator note: This file will be REGENERATED on each build. + */ +package net.mcreator.arisrandomadditions.init; + +import net.minecraftforge.registries.RegistryObject; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.DeferredRegister; + +import net.minecraft.core.particles.SimpleParticleType; +import net.minecraft.core.particles.ParticleType; + +import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; + +public class ArisRandomAdditionsModParticleTypes { + public static final DeferredRegister> REGISTRY = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, ArisRandomAdditionsMod.MODID); + public static final RegistryObject BLEEDING_PARTICLES = REGISTRY.register("bleeding_particles", () -> new SimpleParticleType(false)); +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModParticles.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModParticles.java new file mode 100644 index 0000000..44e9a75 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModParticles.java @@ -0,0 +1,20 @@ + +/* + * MCreator note: This file will be REGENERATED on each build. + */ +package net.mcreator.arisrandomadditions.init; + +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.client.event.RegisterParticleProvidersEvent; +import net.minecraftforge.api.distmarker.Dist; + +import net.mcreator.arisrandomadditions.client.particle.BleedingParticlesParticle; + +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +public class ArisRandomAdditionsModParticles { + @SubscribeEvent + public static void registerParticles(RegisterParticleProvidersEvent event) { + event.registerSpriteSet(ArisRandomAdditionsModParticleTypes.BLEEDING_PARTICLES.get(), BleedingParticlesParticle::provider); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java index fdd9b4d..6900739 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java +++ b/src/main/java/net/mcreator/arisrandomadditions/init/ArisRandomAdditionsModTabs.java @@ -108,6 +108,7 @@ public class ArisRandomAdditionsModTabs { tabData.accept(ArisRandomAdditionsModItems.ENDITE_ARMOR_LEGGINGS.get()); tabData.accept(ArisRandomAdditionsModItems.ENDITE_ARMOR_BOOTS.get()); tabData.accept(ArisRandomAdditionsModItems.ENDITE_SCYTHE.get()); + tabData.accept(ArisRandomAdditionsModItems.ORICHALCUM_KATANA.get()); } } } diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/EnditeScytheItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/EnditeScytheItem.java index 5e4b5c0..28f2567 100644 --- a/src/main/java/net/mcreator/arisrandomadditions/item/EnditeScytheItem.java +++ b/src/main/java/net/mcreator/arisrandomadditions/item/EnditeScytheItem.java @@ -12,6 +12,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.network.chat.Component; import net.mcreator.arisrandomadditions.procedures.EnditeScytheLivingEntityIsHitWithToolProcedure; +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModItems; import java.util.List; @@ -39,7 +40,7 @@ public class EnditeScytheItem extends HoeItem { } public Ingredient getRepairIngredient() { - return Ingredient.of(); + return Ingredient.of(new ItemStack(ArisRandomAdditionsModItems.ENDITE_INGOT.get())); } }, 0, -3f, new Item.Properties().fireResistant()); } diff --git a/src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumKatanaItem.java b/src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumKatanaItem.java new file mode 100644 index 0000000..1fb13b3 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/item/OrichalcumKatanaItem.java @@ -0,0 +1,81 @@ + +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.crafting.Ingredient; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Item; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.InteractionHand; +import net.minecraft.network.chat.Component; + +import net.mcreator.arisrandomadditions.procedures.OrichalcumKatanaRightclickedProcedure; +import net.mcreator.arisrandomadditions.procedures.OrichalcumKatanaLivingEntityIsHitWithToolProcedure; +import net.mcreator.arisrandomadditions.procedures.OrichalcumKatanaHasItemGlowingEffectProcedure; +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModItems; + +import java.util.List; + +public class OrichalcumKatanaItem extends SwordItem { + public OrichalcumKatanaItem() { + super(new Tier() { + public int getUses() { + return 2032; + } + + public float getSpeed() { + return 12f; + } + + public float getAttackDamageBonus() { + return 5f; + } + + public int getLevel() { + return 3; + } + + public int getEnchantmentValue() { + return 22; + } + + public Ingredient getRepairIngredient() { + return Ingredient.of(new ItemStack(ArisRandomAdditionsModItems.ORICHALCUM.get())); + } + }, 3, -2.1f, new Item.Properties().fireResistant()); + } + + @Override + public boolean hurtEnemy(ItemStack itemstack, LivingEntity entity, LivingEntity sourceentity) { + boolean retval = super.hurtEnemy(itemstack, entity, sourceentity); + OrichalcumKatanaLivingEntityIsHitWithToolProcedure.execute(entity.level(), entity.getX(), entity.getY(), entity.getZ(), entity, itemstack); + return retval; + } + + @Override + public InteractionResultHolder use(Level world, Player entity, InteractionHand hand) { + InteractionResultHolder ar = super.use(world, entity, hand); + OrichalcumKatanaRightclickedProcedure.execute(world, entity.getX(), entity.getY(), entity.getZ(), entity, ar.getObject()); + return ar; + } + + @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_katana.description_0")); + } + + @Override + @OnlyIn(Dist.CLIENT) + public boolean isFoil(ItemStack itemstack) { + return OrichalcumKatanaHasItemGlowingEffectProcedure.execute(itemstack); + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/potion/BleedEffectMobEffect.java b/src/main/java/net/mcreator/arisrandomadditions/potion/BleedEffectMobEffect.java new file mode 100644 index 0000000..98fa2b9 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/potion/BleedEffectMobEffect.java @@ -0,0 +1,36 @@ + +package net.mcreator.arisrandomadditions.potion; + +import net.minecraft.world.item.Items; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.effect.MobEffect; + +import net.mcreator.arisrandomadditions.procedures.BleedEffectOnEffectActiveTickProcedure; + +import java.util.List; +import java.util.ArrayList; + +public class BleedEffectMobEffect extends MobEffect { + public BleedEffectMobEffect() { + super(MobEffectCategory.HARMFUL, -65536); + } + + @Override + public List getCurativeItems() { + ArrayList cures = new ArrayList(); + cures.add(new ItemStack(Items.TOTEM_OF_UNDYING)); + return cures; + } + + @Override + public void applyEffectTick(LivingEntity entity, int amplifier) { + BleedEffectOnEffectActiveTickProcedure.execute(entity.level(), entity.getX(), entity.getY(), entity.getZ(), entity); + } + + @Override + public boolean isDurationEffectTick(int duration, int amplifier) { + return true; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/BleedEffectOnEffectActiveTickProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/BleedEffectOnEffectActiveTickProcedure.java new file mode 100644 index 0000000..01c6016 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/BleedEffectOnEffectActiveTickProcedure.java @@ -0,0 +1,27 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.ResourceKey; +import net.minecraft.core.registries.Registries; +import net.minecraft.core.particles.SimpleParticleType; + +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModParticleTypes; +import net.mcreator.arisrandomadditions.ArisRandomAdditionsMod; + +public class BleedEffectOnEffectActiveTickProcedure { + public static void execute(LevelAccessor world, double x, double y, double z, Entity entity) { + if (entity == null) + return; + if (!world.isClientSide()) { + 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); + }); + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaHasItemGlowingEffectProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaHasItemGlowingEffectProcedure.java new file mode 100644 index 0000000..c108d21 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaHasItemGlowingEffectProcedure.java @@ -0,0 +1,12 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraft.world.item.ItemStack; + +public class OrichalcumKatanaHasItemGlowingEffectProcedure { + public static boolean execute(ItemStack itemstack) { + if (itemstack.getOrCreateTag().getBoolean("nextAttackBleeds") == true) { + return true; + } + return false; + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaLivingEntityIsHitWithToolProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaLivingEntityIsHitWithToolProcedure.java new file mode 100644 index 0000000..8b4409d --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaLivingEntityIsHitWithToolProcedure.java @@ -0,0 +1,42 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraftforge.registries.ForgeRegistries; + +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.Level; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.util.RandomSource; +import net.minecraft.sounds.SoundSource; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.BlockPos; + +import net.mcreator.arisrandomadditions.init.ArisRandomAdditionsModMobEffects; + +public class OrichalcumKatanaLivingEntityIsHitWithToolProcedure { + public static void execute(LevelAccessor world, double x, double y, double z, Entity entity, ItemStack itemstack) { + if (entity == null) + return; + if (!world.isClientSide() && itemstack.getOrCreateTag().getBoolean("nextAttackBleeds") == true) { + itemstack.getOrCreateTag().putBoolean("nextAttackBleeds", false); + if (world instanceof Level _level) { + if (!_level.isClientSide()) { + _level.playSound(null, BlockPos.containing(x, y, z), ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.amethyst_block.hit")), SoundSource.PLAYERS, (float) 0.66, (float) 1.36); + } else { + _level.playLocalSound(x, y, z, ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.amethyst_block.hit")), SoundSource.PLAYERS, (float) 0.66, (float) 1.36, false); + } + } + if (entity instanceof LivingEntity _entity && !_entity.level().isClientSide()) + _entity.addEffect(new MobEffectInstance(ArisRandomAdditionsModMobEffects.BLEED_EFFECT.get(), 100, 0, false, false)); + { + ItemStack _ist = itemstack; + if (_ist.hurt(30, RandomSource.create(), null)) { + _ist.shrink(1); + _ist.setDamageValue(0); + } + } + } + } +} diff --git a/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaRightclickedProcedure.java b/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaRightclickedProcedure.java new file mode 100644 index 0000000..dfbb505 --- /dev/null +++ b/src/main/java/net/mcreator/arisrandomadditions/procedures/OrichalcumKatanaRightclickedProcedure.java @@ -0,0 +1,31 @@ +package net.mcreator.arisrandomadditions.procedures; + +import net.minecraftforge.registries.ForgeRegistries; + +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.Level; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.Entity; +import net.minecraft.sounds.SoundSource; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.BlockPos; + +public class OrichalcumKatanaRightclickedProcedure { + public static void execute(LevelAccessor world, double x, double y, double z, Entity entity, ItemStack itemstack) { + if (entity == null) + return; + if (!world.isClientSide() && itemstack.getOrCreateTag().getBoolean("nextAttackBleeds") == false) { + if (entity instanceof Player _player) + _player.getCooldowns().addCooldown(itemstack.getItem(), 13); + if (world instanceof Level _level) { + if (!_level.isClientSide()) { + _level.playSound(null, BlockPos.containing(x, y, z), ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.amethyst_block.resonate")), SoundSource.PLAYERS, (float) 0.66, (float) 1.36); + } else { + _level.playLocalSound(x, y, z, ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("block.amethyst_block.resonate")), SoundSource.PLAYERS, (float) 0.66, (float) 1.36, false); + } + } + itemstack.getOrCreateTag().putBoolean("nextAttackBleeds", true); + } + } +} diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 8239bb9..70c95a0 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -1,4 +1,3 @@ public net.minecraft.world.level.levelgen.feature.ScatteredOreFeature (Lcom/mojang/serialization/Codec;)V #constructor public-f net.minecraft.world.level.levelgen.feature.TreeFeature m_142674_(Lnet/minecraft/world/level/levelgen/feature/FeaturePlaceContext;)Z #place - diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 70a2eab..c757ab7 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.0" +version="2.1.1" displayName="Ari's Random Additions" displayURL="https://mcreator.net" logoFile="logo.png" 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 85163df..c1a5ae9 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 @@ -31,8 +31,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", - "item.aris_random_additions.wand_of_draining": "Wand Of Draining", "block.aris_random_additions.endite_block": "Block of Endite", + "item.aris_random_additions.wand_of_draining": "Wand Of Draining", "enchantment.aris_random_additions.passive_income_enchantment": "Passive Income", "item.aris_random_additions.sand_dust": "Sand Dust", "block.aris_random_additions.orichalcum_block": "Block of Orichalcum", @@ -40,9 +40,10 @@ "item.aris_random_additions.power_star": "Power Star", "enchantment.nims_random_bullshit.ruining_enchantment": "Ruining", "advancements.endite_advancement.descr": "Obtain Endite", - "block.nims_random_bullshit.condensed_condensed_netherrack": "Condensed Condensed Netherrack", "advancements.netherrack_juice_advancement.descr": "Obtain Netherrack Juice", + "block.nims_random_bullshit.condensed_condensed_netherrack": "Condensed Condensed Netherrack", "block.nims_random_bullshit.quadra_condensed_netherrack": "Quadra-condensed Netherrack", + "advancements.orichalcum_katana_advancement.descr": "Obtain an Orichalcum Katana", "gui.nims_random_bullshit.bedrockifier_gui.button_empty": "-\u003e", "block.nims_random_bullshit.hexa_condensed_netherrack": "Hexa-condensed Netherrack", "enchantment.nims_random_bullshit.sundering_enchantment": "Sundering", @@ -76,8 +77,8 @@ "block.nims_random_bullshit.broken_glass": "Broken Glass", "block.nims_random_bullshit.redstone_brick_walls": "Redstone Brick Wall", "item.aris_random_additions.tux_spawn_egg": "Tux Spawn Egg", - "effect.nims_random_bullshit.summoned_entity_effect": "Summoned Entity", "advancements.grave_digger_advancement.descr": "Obtain Gravedigger", + "effect.nims_random_bullshit.summoned_entity_effect": "Summoned Entity", "item.aris_random_additions.netherrackite": "Netherrackite Ingot", "effect.aris_random_additions.the_end_of_your_misery_effect": "The End Of Your Misery", "advancements.orichalcum_advancement.title": "Folly Red", @@ -88,6 +89,7 @@ "item.nims_random_bullshit.tux_spawn_egg": "Tux Spawn Egg", "gui.nims_random_bullshit.mailbox_gui.label_x": "X:", "item.nims_random_bullshit.orichalcum_armor_helmet": "Orichalcum Helmet", + "death.attack.bleed_damage_type.item": "%1$s was bled to death by %2$s using %3$s", "block.aris_random_additions.magma_bricks": "Magma Bricks", "item.aris_random_additions.endite_axe": "Endite Axe", "item.nims_random_bullshit.snow_golem_question_mark": "Snow Golem...?", @@ -108,6 +110,7 @@ "item.aris_random_additions.netherrack_juice_bucket": "Netherrack Juice Bucket", "item.nims_random_bullshit.netherrackite_pickaxe.description_0": "Non-condensed netherracks broken by this pickaxe drop themselves an additional time.", "effect.nims_random_bullshit.stinky_effect": "Stinky", + "death.attack.bleed_damage_type": "%1$s bled to death", "advancements.tux_advancement.descr": "Obtain a Tux Spawn Egg", "item.aris_random_additions.gravedigger": "Gravedigger", "item.aris_random_additions.orichalcum": "Orichalcum", @@ -126,6 +129,7 @@ "block.nims_random_bullshit.magma_brick_stairs": "Magma Brick Stairs", "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.endite_upgrade_smithing_template": "Endite Upgrade Template", "item.aris_random_additions.bedrock_eater": "Bedrock Eater", @@ -142,6 +146,7 @@ "enchantment.aris_random_additions.ruining_enchantment": "Ruining", "block.aris_random_additions.ore_miner": "Ore Miner", "block.aris_random_additions.condensed_netherrack": "Condensed Netherrack", + "item.aris_random_additions.orichalcum_katana.description_0": "Right-Click: empower the blade, making your next attack cause bleeding DoT effect to the target for a duration.", "block.nims_random_bullshit.redstone_bricks": "Redstone Bricks", "item.nims_random_bullshit.iron_golem_question_mark": "Iron Golem...?", "item.aris_random_additions.golden_berries": "Golden Berries", @@ -154,6 +159,7 @@ "item.nims_random_bullshit.gravedigger": "Gravedigger", "item.aris_random_additions.pocket_lightning": "Pocket Lightning", "item.aris_random_additions.night_vision_goggles_helmet": "Night Vision Goggles", + "advancements.orichalcum_katana_advancement.title": "As Fierce As The Color", "item.aris_random_additions.cheese": "Cheese", "item.aris_random_additions.orichalcum_sword": "Orichalcum Sword", "item.aris_random_additions.wand_of_resizing.description_0": "DISCLAIMER: Does not work with Origins that periodically reset your scale!", @@ -178,11 +184,13 @@ "gui.nims_random_bullshit.ore_miner_gui.button_mine": "Mine", "item.aris_random_additions.endite_scythe": "Endite Scythe", "advancements.star_advancement.title": "A Star Meant To Be", + "effect.aris_random_additions.bleed_effect": "Bleeding", "painting.nims_random_bullshit.shit_painting.author": "nim", "gui.nims_random_bullshit.mailbox_gui.outbox_x_coord": "0", "block.nims_random_bullshit.rubber_fence": "Rubber Fence", "advancements.turd_advancement.descr": "Turd", "advancements.condensed_netherrack_advancement.title": "Rackin\u0027 Em Up!", + "death.attack.bleed_damage_type.player": "%1$s bled to death whilst trying to escape %2$s", "item.aris_random_additions.magic_flesh": "Magic Flesh", "item.aris_random_additions.black_iron_ingot": "Black Iron Ingot", "item.aris_random_additions.endite_armor_helmet": "Endite Helmet", diff --git a/src/main/resources/assets/aris_random_additions/particles/bleeding_particles.json b/src/main/resources/assets/aris_random_additions/particles/bleeding_particles.json new file mode 100644 index 0000000..1c64db9 --- /dev/null +++ b/src/main/resources/assets/aris_random_additions/particles/bleeding_particles.json @@ -0,0 +1,5 @@ +{ + "textures": [ + "aris_random_additions:bleeding_particles" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/aris_random_additions/textures/block/blade.png b/src/main/resources/assets/aris_random_additions/textures/block/blade.png new file mode 100644 index 0000000..bfbab21 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/block/blade.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/block/drip.png b/src/main/resources/assets/aris_random_additions/textures/block/drip.png new file mode 100644 index 0000000..5818960 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/block/drip.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/block/fui3yrci82rvvussfiy99rur112f32jxj28.png b/src/main/resources/assets/aris_random_additions/textures/block/fui3yrci82rvvussfiy99rur112f32jxj28.png new file mode 100644 index 0000000..ec51897 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/block/fui3yrci82rvvussfiy99rur112f32jxj28.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/block/hilt.png b/src/main/resources/assets/aris_random_additions/textures/block/hilt.png new file mode 100644 index 0000000..b2b1c1c Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/block/hilt.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/block/katana.png b/src/main/resources/assets/aris_random_additions/textures/block/katana.png new file mode 100644 index 0000000..0416d2b Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/block/katana.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/blade.png b/src/main/resources/assets/aris_random_additions/textures/item/blade.png new file mode 100644 index 0000000..bfbab21 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/blade.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/fui3yrci82rvvussfiy99rur112f32jxj28.png b/src/main/resources/assets/aris_random_additions/textures/item/fui3yrci82rvvussfiy99rur112f32jxj28.png new file mode 100644 index 0000000..ec51897 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/item/fui3yrci82rvvussfiy99rur112f32jxj28.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/item/handle.png b/src/main/resources/assets/aris_random_additions/textures/item/handle.png deleted file mode 100644 index 48d4ede..0000000 Binary files a/src/main/resources/assets/aris_random_additions/textures/item/handle.png and /dev/null differ diff --git a/src/main/resources/assets/aris_random_additions/textures/mob_effect/bleed.png b/src/main/resources/assets/aris_random_additions/textures/mob_effect/bleed.png new file mode 100644 index 0000000..6a69623 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/mob_effect/bleed.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/mob_effect/bleed_effect.png b/src/main/resources/assets/aris_random_additions/textures/mob_effect/bleed_effect.png new file mode 100644 index 0000000..6a69623 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/mob_effect/bleed_effect.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/particle/bleed.png b/src/main/resources/assets/aris_random_additions/textures/particle/bleed.png new file mode 100644 index 0000000..6a69623 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/particle/bleed.png differ diff --git a/src/main/resources/assets/aris_random_additions/textures/particle/bleeding_particles.png b/src/main/resources/assets/aris_random_additions/textures/particle/bleeding_particles.png new file mode 100644 index 0000000..6a69623 Binary files /dev/null and b/src/main/resources/assets/aris_random_additions/textures/particle/bleeding_particles.png differ diff --git a/src/main/resources/data/aris_random_additions/advancements/orichalcum_katana_advancement.json b/src/main/resources/data/aris_random_additions/advancements/orichalcum_katana_advancement.json new file mode 100644 index 0000000..47c6f40 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/advancements/orichalcum_katana_advancement.json @@ -0,0 +1,36 @@ +{ + "display": { + "icon": { + "item": "aris_random_additions:orichalcum_katana" + }, + "title": { + "translate": "advancements.orichalcum_katana_advancement.title" + }, + "description": { + "translate": "advancements.orichalcum_katana_advancement.descr" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "orichalcum_katana_advancement_0": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "aris_random_additions:orichalcum_katana" + ], + "count": { + "min": 1, + "max": 64 + } + } + ] + } + } + }, + "parent": "aris_random_additions:orichalcum_advancement" +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/damage_type/bleed_damage_type.json b/src/main/resources/data/aris_random_additions/damage_type/bleed_damage_type.json new file mode 100644 index 0000000..89b6d67 --- /dev/null +++ b/src/main/resources/data/aris_random_additions/damage_type/bleed_damage_type.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0.1, + "message_id": "bleed_damage_type", + "scaling": "never" +} \ No newline at end of file diff --git a/src/main/resources/data/aris_random_additions/recipes/orichalcum_katana_recipe.json b/src/main/resources/data/aris_random_additions/recipes/orichalcum_katana_recipe.json new file mode 100644 index 0000000..00a1dee --- /dev/null +++ b/src/main/resources/data/aris_random_additions/recipes/orichalcum_katana_recipe.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "a", + "b", + "c" + ], + "key": { + "a": { + "item": "aris_random_additions:orichalcum_sword" + }, + "b": { + "item": "aris_random_additions:power_star" + }, + "c": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "aris_random_additions:orichalcum_katana", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/swords.json b/src/main/resources/data/minecraft/tags/items/swords.json index f147428..4971140 100644 --- a/src/main/resources/data/minecraft/tags/items/swords.json +++ b/src/main/resources/data/minecraft/tags/items/swords.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "aris_random_additions:orichalcum_katana", "aris_random_additions:endite_sword", "aris_random_additions:orichalcum_sword", "aris_random_additions:bedrock_sword"