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

2
cooker/cooker.gradle.kts
View File

@ -23,7 +23,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
version = "0.0.1"
version = "1.0.0"
project.extra["PluginName"] = "Chaos Cooker" // This is the name that is used in the external plugin manager panel
project.extra["PluginDescription"] = "Cooks better than Gordon Ramsay" // This is the description that is used in the external plugin manager panel

2
cooker/src/main/java/io/reisub/openosrs/cooker/Config.java
View File

@ -28,7 +28,7 @@ import net.runelite.client.config.Button;
import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem;
@ConfigGroup("ChaosCookerConfig")
@ConfigGroup("chaoscooker")
public interface Config extends net.runelite.client.config.Config {
@ConfigItem(

96
cooker/src/main/java/io/reisub/openosrs/cooker/Cooker.java
View File

@ -3,34 +3,23 @@ package io.reisub.openosrs.cooker;
import com.google.inject.Provides;
import io.reisub.openosrs.cooker.tasks.Cook;
import io.reisub.openosrs.cooker.tasks.HandleBank;
import io.reisub.openosrs.cooker.tasks.SkipLevel;
import io.reisub.openosrs.util.Task;
import io.reisub.openosrs.util.CScript;
import io.reisub.openosrs.util.Util;
import io.reisub.openosrs.util.enums.Activity;
import io.reisub.openosrs.util.tasks.Run;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.AnimationID;
import net.runelite.api.ChatMessageType;
import net.runelite.api.GameState;
import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigButtonClicked;
import net.runelite.api.events.ItemContainerChanged;
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.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
import static net.runelite.api.AnimationID.IDLE;
@Extension
@PluginDependency(Util.class)
@ -41,14 +30,7 @@ import static net.runelite.api.AnimationID.IDLE;
enabledByDefault = false
)
@Slf4j
public class Cooker extends iScript {
private List<Task> tasks;
@Getter
private Activity currentActivity;
private Instant lastActionTime;
public class Cooker extends CScript {
@Inject
private Config config;
@ -57,50 +39,16 @@ public class Cooker extends iScript {
return configManager.getConfig(Config.class);
}
@Override
protected void loop() {
for (Task t : tasks) {
if (t.validate()) {
log.info(t.getStatus());
t.execute();
break;
}
}
checkActionTimeout();
game.sleepDelay();
}
@Override
protected void onStart() {
log.info("Starting Chaos Cooker");
super.onStart();
Run runTask = injector.getInstance(Run.class);
runTask.setInterval(70, 95);
tasks = new ArrayList<>();
tasks.add(runTask);
tasks.add(injector.getInstance(SkipLevel.class));
tasks.add(injector.getInstance(HandleBank.class));
tasks.add(injector.getInstance(Cook.class));
}
@Override
protected void onStop() {
log.info("Stopping Chaos Cooker");
if (tasks != null) {
tasks.clear();
}
setActivity(Activity.IDLE);
}
@SuppressWarnings("unused")
@Subscribe
private void onConfigButtonPressed(ConfigButtonClicked configButtonClicked) {
if (configButtonClicked.getKey().equals("startButton")) {
execute();
}
addTask(HandleBank.class);
addTask(Cook.class);
}
@SuppressWarnings("unused")
@ -124,36 +72,4 @@ public class Cooker extends iScript {
setActivity(Activity.IDLE);
}
}
@SuppressWarnings("unused")
@Subscribe
private void onChatMessage(ChatMessage chatMessage) {
if (chatMessage.getType() == ChatMessageType.GAMEMESSAGE) {
if (chatMessage.getMessage().startsWith("Congratulations, you've just advanced your")) {
setActivity(Activity.IDLE);
}
}
}
private void setActivity(Activity action) {
currentActivity = action;
if (action != Activity.IDLE) {
lastActionTime = Instant.now();
}
}
private void checkActionTimeout() {
if (currentActivity == Activity.IDLE) return;
int animId = game.localPlayer().animation();
if (animId != IDLE || lastActionTime == null) return;
Duration timeout = Duration.ofSeconds(3);
Duration sinceAction = Duration.between(lastActionTime, Instant.now());
if (sinceAction.compareTo(timeout) >= 0) {
setActivity(Activity.IDLE);
}
}
}

2
cooker/src/main/java/io/reisub/openosrs/cooker/tasks/Cook.java
View File

@ -1,9 +1,9 @@
package io.reisub.openosrs.cooker.tasks;
import io.reisub.openosrs.cooker.Activity;
import io.reisub.openosrs.cooker.Config;
import io.reisub.openosrs.cooker.Cooker;
import io.reisub.openosrs.util.Task;
import io.reisub.openosrs.util.enums.Activity;
import net.runelite.client.plugins.iutils.game.InventoryItem;
import net.runelite.client.plugins.iutils.game.iObject;
import net.runelite.client.plugins.iutils.ui.Chatbox;