From 2d7f4a04c0a18cb72f3bd70523a1a5655ce5e09e Mon Sep 17 00:00:00 2001
From: Joe <burtonjae@hotmail.co.uk>
Date: Fri, 4 Mar 2022 21:37:41 +0000
Subject: [PATCH] Fix clientcommands-scripting and compile errors

---
 clientcommands-scripting                                        | 2 +-
 .../earthcomputer/clientcommands/mixin/MixinLivingEntity.java   | 2 +-
 src/main/resources/clientcommands.aw                            | 2 +-
 src/main/resources/fabric.mod.json                              | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/clientcommands-scripting b/clientcommands-scripting
index 72e46e585..d5290ed8e 160000
--- a/clientcommands-scripting
+++ b/clientcommands-scripting
@@ -1 +1 @@
-Subproject commit 72e46e585951bfa075899e31639c63a726706b81
+Subproject commit d5290ed8e454626ca66958e3285221315d159dea
diff --git a/src/main/java/net/earthcomputer/clientcommands/mixin/MixinLivingEntity.java b/src/main/java/net/earthcomputer/clientcommands/mixin/MixinLivingEntity.java
index aa1f98cb2..78ee12483 100644
--- a/src/main/java/net/earthcomputer/clientcommands/mixin/MixinLivingEntity.java
+++ b/src/main/java/net/earthcomputer/clientcommands/mixin/MixinLivingEntity.java
@@ -60,7 +60,7 @@ public void onEat(ItemStack stack, int particleCount, CallbackInfo ci) {
     }
 
     @Inject(method = "baseTick",
-            slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/tag/FluidTags;WATER:Lnet/minecraft/tag/Tag$Identified;", ordinal = 0)),
+            slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/tag/FluidTags;WATER:Lnet/minecraft/tag/TagKey;", ordinal = 0)),
             at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;", ordinal = 0))
     public void onUnderwater(CallbackInfo ci) {
         if (isThePlayer())
diff --git a/src/main/resources/clientcommands.aw b/src/main/resources/clientcommands.aw
index c0731ce8a..120a1f858 100644
--- a/src/main/resources/clientcommands.aw
+++ b/src/main/resources/clientcommands.aw
@@ -3,5 +3,5 @@ extendable method net/minecraft/loot/condition/EntityPropertiesLootCondition <in
 extendable method net/minecraft/loot/condition/LocationCheckLootCondition <init> (Lnet/minecraft/predicate/entity/LocationPredicate;Lnet/minecraft/util/math/BlockPos;)V
 accessible class net/minecraft/command/argument/BlockPredicateArgumentType$StatePredicate
 accessible class net/minecraft/command/argument/BlockPredicateArgumentType$TagPredicate
-accessible method net/minecraft/command/argument/BlockPredicateArgumentType$TagPredicate <init> (Lnet/minecraft/tag/Tag;Ljava/util/Map;Lnet/minecraft/nbt/NbtCompound;)V
+accessible method net/minecraft/command/argument/BlockPredicateArgumentType$TagPredicate <init> (Lnet/minecraft/tag/TagKey;Ljava/util/Map;Lnet/minecraft/nbt/NbtCompound;)V
 extendable method net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen drawStatusEffects (Lnet/minecraft/client/util/math/MatrixStack;II)V
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 949dc5762..a34add957 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,6 +23,7 @@
     ]
   },
   "depends": {
+    "minecraft": "1.18.2",
     "fabricloader": ">=0.4.0",
     "fabric": "*"
   },