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

move runepouch rune enum to client/game

Browse Source
This commit is contained in:
Hydrox6
2020-04-19 13:42:31 +01:00
committed by Jordan Atwood
parent b6ce64d315
commit e9a1326fd4
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java → runelite-client/src/main/java/net/runelite/client/game/RunepouchRune.java
View File

@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.runelite.client.plugins.runepouch; package net.runelite.client.game;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
@@ -52,7 +52,7 @@ import static net.runelite.api.ItemID.STEAM_RUNE;
import static net.runelite.api.ItemID.WATER_RUNE; import static net.runelite.api.ItemID.WATER_RUNE;
import static net.runelite.api.ItemID.WRATH_RUNE; import static net.runelite.api.ItemID.WRATH_RUNE;
public enum Runes public enum RunepouchRune
{ {
AIR(1, AIR_RUNE), AIR(1, AIR_RUNE),
WATER(2, WATER_RUNE), WATER(2, WATER_RUNE),
@@ -85,25 +85,25 @@ public enum Runes
@Setter @Setter
private BufferedImage image; private BufferedImage image;
private static final Map<Integer, Runes> runes; private static final Map<Integer, RunepouchRune> runes;
static static
{ {
ImmutableMap.Builder<Integer, Runes> builder = new ImmutableMap.Builder<>(); ImmutableMap.Builder<Integer, RunepouchRune> builder = new ImmutableMap.Builder<>();
for (Runes rune : values()) for (RunepouchRune rune : values())
{ {
builder.put(rune.getId(), rune); builder.put(rune.getId(), rune);
} }
runes = builder.build(); runes = builder.build();
} }
Runes(int id, int itemId) RunepouchRune(int id, int itemId)
{ {
this.id = id; this.id = id;
this.itemId = itemId; this.itemId = itemId;
} }
public static Runes getRune(int varbit) public static RunepouchRune getRune(int varbit)
{ {
return runes.get(varbit); return runes.get(varbit);
} }

5
runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java
View File

@@ -35,6 +35,7 @@ import net.runelite.api.Point;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.widgets.WidgetItem; import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemManager;
import net.runelite.client.game.RunepouchRune;
import static net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode.BOTH; import static net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode.BOTH;
import static net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode.MOUSE_HOVER; import static net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode.MOUSE_HOVER;
import net.runelite.client.ui.FontManager; import net.runelite.client.ui.FontManager;
@@ -100,7 +101,7 @@ public class RunepouchOverlay extends WidgetItemOverlay
Varbits runeVarbit = RUNE_VARBITS[i]; Varbits runeVarbit = RUNE_VARBITS[i];
int runeId = client.getVar(runeVarbit); int runeId = client.getVar(runeVarbit);
Runes rune = Runes.getRune(runeId); RunepouchRune rune = RunepouchRune.getRune(runeId);
if (rune == null) if (rune == null)
{ {
continue; continue;
@@ -149,7 +150,7 @@ public class RunepouchOverlay extends WidgetItemOverlay
} }
} }
private BufferedImage getRuneImage(Runes rune) private BufferedImage getRuneImage(RunepouchRune rune)
{ {
BufferedImage runeImg = rune.getImage(); BufferedImage runeImg = rune.getImage();
if (runeImg != null) if (runeImg != null)