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

Replace Tithe Farm overlay with layoutable widget

Browse Source 
Remove Tithe Farm custom sack overlay with layoutable RS widget.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-09-06 23:03:49 +02:00
parent 8488b89f6d
commit 253858b65d
4 changed files with 1 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java
View File

@@ -55,9 +55,6 @@ public class TitheFarmPlugin extends Plugin
@Inject
private TitheFarmPlantOverlay titheFarmOverlay;
@Inject
private TitheFarmSackOverlay titheFarmSackOverlay;
@Getter
private final Set<TitheFarmPlant> plants = new HashSet<>();
@@ -71,7 +68,6 @@ public class TitheFarmPlugin extends Plugin
protected void startUp() throws Exception
{
overlayManager.add(titheFarmOverlay);
overlayManager.add(titheFarmSackOverlay);
titheFarmOverlay.updateConfig();
}
@@ -79,7 +75,6 @@ public class TitheFarmPlugin extends Plugin
protected void shutDown() throws Exception
{
overlayManager.remove(titheFarmOverlay);
overlayManager.remove(titheFarmSackOverlay);
}
@Subscribe

11
runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPluginConfig.java
View File

@@ -32,17 +32,6 @@ import net.runelite.client.config.ConfigItem;
@ConfigGroup("tithefarmplugin")
public interface TitheFarmPluginConfig extends Config
{
@ConfigItem(
position = 0,
keyName = "showSack",
name = "Show fruit sack",
description = "Configures whether or not the fruit sack is displayed"
)
default boolean showSack()
{
return true;
}
@ConfigItem(
position = 1,
keyName = "hexColorUnwatered",

80
runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmSackOverlay.java
View File

@@ -1,80 +0,0 @@
/*
* Copyright (c) 2018, Unmoon <https://github.com/Unmoon>
* 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.tithefarm;
import java.awt.Dimension;
import java.awt.Graphics2D;
import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.Varbits;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
class TitheFarmSackOverlay extends Overlay
{
private final Client client;
private final TitheFarmPluginConfig config;
private final PanelComponent panelComponent = new PanelComponent();
@Inject
TitheFarmSackOverlay(Client client, TitheFarmPluginConfig config)
{
setPosition(OverlayPosition.TOP_LEFT);
this.client = client;
this.config = config;
}
@Override
public Dimension render(Graphics2D graphics)
{
Widget sack = client.getWidget(WidgetInfo.TITHE_FARM);
if (sack == null)
{
return null;
}
panelComponent.getChildren().clear();
sack.setHidden(true);
if (config.showSack())
{
panelComponent.getChildren().add(LineComponent.builder()
.left("Fruits in sack:")
.right(String.valueOf(client.getVar(Varbits.TITHE_FARM_SACK_AMOUNT)))
.build());
panelComponent.getChildren().add(LineComponent.builder()
.left("Points:")
.right(String.valueOf(client.getVar(Varbits.TITHE_FARM_POINTS)))
.build());
}
return panelComponent.render(graphics);
}
}

1
runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java
View File

@@ -44,6 +44,7 @@ public class WidgetOverlay extends Overlay
.put(WidgetInfo.RESIZABLE_MINIMAP_STONES_WIDGET, OverlayPosition.CANVAS_TOP_RIGHT)
.put(WidgetInfo.FOSSIL_ISLAND_OXYGENBAR, OverlayPosition.TOP_LEFT)
.put(WidgetInfo.EXPERIENCE_TRACKER_WIDGET, OverlayPosition.TOP_RIGHT)
.put(WidgetInfo.TITHE_FARM, OverlayPosition.TOP_RIGHT)
.put(WidgetInfo.PEST_CONTROL_BOAT_INFO, OverlayPosition.TOP_LEFT)
.put(WidgetInfo.PEST_CONTROL_INFO, OverlayPosition.TOP_LEFT)
.build();