Port IsRainingAtTransformer

src/main/java/twilightforest/ASMHooks.java

@@ -253,11 +253,12 @@ public static int shroom(int o, LevelReader level, BlockPos pos) {
 	}
 
 	/**
-	 * Injection Point:<br>
-	 * {@link net.minecraft.world.level.Level#isRainingAt(BlockPos)}<br>
-	 * [BEFORE ALOAD]
+	 * {@link twilightforest.asm.transformers.cloud.IsRainingAtTransformer}<p/>
+	 *
+	 * Injection Point:<br/>
+	 * {@link net.minecraft.world.level.Level#isRainingAt(BlockPos)}
 	 */
-	public static boolean cloud(boolean isRaining, Level level, BlockPos pos) {
+	public static boolean isRainingAt(boolean isRaining, Level level, BlockPos pos) {
 		if (!isRaining && TFConfig.commonCloudBlockPrecipitationDistance > 0) {
 			LevelChunk chunk = level.getChunkAt(pos);
 			for (int y = pos.getY(); y < pos.getY() + TFConfig.commonCloudBlockPrecipitationDistance; y++) {

src/main/resources/META-INF/coremods.json

@@ -7,7 +7,6 @@
   "mount": "META-INF/asm/mount.js",
   "conquered": "META-INF/asm/conquered.js",
   "shroom": "META-INF/asm/shroom.js",
-  "cloud": "META-INF/asm/cloud.js",
   "lead": "META-INF/asm/lead.js",
   "structure_terraform": "META-INF/asm/structure_terraform.js",
   "structure_scan": "META-INF/asm/structure_scan.js"

tf-asm/src/main/java/twilightforest/asm/TFCoreMod.java

@@ -7,6 +7,7 @@
 import twilightforest.asm.transformers.armor.CancelArmorRenderingTransformer;
 import twilightforest.asm.transformers.book.ModifyWrittenBookNameTransformer;
 import twilightforest.asm.transformers.chunk.ChunkStatusTaskTransformer;
+import twilightforest.asm.transformers.cloud.IsRainingAtTransformer;
 
 import java.util.List;
 
@@ -23,7 +24,10 @@ public Iterable<? extends ITransformer<?>> getTransformers() {
 			new ModifyWrittenBookNameTransformer(),
 
 			// chunk
-			new ChunkStatusTaskTransformer()
+			new ChunkStatusTaskTransformer(),
+
+			// cloud
+			new IsRainingAtTransformer()
 		);
 	}
 }

tf-asm/src/main/java/twilightforest/asm/transformers/cloud/IsRainingAtTransformer.java

@@ -0,0 +1,62 @@
+package twilightforest.asm.transformers.cloud;
+
+import cpw.mods.modlauncher.api.ITransformer;
+import cpw.mods.modlauncher.api.ITransformerVotingContext;
+import cpw.mods.modlauncher.api.TargetType;
+import cpw.mods.modlauncher.api.TransformerVoteResult;
+import net.neoforged.coremod.api.ASMAPI;
+import org.jetbrains.annotations.NotNull;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
+import twilightforest.asm.AsmUtil;
+
+import java.util.Set;
+
+/**
+ * {@link twilightforest.ASMHooks#isRainingAt}
+ */
+public class IsRainingAtTransformer implements ITransformer<MethodNode> {
+
+	@Override
+	public @NotNull MethodNode transform(MethodNode node, ITransformerVotingContext context) {
+		AsmUtil.findInstructions(
+			node,
+			Opcodes.IRETURN
+		).forEach(target -> node.instructions.insertBefore(
+			target,
+			ASMAPI.listOf(
+				new VarInsnNode(Opcodes.ALOAD, 0),
+				new VarInsnNode(Opcodes.ALOAD, 1),
+				new MethodInsnNode(
+					Opcodes.INVOKESTATIC,
+					"twilightforest/ASMHooks",
+					"isRainingAt",
+					"(ZLnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Z"
+				)
+			)
+		));
+		return node;
+	}
+
+	@Override
+	public @NotNull TransformerVoteResult castVote(ITransformerVotingContext context) {
+		return TransformerVoteResult.YES;
+	}
+
+	@Override
+	public @NotNull Set<Target<MethodNode>> targets() {
+		return Set.of(Target.targetMethod(
+			"net.minecraft.world.level.Level",
+			"isRainingAt",
+			"(Lnet/minecraft/core/BlockPos;)Z"
+		));
+	}
+
+	@Override
+	public @NotNull TargetType<MethodNode> getTargetType() {
+		return TargetType.METHOD;
+	}
+
+}