25w04a

TISUnion · Jan 24, 2025 · 435d1eb · 435d1eb
1 parent 8a8d22c
commit 435d1eb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/.../carpettisaddition/mixins/command/lifetime/removal/merge/ExperienceOrbEntityAccessor.java b/.../carpettisaddition/mixins/command/lifetime/removal/merge/ExperienceOrbEntityAccessor.java
@@ -34,14 +34,14 @@
 public interface ExperienceOrbEntityAccessor
 {
 	//#if MC >= 12105
-	//$$ @Invoker("getExperienceAmount")
+	//$$ @Invoker("getValue")
 	//#else
 	@Accessor("amount")
 	//#endif
 	int getAmount$TISCM();
 
 	//#if MC >= 12105
-	//$$ @Invoker("method_66666")
+	//$$ @Invoker("setValue")
 	//#else
 	@Accessor("amount")
 	//#endif

diff --git a/...main/java/carpettisaddition/mixins/command/lifetime/spawning/natural/CatSpawnerMixin.java b/...main/java/carpettisaddition/mixins/command/lifetime/spawning/natural/CatSpawnerMixin.java
@@ -32,7 +32,9 @@
 public abstract class CatSpawnerMixin
 {
 	@ModifyArg(
-			//#if MC >= 11600
+			//#if MC >= 12105
+			//$$ method = "spawn(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/world/ServerWorld;Z)V",
+			//#elseif MC >= 11600
 			//$$ method = "spawn(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/world/ServerWorld;)I",
 			//#else
 			method = "spawn(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;)I",

diff --git a/src/main/java/carpettisaddition/mixins/logger/phantom/PhantomSpawnerMixin.java b/src/main/java/carpettisaddition/mixins/logger/phantom/PhantomSpawnerMixin.java
@@ -24,13 +24,12 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import com.llamalad7.mixinextras.sugar.Share;
 import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.world.gen.PhantomSpawner;
 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.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.Slice;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 //#if MC >= 12000
 //$$ import net.minecraft.server.network.ServerPlayerEntity;
@@ -41,17 +40,19 @@
 @Mixin(PhantomSpawner.class)
 public abstract class PhantomSpawnerMixin
 {
-	@Inject(
+	@ModifyVariable(
 			method = "spawn",
 			at = @At(
 					value = "INVOKE",
 					target = "Lnet/minecraft/world/LocalDifficulty;getGlobalDifficulty()Lnet/minecraft/world/Difficulty;",
 					ordinal = 0
-			)
+			),
+			argsOnly = true
 	)
-	private void resetFlag_phantomLogger(CallbackInfoReturnable<Integer> cir, @Share("once") LocalBooleanRef hasLogged)
+	private ServerWorld resetFlag_phantomLogger(ServerWorld serverWorld, @Share("once") LocalBooleanRef hasLogged)
 	{
 		hasLogged.set(false);
+		return serverWorld;
 	}
 
 	@ModifyVariable(

diff --git a/versions/1.21.5/gradle.properties b/versions/1.21.5/gradle.properties
@@ -1,7 +1,7 @@
 # Fabric Properties
-	# check these on https://fallen-breath.github.io/fabric-versions/?&version=25w03a
-	minecraft_version=25w03a
-	yarn_mappings=25w03a+build.1
+	# check these on https://fallen-breath.github.io/fabric-versions/?&version=25w04a
+	minecraft_version=25w04a
+	yarn_mappings=25w04a+build.6
 
 # Fabric Mod Metadata
 	carpet_dependency=>=1.4.162
@@ -10,12 +10,12 @@
 
 # Build Information
 	# The target mc versions for the mod during mod publishing, separated with \n
-	game_versions=25w03a
+	game_versions=25w04a
 
 # Mod Dependency
 	# check available versions on maven for the given minecraft version you are using
 	# https://masa.dy.fi/maven/carpet/fabric-carpet/
-	carpet_core_version=25w03a-1.4.163+v250116
+	carpet_core_version=25w04a-1.4.164+v250122
 
 	# Lithium mc1.21.4-0.14.3 for Fabric
 	# https://www.curseforge.com/minecraft/mc-mods/lithium/files/5959998