update to 1.20(.1)

DerpDerpling · Jul 17, 2023 · 09d709c · 09d709c
1 parent 3494c3f
commit 09d709c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 20 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.2
-loader_version=0.14.19
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.9
+loader_version=0.14.21
 
 # Mod Properties
-mod_version=1.1.0
+mod_version=1.2.0
 maven_group=derp.tpsounds
 archives_base_name=tpsounds
 
 # Dependencies
-fabric_version=0.80.0+1.19.4
+fabric_version=0.85.0+1.20.1
diff --git a/src/main/java/derp/tpsounds/mixin/DragonEggBlockMixin.java b/src/main/java/derp/tpsounds/mixin/DragonEggBlockMixin.java
@@ -5,7 +5,6 @@
 import net.minecraft.block.DragonEggBlock;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;

diff --git a/src/main/java/derp/tpsounds/mixin/EndGatewayBlockEntityMixin.java b/src/main/java/derp/tpsounds/mixin/EndGatewayBlockEntityMixin.java
@@ -1,19 +1,18 @@
 package derp.tpsounds.mixin;
 
-import java.lang.reflect.Field;
-
 import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.EndGatewayBlockEntity;
+import net.minecraft.entity.Entity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.block.entity.EndGatewayBlockEntity;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
+import java.lang.reflect.Field;
 
 @Mixin(EndGatewayBlockEntity.class)
 public class EndGatewayBlockEntityMixin {

diff --git a/src/main/java/derp/tpsounds/mixin/EnderPearlEntityMixin.java b/src/main/java/derp/tpsounds/mixin/EnderPearlEntityMixin.java
@@ -19,7 +19,7 @@
 public abstract class EnderPearlEntityMixin {
 	@Inject(method = "onCollision", at = @At("HEAD"))
 	private void playSoundOnCollision(HitResult hitResult, CallbackInfo ci) {
-		World world = ((EnderPearlEntity)(Object)this).world;
+		World world = ((EnderPearlEntity) (Object) this).getWorld();
 		if (!world.isClient) {
 			ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
 			scheduler.schedule(() -> {

diff --git a/src/main/java/derp/tpsounds/mixin/FollowOwnerGoalMixin.java b/src/main/java/derp/tpsounds/mixin/FollowOwnerGoalMixin.java
@@ -4,20 +4,18 @@
 import net.minecraft.entity.ai.goal.FollowOwnerGoal;
 import net.minecraft.entity.passive.TameableEntity;
 import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
-import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-
 @Mixin(FollowOwnerGoal.class)
 public abstract class FollowOwnerGoalMixin<T extends TameableEntity> {
+    @Final
     @Shadow
-    protected T tameable;
+    private T tameable;
 
     @Inject(method = "tryTeleportTo", at = @At("RETURN"))
     private void playTeleportSound(int x, int y, int z, CallbackInfoReturnable<Boolean> ci) {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -24,7 +24,7 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.14.19",
-		"minecraft": "~1.19.4",
+		"minecraft": ">=1.20-",
 		"java": ">=17",
 		"fabric-api": "*"
 	}