Fix clientcommands-scripting and compile errors

Earthcomputer · Mar 4, 2022 · 2d7f4a0 · 2d7f4a0
1 parent 123b437
commit 2d7f4a0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/clientcommands-scripting b/clientcommands-scripting
diff --git 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
@@ -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
@@ -23,6 +23,7 @@
     ]
   },
   "depends": {
+    "minecraft": "1.18.2",
     "fabricloader": ">=0.4.0",
     "fabric": "*"
   },
+1 −1		build.gradle
+2 −2		gradle.properties
+1 −5		src/main/java/net/earthcomputer/clientcommands/script/ScriptBlockState.java
+1 −6		src/main/java/net/earthcomputer/clientcommands/script/ScriptItemStack.java
+1 −1		src/main/java/net/earthcomputer/clientcommands/script/ScriptPlayer.java
+3 −3		src/main/java/net/earthcomputer/clientcommands/script/mixin/MixinClientPlayerEntity.java
+1 −1		src/main/resources/fabric.mod.json