diff --git a/src/main/java/net/herobane/learning/Learning.java b/src/main/java/net/herobane/learning/Learning.java index b6f31c8..04dc01b 100644 --- a/src/main/java/net/herobane/learning/Learning.java +++ b/src/main/java/net/herobane/learning/Learning.java @@ -51,6 +51,17 @@ public class Learning { event.accept(ModItems.SAPPHIRE_SWORD); } + if(event.getTabKey() == CreativeModeTabs.TOOLS_AND_UTILITIES) { + event.accept(ModItems.RUBY_SHOVEL); + event.accept(ModItems.RUBY_PICKAXE); + event.accept(ModItems.RUBY_AXE); + event.accept(ModItems.RUBY_HOE); + + event.accept(ModItems.SAPPHIRE_SHOVEL); + event.accept(ModItems.SAPPHIRE_PICKAXE); + event.accept(ModItems.SAPPHIRE_AXE); + event.accept(ModItems.SAPPHIRE_HOE); + } } @SubscribeEvent diff --git a/src/main/java/net/herobane/learning/item/ModItems.java b/src/main/java/net/herobane/learning/item/ModItems.java index 27e32e0..20ef6c5 100644 --- a/src/main/java/net/herobane/learning/item/ModItems.java +++ b/src/main/java/net/herobane/learning/item/ModItems.java @@ -1,7 +1,11 @@ package net.herobane.learning.item; import net.herobane.learning.Learning; +import net.minecraft.world.item.AxeItem; +import net.minecraft.world.item.HoeItem; import net.minecraft.world.item.Item; +import net.minecraft.world.item.PickaxeItem; +import net.minecraft.world.item.ShovelItem; import net.minecraft.world.item.SwordItem; import net.minecraft.world.item.Tiers; import net.minecraftforge.eventbus.api.IEventBus; @@ -20,6 +24,18 @@ public class ModItems { // 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 final RegistryObject RUBY_AXE = ITEMS.register("ruby_axe", () -> new AxeItem(Tiers.DIAMOND, 5.0f, -3.0f, new Item.Properties())); + public static final RegistryObject SAPPHIRE_AXE = ITEMS.register("sapphire_axe", () -> new AxeItem(Tiers.DIAMOND, 5.0f, -3.0f, new Item.Properties())); + + public static final RegistryObject RUBY_PICKAXE = ITEMS.register("ruby_pickaxe", () -> new PickaxeItem(Tiers.DIAMOND, 1, -2.8f, new Item.Properties())); + public static final RegistryObject SAPPHIRE_PICKAXE = ITEMS.register("sapphire_pickaxe", () -> new PickaxeItem(Tiers.DIAMOND, 1, -2.8f, new Item.Properties())); + + public static final RegistryObject RUBY_SHOVEL = ITEMS.register("ruby_shovel", () -> new ShovelItem(Tiers.DIAMOND, 1.5f, -3.0f, new Item.Properties())); + public static final RegistryObject SAPPHIRE_SHOVEL = ITEMS.register("sapphire_shovel", () -> new ShovelItem(Tiers.DIAMOND, 1.5f, -3.0f, new Item.Properties())); + + public static final RegistryObject RUBY_HOE = ITEMS.register("ruby_hoe", () -> new HoeItem(Tiers.DIAMOND, -3, .0f, new Item.Properties())); + public static final RegistryObject SAPPHIRE_HOE = ITEMS.register("sapphire_hoe", () -> new HoeItem(Tiers.DIAMOND, -3, .0f, new Item.Properties())); public static void register(IEventBus eventBus) { diff --git a/src/main/resources/assets/learning/lang/en_us.json b/src/main/resources/assets/learning/lang/en_us.json index 1be7e43..5ccf5d2 100644 --- a/src/main/resources/assets/learning/lang/en_us.json +++ b/src/main/resources/assets/learning/lang/en_us.json @@ -3,5 +3,17 @@ "item.learning.sapphire": "Sapphire", "item.learning.ruby_sword": "Ruby Sword", - "item.learning.sapphire_sword": "Sapphire Sword" + "item.learning.sapphire_sword": "Sapphire Sword", + + "item.learning.ruby_axe": "Ruby Axe", + "item.learning.sapphire_axe": "Sapphire Axe", + + "item.learning.ruby_pickaxe": "Ruby Pickaxe", + "item.learning.sapphire_pickaxe": "Sapphire Pickaxe", + + "item.learning.ruby_shovel": "Ruby Shovel", + "item.learning.sapphire_shovel": "Sapphire Shovel", + + "item.learning.ruby_hoe": "Ruby Hoe", + "item.learning.sapphire_hoe": "Sapphire Hoe" } \ 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 496ae55..3f22636 100644 --- a/src/main/resources/assets/learning/lang/fr_fr.json +++ b/src/main/resources/assets/learning/lang/fr_fr.json @@ -2,6 +2,18 @@ "item.learning.ruby": "Rubis", "item.learning.sapphire": "Saphir", - "item.learning.ruby_sword": "Epee de Rubis", - "item.learning.sapphire_sword": "Epee de Saphir" + "item.learning.ruby_sword": "Épée en rubis", + "item.learning.sapphire_sword": "Épée en saphir", + + "item.learning.ruby_axe": "Hache en rubis", + "item.learning.sapphire_axe": "Hache en saphir", + + "item.learning.ruby_pickaxe": "Pioche en rubis", + "item.learning.sapphire_pickaxe": "Pioche en saphir", + + "item.learning.ruby_shovel": "Pelle en rubis", + "item.learning.sapphire_shovel": "Pelle en saphir", + + "item.learning.ruby_hoe": "Houe en rubis", + "item.learning.sapphire_hoe": "Houe en saphir" } \ No newline at end of file diff --git a/src/main/resources/assets/learning/models/item/ruby_axe.json b/src/main/resources/assets/learning/models/item/ruby_axe.json new file mode 100644 index 0000000..a8cdd60 --- /dev/null +++ b/src/main/resources/assets/learning/models/item/ruby_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "learning:item/ruby_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/learning/models/item/ruby_hoe.json b/src/main/resources/assets/learning/models/item/ruby_hoe.json new file mode 100644 index 0000000..7e1c5b3 --- /dev/null +++ b/src/main/resources/assets/learning/models/item/ruby_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "learning:item/ruby_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/learning/models/item/ruby_pickaxe.json b/src/main/resources/assets/learning/models/item/ruby_pickaxe.json new file mode 100644 index 0000000..e4891b2 --- /dev/null +++ b/src/main/resources/assets/learning/models/item/ruby_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "learning:item/ruby_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/learning/models/item/ruby_shovel.json b/src/main/resources/assets/learning/models/item/ruby_shovel.json new file mode 100644 index 0000000..c81f346 --- /dev/null +++ b/src/main/resources/assets/learning/models/item/ruby_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "learning:item/ruby_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/learning/models/item/sapphire_axe.json b/src/main/resources/assets/learning/models/item/sapphire_axe.json new file mode 100644 index 0000000..9e4bdee --- /dev/null +++ b/src/main/resources/assets/learning/models/item/sapphire_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "learning:item/sapphire_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/learning/models/item/sapphire_hoe.json b/src/main/resources/assets/learning/models/item/sapphire_hoe.json new file mode 100644 index 0000000..436cfff --- /dev/null +++ b/src/main/resources/assets/learning/models/item/sapphire_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "learning:item/sapphire_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/learning/models/item/sapphire_pickaxe.json b/src/main/resources/assets/learning/models/item/sapphire_pickaxe.json new file mode 100644 index 0000000..99744f3 --- /dev/null +++ b/src/main/resources/assets/learning/models/item/sapphire_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "learning:item/sapphire_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/learning/models/item/sapphire_shovel.json b/src/main/resources/assets/learning/models/item/sapphire_shovel.json new file mode 100644 index 0000000..45e0ceb --- /dev/null +++ b/src/main/resources/assets/learning/models/item/sapphire_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "learning:item/sapphire_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/learning/textures/item/ruby_axe.png b/src/main/resources/assets/learning/textures/item/ruby_axe.png new file mode 100644 index 0000000..62e3503 Binary files /dev/null and b/src/main/resources/assets/learning/textures/item/ruby_axe.png differ diff --git a/src/main/resources/assets/learning/textures/item/ruby_hoe.png b/src/main/resources/assets/learning/textures/item/ruby_hoe.png new file mode 100644 index 0000000..f1ca8a2 Binary files /dev/null and b/src/main/resources/assets/learning/textures/item/ruby_hoe.png differ diff --git a/src/main/resources/assets/learning/textures/item/ruby_pickaxe.png b/src/main/resources/assets/learning/textures/item/ruby_pickaxe.png new file mode 100644 index 0000000..44beed4 Binary files /dev/null and b/src/main/resources/assets/learning/textures/item/ruby_pickaxe.png differ diff --git a/src/main/resources/assets/learning/textures/item/ruby_shovel.png b/src/main/resources/assets/learning/textures/item/ruby_shovel.png new file mode 100644 index 0000000..c75b623 Binary files /dev/null and b/src/main/resources/assets/learning/textures/item/ruby_shovel.png differ diff --git a/src/main/resources/assets/learning/textures/item/sapphire_axe.png b/src/main/resources/assets/learning/textures/item/sapphire_axe.png new file mode 100644 index 0000000..8ecb5b4 Binary files /dev/null and b/src/main/resources/assets/learning/textures/item/sapphire_axe.png differ diff --git a/src/main/resources/assets/learning/textures/item/sapphire_hoe.png b/src/main/resources/assets/learning/textures/item/sapphire_hoe.png new file mode 100644 index 0000000..64df1aa Binary files /dev/null and b/src/main/resources/assets/learning/textures/item/sapphire_hoe.png differ diff --git a/src/main/resources/assets/learning/textures/item/sapphire_pickaxe.png b/src/main/resources/assets/learning/textures/item/sapphire_pickaxe.png new file mode 100644 index 0000000..e2e0a60 Binary files /dev/null and b/src/main/resources/assets/learning/textures/item/sapphire_pickaxe.png differ diff --git a/src/main/resources/assets/learning/textures/item/sapphire_shovel.png b/src/main/resources/assets/learning/textures/item/sapphire_shovel.png new file mode 100644 index 0000000..380aadf Binary files /dev/null and b/src/main/resources/assets/learning/textures/item/sapphire_shovel.png differ