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

Merge pull request #2199 from Abextm/varpbsad

Browse Source 
Refactor Vars
This commit is contained in:
Adam
2018-04-30 20:21:30 -04:00
committed by GitHub
parent e648c426a2 efa67d7c93
commit 618c16adca
39 changed files with 122 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -51,7 +51,7 @@ import net.runelite.api.Player;
import net.runelite.api.Point;
import net.runelite.api.Prayer;
import net.runelite.api.Projectile;
import net.runelite.api.Setting;
import net.runelite.api.VarPlayer;
import net.runelite.api.Skill;
import net.runelite.api.SpritePixels;
import net.runelite.api.Tile;
@@ -316,17 +316,17 @@ public abstract class RSClientMixin implements RSClient
@Inject
@Override
public int getSetting(Setting setting)
public int getVar(VarPlayer varPlayer)
{
int[] varps = getVarps();
return varps[setting.getId()];
return varps[varPlayer.getId()];
}
@Inject
@Override
public boolean isPrayerActive(Prayer prayer)
{
return getSetting(prayer.getVarbit()) == 1;
return getVar(prayer.getVarbit()) == 1;
}
/**
@@ -380,7 +380,7 @@ public abstract class RSClientMixin implements RSClient
{
if (isResized())
{
if (getSetting(Varbits.SIDE_PANELS) == 1)
if (getVar(Varbits.SIDE_PANELS) == 1)
{
return getWidget(WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE);
}

51
runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java
View File

@@ -1,51 +0,0 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.mixins;
import net.runelite.api.VarClientInt;
import net.runelite.api.VarClientStr;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSVarcs;
@Mixin(RSVarcs.class)
public abstract class RSVarcsMixin implements RSVarcs
{
@Inject
@Override
public int getIntVar(VarClientInt var)
{
int[] varcs = getIntVarcs();
return varcs[var.getIndex()];
}
@Inject
@Override
public String getStrVar(VarClientStr var)
{
String[] varcs = getStrVarcs();
return varcs[var.getIndex()];
}
}

18
runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java
View File

@@ -26,6 +26,8 @@ package net.runelite.mixins;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import net.runelite.api.VarClientInt;
import net.runelite.api.VarClientStr;
import net.runelite.api.Varbits;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
@@ -52,7 +54,7 @@ public abstract class VarbitMixin implements RSClient
@Inject
@Override
public int getSetting(Varbits varbit)
public int getVar(Varbits varbit)
{
int varbitId = varbit.getId();
return getVarbitValue(varbitId);
@@ -106,4 +108,18 @@ public abstract class VarbitMixin implements RSClient
int mask = (1 << ((msb - lsb) + 1)) - 1;
varps[v.getIndex()] = (varps[v.getIndex()] & ~(mask << lsb)) | ((value & mask) << lsb);
}
@Inject
@Override
public int getVar(VarClientInt varClientInt)
{
return getVarcs().getIntVarcs()[varClientInt.getIndex()];
}
@Inject
@Override
public String getVar(VarClientStr varClientStr)
{
return getVarcs().getStrVarcs()[varClientStr.getIndex()];
}
}