diff --git a/.gradle/8.2.1/fileHashes/fileHashes.lock b/.gradle/8.2.1/fileHashes/fileHashes.lock index 1b5ae01..6a226cf 100644 Binary files a/.gradle/8.2.1/fileHashes/fileHashes.lock and b/.gradle/8.2.1/fileHashes/fileHashes.lock differ diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index ab72f13..493d6b3 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -97,28 +97,6 @@ public class CinderLoE { public static LOTRMaterial MATERIAL_BREE; public static LOTRMaterial MATERIAL_BATTLENUN; public static LOTRMaterial MATERIAL_ASH; - public static LOTRMaterial WOOD_ELVEN; - public static LOTRMaterial MOREDAIN; - public static LOTRMaterial UMBAR; - public static LOTRMaterial GULF_HARAD; - public static LOTRMaterial CORSAIR; - public static LOTRMaterial HARNEDOR; - public static LOTRMaterial NEAR_HARAD; - public static LOTRMaterial DUNLENDING; - public static LOTRMaterial RHUN; - public static LOTRMaterial RHUN_GOLD; - public static LOTRMaterial LOSSARNACH; - public static LOTRMaterial DORWINION; - public static LOTRMaterial TAUREDAIN; - public static LOTRMaterial ROHAN; - public static LOTRMaterial DORWINION_ELF; - public static LOTRMaterial GONDOR; - public static LOTRMaterial DALE; - public static LOTRMaterial HALF_TROLL; - public static LOTRMaterial BLACK_URUK; - public static LOTRMaterial URUK; - public static LOTRMaterial ANGMAR; - public static LOTRMaterial LAMEDON; // Blocks @@ -600,7 +578,7 @@ public class CinderLoE { ingotAsh = new Item().setUnlocalizedName("lotr:ingotAsh").setTextureName("lotr:ingotAsh").setCreativeTab((CreativeTabs) materials); if (MATERIAL_ASH != null) { swordAsh = (new LOTRItemSword(MATERIAL_ASH)).addWeaponDamage(4.25F).setUnlocalizedName("lotr:swordAsh").setTextureName("lotr:swordAsh"); - staffAsh = (new LOTRItemPolearm(MATERIAL_ASH)).addWeaponDamage(6.5F).setUnlocalizedName("lotr:staffAsh").setTextureName("lotr:staffAsh"); + staffAsh = (new LOTRItemPolearm(MATERIAL_ASH)).addWeaponDamage(5.5F).setUnlocalizedName("lotr:staffAsh").setTextureName("lotr:staffAsh"); 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"); diff --git a/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java b/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java index 787df6b..8ec6aad 100644 --- a/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java +++ b/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java @@ -86,23 +86,21 @@ public class LOTRMaterialTransformer implements IClassTransformer { classNode.fields.add(field); } - public void modifyMaterial2(String fieldName, int durability, float protection, ClassNode classNode) { - System.out.println("[CinderLoE] Attempting to modify " + fieldName); - + public void modifyMaterial(String fieldName, int durability, float protection, ClassNode classNode) { MethodNode clinit = null; boolean foundField = false; + boolean durabilityModified = false; + boolean protectionModified = false; // First, find the method for (MethodNode method : classNode.methods) { if (method.name.equals("")) { - System.out.println("[CinderLoE] Found clinit"); clinit = method; break; } } if (clinit == null) { - System.out.println("[CinderLoE] clinit not found"); return; } @@ -111,16 +109,9 @@ public class LOTRMaterialTransformer implements IClassTransformer { while (iter.hasNext()) { AbstractInsnNode insn = iter.next(); - if (insn instanceof LdcInsnNode) { - System.out.println("[CinderLoE] Reading node " + ((LdcInsnNode) insn).cst); - } - - if (insn instanceof LdcInsnNode && ((LdcInsnNode) insn).cst.equals(fieldName)) { foundField = true; } - - if (foundField && insn instanceof MethodInsnNode && ((MethodInsnNode) insn).name.equals("setProtection")) { AbstractInsnNode protectionInsn = insn.getPrevious(); @@ -131,42 +122,6 @@ public class LOTRMaterialTransformer implements IClassTransformer { } } - - } - - if (!foundField) { - System.out.println("[CinderLoE] Field '" + fieldName + "' not found in ."); - } - } - - public void modifyMaterial(String fieldName, int durability, ClassNode classNode) { - MethodNode clinit = null; - boolean foundField = false; - boolean durabilityModified = false; - boolean protectionModified = false; - - // First, find the method - for (MethodNode method : classNode.methods) { - if (method.name.equals("")) { - clinit = method; - break; - } - } - - if (clinit == null) { - return; - } - - - Iterator iter = clinit.instructions.iterator(); - while (iter.hasNext()) { - AbstractInsnNode insn = iter.next(); - - if (insn instanceof LdcInsnNode && ((LdcInsnNode) insn).cst.equals(fieldName)) { - foundField = true; - } - - if (foundField && !durabilityModified && insn instanceof MethodInsnNode && ((MethodInsnNode) insn).name.equals("setUses")) { AbstractInsnNode durabilityInsn = insn.getPrevious();