ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/runelite-extended/runelite

Browse Source
This commit is contained in:
PKLite
2019-07-30 06:40:17 -04:00
parent 83208d4add 785479c648
commit 19bf6ed083
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@@ -91,5 +91,4 @@ wrapper {
run { run {
classpath = childProjects.client.sourceSets.main.runtimeClasspath classpath = childProjects.client.sourceSets.main.runtimeClasspath
mainClassName = "net.runelite.client.RuneLite" mainClassName = "net.runelite.client.RuneLite"
args += "--local-injected"
} }

8
runelite-client/src/main/java/net/runelite/client/plugins/privateserver/PrivateServerPlugin.java
View File

@@ -75,6 +75,10 @@ public class PrivateServerPlugin extends Plugin
updateConfig(); updateConfig();
addSubscriptions(); addSubscriptions();
} }
else
{
client.setModulus(new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16));
}
} }
@Override @Override
@@ -110,6 +114,8 @@ public class PrivateServerPlugin extends Plugin
private void updateConfig() private void updateConfig()
{ {
if (!config.modulus().equals("")) if (!config.modulus().equals(""))
client.setModulus(new BigInteger(config.modulus(), 16)); {
client.setModulus(new BigInteger(config.modulus(), 16));
}
} }
} }

8
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java
View File

@@ -232,16 +232,22 @@ public enum Activity
CriticalItem.SHAIKAHAN_BONES, null, null), CriticalItem.SHAIKAHAN_BONES, null, null),
BABYDRAGON_BONES(ItemID.BABYDRAGON_BONES, "Babydragon bones", Skill.PRAYER, 1, 30.0, BABYDRAGON_BONES(ItemID.BABYDRAGON_BONES, "Babydragon bones", Skill.PRAYER, 1, 30.0,
CriticalItem.BABYDRAGON_BONES, null, null), CriticalItem.BABYDRAGON_BONES, null, null),
WYRM_BONES(ItemID.WYRM_BONES, "Babydragon bones", Skill.PRAYER, 1, 50,
CriticalItem.WYRM_BONES, null, null),
WYVERN_BONES(ItemID.WYVERN_BONES, "Wyvern bones", Skill.PRAYER, 1, 72.0, WYVERN_BONES(ItemID.WYVERN_BONES, "Wyvern bones", Skill.PRAYER, 1, 72.0,
CriticalItem.WYVERN_BONES, null, null), CriticalItem.WYVERN_BONES, null, null),
DRAGON_BONES(ItemID.DRAGON_BONES, "Dragon bones", Skill.PRAYER, 1, 72.0, DRAGON_BONES(ItemID.DRAGON_BONES, "Dragon bones", Skill.PRAYER, 1, 72.0,
CriticalItem.DRAGON_BONES, null, null), CriticalItem.DRAGON_BONES, null, null),
DRAKE_BONES(ItemID.DRAKE_BONES, "Drake bones", Skill.PRAYER, 1, 80,
CriticalItem.DRAKE_BONES, null, null),
FAYRG_BONES(ItemID.FAYRG_BONES, "Fayrg bones", Skill.PRAYER, 1, 84.0, FAYRG_BONES(ItemID.FAYRG_BONES, "Fayrg bones", Skill.PRAYER, 1, 84.0,
CriticalItem.FAYRG_BONES, null, null), CriticalItem.FAYRG_BONES, null, null),
LAVA_DRAGON_BONES(ItemID.LAVA_DRAGON_BONES, "Lava dragon bones", Skill.PRAYER, 1, 85.0, LAVA_DRAGON_BONES(ItemID.LAVA_DRAGON_BONES, "Lava dragon bones", Skill.PRAYER, 1, 85.0,
CriticalItem.LAVA_DRAGON_BONES, null, null), CriticalItem.LAVA_DRAGON_BONES, null, null),
RAURG_BONES(ItemID.RAURG_BONES, "Raurg bones", Skill.PRAYER, 1, 96.0, RAURG_BONES(ItemID.RAURG_BONES, "Raurg bones", Skill.PRAYER, 1, 96.0,
CriticalItem.RAURG_BONES, null, null), CriticalItem.RAURG_BONES, null, null),
HYDRA_BONES(ItemID.HYDRA_BONES, "Hydra bones", Skill.PRAYER, 1, 110,
CriticalItem.HYDRA_BONES, null, null),
DAGANNOTH_BONES(ItemID.DAGANNOTH_BONES, "Dagannoth bones", Skill.PRAYER, 1, 125.0, DAGANNOTH_BONES(ItemID.DAGANNOTH_BONES, "Dagannoth bones", Skill.PRAYER, 1, 125.0,
CriticalItem.DAGANNOTH_BONES, null, null), CriticalItem.DAGANNOTH_BONES, null, null),
OURG_BONES(ItemID.OURG_BONES, "Ourg bones", Skill.PRAYER, 1, 140.0, OURG_BONES(ItemID.OURG_BONES, "Ourg bones", Skill.PRAYER, 1, 140.0,
@@ -719,4 +725,4 @@ public enum Activity
a.outputItemInfo = new ItemInfo(c.getName(), c.isStackable()); a.outputItemInfo = new ItemInfo(c.getName(), c.isStackable());
} }
} }
} }

5
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/CriticalItem.java
View File

@@ -117,11 +117,14 @@ public enum CriticalItem
ZOGRE_BONES(ItemID.ZOGRE_BONES, Skill.PRAYER, "Bones"), ZOGRE_BONES(ItemID.ZOGRE_BONES, Skill.PRAYER, "Bones"),
SHAIKAHAN_BONES(ItemID.SHAIKAHAN_BONES, Skill.PRAYER, "Bones"), SHAIKAHAN_BONES(ItemID.SHAIKAHAN_BONES, Skill.PRAYER, "Bones"),
BABYDRAGON_BONES(ItemID.BABYDRAGON_BONES, Skill.PRAYER, "Bones"), BABYDRAGON_BONES(ItemID.BABYDRAGON_BONES, Skill.PRAYER, "Bones"),
WYRM_BONES(ItemID.WYRM_BONES, Skill.PRAYER, "Bones"),
WYVERN_BONES(ItemID.WYVERN_BONES, Skill.PRAYER, "Bones"), WYVERN_BONES(ItemID.WYVERN_BONES, Skill.PRAYER, "Bones"),
DRAGON_BONES(ItemID.DRAGON_BONES, Skill.PRAYER, "Bones"), DRAGON_BONES(ItemID.DRAGON_BONES, Skill.PRAYER, "Bones"),
DRAKE_BONES(ItemID.DRAKE_BONES, Skill.PRAYER, "Bones"),
FAYRG_BONES(ItemID.FAYRG_BONES, Skill.PRAYER, "Bones"), FAYRG_BONES(ItemID.FAYRG_BONES, Skill.PRAYER, "Bones"),
LAVA_DRAGON_BONES(ItemID.LAVA_DRAGON_BONES, Skill.PRAYER, "Bones"), LAVA_DRAGON_BONES(ItemID.LAVA_DRAGON_BONES, Skill.PRAYER, "Bones"),
RAURG_BONES(ItemID.RAURG_BONES, Skill.PRAYER, "Bones"), RAURG_BONES(ItemID.RAURG_BONES, Skill.PRAYER, "Bones"),
HYDRA_BONES(ItemID.HYDRA_BONES, Skill.PRAYER, "Bones"),
DAGANNOTH_BONES(ItemID.DAGANNOTH_BONES, Skill.PRAYER, "Bones"), DAGANNOTH_BONES(ItemID.DAGANNOTH_BONES, Skill.PRAYER, "Bones"),
OURG_BONES(ItemID.OURG_BONES, Skill.PRAYER, "Bones"), OURG_BONES(ItemID.OURG_BONES, Skill.PRAYER, "Bones"),
SUPERIOR_DRAGON_BONES(ItemID.SUPERIOR_DRAGON_BONES, Skill.PRAYER, "Bones"), SUPERIOR_DRAGON_BONES(ItemID.SUPERIOR_DRAGON_BONES, Skill.PRAYER, "Bones"),
@@ -352,4 +355,4 @@ public enum CriticalItem
i.itemInfo = new ItemInfo(c.getName(), c.isStackable()); i.itemInfo = new ItemInfo(c.getName(), c.isStackable());
} }
} }
} }