From c51b4b059484546e401f18428331eb7613f62fa6 Mon Sep 17 00:00:00 2001 From: KeyLime17 Date: Wed, 8 May 2024 19:36:14 -0400 Subject: [PATCH] Ash-material stuff fixed and repairable, and some other stuff --- .gradle/8.2.1/fileHashes/fileHashes.lock | 2 +- .../com/zivilon/cinder_loe/CinderLoE.java | 3 +- .../zivilon/cinder_loe/items/CinderBow.java | 38 +++++++++++++ .../java/com/zivilon/cinder_loe/recipes.java | 2 + .../assets/cinder_loe/lang/en_US.lang | 1 + .../lotr/textures/items/large/staffAsh.png | Bin 0 -> 3981 bytes .../textures/items/large/staffAsh.png.mcmeta | 52 ++++++++++++++++++ .../assets/lotr/textures/items/staffAsh.png | Bin 0 -> 1884 bytes 8 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/zivilon/cinder_loe/items/CinderBow.java create mode 100644 src/main/resources/assets/lotr/textures/items/large/staffAsh.png create mode 100644 src/main/resources/assets/lotr/textures/items/large/staffAsh.png.mcmeta create mode 100644 src/main/resources/assets/lotr/textures/items/staffAsh.png diff --git a/.gradle/8.2.1/fileHashes/fileHashes.lock b/.gradle/8.2.1/fileHashes/fileHashes.lock index 6a226cf..48d26ae 100644 --- a/.gradle/8.2.1/fileHashes/fileHashes.lock +++ b/.gradle/8.2.1/fileHashes/fileHashes.lock @@ -1 +1 @@ -�[�i5ï¿½ï¿¾Ž \ No newline at end of file +�[�i5�ï¿Ä. \ No newline at end of file diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index 493d6b3..4578f81 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -582,12 +582,11 @@ public class CinderLoE { daggerAsh = (new LOTRItemDagger(MATERIAL_ASH)).addWeaponDamage(6.75F).setUnlocalizedName("lotr:daggerAsh").setTextureName("lotr:daggerAsh"); hammerAsh = (new LOTRItemHammer(MATERIAL_ASH)).addWeaponDamage(5.5F).setUnlocalizedName("lotr:hammerAsh").setTextureName("lotr:hammerAsh"); battleaxeAsh = (new LOTRItemBattleaxe(MATERIAL_ASH)).addWeaponDamage(5.5F).setUnlocalizedName("lotr:battleaxeAsh").setTextureName("lotr:battleaxeAsh"); - bowAsh = (new LOTRItemBow(MATERIAL_ASH, 1.5)).setDrawTime(16).setUnlocalizedName("lotr:bowAsh").setTextureName("lotr:bowAsh"); + bowAsh = (new CinderBow(MATERIAL_ASH, 1.5)).setDrawTime(16).setUnlocalizedName("lotr:bowAsh").setTextureName("lotr:bowAsh"); pikeAsh = (new LOTRItemPike(MATERIAL_ASH)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:pikeAsh").setTextureName("lotr:pikeAsh"); spearAsh = (new LOTRItemSpear(MATERIAL_ASH)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:spearAsh").setTextureName("lotr:spearAsh"); ItemRegistration.registerItem(ingotAsh, "ingotAsh", 74); - ItemRegistration.registerItem(swordAsh, "swordAsh", 75); ItemRegistration.registerItem(daggerAsh, "daggerAsh", 76); ItemRegistration.registerItem(hammerAsh, "hammerAsh", 77); diff --git a/src/main/java/com/zivilon/cinder_loe/items/CinderBow.java b/src/main/java/com/zivilon/cinder_loe/items/CinderBow.java new file mode 100644 index 0000000..6abce42 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/items/CinderBow.java @@ -0,0 +1,38 @@ +package com.zivilon.cinder_loe.items; + +import com.zivilon.cinder_loe.CinderLoE; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import lotr.common.LOTRLevelData; +import lotr.common.LOTRMod; +import lotr.common.fac.LOTRFaction; +import lotr.common.item.LOTRItemBow; +import lotr.common.item.LOTRMaterial; +import lotr.common.network.LOTRPacketHandler; +import lotr.common.network.LOTRPacketWeaponFX; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Overwrite; + +import java.util.List; + +public class CinderBow extends LOTRItemBow { + + + public CinderBow(LOTRMaterial material, double d) { + super(material, d); + } + + @Override + public boolean getIsRepairable(ItemStack itemstack, ItemStack repairItem) { + return repairItem.getItem() == CinderLoE.ingotAsh || super.getIsRepairable(itemstack, repairItem); + } + +} diff --git a/src/main/java/com/zivilon/cinder_loe/recipes.java b/src/main/java/com/zivilon/cinder_loe/recipes.java index f0617b7..c6f6d49 100644 --- a/src/main/java/com/zivilon/cinder_loe/recipes.java +++ b/src/main/java/com/zivilon/cinder_loe/recipes.java @@ -37,6 +37,8 @@ public class recipes { Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.swordAsh), new Object[] { " X ", " X ", " Y ", Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); + GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.staffAsh), new Object[] { " X", " Y ", "X ", + Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.battleaxeAsh), new Object[] { "XXX", "XYX", " Y ", Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.pikeAsh), new Object[] { " X", " YX", "Y ", diff --git a/src/main/resources/assets/cinder_loe/lang/en_US.lang b/src/main/resources/assets/cinder_loe/lang/en_US.lang index 65e189e..d17c784 100644 --- a/src/main/resources/assets/cinder_loe/lang/en_US.lang +++ b/src/main/resources/assets/cinder_loe/lang/en_US.lang @@ -83,6 +83,7 @@ item.lotr:maceArnor.name=Arnorian Mace item.lotr:ingotAsh.name=Ashen Ingot item.lotr:swordAsh.name=Ash-Forged Sword +item.lotr:staffAsh.name=Ash-Forged Bardiche item.lotr:daggerAsh.name=Ash-Forged Dagger item.lotr:hammerAsh.name=Ash-Forged Mace item.lotr:battleaxeAsh.name=Ash-Forged Axe diff --git a/src/main/resources/assets/lotr/textures/items/large/staffAsh.png b/src/main/resources/assets/lotr/textures/items/large/staffAsh.png new file mode 100644 index 0000000000000000000000000000000000000000..285ec001482db36af4ecc2b0f2ba6cf115b5c73b GIT binary patch literal 3981 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 Y?))~%v4?wgstEwiyLzfPW$Vy?0cP{D8vp zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3yemg6W4h2L4lECEUUh~;1~=gbaf`Evo|B(9{} zU0tDKVHt$bC*+jb|NFO@fAC?OtZ_bSNFi8!TylvsI%?-9k1JU>uE&jCofo}1A23t` zDf3ptF@EXEzF4A+o_{i=<#@2YK1lAcuNOndLef2Abn0O!9fpMG13C=kxh)%##^)_; z`;>LY)_oU7*I5#Z3pKf1QzxjvrUWKoUit(6Wf=;Ryor zE>8BzD|4lC_UMED0!6~q8z^3b8BY0DPyT)I%?R<+%2LjiU-Y}4OS}ZRe_N|+THELD zvI_`lI5xGmGI|)eA>=Zq1+<8-M?a31(9|G%3y@b^?1ok-5d%vjN0l-)+J`Ju;G*N5 zBP4TS89J57iHleRKCU-v93@EwHI@Rr0xh4u&{#K( zRHJ4AgqI)@Xp&^Gawu%bpXd}hl)ZT8y$?Qm^~vWT!37^eh@lt193{HwV~8G}n9!EjDeb<&zqjiS_N4HPEJ`Q_*Kl3-zbbEH0j>8SWJROqJNvfrsZtv-_16~77oklbS zH%%88Yn5@+U*Pv-EXJ)lelCf!to!gQAVa5z{ino~HLgK9jd?&6#&CmuAl28*hue3F zEkLI4Z}-Rckl@EMDJ`dw_(!j5J9lzw{Wg6xwiI0fZCehPz1)?}sIIx&bb{dxEypUY zyeMr@@hMgHc`Us-(X!1=uz8;L$gw|6B1p3mvDc{C&GFcN2p_We=uTV*E%R+$7ipe2 zQn;e^Yt41!Kx^a{y*lhPNt3^kxw-A58M)uml@KEW~HrSyT?ql}Que6c>olS*nU zapV&g^LQlS z8G8H<;dYk!>Dnmsrp%h{)9ph4UYcLM8Qd(bj)HIJQT>n<=7-Mg)zI5h>gLnLzsgMW z1I}CwJrxrET2OA+qrW~W_{Xm%^FKud%6*IgaI^pb0flKpLr_UWLm+T+Z)Rz1WdHzp zoPCi!NW(xJ#a}<9B2@oh*uqI7$_ZV4<`XT6HkF^b49aBq=VAf@{ISkHxBk zi?gl{u7V)=0pjf7r060g{x2!Ci1FaKAMfrx?%o03MujPce*#ccQ%}WXLN>Q51YY4s z7=!4;xX27GkzUNeb$s2!!`Hhg&vHNa=jfI51_L|-@f_21lX!!8X4BL-?-PeuNtB7t ziN|!hAn_yDC5PWQ7j5?P%#fZ*%@c=+g<=Ow9n4C)LOe|zkrkEly;+B4&Rd+7N{zMd z$zK@Et1D@)(;P+|OGqFI0TOB`qXH9AT2)dEq-a0p;vcg8NpeZ#Dua<@0aYjvZ9n)Q z{O;B$OiemT!5Gl>Vp$&}KwuYW)-CJ%*s_`@fbSW&QrrG&1DO3Jz24R$M?n8JaBw3Vu9k0rgF|4nNZIQy@9ysG z?cX!4{(bD00(qQO+^Rj1qc=kCKAOLBme*a>PbXFR5;6>(?M&(Fc`-1f80>1wXhxnvQyuK zC%^w^=tppu9X2-cg(}0P1)*ez(c+wGv%SZ_FL|DX7)GWj3J>6%>(^A(h=>Qc8^hUR z!E8EZHlNcpO^=sJ!r^$tjNxeE z{I=f@;+qLVw;h#WvljoDXVLh_23_Zv*uN@V;^)_0GzRED#_6N_GX}s~>#en(f6f;I W>YIdv7{>ho0000