From e0bcb77d667d33d33b84d114df7bc476e7032584 Mon Sep 17 00:00:00 2001 From: KrisHD1337 Date: Wed, 19 Nov 2025 11:34:19 +0100 Subject: [PATCH] Finished Mace and moved upgraded mod version number --- gradle.properties | 4 +-- .../datagen/ModItemModelProvider.java | 1 + .../stalinium/item/ModCreativeModeTabs.java | 1 + .../item/custom/StaliniumMaceItem.java | 16 +++++++++ .../assets/stalinium/lang/en_us.json | 11 ++++-- .../advancement/stalinium/amacing_hammer.json | 34 +++++++++++++++++++ .../stalinium/means_revolution.json | 10 ++++++ 7 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/data/stalinium/advancement/stalinium/amacing_hammer.json diff --git a/gradle.properties b/gradle.properties index e2305b0..4d53a36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,7 +36,7 @@ mod_name=Stalinium # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=MIT # The mod version. See https://semver.org/ -mod_version=0.3.0 +mod_version=1.0.0 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html @@ -44,4 +44,4 @@ mod_group_id=net.krituximon.stalinium # The authors of the mod. This is a simple text string that is used for display purposes in the mod list. mod_authors=Kris HD, Fretux, Gianimon # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description=Adds Stalinium +mod_description=A mod that adds the strongest material known to man. diff --git a/src/main/java/net/krituximon/stalinium/datagen/ModItemModelProvider.java b/src/main/java/net/krituximon/stalinium/datagen/ModItemModelProvider.java index bc80aed..5360813 100644 --- a/src/main/java/net/krituximon/stalinium/datagen/ModItemModelProvider.java +++ b/src/main/java/net/krituximon/stalinium/datagen/ModItemModelProvider.java @@ -26,5 +26,6 @@ public class ModItemModelProvider extends ItemModelProvider { handheldItem(ModItems.STALINIUM_SHOVEL.get()); handheldItem(ModItems.STALINIUM_HOE.get()); handheldItem(ModItems.STALINIUM_PICKAXE.get()); + handheldItem(ModItems.STALINIUM_MACE.get()); } } diff --git a/src/main/java/net/krituximon/stalinium/item/ModCreativeModeTabs.java b/src/main/java/net/krituximon/stalinium/item/ModCreativeModeTabs.java index d83e9e2..843275c 100644 --- a/src/main/java/net/krituximon/stalinium/item/ModCreativeModeTabs.java +++ b/src/main/java/net/krituximon/stalinium/item/ModCreativeModeTabs.java @@ -26,6 +26,7 @@ public class ModCreativeModeTabs { output.accept(ModBlocks.STALINIUM_ORE.get()); output.accept(ModBlocks.COMPRESSED_BEDROCK.get()); output.accept(ModBlocks.STALINIUM_PRESS.get()); + output.accept(ModItems.STALINIUM_MACE.get()); output.accept(ModItems.STALINIUM_SWORD.get()); output.accept(ModItems.STALINIUM_AXE.get()); output.accept(ModItems.STALINIUM_PICKAXE.get()); diff --git a/src/main/java/net/krituximon/stalinium/item/custom/StaliniumMaceItem.java b/src/main/java/net/krituximon/stalinium/item/custom/StaliniumMaceItem.java index 165df95..b9a133d 100644 --- a/src/main/java/net/krituximon/stalinium/item/custom/StaliniumMaceItem.java +++ b/src/main/java/net/krituximon/stalinium/item/custom/StaliniumMaceItem.java @@ -1,8 +1,10 @@ package net.krituximon.stalinium.item.custom; import net.krituximon.stalinium.item.ModItems; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.core.particles.BlockParticleOption; import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -18,6 +20,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.projectile.windcharge.WindCharge; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.MaceItem; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; @@ -131,4 +134,17 @@ public class StaliniumMaceItem extends MaceItem { double z = vec.x * sin + vec.z * cos; return new Vec3(x, vec.y, z); } + + @Override + public void appendHoverText(ItemStack stack, + TooltipContext context, + List tooltipComponents, + TooltipFlag tooltipFlag) { + if (Screen.hasShiftDown()) { + tooltipComponents.add(Component.translatable("item.stalinium_mace.tooltip_shift")); + } else { + tooltipComponents.add(Component.translatable("item.stalinium_mace.tooltip")); + } + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + } } diff --git a/src/main/resources/assets/stalinium/lang/en_us.json b/src/main/resources/assets/stalinium/lang/en_us.json index e5bcc85..0a2b418 100644 --- a/src/main/resources/assets/stalinium/lang/en_us.json +++ b/src/main/resources/assets/stalinium/lang/en_us.json @@ -42,7 +42,9 @@ "advancements.stalinium.stalinium.boots_bloc.desc": "Obtain the Stalinium Boots", "advancements.stalinium.stalinium.comrade_prime.title": "Comrade Prime", "advancements.stalinium.stalinium.comrade_prime.desc": "Wear a full set of Stalinium Armor", - + "advancements.stalinium.stalinium.amacing_hammer.title": "Amacing Hammer", + "advancements.stalinium.stalinium.amacing_hammer.desc": "Obtain the Stalinium Mace", + "item.stalinium.stalinium_helmet": "Stalinium Helmet", "item.stalinium.stalinium_chestplate": "Stalinium Chestplate", @@ -76,7 +78,7 @@ "item.stalinium_pickaxe.tooltip": "Pickaxe made out of §cStalinium§0\n\n§l§cVein of Unity§0\n\n§l§cOre for All\n\n§f(Shift to expand)", "item.stalinium_pickaxe.tooltip_shift": "Pickaxe made out of §cStalinium\n\n§l§cVein of Unity:§f\nInstantly mines all connected ore blocks.\n\n§l§cOre for all:§f\n50% chance nearby comrades also receive your ore drops.", - + "item.stalinium_boots.tooltip": "Boots made out of §cStalinium\n\n§l§cMarch of Progress\n\n§fFull Armor Set Bonus:\n§l§cPower of the Many\n\n§f(Shift to expand)", "item.stalinium_boots.tooltip_shift": "Boots made out of §cStalinium\n\n§l§cMarch of Progress:§f\nSprinting gives you and everyone nearby Speed I.\n\n§fFull Armor Set Bonus:\n§l§cPower of the Many: Gain more hearts the more allies are nearby.", @@ -88,7 +90,10 @@ "item.stalinium_leggings.tooltip": "Leggings made out of §cStalinium\n\n§l§cIron Will of the Collective\n\n§fFull Armor Set Bonus:\n§l§cPower of the Many\n\n§f(Shift to expand)", "item.stalinium_leggings.tooltip_shift": "Leggings made out of §cStalinium\n\n§l§cIron Will of the Collective:§f\nWhen wearing the chestplate alongside the leggings, gain Resistance I.\n\n§fFull Armor Set Bonus:\n§l§cPower of the Many: Gain more hearts the more allies are nearby.", - + + "item.stalinium_mace.tooltip": "Mace made out of §cStalinium\n\n§l§cWinds of Revolution§0\n\n§l§cCrush the Bourgeoisie\n\n§f(Shift to expand)", + "item.stalinium_mace.tooltip_shift": "Mace made out of §cStalinium\n\n§l§cWinds of Revolution§f\nShoots a Wind Charge on regular right-click.\n\n§l§cCrush the Bourgeoisie§f\nWhen right-clicking while sneaking, do a smash attack launching enemies away and dealing damage.", + "item.minecraft.potion.effect.vodka": "Bottle of Vodka", "item.minecraft.splash_potion.effect.vodka": "Throwable Bottle of Vodka", "item.minecraft.lingering_potion.effect.vodka": "Lingering Bottle of Vodka", diff --git a/src/main/resources/data/stalinium/advancement/stalinium/amacing_hammer.json b/src/main/resources/data/stalinium/advancement/stalinium/amacing_hammer.json new file mode 100644 index 0000000..5629b84 --- /dev/null +++ b/src/main/resources/data/stalinium/advancement/stalinium/amacing_hammer.json @@ -0,0 +1,34 @@ +{ + "parent": "stalinium:stalinium/strike_state", + "criteria": { + "stalinium_mace": { + "conditions": { + "items": [ + { + "items": "stalinium:stalinium_mace" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "background": "minecraft:textures/gui/advancements/backgrounds/stone.png", + "description": { + "translate": "advancements.stalinium.stalinium.amacing_hammer.desc" + }, + "icon": { + "count": 1, + "id": "stalinium:stalinium_mace" + }, + "title": { + "translate": "advancements.stalinium.stalinium.amacing_hammer.title" + } + }, + "requirements": [ + [ + "stalinium_mace" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/main/resources/data/stalinium/advancement/stalinium/means_revolution.json b/src/main/resources/data/stalinium/advancement/stalinium/means_revolution.json index 47d4c08..7ddca2c 100644 --- a/src/main/resources/data/stalinium/advancement/stalinium/means_revolution.json +++ b/src/main/resources/data/stalinium/advancement/stalinium/means_revolution.json @@ -50,6 +50,16 @@ ] }, "trigger": "minecraft:inventory_changed" + }, + "stalinium_mace": { + "conditions": { + "items": [ + { + "items": "stalinium:stalinium_mace" + } + ] + }, + "trigger": "minecraft:inventory_changed" } }, "display": {