Testing Bdew's title injector, might work better now that EnumExtend seems to be broken

src/main/java/mod/sin/actions/items/StableContractAction.java

@@ -66,6 +66,10 @@ public class StableContractAction implements ModAction, BehaviourProvider, Actio
                 performer.getCommunicator().sendNormalServerMessage("You cannot summon the stable master right now!");
                 return true;
             }
+            if(performer.getCurrentVillage() == null) {
+                performer.getCommunicator().sendNormalServerMessage("You must be part of a settlement to summon a stablemaster.");
+                return true;
+            }
             if(counter == 1.0f) {
                 performer.getCommunicator().sendNormalServerMessage("You begin reading the contract...");
                 final int time = 5;

src/main/java/mod/sin/wyvern/AchievementChanges.java

@@ -313,8 +313,9 @@ public class AchievementChanges {
     public static Titles.Title getAwardedTitle(Achievement a) {
         int count = a.getCounter();
         if(a.getTemplate() == gremlinSlayer) {
+            logger.info("Achievement at " + count);
             if(count >= 100) {
-                return Titles.Title.getTitle(Mastercraft.GremlinSlayer);
+                return Titles.Title.getTitle(704);
             }
         }
         return null;
@@ -325,8 +326,10 @@ public class AchievementChanges {
         Achievements achievments = Achievements.getAchievementObject(player.getWurmId());
         Achievement achievment = achievments.getAchievement(tpl.getNumber());
         if (achievment != null) {
+            logger.info("Achievemtn found");
             Titles.Title title = getAwardedTitle(achievment);
             if (title != null) {
+                logger.info("Adding title");
                 player.addTitle(title);
             }
         }

src/main/java/mod/sin/wyvern/CombatChanges.java

@@ -334,6 +334,26 @@ public class CombatChanges {
             replace = "$_ = true;";
             Util.instrumentDescribed(thisClass, ctCombatHandler, "getDamage", desc2, "isThisAnEpicOrChallengeServer", replace);
 
+            CtClass ctAttackAction = classPool.get("com.wurmonline.server.creatures.AttackAction");
+            CtClass[] paramsWoa1 = {
+                    ctAttackAction,
+                    ctItem
+            };
+            CtClass[] paramsWoa2 = {
+                    ctItem
+            };
+            String descWoa1 = Descriptor.ofMethod(CtClass.floatType, paramsWoa1);
+            String descWoa2 = Descriptor.ofMethod(CtClass.floatType, paramsWoa2);
+            Util.setReason("Adjust WoA effect on weapons to be more noticeable");
+            replace = "$_ = $proceed($$) * 2;";
+            Util.instrumentDescribedCount(thisClass, ctCombatHandler, "getSpeed", descWoa1,"getSpellSpeedBonus", 2, replace);
+            Util.instrumentDescribedCount(thisClass, ctCombatHandler, "getSpeed", descWoa2,"getSpellSpeedBonus", 2, replace);
+
+            Util.setReason("Adjust bloodthirst cap up to 17k from 10k");
+            replace = "$1 = 17000;" +
+                    "$_ = $proceed($$);";
+            Util.instrumentDeclaredCount(thisClass, ctCombatHandler, "setDamage", "min", 5, replace);
+
             Util.setReason("Fix magranon damage bonus stacking.");
             replace = "if(mildStack){" +
                     "  $_ = $proceed($$) * 8 / 5;" +
@@ -343,7 +363,6 @@ public class CombatChanges {
             Util.instrumentDescribed(thisClass, ctCombatHandler, "getDamage", desc2, "getModifiedFloatEffect", replace);
 
             Util.setReason("Adjust bloodthirst to epic settings.");
-            CtClass ctAttackAction = classPool.get("com.wurmonline.server.creatures.AttackAction");
             CtClass[] params3 = {
                     ctCreature,
                     ctAttackAction,

src/main/java/mod/sin/wyvern/ItemMod.java

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.logging.Logger;
 
 import com.wurmonline.server.Servers;
+import com.wurmonline.server.combat.ArmourTemplate;
 import mod.sin.actions.items.magicitems.MagicItemMenuProvider;
 import mod.sin.actions.items.magicitems.MagicItemRechargeAction;
 import mod.sin.items.schematicitems.SchematicItems;

src/main/java/mod/sin/wyvern/MiscChanges.java

@@ -284,9 +284,7 @@ public class MiscChanges {
             // Sleep powder added
             toRestock.add(new TraderItem(ItemList.sleepPowder, 99, false, 99, 99, 20));
             logger.info("Adding sleep powder to trader restock list");
-            // Kingdom tokens added
+            // Kingdom tokens Removed
-            toRestock.add(new TraderItem(ItemCreator.KINGDOM_TOKEN.getTemplateId(), 99, false, 99, 99, 20));
-            logger.info("Adding kingdom tokens to trader restock list");
             // Sealed maps added, use ranom qualities between 10 and 100 (inclusive)
             toRestock.add(new TraderItem(SealedMap.templateId, 99, true, 10, 101, 3));
             logger.info("Adding sealed maps to trader restock list");
@@ -885,8 +883,7 @@ public class MiscChanges {
                     if (m.getMethodName().equals("min")) {
                         if (first) {
                             first = false;
-                        }
+                        } else {
-                        else {
                             m.replace("$_ = $proceed($1, $2 * " + MiscChanges.class.getName() + ".boatSpeedBonus(this));");
                             logger.info("Allowing preists of vynora to gain 20% boat speed above 60 faith.");
                         }
@@ -1000,6 +997,18 @@ public class MiscChanges {
                     "}";
             Util.insertBeforeDescribed(thisClass, ctItemBehaviour, "action", desc15, replace);
 
+            Util.setReason("Change fantastic items to red.");
+            CtClass ctManageObjectList = classPool.get("com.wurmonline.server.questions.ManageObjectList");
+            /* This is for adding a new rarity!
+            replace = "if (item.getRarity() == 4) {" +
+                    "return \"label{color=\\\"66,153,225\\\";text=\\\"rare \" + name + \"\\\"};\";" +
+                    "}";
+                    */
+            replace = "if (item.getRarity() == 3) {" +
+                "return \"label{color=\\\"255,53,0\\\";text=\\\"fantastic \" + name + \"\\\"};\";" +
+                        "}";
+            Util.insertBeforeDeclared(thisClass, ctManageObjectList, "addRariryColour", replace);
+
         } catch (CannotCompileException | NotFoundException | IllegalArgumentException | ClassCastException e) {
             throw new HookException(e);
         }

src/main/java/mod/sin/wyvern/WyvernMods.java

@@ -18,6 +18,7 @@ import com.wurmonline.server.Items;
 import com.wurmonline.server.Server;
 import com.wurmonline.server.creatures.Communicator;
 import com.wurmonline.server.creatures.Creature;
+import com.wurmonline.server.deities.Deities;
 import com.wurmonline.server.items.*;
 import com.wurmonline.server.kingdom.Kingdoms;
 import mod.sin.actions.items.SorcerySplitAction;
@@ -325,9 +326,6 @@ implements WurmServerMod, Configurable, PreInitable, Initable, ItemTemplatesCrea
                                 // Stable master contract
                                 item = Creature.createItem(StableContract.templateId, 50);
                                 inventory.insertItem(item);
-                                // Kingdom token
-                                item = Creature.createItem(ItemCreator.KINGDOM_TOKEN.getTemplateId(), 50);
-                                inventory.insertItem(item);
                             }
                             return result;
                         }

src/main/java/mod/sin/wyvern/bonusoverhaul/ItemBonusOverhaul.java

@@ -36,7 +36,7 @@ public class ItemBonusOverhaul {
      */
     public static void initializeBonuses() throws NoSuchTemplateException {
         itemBonuses.add(new ItemBonusWrapper(GlimmerscaleVest.templateId, SpellEffectsEnum.ITEM_RING_CR, false, 1.0f, false));
-        itemBonuses.add(new ItemBonusWrapper(ArcaniteNecklaceFocus.templateId, SpellEffectsEnum.ITEM_NECKLACE_FOCUS, false, .2f, true));
+        itemBonuses.add(new ItemBonusWrapper(ArcaniteNecklaceFocus.templateId, SpellEffectsEnum.ITEM_NECKLACE_FOCUS, false, 20.0f, true));
 
         batteries = new Battery[] {
                 new Battery(Soul.templateId, 30),

src/main/java/mod/sin/wyvern/bounty/PlayerBounty.java

@@ -216,9 +216,11 @@ public class PlayerBounty {
 			strBuilder += " for slaying the " + mob.getName() + ".";
 			player.getCommunicator().sendSafeServerMessage(strBuilder);
 			long playerSteamId = steamIdMap.get(player.getName());
+			/* Maybe re-enable kingdom titles when they can be interesting again
 			Item creatureToken = ItemFactory.createItem(ItemCreator.CREATURE_TOKEN.getTemplateId(), 50, (byte)0, "");
 			inventory.insertItem(creatureToken);
 			player.getCommunicator().sendSafeServerMessage("You also receive a " + creatureToken.getName() + "!");
+			*/
 			if(playersRewarded.containsKey(mobWurmId)){
 				playersRewarded.get(mobWurmId).add(playerSteamId);
 			}else{

src/main/java/mod/sin/wyvern/mastercraft/AchievementTitles.java

@@ -0,0 +1,14 @@
+package mod.sin.wyvern.mastercraft;
+
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.NotFoundException;
+import javassist.bytecode.BadBytecode;
+
+public class AchievementTitles {
+    public static int gremlinSlayerTitleID = 704;
+    public static void register(ClassPool cp) throws NotFoundException, BadBytecode, CannotCompileException {
+        TitleInjector injector = new TitleInjector(cp);
+        injector.addTitle("GremlinSlayer", gremlinSlayerTitleID, "Gremlin Slayer", "Gremlin Slayer", -1, "NORMAL");
+    }
+}

src/main/java/mod/sin/wyvern/mastercraft/BytecodeTools.java

@@ -491,4 +491,71 @@ public class BytecodeTools extends Bytecode {
         }
         logger.log(Level.INFO,name + " : " + Arrays.toString(a));
     }
+
+    // BDEW EXTRAS
+    public static void putInteger(ConstPool cp, Bytecode code, int val) {
+        switch (val) {
+            case -1:
+                code.add(Bytecode.ICONST_M1);
+                break;
+            case 0:
+                code.add(Bytecode.ICONST_0);
+                break;
+            case 1:
+                code.add(Bytecode.ICONST_1);
+                break;
+            case 2:
+                code.add(Bytecode.ICONST_2);
+                break;
+            case 3:
+                code.add(Bytecode.ICONST_3);
+                break;
+            case 4:
+                code.add(Bytecode.ICONST_4);
+                break;
+            case 5:
+                code.add(Bytecode.ICONST_5);
+                break;
+            default:
+                if (val >= Byte.MIN_VALUE && val <= Byte.MAX_VALUE) {
+                    code.add(Bytecode.BIPUSH);
+                    code.add(val);
+                } else if (val >= Short.MIN_VALUE && val <= Short.MAX_VALUE) {
+                    code.add(Bytecode.SIPUSH);
+                    code.add(val >> 8 & 0xFF, val & 0xFF);
+                } else {
+                    code.addLdc(cp.addIntegerInfo(val));
+                }
+        }
+    }
+
+    public static int getInteger(ConstPool cp, CodeIterator iterator, int pos) {
+        int op = iterator.byteAt(pos);
+        switch (op) {
+            case Bytecode.ICONST_M1:
+                return -1;
+            case Bytecode.ICONST_0:
+                return 0;
+            case Bytecode.ICONST_1:
+                return 1;
+            case Bytecode.ICONST_2:
+                return 2;
+            case Bytecode.ICONST_3:
+                return 3;
+            case Bytecode.ICONST_4:
+                return 4;
+            case Bytecode.ICONST_5:
+                return 5;
+            case Bytecode.BIPUSH:
+                return iterator.byteAt(pos + 1);
+            case Bytecode.SIPUSH:
+                return iterator.s16bitAt(pos + 1);
+            case Bytecode.LDC:
+                return cp.getIntegerInfo(iterator.byteAt(pos + 1));
+            case Bytecode.LDC_W:
+                return cp.getIntegerInfo(iterator.u16bitAt(pos + 1));
+            default:
+                throw new RuntimeException(String.format("Failed to decode integer. Pos = %d, Bytecode = %d", pos, op));
+        }
+    }
 }

src/main/java/mod/sin/wyvern/mastercraft/Mastercraft.java

@@ -18,7 +18,6 @@ import java.util.logging.Logger;
 
 public class Mastercraft {
 	private static Logger logger = Logger.getLogger(Mastercraft.class.getName());
-	public static int GremlinSlayer = 704;
 	public static double getNewDifficulty(Skill skill, double diff, Item item){
 		if(skill.affinity > 0){
 			diff -= skill.affinity;
@@ -100,7 +99,7 @@ public class Mastercraft {
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Spectral_Slayer", 701, "Spectral Warrior", "Spectral Warrior", -1, "NORMAL");
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Holdstrong_Architect", 702, "Holdstrong Architect", "Holdstrong Architect", -1, "NORMAL");
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Stronghold_Architect", 703, "Stronghold Architect", "Stronghold Architect", -1, "NORMAL");
-            ExtendTitleEnum.getSingletonInstance().addExtendEntry("Gremlin_Slayer", GremlinSlayer, "Gremlin Slayer", "Gremlin Slayer", -1, "NORMAL");
+            //ExtendTitleEnum.getSingletonInstance().addExtendEntry("Gremlin_Slayer", 704, "Gremlin Slayer", "Gremlin Slayer", -1, "NORMAL");
 
             // Donation titles
             ExtendTitleEnum.getSingletonInstance().addExtendEntry("Donator", 800, "Donator", "Donator", -1, "NORMAL");

src/main/java/mod/sin/wyvern/mastercraft/TitleInjector.java

@@ -0,0 +1,96 @@
+package mod.sin.wyvern.mastercraft;
+
+import javassist.ClassPool;
+import javassist.*;
+import javassist.bytecode.*;
+
+import java.io.IOException;
+
+public class TitleInjector {
+    private final CtClass titleCls;
+    private final ConstPool constPool;
+    private final CodeIterator codeIterator;
+    private int insertPos = -1;
+    private int lastOrd = -1;
+    private int arraySizePos = -1;
+
+
+    public TitleInjector(ClassPool classPool) throws NotFoundException, BadBytecode {
+        titleCls = classPool.getCtClass("com.wurmonline.server.players.Titles$Title");
+        CtConstructor initializer = titleCls.getClassInitializer();
+        CodeAttribute codeAttr = initializer.getMethodInfo().getCodeAttribute();
+        constPool = codeAttr.getConstPool();
+        codeIterator = codeAttr.iterator();
+
+        BytecodeTools b = new BytecodeTools(constPool);
+
+        // My code needs a bit more stack space than javac-generated one
+        codeAttr.setMaxStack(codeAttr.getMaxStack() + 3);
+
+        while (codeIterator.hasNext()) {
+            int pos = codeIterator.next();
+            int op = codeIterator.byteAt(pos);
+            if (op == Bytecode.AASTORE) {
+                insertPos = codeIterator.next();
+            } else if (op == Bytecode.ANEWARRAY) {
+                arraySizePos = pos - 2;
+            } else if (op == Bytecode.NEW) {
+                pos = codeIterator.next(); // dup
+                pos = codeIterator.next(); // ldc of ident
+                pos = codeIterator.next(); // here's the ordinal
+                lastOrd = BytecodeTools.getInteger(constPool, codeIterator, pos);
+            }
+        }
+
+        if (insertPos == -1) throw new RuntimeException("Failed to find AASTORE");
+        if (lastOrd == -1) throw new RuntimeException("Failed to find ordinals");
+        if (arraySizePos == -1) throw new RuntimeException("Failed to array size position");
+    }
+
+    public void saveDebug() throws IOException, CannotCompileException, NotFoundException {
+        titleCls.writeFile();
+    }
+
+
+    public void addTitle(String ident, int id, String name, String femaleName, int skillId, String type) throws BadBytecode, CannotCompileException {
+        int ordinal = ++lastOrd;
+        Bytecode code = new Bytecode(constPool);
+
+        // When starting the values array is on stack, dup it for later use
+        code.add(Bytecode.DUP);
+
+        // Put out ordinal, will be used by AASTORE
+        BytecodeTools.putInteger(constPool, code, ordinal);
+
+        // Make new instance, and dupe that too
+        code.addNew("com.wurmonline.server.players.Titles$Title");
+        code.add(Bytecode.DUP);
+
+        // Put constructor parameters into stack
+        code.addLdc(ident);
+        BytecodeTools.putInteger(constPool, code, ordinal);
+        BytecodeTools.putInteger(constPool, code, id);
+        code.addLdc(name);
+        code.addLdc(femaleName);
+        BytecodeTools.putInteger(constPool, code, skillId);
+        code.addGetstatic("com.wurmonline.server.players.Titles$TitleType", type, "Lcom/wurmonline/server/players/Titles$TitleType;");
+
+        // Call constructor, this will use one copy of our instance duped above, we need 2 more so dup it again
+        code.addInvokespecial("com.wurmonline.server.players.Titles$Title", "<init>", "(Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;ILcom/wurmonline/server/players/Titles$TitleType;)V");
+        code.add(Bytecode.DUP);
+
+        // Put instance into static field - this will use the second copy of our instance
+        //code.addPutstatic("net.bdew.wurm.halloween.titles.TitlesExtended", ident, "Lcom/wurmonline/server/players/Titles$Title;");
+
+        // And finally stick it into values array, this will use the duped array, ordinal and the final copy of our instance
+        code.add(Bytecode.AASTORE);
+
+        // End of bytecode gen, insert it into the initializer
+        byte[] bytes = code.get();
+        codeIterator.insertAt(insertPos, bytes);
+        insertPos += bytes.length;
+
+        // And increase array size
+        codeIterator.write16bit(codeIterator.u16bitAt(arraySizePos) + 1, arraySizePos);
+    }
+}