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

Added hide take, text outline to ground items etc (#35)

Browse Source 
* added smelting plugin

* Added hide take, text outline to ground items
This commit is contained in:
James
2019-04-21 11:34:53 -07:00
committed by Kyleeld
parent 34bd67af0b
commit 710745a56f
7 changed files with 425 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsConfig.java
View File

@@ -358,4 +358,26 @@ public interface GroundItemsConfig extends Config
{
return false;
}
@ConfigItem(
position = 27,
keyName = "removeIgnored",
name = "Hide Ignored",
description = "Remove take option for items that are on the hidden items list."
)
default boolean removeIgnored()
{
return false;
}
@ConfigItem(
keyName = "toggleOutline",
name = "Text Outline",
description = "Use an outline around text instead of a text shadow",
position = 29
)
default boolean toggleOutline()
{
return false;
}
}

9
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
View File

@@ -333,6 +333,15 @@ public class GroundItemsOverlay extends Overlay
drawRectangle(graphics, itemHighlightBox, topItem && mouseInHighlightBox ? Color.GREEN : color, highlighted != null, false);
}
if (config.toggleOutline())
{
graphics.setColor(Color.BLACK);
graphics.drawString(itemString, textX + 1, textY + 1);
graphics.drawString(itemString, textX - 1, textY - 1);
graphics.drawString(itemString, textX - 1, textY + 1);
graphics.drawString(itemString, textX + 1, textY - 1);
}
textComponent.setText(itemString);
textComponent.setColor(color);
textComponent.setPosition(new java.awt.Point(textX, textY));

30
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
View File

@@ -509,10 +509,40 @@ public class GroundItemsPlugin extends Plugin
lastEntry.setTarget(lastEntry.getTarget() + " (" + quantity + ")");
}
if(config.removeIgnored() && event.getOption().equals("Take") && hiddenItemList.contains(Text.removeTags(event.getTarget())))
{
menuEntries = removeOption(event.getOption(), event.getTarget());
}
client.setMenuEntries(menuEntries);
}
}
private MenuEntry[] removeOption(String option, String target)
{
MenuEntry[] entries = client.getMenuEntries();
int j = 0;
if(entries.length > 1)
{
MenuEntry[] newEntries = new MenuEntry[entries.length - 1];
for (int i = 0; i < entries.length; ++i)
{
if (!(entries[i].getOption().equals(option) && entries[i].getTarget().equals(target)))
{
newEntries[j++] = entries[i];
}
}
return newEntries;
}
else
{
return entries;
}
}
void updateList(String item, boolean hiddenList)
{
final Set<String> hiddenItemSet = new HashSet<>(hiddenItemList);

45
runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingConfig.java Normal file
View File

@@ -0,0 +1,45 @@
/*
* Copyright (c) 2019, Stephen <stepzhu@umich.edu>
* 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.client.plugins.smelting;
import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup("smelting")
public interface SmeltingConfig extends Config
{
@ConfigItem(
position = 1,
keyName = "statTimeout",
name = "Reset stats (minutes)",
description = "The time it takes for the current smelting session to be reset"
)
default int statTimeout()
{
return 5;
}
}

136
runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java Normal file
View File

@@ -0,0 +1,136 @@
/*
* Copyright (c) 2019, Stephen <stepzhu@umich.edu>
* 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.client.plugins.smelting;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.time.Instant;
import java.time.Duration;
import javax.inject.Inject;
import static net.runelite.api.AnimationID.SMITHING_SMELTING;
import static net.runelite.api.AnimationID.SMITHING_CANNONBALL;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.api.Skill;
import net.runelite.client.plugins.xptracker.XpTrackerService;
import net.runelite.client.ui.overlay.Overlay;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
import net.runelite.client.ui.overlay.OverlayMenuEntry;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent;
class SmeltingOverlay extends Overlay
{
private static final int SMELT_TIMEOUT = 5;
private final Client client;
private final SmeltingPlugin plugin;
private final SmeltingConfig config;
private final XpTrackerService xpTrackerService;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
public SmeltingOverlay(Client client, SmeltingPlugin plugin, SmeltingConfig config, XpTrackerService xpTrackerService)
{
super(plugin);
setPosition(OverlayPosition.TOP_LEFT);
this.client = client;
this.plugin = plugin;
this.config = config;
this.xpTrackerService = xpTrackerService;
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Smelting overlay"));
}
@Override
public Dimension render(Graphics2D graphics)
{
SmeltingSession session = plugin.getSession();
if (session.getLastItemSmelted() == null)
{
return null;
}
panelComponent.getChildren().clear();
if (isSmelting() || Duration.between(session.getLastItemSmelted(), Instant.now()).getSeconds() < SMELT_TIMEOUT)
{
panelComponent.getChildren().add(TitleComponent.builder()
.text("Smelting")
.color(Color.GREEN)
.build());
}
else
{
panelComponent.getChildren().add(TitleComponent.builder()
.text("NOT smelting")
.color(Color.RED)
.build());
}
int actions = xpTrackerService.getActions(Skill.SMITHING);
if (actions > 0)
{
if (plugin.getSession().getBarsSmelted() > 0)
{
panelComponent.getChildren().add(LineComponent.builder()
.left("Bars:")
.right(Integer.toString(session.getBarsSmelted()))
.build());
}
if (plugin.getSession().getCannonBallsSmelted() > 0)
{
panelComponent.getChildren().add(LineComponent.builder()
.left("Cannonballs:")
.right(Integer.toString(session.getCannonBallsSmelted()))
.build());
}
if (actions > 2)
{
panelComponent.getChildren().add(LineComponent.builder()
.left("Actions/hr:")
.right(Integer.toString(xpTrackerService.getActionsHr(Skill.SMITHING)))
.build());
}
}
return panelComponent.render(graphics);
}
private boolean isSmelting()
{
switch (client.getLocalPlayer().getAnimation())
{
case SMITHING_SMELTING:
case SMITHING_CANNONBALL:
return true;
default:
return false;
}
}
}

129
runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java Normal file
View File

@@ -0,0 +1,129 @@
/*
* Copyright (c) 2019, Stephen <stepzhu@umich.edu>
* 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.client.plugins.smelting;
import com.google.inject.Provides;
import java.time.Duration;
import java.time.Instant;
import javax.inject.Inject;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.ChatMessageType;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GameTick;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDependency;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.xptracker.XpTrackerPlugin;
import net.runelite.client.ui.overlay.OverlayManager;
@PluginDescriptor(
name = "Smelting",
description = "Show Smelting stats",
tags = {"overlay", "skilling"}
)
@PluginDependency(XpTrackerPlugin.class)
public class SmeltingPlugin extends Plugin
{
@Inject
private SmeltingConfig config;
@Inject
private SmeltingOverlay overlay;
@Inject
private OverlayManager overlayManager;
@Getter(AccessLevel.PACKAGE)
private SmeltingSession session;
@Provides
SmeltingConfig getConfig(ConfigManager configManager)
{
return configManager.getConfig(SmeltingConfig.class);
}
@Override
protected void startUp() throws Exception
{
session = null;
overlayManager.add(overlay);
}
@Override
protected void shutDown() throws Exception
{
overlayManager.remove(overlay);
session = null;
}
@Subscribe
public void onChatMessage(ChatMessage event)
{
if (event.getType() != ChatMessageType.SPAM)
{
return;
}
if (event.getMessage().contains("You retrieve a bar of"))
{
if (session == null)
{
session = new SmeltingSession();
}
session.setLastItemSmelted(Instant.now());
session.increaseBarsSmelted();
}
else if (event.getMessage().contains("You remove the cannonballs from the mould"))
{
if (session == null)
{
session = new SmeltingSession();
}
session.setLastItemSmelted(Instant.now());
session.increaseCannonBallsSmelted();
}
}
@Subscribe
public void onGameTick(GameTick event)
{
if (session.getLastItemSmelted() != null)
{
final Duration statTimeout = Duration.ofMinutes(config.statTimeout());
final Duration sinceCaught = Duration.between(session.getLastItemSmelted(), Instant.now());
if (sinceCaught.compareTo(statTimeout) >= 0)
{
session.setLastItemSmelted(null);
}
}
}
}

54
runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingSession.java Normal file
View File

@@ -0,0 +1,54 @@
/*
* Copyright (c) 2019, Stephen <stepzhu@umich.edu>
* 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.client.plugins.smelting;
import java.time.Instant;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
class SmeltingSession
{
@Getter(AccessLevel.PACKAGE)
@Setter
private Instant lastItemSmelted;
@Getter(AccessLevel.PACKAGE)
private int barsSmelted;
@Getter(AccessLevel.PACKAGE)
private int cannonBallsSmelted;
void increaseBarsSmelted()
{
barsSmelted++;
}
void increaseCannonBallsSmelted()
{
cannonBallsSmelted += 4;
}
}