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
smelter/src/main/java/io/reisub/openosrs/smelter/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("ChaosSmelterConfig")
@ConfigGroup("chaossmelter")
public interface Config extends net.runelite.client.config.Config {
@ConfigItem(

10
smelter/src/main/java/io/reisub/openosrs/smelter/Ingredient.java
View File

@ -1,11 +1,9 @@
package io.reisub.openosrs.smelter;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Value;
@AllArgsConstructor
@Getter
@Value
public class Ingredient {
private final int id;
private final int amount;
int id;
int amount;
}

9
smelter/src/main/java/io/reisub/openosrs/smelter/Product.java
View File

@ -5,14 +5,17 @@ import net.runelite.api.ItemID;
@Getter
public enum Product {
MOLTEN_GLASS(ItemID.MOLTEN_GLASS, new Ingredient(ItemID.SODA_ASH, 14), new Ingredient(ItemID.BUCKET_OF_SAND, 14)),
CANNONBALLS(ItemID.CANNONBALL, new Ingredient(ItemID.STEEL_BAR, 27));
STEEL_BAR(ItemID.STEEL_BAR, 4, new Ingredient(ItemID.IRON_ORE, 9), new Ingredient(ItemID.COAL, 28)),
MOLTEN_GLASS(ItemID.MOLTEN_GLASS, 0, new Ingredient(ItemID.SODA_ASH, 14), new Ingredient(ItemID.BUCKET_OF_SAND, 14)),
CANNONBALLS(ItemID.CANNONBALL, 0, new Ingredient(ItemID.STEEL_BAR, 27));
private final int id;
private final int index;
private final Ingredient[] ingredients;
Product(int id, Ingredient... ingredients) {
Product(int id, int index, Ingredient... ingredients) {
this.id = id;
this.index = index;
this.ingredients = ingredients;
}
}

110
smelter/src/main/java/io/reisub/openosrs/smelter/Smelter.java
View File

@ -1,37 +1,23 @@
package io.reisub.openosrs.smelter;
import com.google.inject.Provides;
import io.reisub.openosrs.smelter.tasks.HandleBank;
import io.reisub.openosrs.smelter.tasks.Smelt;
import io.reisub.openosrs.util.Task;
import io.reisub.openosrs.util.CScript;
import io.reisub.openosrs.util.Util;
import io.reisub.openosrs.util.tasks.Eat;
import io.reisub.openosrs.util.tasks.KittenTask;
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.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 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)
@PluginDependency(iUtils.class)
@ -41,64 +27,22 @@ import static net.runelite.api.AnimationID.IDLE;
enabledByDefault = false
)
@Slf4j
public class Smelter extends iScript {
private List<Task> tasks;
private KittenTask kittenTask;
@Getter
private Activity currentActivity;
private Instant lastActionTime;
public class Smelter extends CScript {
@Provides
Config provideConfig(ConfigManager configManager) {
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 Smelter");
Eat eatTask = injector.getInstance(Eat.class);
eatTask.setInterval(14, 24);
super.onStart();
Run runTask = injector.getInstance(Run.class);
runTask.setInterval(70, 95);
kittenTask = KittenTask.getInstance(injector);
currentActivity = Activity.IDLE;
tasks = new ArrayList<>();
tasks.add(eatTask);
tasks.add(runTask);
tasks.add(kittenTask);
tasks.add(injector.getInstance(HandleBank.class));
tasks.add(injector.getInstance(Smelt.class));
}
@Override
protected void onStop() {
log.info("Stopping Chaos Smelter");
if (tasks != null) {
tasks.clear();
}
KittenTask.handleKitten = false;
addTask(HandleBank.class);
addTask(Smelt.class);
}
@SuppressWarnings("unused")
@ -116,46 +60,4 @@ public class Smelter extends iScript {
break;
}
}
@Subscribe
private void onConfigButtonPressed(ConfigButtonClicked configButtonClicked) {
if (configButtonClicked.getKey().equals("startButton")) {
execute();
}
}
@Subscribe
private void onChatMessage(ChatMessage chatMessage) {
if (kittenTask != null) {
kittenTask.onChatMessage(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(5);
Duration sinceAction = Duration.between(lastActionTime, Instant.now());
if (sinceAction.compareTo(timeout) >= 0) {
setActivity(Activity.IDLE);
}
}
}

4
smelter/src/main/java/io/reisub/openosrs/smelter/tasks/Smelt.java
View File

@ -1,10 +1,10 @@
package io.reisub.openosrs.smelter.tasks;
import io.reisub.openosrs.smelter.Activity;
import io.reisub.openosrs.smelter.Config;
import io.reisub.openosrs.smelter.Ingredient;
import io.reisub.openosrs.smelter.Smelter;
import io.reisub.openosrs.util.Task;
import io.reisub.openosrs.util.enums.Activity;
import net.runelite.client.plugins.iutils.game.iObject;
import net.runelite.client.plugins.iutils.ui.Chatbox;
@ -52,7 +52,7 @@ public class Smelt extends Task {
}
}
chatbox.make(0, quantity);
chatbox.make(config.targetProduct().getIndex(), quantity);
game.waitUntil(() -> plugin.getCurrentActivity() == Activity.SMELTING, 5);
}
}