Fixed altoclef crashing if quitting the world while the task is running.

.gitignore

@@ -1,5 +1,6 @@
 # User-specific stuff
 .idea/
+.vs/
 baritone/
 
 *.iml
@@ -117,4 +118,3 @@ run/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
-

README.md

@@ -46,10 +46,6 @@ If the Nightly Link doesn't work, check the latest [Build Action](https://github
 that succeeded and download `Artifacts.zip` (you must be signed into GitHub). Replace your
 existing `altoclef-4.0-SNAPSHOT.jar` with the one found in `Artifacts.zip`
 
-Then, copy `altoclef-4.0-SNAPSHOT.jar` from `Artifacts.zip` to `./mods`.
-
-Then, copy the `baritone-unoptimized-fabric-1.XX.X.jar` from the long term release zip file to `./mods`
-
 ### Long Term Release
 
 [Check releases](https://github.com/gaucho-matrero/altoclef/releases). Note you will need to copy over both jar files
@@ -65,7 +61,7 @@ out now if you'd like:
 
 ### Versions
 
-This is a **fabric only** mod, currently only available for **Minecraft 1.19.2-1.19.3**.
+This is a **fabric only** mod, currently only available for **Minecraft 1.19.2-1.19.4**.
 
 For older MC versions, try [multiconnect](https://www.curseforge.com/minecraft/mc-mods/multiconnect) (NOTE: multiconnect
 is untested and not affiliated with altoclef, use at your own risk!)

build.gradle

@@ -1,11 +1,11 @@
 plugins {
-    id "fabric-loom" version "1.1-SNAPSHOT"
+    id "fabric-loom" version "1.7-SNAPSHOT"
     id "maven-publish"
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -14,8 +14,12 @@ group = project.maven_group
 repositories {
     mavenCentral()
     maven {
-        name = "gaucho-matrero-repo"
-        url = "https://gaucho-matrero.github.io/maven/"
+        name = "MarvionKiritoRepo"
+        url = "https://marvionkirito.github.io/maven/"
+    }
+    maven {
+        name = 'babbaj-repo'
+        url = 'https://babbaj.github.io/maven/'
     }
     flatDir {
         dirs '../baritone/dist'
@@ -32,25 +36,28 @@ dependencies {
     modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
     // Jackson JSON
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.15.0-rc1'
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.0-rc1'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.0-rc1'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.2'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.2'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
+
+    // Nether pathfinder
+    implementation 'dev.babbaj:nether-pathfinder:1.5'
 
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
     // You may need to force-disable transitiveness on them.
-    shadow('com.fasterxml.jackson.core:jackson-core:2.15.0-rc1')
-    shadow('com.fasterxml.jackson.core:jackson-annotations:2.15.0-rc1')
-    shadow('com.fasterxml.jackson.core:jackson-databind:2.15.0-rc1')
+    shadow('com.fasterxml.jackson.core:jackson-core:2.17.2')
+    shadow('com.fasterxml.jackson.core:jackson-annotations:2.17.2')
+    shadow('com.fasterxml.jackson.core:jackson-databind:2.17.2')
 
     // Thank you georgeagostino for fixing my garbage
-//    if (getProject().hasProperty("altoclef.development")) {
-    // Must run build from baritone-plus once
-    modImplementation 'baritone-api-fabric:baritone-unoptimized-fabric-1.19.4-beta1'
-    include "baritone-api-fabric:baritone-unoptimized-fabric-1.19.4-beta1"
-    //} else {
-    //    modImplementation "cabaletta:baritone-unoptimized-fabric:1.18.2"
-    //    include "cabaletta:baritone-unoptimized-fabric:1.18.2"
-    //}
+    if (getProject().hasProperty("altoclef.development")) {
+        // Must run build from baritone-plus once
+        modImplementation 'baritone-api-fabric:baritone-unoptimized-fabric-1.21-beta1'
+        include "baritone-api-fabric:baritone-unoptimized-fabric-1.21-beta1"
+    } else {
+        modImplementation "cabaletta:baritone-unoptimized-fabric:1.21-beta1"
+        include "cabaletta:baritone-unoptimized-fabric:1.21-beta1"
+    }
     //modImplementation 'baritone-api-fabric:baritone-api-fabric:1.6.3'
     //implementation files('baritone-plus/build/libs/baritone-unoptimized-fabric-1.6.3.jar')
 }

develop.md

@@ -30,11 +30,11 @@ Click `File > New > Project from Version Control...` ![image](https://user-image
 
 If the gradle tab doesn't exist, try `View > Tool Windows > Gradle`
 
-## Get it Running (Command line, Linux & macOS)
+## Get it Running (Command line)
 
 1) Git Clone project
 2) `cd` into cloned local repo
-3) `sudo / doas chmod +x gradlew`
+3) `sudo / doas chmod +x gradlew` (skip this step if you are on windows)
 4) `./gradlew build` or `./gradlew runClient`
 
 ## Modifying Baritone (dev mode)

gradle.properties

@@ -8,13 +8,13 @@ org.gradle.caching=true
 org.gradle.warning.mode=all
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.1
-loader_version=0.14.18
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
+loader_version=0.15.11
 # Mod Properties
-mod_version=1.19.4-beta1
+mod_version=1.21-beta1
 maven_group=gaucho-matrero.altoclef
 archives_base_name=altoclef
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.76.0+1.19.4
+fabric_version=0.100.7+1.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/adris/altoclef/AltoClef.java

@@ -231,9 +231,10 @@ private void initializeBaritoneSettings() {
         getClientBaritoneSettings().blocksToAvoid.value = List.of(Blocks.FLOWERING_AZALEA, Blocks.AZALEA,
                 Blocks.POWDER_SNOW, Blocks.BIG_DRIPLEAF, Blocks.BIG_DRIPLEAF_STEM, Blocks.CAVE_VINES,
                 Blocks.CAVE_VINES_PLANT, Blocks.TWISTING_VINES, Blocks.TWISTING_VINES_PLANT, Blocks.SWEET_BERRY_BUSH,
-                Blocks.WARPED_ROOTS, Blocks.VINE, Blocks.GRASS, Blocks.FERN, Blocks.TALL_GRASS, Blocks.LARGE_FERN,
+                Blocks.WARPED_ROOTS, Blocks.VINE, Blocks.GRASS_BLOCK, Blocks.FERN, Blocks.TALL_GRASS, Blocks.LARGE_FERN,
                 Blocks.SMALL_AMETHYST_BUD, Blocks.MEDIUM_AMETHYST_BUD, Blocks.LARGE_AMETHYST_BUD,
-                Blocks.AMETHYST_CLUSTER, Blocks.SCULK, Blocks.SCULK_VEIN);
+                Blocks.AMETHYST_CLUSTER, Blocks.SCULK, Blocks.SCULK_VEIN, Blocks.SUNFLOWER, Blocks.LILAC,
+                Blocks.ROSE_BUSH, Blocks.PEONY);
         // Let baritone move items to hotbar to use them
         // Reduces a bit of far rendering to save FPS
         getClientBaritoneSettings().fadePath.value = true;

src/main/java/adris/altoclef/AltoClefCommands.java

@@ -36,7 +36,8 @@ public AltoClefCommands() throws CommandException {
                 new SetGammaCommand(),
                 new ListCommand(),
                 new CoverWithSandCommand(),
-                new CoverWithBlocksCommand()
+                new CoverWithBlocksCommand(),
+                new SelfCareCommand()
                 //new TestMoveInventoryCommand(),
                 //    new TestSwapInventoryCommand()
         );

src/main/java/adris/altoclef/Playground.java

@@ -10,6 +10,7 @@
 import adris.altoclef.tasks.container.SmeltInFurnaceTask;
 import adris.altoclef.tasks.container.StoreInAnyContainerTask;
 import adris.altoclef.tasks.entity.KillEntityTask;
+import adris.altoclef.tasks.entity.ShootArrowSimpleProjectileTask;
 import adris.altoclef.tasks.examples.ExampleTask2;
 import adris.altoclef.tasks.misc.EquipArmorTask;
 import adris.altoclef.tasks.misc.PlaceBedAndSetSpawnTask;
@@ -31,7 +32,9 @@
 import adris.altoclef.util.helpers.WorldHelper;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.mob.GhastEntity;
 import net.minecraft.entity.mob.ZombieEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
@@ -43,6 +46,7 @@
 
 import java.io.*;
 import java.util.List;
+import java.util.Optional;
 import java.util.Scanner;
 
 /**
@@ -335,6 +339,18 @@ public static void TEMP_TEST_FUNCTION(AltoClef mod, String arg) {
                         new ItemTarget("netherite_leggings", 1),
                         new ItemTarget("netherite_boots", 1)));
                 break;
+            case "arrow":
+
+                List<GhastEntity> ghasts = mod.getEntityTracker().getTrackedEntities(GhastEntity.class);
+
+                if (ghasts.size() == 0) {
+                    Debug.logWarning("No ghasts found.");
+                    break;
+                }
+
+                GhastEntity ghast = ghasts.get(0);
+                mod.runUserTask(new ShootArrowSimpleProjectileTask(ghast));
+                break;
             case "whisper": {
                 File check = new File("whisper.txt");
                 try {

src/main/java/adris/altoclef/Settings.java

@@ -283,6 +283,19 @@ public class Settings implements IFailableConfigFile {
      */
     private String idleCommand = "";
 
+
+    /**
+     * If set, will run this command after death.
+     * Also {deathmessage} will be replaced with the death message.
+     * <p>
+     * For example, try setting this to "@goto <Your base coords>" to make the bot go to the base before continuing the task it was given.
+     * Or setting it to "I died!" will send the i died message
+     * Or setting it to "/back" will execute /back on the server
+     * When running altoclef commands, if the prefix is not @, the set prefix should be used for the command and not @
+     * You may run multiple commands even commands of differet type by splitting them with " & ". Example: /home & i died with message: {deathmessage} & @get diamond
+     */
+    private String deathCommand = "";
+
     /**
      * If we need to throw away something, throw away these items first.
      */
@@ -507,6 +520,10 @@ public String getIdleCommand() {
         return idleCommand;
     }
 
+    public String getDeathCommand() {
+        return deathCommand;
+    }
+
     public boolean shouldRunIdleCommandWhenNotActive() {
         return idleCommand != null && !idleCommand.isBlank();
     }

src/main/java/adris/altoclef/TaskCatalogue.java

@@ -71,7 +71,7 @@ public class TaskCatalogue {
             mine("diamond", MiningRequirement.IRON, new Block[]{Blocks.DIAMOND_ORE, Blocks.DEEPSLATE_DIAMOND_ORE}, Items.DIAMOND);
             mine("emerald", MiningRequirement.IRON, new Block[]{Blocks.EMERALD_ORE, Blocks.DEEPSLATE_EMERALD_ORE}, Items.EMERALD);
             mine("redstone", MiningRequirement.IRON, new Block[]{Blocks.REDSTONE_ORE, Blocks.DEEPSLATE_REDSTONE_ORE}, Items.REDSTONE);
-            mine("lapis_lazuli", MiningRequirement.IRON, new Block[]{Blocks.LAPIS_ORE, Blocks.DEEPSLATE_LAPIS_ORE}, Items.LAPIS_LAZULI);
+            mine("lapis_lazuli", MiningRequirement.STONE, new Block[]{Blocks.LAPIS_ORE, Blocks.DEEPSLATE_LAPIS_ORE}, Items.LAPIS_LAZULI);
             alias("lapis", "lapis_lazuli");
             mine("amethyst_shard", MiningRequirement.WOOD, Blocks.AMETHYST_CLUSTER, Items.AMETHYST_SHARD);
             mine("pointed_dripstone", MiningRequirement.WOOD, Blocks.POINTED_DRIPSTONE, Items.POINTED_DRIPSTONE);
@@ -88,6 +88,7 @@ public class TaskCatalogue {
             mine("acacia_sapling", Blocks.ACACIA_LEAVES, Items.ACACIA_SAPLING);
             mine("dark_oak_sapling", Blocks.DARK_OAK_LEAVES, Items.DARK_OAK_SAPLING);
             mine("mangrove_propagule", Blocks.MANGROVE_PROPAGULE, Items.MANGROVE_PROPAGULE);
+            mine("cherry_sapling", Blocks.CHERRY_LEAVES, Items.CHERRY_SAPLING);
             simple("sapling", ItemHelper.SAPLINGS, CollectSaplingsTask::new);
             simple("sandstone", Items.SANDSTONE, CollectSandstoneTask::new).dontMineIfPresent();
             simple("red_sandstone", Items.RED_SANDSTONE, CollectRedSandstoneTask::new).dontMineIfPresent();
@@ -100,7 +101,7 @@ public class TaskCatalogue {
             simple("egg", Items.EGG, CollectEggsTask::new);
             mob("bone", Items.BONE, SkeletonEntity.class);
             mob("gunpowder", Items.GUNPOWDER, CreeperEntity.class);
-            mob("ender_pearl", Items.ENDER_PEARL, EndermanEntity.class).anyDimension();
+            simple("ender_pearl", Items.ENDER_PEARL, KillEndermanTask::new);
             mob("spider_eye", Items.SPIDER_EYE, SpiderEntity.class);
             mob("leather", Items.LEATHER, CowEntity.class);
             mob("feather", Items.FEATHER, ChickenEntity.class);
@@ -153,7 +154,7 @@ public class TaskCatalogue {
             }
             mine("bamboo", Blocks.BAMBOO, Items.BAMBOO);
             shear("vine", Blocks.VINE, Items.VINE).dontMineIfPresent();
-            shear("grass", Blocks.GRASS, Items.GRASS).dontMineIfPresent();
+            shear("grass", Blocks.GRASS_BLOCK, Items.GRASS_BLOCK).dontMineIfPresent();
             shear("lily_pad", Blocks.LILY_PAD, Items.LILY_PAD).dontMineIfPresent();
             shear("tall_grass", Blocks.TALL_GRASS, Items.TALL_GRASS).dontMineIfPresent();
             shear("fern", Blocks.FERN, Items.FERN).dontMineIfPresent();
@@ -190,6 +191,9 @@ public class TaskCatalogue {
 
 
             // MATERIALS
+            //mine("netherite_upgrade_smithing_template", MiningRequirement.HAND, Blocks.CHEST, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE).forceDimension(Dimension.NETHER);
+            simple("netherite_upgrade_smithing_template", Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, GetSmithingTemplateTask::new);
+            alias("netherite_upgrade", "netherite_upgrade_smithing_template");
             simple("planks", ItemHelper.PLANKS, CollectPlanksTask::new).dontMineIfPresent();
             // Per-tree Planks. At the moment, nether planks need to be specified that their logs are in the nether.
             for (CataloguedResource woodCatalogue : woodTasks("planks", wood -> wood.planks, (wood, count) -> {
@@ -203,6 +207,11 @@ public class TaskCatalogue {
                 // Don't mine individual planks either!! Handled internally.
                 woodCatalogue.dontMineIfPresent();
             }
+            simple("stripped_logs", ItemHelper.STRIPPED_LOGS, CollectStrippedLogTask::new).dontMineIfPresent();
+            for (CataloguedResource woodCatalogue : woodTasks("stripped_logs", wood -> wood.strippedLog,
+                    (wood, count) -> new CollectStrippedLogTask(wood.strippedLog, count))) {
+                woodCatalogue.dontMineIfPresent();
+            }
             // shapedRecipe2x2("stick", Items.STICK, 4, p, o, p, o);
             simple("stick", Items.STICK, CollectSticksTask::new);
             smelt("stone", Items.STONE, "cobblestone").dontMineIfPresent();
@@ -243,6 +252,8 @@ public class TaskCatalogue {
             shapedRecipe2x2("sugar", Items.SUGAR, 1, "sugar_cane", o, o, o);
             shapedRecipe2x2("bone_meal", Items.BONE_MEAL, 3, "bone", o, o, o);
             shapedRecipe2x2("melon_seeds", Items.MELON_SEEDS, 1, "melon_slice", o, o, o);
+            shapedRecipe2x2("bamboo_planks", Items.BAMBOO_PLANKS, 2, "bamboo_block", o, o, o);
+            shapedRecipe3x3Block("bamboo_block", Items.BAMBOO_BLOCK, "bamboo");
             simple("hay_block", Items.HAY_BLOCK, CollectHayBlockTask::new).dontMineIfPresent();
             shapedRecipe2x2Block("polished_andesite", Items.POLISHED_ANDESITE, 4, "andesite");
             shapedRecipe2x2Block("polished_diorite", Items.POLISHED_DIORITE, 4, "diorite");
@@ -276,6 +287,7 @@ public class TaskCatalogue {
                 String b = "nether_brick";
                 shapedRecipe3x3("nether_brick_fence", Items.NETHER_BRICK_FENCE, 6, o, o, o, B, b, B, B, b, B);
             }
+            shapedRecipe3x3("brush", Items.BRUSH, 1, o, "feather", o, o, "copper_ingot", o, o, s, o);
             shapedRecipe3x3("paper", Items.PAPER, 3, "sugar_cane", "sugar_cane", "sugar_cane", o, o, o, o, o, o);
             shapedRecipe2x2("book", Items.BOOK, 1, "paper", "paper", "paper", "leather");
             shapedRecipe2x2("writable_book", Items.WRITABLE_BOOK, 1, "book", "ink_sac", o, "feather");
@@ -459,6 +471,8 @@ public class TaskCatalogue {
                 shapedRecipe3x3("observer", Items.OBSERVER, 1, c, c, c, "redstone", "redstone", "quartz", c, c, c);
                 shapedRecipe2x2("lever", Items.LEVER, 1, s, o, c, o);
             }
+            simple("hanging_sign", ItemHelper.WOOD_HANGING_SIGN, CollectHangingSignTask::new).dontMineIfPresent();
+            woodTasks("hanging_sign", woodItems -> woodItems.hangingSign, (woodItems, count) -> new CollectHangingSignTask(woodItems.hangingSign, woodItems.prefix + "_stripped_logs", count));
             shapedRecipe3x3("chest", Items.CHEST, 1, p, p, p, p, o, p, p, p, p).dontMineIfPresent();
             shapedRecipe2x2("torch", Items.TORCH, 4, "coal", o, s, o);
             simple("bed", ItemHelper.BED, CollectBedTask::new);
@@ -483,6 +497,7 @@ public class TaskCatalogue {
             }
             {
                 String b = "brick";
+                shapedRecipe3x3("decorated_pot", Items.DECORATED_POT, 1, o, b, o, b, o, b, o, b, o);
                 shapedRecipe3x3("flower_pot", Items.FLOWER_POT, 1, b, o, b, o, b, o, o, o, o);
                 shapedRecipe2x2Block("bricks", Items.BRICKS, b);
                 shapedRecipeSlab("brick_slab", Items.BRICK_SLAB, b);
@@ -537,6 +552,7 @@ public class TaskCatalogue {
             woodTasks("fence_gate", woodItems -> woodItems.fenceGate, (woodItems, count) -> new CollectFenceGateTask(woodItems.fenceGate, woodItems.prefix + "_planks", count));
             {
                 String r = "wooden_slab";
+                shapedRecipe3x3("chiseled_bookshelf", Items.CHISELED_BOOKSHELF, 1, p, p, p, r, r, r, p, p, p).dontMineIfPresent();
                 shapedRecipe3x3("barrel", Items.BARREL, 1, p, r, p, p, o, p, p, r, p);
                 shapedRecipe3x3("cartography_table", Items.CARTOGRAPHY_TABLE, 1, "paper", "paper", o, p, p, o, p, p, o);
                 shapedRecipe3x3("composter", Items.COMPOSTER, 1, r, o, r, r, o, r, r, r, r);
@@ -715,6 +731,11 @@ private static CataloguedResource simple(String name, Item matches, Function<Int
         return simple(name, new Item[]{matches}, getTask);
     }
 
+    // TODO: Do I really need this?
+    //private static CataloguedResource task(Item matches, Function<Integer, ResourceTask> getTask){
+    //
+    //}
+
     private static CataloguedResource mine(String name, MiningRequirement requirement, Item[] toMine, Item... targets) {
         Block[] toMineBlocks = new Block[toMine.length];
         for (int i = 0; i < toMine.length; ++i) toMineBlocks[i] = Block.getBlockFromItem(toMine[i]);