From 4a5cf461701ce7ca323187a2ff68b6ab2ec32ad6 Mon Sep 17 00:00:00 2001 From: Herobane Date: Tue, 17 Oct 2023 23:45:59 +0200 Subject: [PATCH] + Added Ruby and Sapphire tools --- .../java/net/herobane/learning/Learning.java | 11 +++++++++++ .../net/herobane/learning/item/ModItems.java | 16 ++++++++++++++++ .../resources/assets/learning/lang/en_us.json | 14 +++++++++++++- .../resources/assets/learning/lang/fr_fr.json | 16 ++++++++++++++-- .../assets/learning/models/item/ruby_axe.json | 6 ++++++ .../assets/learning/models/item/ruby_hoe.json | 6 ++++++ .../learning/models/item/ruby_pickaxe.json | 6 ++++++ .../learning/models/item/ruby_shovel.json | 6 ++++++ .../learning/models/item/sapphire_axe.json | 6 ++++++ .../learning/models/item/sapphire_hoe.json | 6 ++++++ .../learning/models/item/sapphire_pickaxe.json | 6 ++++++ .../learning/models/item/sapphire_shovel.json | 6 ++++++ .../assets/learning/textures/item/ruby_axe.png | Bin 0 -> 775 bytes .../assets/learning/textures/item/ruby_hoe.png | Bin 0 -> 733 bytes .../learning/textures/item/ruby_pickaxe.png | Bin 0 -> 772 bytes .../learning/textures/item/ruby_shovel.png | Bin 0 -> 741 bytes .../learning/textures/item/sapphire_axe.png | Bin 0 -> 772 bytes .../learning/textures/item/sapphire_hoe.png | Bin 0 -> 756 bytes .../learning/textures/item/sapphire_pickaxe.png | Bin 0 -> 766 bytes .../learning/textures/item/sapphire_shovel.png | Bin 0 -> 747 bytes 20 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/learning/models/item/ruby_axe.json create mode 100644 src/main/resources/assets/learning/models/item/ruby_hoe.json create mode 100644 src/main/resources/assets/learning/models/item/ruby_pickaxe.json create mode 100644 src/main/resources/assets/learning/models/item/ruby_shovel.json create mode 100644 src/main/resources/assets/learning/models/item/sapphire_axe.json create mode 100644 src/main/resources/assets/learning/models/item/sapphire_hoe.json create mode 100644 src/main/resources/assets/learning/models/item/sapphire_pickaxe.json create mode 100644 src/main/resources/assets/learning/models/item/sapphire_shovel.json create mode 100644 src/main/resources/assets/learning/textures/item/ruby_axe.png create mode 100644 src/main/resources/assets/learning/textures/item/ruby_hoe.png create mode 100644 src/main/resources/assets/learning/textures/item/ruby_pickaxe.png create mode 100644 src/main/resources/assets/learning/textures/item/ruby_shovel.png create mode 100644 src/main/resources/assets/learning/textures/item/sapphire_axe.png create mode 100644 src/main/resources/assets/learning/textures/item/sapphire_hoe.png create mode 100644 src/main/resources/assets/learning/textures/item/sapphire_pickaxe.png create mode 100644 src/main/resources/assets/learning/textures/item/sapphire_shovel.png 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 0000000000000000000000000000000000000000..62e350304903499960c1565d5eb84feda54184d4 GIT binary patch literal 775 zcmV+i1Ni)jP)EX>4Tx04R}tkv&MmKp2MKrixN3B6bjQ$WWauf{F+(rHVzcP}&NuI+$Gg2TdB1 z6ct?f%Ws^E4huXpWMoqF#35p_*uioKvy!0_PZNg~Rik_% z>$1Xmi?dp(vDQ8L3xj!WCCznOBZy-O2_zvxMh#_DU?D=gMv93PoyR=3_a2&}n%Yn|it0mx9VmT!QA zLtv~(+3Ozf?(OW`zcsD?{QxoYa`Oml&6NNE00v@9M??Vs0CNDEbxP2n00009a7bBm z001r{001r{0eGc9b^rhX2XskIMF-~!5fTRsJkFfcHPsK_%g zFfcG&`t_b+8-FsxfeUX@)G^}of-9HQe+C8y1{R&)4BPmV8TMVfz~H21z~FXt5yS3p z&lm}Y!R~L*7+G|FGssJDGHBkM%;2PDKw1oVnu-4JOjrM}A;0iE=g}z&KzwV*m{~Zt^u#0suWrV}cE{e=7h0002ovPDHLk FV1j*>O3MHM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f1ca8a24b0da7d07f91dff4a3d0a0446b6f78672 GIT binary patch literal 733 zcmV<30wVp1P)EX>4Tx04R}tkv&MmKp2MKrixN3B6bjQ$WWauf{F+(rHVzcP}&NuI+$Gg2TdB1 z6ct?f%Ws^E4huXpWMoqF#35p_*uioKvy!0_PZNg~Rik_% z>$1Xmi?dp(vDQ8L3xj!WCCznOBZy-O2_zvxMh#_DU?D=gMv93PoyR=3_a2&}n%Yn|it0mx9VmT!QA zLtv~(+3Ozf?(OW`zcsD?{QxoYa`Oml&6NNE00v@9M??Vs0CNDEbxP2n00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-~!5fTkAWL=%h0000PbVXQnLvL+uWo~o;Lvm$d zbY)~9cWHEJAV*0}P*;Ht7XSbNvq?ljR5;6HV4x5%;*(6~Q~eKP&;4{8t6CO(n&+gJ zGB8}a2N5{A_CGd5@Vda2OX@!Z0|Ub{aeD?46?uk~lWQ5CX?$Rim*8ZWvFQ;b(f)Mh zlKTHzG4lUw#mN7i>FWPA}O&EjB&th#_9sP+Kd4- P00000NkvXXu0mjf{d+&4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..44beed409f5657f659dd111a0c0a4eb218aaca9a GIT binary patch literal 772 zcmV+f1N;1mP)EX>4Tx04R}tkv&MmKp2MKrixN3B6bjQ$WWauf{F+(rHVzcP}&NuI+$Gg2TdB1 z6ct?f%Ws^E4huXpWMoqF#35p_*uioKvy!0_PZNg~Rik_% z>$1Xmi?dp(vDQ8L3xj!WCCznOBZy-O2_zvxMh#_DU?D=gMv93PoyR=3_a2&}n%Yn|it0mx9VmT!QA zLtv~(+3Ozf?(OW`zcsD?{QxoYa`Oml&6NNE00v@9M??Vs0CNDEbxP2n00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-~!5fTX}4(ibT0000PbVXQnLvL+uWo~o;Lvm$d zbY)~9cWHEJAV*0}P*;Ht7XSbN+DSw~R5;6HU>In?h)W`wPxU{#*xXOIG1Rl*(mW@% zl!4*WJ%%@T9x^a6FffRy$TKjUT>Jl-#s>y@2~LI?n;tO|bit!PU*Y^^;`R&-3=9nO z+|Dt~-~NQ*#-p!{B>C0TO!WVM*NXqI6(j$zX1eo)>Fdo?9O!c z{~B`K|8c27js-?+He+)(QBg(6X1qW{j+=bVlmGyNI%7C4#N^Td0000EX>4Tx04R}tkv&MmKp2MKrixN3B6bjQ$WWauf{F+(rHVzcP}&NuI+$Gg2TdB1 z6ct?f%Ws^E4huXpWMoqF#35p_*uioKvy!0_PZNg~Rik_% z>$1Xmi?dp(vDQ8L3xj!WCCznOBZy-O2_zvxMh#_DU?D=gMv93PoyR=3_a2&}n%Yn|it0mx9VmT!QA zLtv~(+3Ozf?(OW`zcsD?{QxoYa`Oml&6NNE00v@9M??Vs0CNDEbxP2n00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-~!5fTe9zYjOK0000PbVXQnLvL+uWo~o;Lvm$d zbY)~9cWHEJAV*0}P*;Ht7XSbNyGcYrR5;6HU>In?NQ&ZQKGpvW3=9m9{(NQF{p}e^ zdKr@WRR8}kp7sBK@vQ%^6(j$|Mo9;xYQ_K>a@<7uo2mc+ X1hHQ5h;n0)00000NkvXXu0mjfR`fs+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8ecb5b415e92e067385468d95923d4ae4eed6a14 GIT binary patch literal 772 zcmV+f1N;1mP)EX>4Tx04R}tkv&MmKp2MKrixN3B6bjQ$WWauf{F+(rHVzcP}&NuI+$Gg2TdB1 z6ct?f%Ws^E4huXpWMoqF#35p_*uioKvy!0_PZNg~Rik_% z>$1Xmi?dp(vDQ8L3xj!WCCznOBZy-O2_zvxMh#_DU?D=gMv93PoyR=3_a2&}n%Yn|it0mx9VmT!QA zLtv~(+3Ozf?(OW`zcsD?{QxoYa`Oml&6NNE00v@9M??Vs0CNDEbxP2n00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-~!5fTzKBVt;)0000PbVXQnLvL+uWo~o;Lvm$d zbY)~9cWHEJAV*0}P*;Ht7XSbN+DSw~R5;6HV4w#O(<=Bcrd9BtY|XP*-Tyy()qSjn zun^MR+K|t%dLILWx;%C@jKpY$0p@dN4Du433^O)8g6m_#Wx&tR4;UC25H{brb(!I> z(J6)l7v2)*0tN;K27cLq{|pQa3|5jy8U7lbVz_hbGJ}emF2l*Kg$y4bZ(zjh0tN;K zhL4XoFj`3-WssNPWO%eqhe1V6m$Vr0G!y;bnXdj{Lyr4D%tbI)5%hwmndpCc2~LIs z7v3`5c=Q#gIz~z~6Xk3|fN{WV#sC^}+~jMf1ONcd17D2jd;Wd^0000 C6-5&O literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..64df1aaedf2035471dff1d0b13a2f3eb963ad324 GIT binary patch literal 756 zcmVEX>4Tx04R}tkv&MmKp2MKrixN3B6bjQ$WWauf{F+(rHVzcP}&NuI+$Gg2TdB1 z6ct?f%Ws^E4huXpWMoqF#35p_*uioKvy!0_PZNg~Rik_% z>$1Xmi?dp(vDQ8L3xj!WCCznOBZy-O2_zvxMh#_DU?D=gMv93PoyR=3_a2&}n%Yn|it0mx9VmT!QA zLtv~(+3Ozf?(OW`zcsD?{QxoYa`Oml&6NNE00v@9M??Vs0CNDEbxP2n00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-~!5fT?6GssF80000PbVXQnLvL+uWo~o;Lvm$d zbY)~9cWHEJAV*0}P*;Ht7XSbN%1J~)R5;6HV4x5%;*%89D)avHye{CE4fxN%z`$Vc-Or#d&%m&9@k9n=o}~=(5}XV(Ha%h_XaKT7 z=HC4b3=9km&i_3a=5K$(aO2TeMg|531}0(*`1p7OBl9^k26cG`hP{kC7@q%kCC&>l z;AtlMUtWTf;lPEr4A1|&GJJfzfsyEF@-!3u-EX>4Tx04R}tkv&MmKp2MKrixN3B6bjQ$WWauf{F+(rHVzcP}&NuI+$Gg2TdB1 z6ct?f%Ws^E4huXpWMoqF#35p_*uioKvy!0_PZNg~Rik_% z>$1Xmi?dp(vDQ8L3xj!WCCznOBZy-O2_zvxMh#_DU?D=gMv93PoyR=3_a2&}n%Yn|it0mx9VmT!QA zLtv~(+3Ozf?(OW`zcsD?{QxoYa`Oml&6NNE00v@9M??Vs0CNDEbxP2n00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-~!5fT(L>s)A@0000PbVXQnLvL+uWo~o;Lvm$d zbY)~9cWHEJAV*0}P*;Ht7XSbN)Ja4^R5;6HU>In?h)Y6DtKdJn*sE(3Fx0c)(%jmR z&v5B31H;XS5HWRm28NZ38U7pdEM<_F;AEJw=@BDA7ySJE0M0k}?q^_NU|?|m@4+yC z`xAy6kG?XJFWPAEX>4Tx04R}tkv&MmKp2MKrixN3B6bjQ$WWauf{F+(rHVzcP}&NuI+$Gg2TdB1 z6ct?f%Ws^E4huXpWMoqF#35p_*uioKvy!0_PZNg~Rik_% z>$1Xmi?dp(vDQ8L3xj!WCCznOBZy-O2_zvxMh#_DU?D=gMv93PoyR=3_a2&}n%Yn|it0mx9VmT!QA zLtv~(+3Ozf?(OW`zcsD?{QxoYa`Oml&6NNE00v@9M??Vs0CNDEbxP2n00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-~!5fT;=3<^v70000PbVXQnLvL+uWo~o;Lvm$d zbY)~9cWHEJAV*0}P*;Ht7XSbN!AV3xR5;6HU>In?NQz=Ht%Cmy3=9lEKR;mj_;>>& z0|NsC3n`jg8}b<#7#J8NlHkh+RTWok%57M!NE|7VgB|fL^~TL9gwOS18B%` d6XkEJ0ss@tSW}7XuSNg>002ovPDHLkV1j{6HctQm literal 0 HcmV?d00001