From bb57cc8657a68a082db6468cee0fedba17ab4b92 Mon Sep 17 00:00:00 2001 From: Vos Date: Sun, 1 Feb 2026 21:32:34 -0600 Subject: [PATCH] Order items --- .../acesbs/models/item/dust_of_order.json | 6 ++++ .../acesbs/models/item/ingot_of_order.json | 6 ++++ .../acesbs/datagen/ModModelProvider.java | 2 ++ .../acesbs/item/ModItemGroups.java | 2 ++ .../acethewildfire/acesbs/item/ModItems.java | 33 +++++++++---------- .../resources/assets/acesbs/lang/en_us.json | 5 +++ 6 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 src/main/generated/assets/acesbs/models/item/dust_of_order.json create mode 100644 src/main/generated/assets/acesbs/models/item/ingot_of_order.json diff --git a/src/main/generated/assets/acesbs/models/item/dust_of_order.json b/src/main/generated/assets/acesbs/models/item/dust_of_order.json new file mode 100644 index 0000000..8d743c6 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/dust_of_order.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/dust_of_order" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ingot_of_order.json b/src/main/generated/assets/acesbs/models/item/ingot_of_order.json new file mode 100644 index 0000000..112f9f9 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ingot_of_order.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ingot_of_order" + } +} \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java index d3cc019..1054501 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java @@ -83,6 +83,8 @@ public class ModModelProvider extends FabricModelProvider { itemModelGenerator.register(ModItems.GREEN_BRICKS, Models.GENERATED); itemModelGenerator.register(ModItems.INFERNAL_ASHES, Models.GENERATED); itemModelGenerator.register(ModItems.MOTE_OF_ORDER, Models.GENERATED); + itemModelGenerator.register(ModItems.DUST_OF_ORDER, Models.GENERATED); + itemModelGenerator.register(ModItems.INGOT_OF_ORDER, Models.GENERATED); // itemModelGenerator.register(ModItems.WAND, Models.HANDHELD_ROD); itemModelGenerator.register(PrismaSteelItems.PRISMA_STEEL, Models.GENERATED); itemModelGenerator.register(PrismaSteelItems.PRISMA_SMITHING_TEMPLATE, Models.GENERATED); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java index f796a7a..35cdacf 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java @@ -23,6 +23,8 @@ public class ModItemGroups { entries.add(ModItems.STABLE_ENDTROPY); entries.add(PrismaSteelItems.PRISMA_STEEL); entries.add(ModItems.MOTE_OF_ORDER); + entries.add(ModItems.DUST_OF_ORDER); + entries.add(ModItems.INGOT_OF_ORDER); entries.add(ModItems.LEMON); entries.add(ModItems.COOKED_LEMON); entries.add(ModItems.INFERNAL_BEEF); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java index 16dc815..a9fad39 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java @@ -80,12 +80,21 @@ public class ModItems { public static final Item MOTE_OF_ORDER = registerItem("mote_of_order", new Item(new Item.Settings()) { public void appendTooltip(ItemStack stack, TooltipContext context, List tooltip, TooltipType type) { - if(!Screen.hasShiftDown()){ - tooltip.add(Text.translatable("tooltip.acesbs.generic.shift_up")); - } - else { - tooltip.add(Text.translatable("tooltip.acesbs.mote_of_order")); - } + tooltip.add(Text.translatable("tooltip.acesbs.mote_of_order")); + super.appendTooltip(stack, context, tooltip, type); + } + }); + + public static final Item DUST_OF_ORDER = registerItem("dust_of_order", new Item(new Item.Settings()) { + public void appendTooltip(ItemStack stack, TooltipContext context, List tooltip, TooltipType type) { + tooltip.add(Text.translatable("tooltip.acesbs.dust_of_order")); + super.appendTooltip(stack, context, tooltip, type); + } + }); + + public static final Item INGOT_OF_ORDER = registerItem("ingot_of_order", new Item(new Item.Settings()) { + public void appendTooltip(ItemStack stack, TooltipContext context, List tooltip, TooltipType type) { + tooltip.add(Text.translatable("tooltip.acesbs.ingot_of_order")); super.appendTooltip(stack, context, tooltip, type); } }); @@ -141,17 +150,7 @@ public class ModItems { public static final Item CIGARETTE = registerItem("cigarette", new Cigarette(new Item.Settings().maxCount(20))); public static final Item CIGARETTE_LEMON = registerItem("cigarette_lemon", new CigaretteLemon(new Item.Settings().maxCount(20))); - public static final Item CIGARETTE_FUNNY = registerItem("cigarette_funny", new CigaretteFunny(new Item.Settings().maxCount(20)){ - public void appendTooltip(ItemStack stack, TooltipContext context, List tooltip, TooltipType type) { - if(!Screen.hasShiftDown()){ - tooltip.add(Text.translatable("tooltip.acesbs.generic.shift_up")); - } - else { - tooltip.add(Text.translatable("tooltip.acesbs.cigarette_funny")); - } - super.appendTooltip(stack, context, tooltip, type); - } - }); + public static final Item CIGARETTE_FUNNY = registerItem("cigarette_funny", new CigaretteFunny(new Item.Settings().maxCount(20))); public static final Item FREN_SPAWN_EGG = registerItem("fren_spawn_egg", new SpawnEggItem(ModEntities.FREN, 894731, 0, new Item.Settings())); diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index 5a3410e..afcf89e 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -24,6 +24,8 @@ "item.minecraft.tipped_arrow.effect.lemon": "Arrow of Puckered", "item.acesbs.mote_of_order": "Mote of Order", + "item.acesbs.dust_of_order": "Dust of Order", + "item.acesbs.ingot_of_order": "Ingot of Order", "item.acesbs.prisma_steel": "Prisma Steel", "item.acesbs.prisma_steel_sword": "Prisma Steel Sword", @@ -160,6 +162,9 @@ "tooltip.acesbs.combustible_lemon2": "§7§oI’m the man who’s gonna burn your house down!§r", "tooltip.acesbs.mote_of_order": "§o§7A delicate mote of unrealized power.§r", + "tooltip.acesbs.dust_of_order": "§o§7A soft pile of fledgling power.§r", + "tooltip.acesbs.ingot_of_order": "§o§7A sturdy ingot of growing power.§r", + "tooltip.acesbs.cigarette_funny": "§o§7I am the danger of second hand smoke§r", "sounds.acesbs.lizard": "Lizard!",