ymo/chaos-plugins
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates and rework to use CScript

Browse Source
This commit is contained in:
Yuri Moens
2022-01-19 12:35:50 +01:00
parent 78786709eb
commit 7efda7494a
79 changed files with 1295 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
woodcutter/src/main/java/io/reisub/openosrs/woodcutter/Config.java
View File

@ -25,13 +25,12 @@
package io.reisub.openosrs.woodcutter;
import net.runelite.client.config.Button;
import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup("ChaosWoodcutterConfig")
@ConfigGroup("chaoswoodcutter")
public interface WoodcutterConfig extends Config {
public interface Config extends net.runelite.client.config.Config {
@ConfigItem(
keyName = "burnLogs",
name = "Burn logs",

52
woodcutter/src/main/java/io/reisub/openosrs/woodcutter/Woodcutter.java
View File

@ -1,25 +1,17 @@
package io.reisub.openosrs.woodcutter;
import com.google.inject.Provides;
import io.reisub.openosrs.util.Task;
import io.reisub.openosrs.util.CScript;
import io.reisub.openosrs.util.Util;
import io.reisub.openosrs.woodcutter.tasks.Chop;
import io.reisub.openosrs.woodcutter.tasks.Drop;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.events.ConfigButtonClicked;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.PluginDependency;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.iutils.iUtils;
import net.runelite.client.plugins.iutils.scripts.iScript;
import org.pf4j.Extension;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
@Extension
@PluginDependency(Util.class)
@PluginDependency(iUtils.class)
@ -29,47 +21,17 @@ import java.util.List;
enabledByDefault = false
)
@Slf4j
public class WoodcutterPlugin extends iScript {
@Inject
private Client client;
private List<Task> tasks;
public class Woodcutter extends CScript {
@Provides
WoodcutterConfig provideConfig(ConfigManager configManager) {
return configManager.getConfig(WoodcutterConfig.class);
}
@Override
protected void loop() {
for (Task t : tasks) {
if (t.validate()) {
t.execute();
}
}
game.tickDelay();
Config provideConfig(ConfigManager configManager) {
return configManager.getConfig(Config.class);
}
@Override
protected void onStart() {
log.info("Starting Chaos Woodcutter");
super.onStart();
tasks = new ArrayList<>();
tasks.add(injector.getInstance(Chop.class));
tasks.add(injector.getInstance(Drop.class));
}
@Override
protected void onStop() {
log.info("Stopping Chaos Woodcutter");
tasks.clear();
}
@Subscribe
private void onConfigButtonPressed(ConfigButtonClicked configButtonClicked) {
if (configButtonClicked.getKey().equals("startButton")) {
execute();
}
addTask(Chop.class);
addTask(Drop.class);
}
}

4
woodcutter/src/main/java/io/reisub/openosrs/woodcutter/tasks/Drop.java
View File

@ -1,13 +1,13 @@
package io.reisub.openosrs.woodcutter.tasks;
import io.reisub.openosrs.util.Task;
import io.reisub.openosrs.woodcutter.WoodcutterConfig;
import io.reisub.openosrs.woodcutter.Config;
import javax.inject.Inject;
public class Drop extends Task {
@Inject
private WoodcutterConfig config;
private Config config;
@Override
public String getStatus() {