diff --git a/src/main/java/net/herobane/learning/Learning.java b/src/main/java/net/herobane/learning/Learning.java index da74c83..b6f31c8 100644 --- a/src/main/java/net/herobane/learning/Learning.java +++ b/src/main/java/net/herobane/learning/Learning.java @@ -45,6 +45,11 @@ public class Learning { event.accept(ModItems.RUBY); event.accept(ModItems.SAPPHIRE); } + + if(event.getTabKey() == CreativeModeTabs.COMBAT) { + event.accept(ModItems.RUBY_SWORD); + event.accept(ModItems.SAPPHIRE_SWORD); + } } diff --git a/src/main/java/net/herobane/learning/item/ModItems.java b/src/main/java/net/herobane/learning/item/ModItems.java index 45e222f..27e32e0 100644 --- a/src/main/java/net/herobane/learning/item/ModItems.java +++ b/src/main/java/net/herobane/learning/item/ModItems.java @@ -2,6 +2,8 @@ package net.herobane.learning.item; import net.herobane.learning.Learning; import net.minecraft.world.item.Item; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.Tiers; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -15,6 +17,11 @@ public class ModItems { public static final RegistryObject RUBY = ITEMS.register("ruby", () -> new Item(new Item.Properties())); public static final RegistryObject SAPPHIRE = ITEMS.register("sapphire", () -> new Item(new Item.Properties())); + // Tools and weapons + public static final RegistryObject RUBY_SWORD = ITEMS.register("ruby_sword", () -> new SwordItem(Tiers.DIAMOND, 3, -2.4f, new Item.Properties())); + public static final RegistryObject SAPPHIRE_SWORD = ITEMS.register("sapphire_sword", () -> new SwordItem(Tiers.DIAMOND, 3, -2.4f, new Item.Properties())); + + public static void register(IEventBus eventBus) { ITEMS.register(eventBus); } diff --git a/src/main/resources/assets/learning/lang/en_us.json b/src/main/resources/assets/learning/lang/en_us.json index fb969bb..1be7e43 100644 --- a/src/main/resources/assets/learning/lang/en_us.json +++ b/src/main/resources/assets/learning/lang/en_us.json @@ -1,4 +1,7 @@ { "item.learning.ruby": "Ruby", - "item.learning.sapphire": "Sapphire" + "item.learning.sapphire": "Sapphire", + + "item.learning.ruby_sword": "Ruby Sword", + "item.learning.sapphire_sword": "Sapphire Sword" } \ No newline at end of file diff --git a/src/main/resources/assets/learning/lang/fr_fr.json b/src/main/resources/assets/learning/lang/fr_fr.json index ee8c7d8..496ae55 100644 --- a/src/main/resources/assets/learning/lang/fr_fr.json +++ b/src/main/resources/assets/learning/lang/fr_fr.json @@ -1,4 +1,7 @@ { "item.learning.ruby": "Rubis", - "item.learning.sapphire": "Saphir" + "item.learning.sapphire": "Saphir", + + "item.learning.ruby_sword": "Epee de Rubis", + "item.learning.sapphire_sword": "Epee de Saphir" } \ No newline at end of file diff --git a/src/main/resources/assets/learning/models/item/ruby_sword.json b/src/main/resources/assets/learning/models/item/ruby_sword.json new file mode 100644 index 0000000..d68d0a2 --- /dev/null +++ b/src/main/resources/assets/learning/models/item/ruby_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "learning:item/ruby_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/learning/models/item/sapphire_sword.json b/src/main/resources/assets/learning/models/item/sapphire_sword.json new file mode 100644 index 0000000..b2e91a5 --- /dev/null +++ b/src/main/resources/assets/learning/models/item/sapphire_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "learning:item/sapphire_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/learning/textures/item/ruby_sword.png b/src/main/resources/assets/learning/textures/item/ruby_sword.png new file mode 100644 index 0000000..a9bfd40 Binary files /dev/null and b/src/main/resources/assets/learning/textures/item/ruby_sword.png differ diff --git a/src/main/resources/assets/learning/textures/item/sapphire_sword.png b/src/main/resources/assets/learning/textures/item/sapphire_sword.png new file mode 100644 index 0000000..6c231b5 Binary files /dev/null and b/src/main/resources/assets/learning/textures/item/sapphire_sword.png differ