From e9c074f037596b96afc0630de73c5cc1c6ff3349 Mon Sep 17 00:00:00 2001 From: Herobane Date: Tue, 17 Oct 2023 13:40:03 +0200 Subject: [PATCH] + Added Ruby and Sapphire Swords --- src/main/java/net/herobane/learning/Learning.java | 5 +++++ .../java/net/herobane/learning/item/ModItems.java | 7 +++++++ .../resources/assets/learning/lang/en_us.json | 5 ++++- .../resources/assets/learning/lang/fr_fr.json | 5 ++++- .../assets/learning/models/item/ruby_sword.json | 6 ++++++ .../learning/models/item/sapphire_sword.json | 6 ++++++ .../assets/learning/textures/item/ruby_sword.png | Bin 0 -> 808 bytes .../learning/textures/item/sapphire_sword.png | Bin 0 -> 816 bytes 8 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/learning/models/item/ruby_sword.json create mode 100644 src/main/resources/assets/learning/models/item/sapphire_sword.json create mode 100644 src/main/resources/assets/learning/textures/item/ruby_sword.png create mode 100644 src/main/resources/assets/learning/textures/item/sapphire_sword.png 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 0000000000000000000000000000000000000000..a9bfd4045fca49cb95e61204b513455f6b221fcb GIT binary patch literal 808 zcmV+@1K0eCP)EX>4Tx04R}tkv&MmP!xqvQ>9WXB6bkzkfA!+MMWH?ibb$c+6t{Yn7s54nlvOS zE{=k0!NH%!s)LKOt`4q(Aov5~>f)s6A|>9J6k5di;PO7sd*^W9eSpxcGS%#v160j2 z(uug3%dd)oR|GMHeyWJXOg))d%))bh-NVQCyBN>%zW3)EPzojkd?N82(+!JwgLr1s z(mC%Fhgn%th|h^93~G@0k?XR{Z=6dG3p_JyWYhD+VPdh=#c~(3vY`@B6Gs(QqkJLf zvch?bvs$gQcAxx(p@O!O;W||W2`nLr6hz3Vqk<|d#Aw$@F_EV8xQBn#@u$coldA$o zjs?`9LUR1zfAD*@W^roLO$x<<-WS{c7y|;kK&xTf-^aGyIsyF8z?IhV*P6iWC+Urj z7Ciz6w}Ff6jwbH`mpj17lP(#OBl)R>Vi9;hqi@Os!?!?i&7E8O9H$RJmS(kl0~{Oz z<0Z;o_jq?-_uT%y)1KcCiokNPreSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{0096=L_t(I%VT6910?gQ{%0T;B=f2M|6e@o|Nr7y|6RGH z{xgxPc}{96!<%*c$+!8nVkF#l@-(|v&`5JKpXz_~&`su3{r}&!0 zpX&cP=D`ea?mT1=QIThGJGzKr_qS(^1fBa@G4ek#He+=G40H&aFf^UrNtDfu*jy3C ztITlZ`%8u+KVA}aHi`>8%|!pRI{aklcz=n(hEtrOLQs!^P?WJCYj!XcVwk`E3B!$V zUl|z~82&RbFfhdODl;%JF#N~m5*Apfvr7DgXnypSk%55$+3AE`AjiVPaAeO{n9V4F mP#Ca0`tz0H(Vwqm=S~3O3z)*8nKlyu0000EX>4Tx04R}tkv&MmP!xqvQ>9WXB6bkzkfA!+MMWH?ibb$c+6t{Yn7s54nlvOS zE{=k0!NH%!s)LKOt`4q(Aov5~>f)s6A|>9J6k5di;PO7sd*^W9eSpxcGS%#v160j2 z(uug3%dd)oR|GMHeyWJXOg))d%))bh-NVQCyBN>%zW3)EPzojkd?N82(+!JwgLr1s z(mC%Fhgn%th|h^93~G@0k?XR{Z=6dG3p_JyWYhD+VPdh=#c~(3vY`@B6Gs(QqkJLf zvch?bvs$gQcAxx(p@O!O;W||W2`nLr6hz3Vqk<|d#Aw$@F_EV8xQBn#@u$coldA$o zjs?`9LUR1zfAD*@W^roLO$x<<-WS{c7y|;kK&xTf-^aGyIsyF8z?IhV*P6iWC+Urj z7Ciz6w}Ff6jwbH`mpj17lP(#OBl)R>Vi9;hqi@Os!?!?i&7E8O9H$RJmS(kl0~{Oz z<0Z;o_jq?-_uT%y)1KcCiokNPreSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{009U|L_t(I%VT691BhuA{AVB+h-nr4pS|k-|JkeV|L2zt z_|HVD=GKOMhSmEhu-PpGVLMrxbK7a9Sxl?oKYHkjX%+m>ZO5+}B@lTeoZwL;rd9Ai zJT{-<=0gSsb$JGcMbioyK0e;Sh;9H2jPdH)1V#o1hX10P`3yflKOjmoh6`Xo#;l)V z>+Z`0H8U_UFfd{Z3myq4hA%JnG5q}e0Iy~Y13b+{|I15oGAuuD#K6w0z`(%3K+q5- zWX%qSLJS8kyk+?Kcmw0l&kq=Wety8f&a1$HFWwnpp&q2Nj^V(Cw+uHPeMPYirWvOz u#Iy?jYX_5