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

project: uwu (197)

Browse Source
This commit is contained in:
ThatGamerBlue
2021-06-16 11:24:56 +01:00
parent 6278fd9835
commit fbbafc7285
437 changed files with 52595 additions and 52141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java
View File

@@ -201,7 +201,7 @@ public class InfoPanel extends PluginPanel
actionsContainer.add(buildLinkPanel(GITHUB_ICON, "Report an issue or", "make a suggestion", githubLink));
actionsContainer.add(buildLinkPanel(DISCORD_ICON, "Talk to us on our", "Discord server", discordInvite));
actionsContainer.add(buildLinkPanel(PATREON_ICON, "Become a patron to", "help support RuneLite", patreonLink));
actionsContainer.add(buildLinkPanel(PATREON_ICON, "Become a patron to", "help support OpenOSRS", patreonLink));
actionsContainer.add(buildLinkPanel(WIKI_ICON, "Information about", "RuneLite and plugins", wikiLink));
add(versionPanel, BorderLayout.NORTH);

52
runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/StaminaPotion.java
View File

@@ -23,57 +23,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
<<<<<<< HEAD:deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/MapKey.java
package net.runelite.deob.deobfuscators.lvt;
import java.util.Objects;
public class MapKey
{
private final int idx;
private final LVTType type;
public MapKey(int idx, LVTType type)
{
this.idx = idx;
this.type = type;
}
@Override
public int hashCode()
{
int hash = 7;
hash = 89 * hash + this.idx;
hash = 89 * hash + Objects.hashCode(this.type);
return hash;
}
@Override
public boolean equals(Object obj)
{
if (this == obj)
{
return true;
}
if (obj == null)
{
return false;
}
if (getClass() != obj.getClass())
{
return false;
}
final MapKey other = (MapKey) obj;
if (this.idx != other.idx)
{
return false;
}
if (this.type != other.type)
{
return false;
}
return true;
=======
package net.runelite.client.plugins.itemstats.potions;
import net.runelite.api.Client;
@@ -105,6 +54,5 @@ public class StaminaPotion extends StatBoost
}
}
return 20;
>>>>>>> upstream/master:runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/StaminaPotion.java
}
}