Merge pull request #4925 from rfresh2/1.21.11

1.21.11

Author: leijurv

build.gradle

@@ -46,6 +46,9 @@ allprojects {
     }
 
     repositories {
+        maven {
+            url = "https://files.minecraftforge.net/maven/"
+        }
         maven {
             name = 'spongepowered-repo'
             url = 'https://repo.spongepowered.org/repository/maven-public/'

fabric/src/main/resources/fabric.mod.json

@@ -25,7 +25,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.14.22",
-    "minecraft": ["1.21.9", "1.21.10"]
+    "minecraft": ["1.21.11"]
   },
   "custom": {
     "modmenu": {

forge/src/main/resources/META-INF/mods.toml

@@ -35,6 +35,6 @@ A Minecraft pathfinder bot.
 modId="minecraft"
 mandatory=true
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[1.21.9, 1.21.10]"
+versionRange="[1.21.11]"
 ordering="NONE"
 side="BOTH"

gradle.properties

@@ -1,24 +1,24 @@
 org.gradle.jvmargs=-Xmx4G
 
-available_loaders=fabric,neoforge,forge,tweaker
+available_loaders=fabric,forge,tweaker
 
-mod_version=1.16.0
+mod_version=1.17.0
 maven_group=baritone
 archives_base_name=baritone
 
 java_version=21
 
-minecraft_version=1.21.10
+minecraft_version=1.21.11
 
-forge_version=60.0.0
+forge_version=61.0.0
 
-neoforge_version=1-beta
+neoforge_version=0-beta
 
-fabric_version=0.17.2
+fabric_version=0.18.1
 
 nether_pathfinder_version=1.4.1
 
 // These dependencies are used for common and tweaker
 // while mod loaders usually ship their own version
-mixin_version=0.8.5
+mixin_version=0.8.7
 asm_version=9.7

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -35,7 +35,7 @@ A Minecraft pathfinder bot.
 modId="minecraft"
 type="required"
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[1.21.9, 1.21.10]"
+versionRange="[1.21.11]"
 ordering="NONE"
 side="BOTH"
 

src/api/java/baritone/api/command/datatypes/BlockById.java

@@ -20,7 +20,7 @@
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.level.block.Block;
 
 import java.util.stream.Stream;
@@ -30,7 +30,7 @@ public enum BlockById implements IDatatypeFor<Block> {
 
     @Override
     public Block get(IDatatypeContext ctx) throws CommandException {
-        ResourceLocation id = ResourceLocation.parse(ctx.getConsumer().getString());
+        Identifier id = Identifier.parse(ctx.getConsumer().getString());
         Block block;
         if ((block = BuiltInRegistries.BLOCK.getOptional(id).orElse(null)) == null) {
             throw new IllegalArgumentException("no block found by that id");

src/api/java/baritone/api/command/datatypes/EntityClassById.java

@@ -20,7 +20,7 @@
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.entity.EntityType;
 
 import java.util.stream.Stream;
@@ -30,7 +30,7 @@ public enum EntityClassById implements IDatatypeFor<EntityType> {
 
     @Override
     public EntityType get(IDatatypeContext ctx) throws CommandException {
-        ResourceLocation id = ResourceLocation.parse(ctx.getConsumer().getString());
+        Identifier id = Identifier.parse(ctx.getConsumer().getString());
         EntityType entity;
         if ((entity = BuiltInRegistries.ENTITY_TYPE.getOptional(id).orElse(null)) == null) {
             throw new IllegalArgumentException("no entity found by that id");

src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java

@@ -21,7 +21,7 @@
 import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.utils.BlockOptionalMeta;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.properties.Property;
 
@@ -77,7 +77,7 @@ public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException
             properties = parts[1];
         }
 
-        Block block = BuiltInRegistries.BLOCK.getOptional(ResourceLocation.parse(blockId)).orElse(null);
+        Block block = BuiltInRegistries.BLOCK.getOptional(Identifier.parse(blockId)).orElse(null);
         if (block == null) {
             // This block doesn't exist so there's no properties to complete.
             return Stream.empty();

src/api/java/baritone/api/command/datatypes/ItemById.java

@@ -20,7 +20,7 @@
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.Item;
 
 import java.util.stream.Stream;
@@ -30,7 +30,7 @@ public enum ItemById implements IDatatypeFor<Item> {
 
     @Override
     public Item get(IDatatypeContext ctx) throws CommandException {
-        ResourceLocation id = ResourceLocation.parse(ctx.getConsumer().getString());
+        Identifier id = Identifier.parse(ctx.getConsumer().getString());
         Item item;
         if ((item = BuiltInRegistries.ITEM.getOptional(id).orElse(null)) == null) {
             throw new IllegalArgumentException("No item found by that id");
@@ -44,7 +44,7 @@ public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException
                 .append(
                         BuiltInRegistries.BLOCK.keySet()
                                 .stream()
-                                .map(ResourceLocation::toString)
+                                .map(Identifier::toString)
                 )
                 .filterPrefixNamespaced(ctx.getConsumer().getString())
                 .sortAlphabetically()

src/api/java/baritone/api/command/helpers/TabCompleteHelper.java

@@ -23,13 +23,14 @@
 import baritone.api.command.manager.ICommandManager;
 import baritone.api.event.events.TabCompleteEvent;
 import baritone.api.utils.SettingsUtil;
+import net.minecraft.resources.Identifier;
+
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-import net.minecraft.resources.ResourceLocation;
 
 /**
  * The {@link TabCompleteHelper} is a <b>single-use</b> object that helps you handle tab completion. It includes helper
@@ -206,13 +207,13 @@ public TabCompleteHelper filterPrefix(String prefix) {
     /**
      * Filter out any element that doesn't start with {@code prefix} and return this object for chaining
      * <p>
-     * Assumes every element in this {@link TabCompleteHelper} is a {@link ResourceLocation}
+     * Assumes every element in this {@link TabCompleteHelper} is a {@link Identifier}
      *
      * @param prefix The prefix to filter for
      * @return This {@link TabCompleteHelper}
      */
     public TabCompleteHelper filterPrefixNamespaced(String prefix) {
-        ResourceLocation loc = ResourceLocation.tryParse(prefix);
+        Identifier loc = Identifier.tryParse(prefix);
         if (loc == null) {
             stream = Stream.empty();
             return this;