Merged 4.2.0 release

build.gradle

@@ -97,6 +97,7 @@ processResources {
     filesMatching('META-INF/mods.toml') {
         expand project.properties
     }
+    outputs.upToDateWhen { false }
 }
 
 dependencies {

gradle.properties

@@ -6,4 +6,4 @@ versions_minecraft=1.18.2
 versions_minecraft_range=[1.18.2,1.19)
 versions_forge=40.2.0
 versions_forge_range=[40.2.0,)
-versions_mod=4.1.0
+versions_mod=4.2.0

src/main/java/com/mlib/Utility.java

@@ -10,6 +10,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.level.Level;
+import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.util.thread.SidedThreadGroups;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -132,12 +133,21 @@ public static boolean isDevBuild() {
 
 	public static void profile( String sectionName, Runnable runnable ) {
 		ProfilerFiller profiler = getProfiler();
-		profiler.push( sectionName );
-		runnable.run();
-		profiler.pop();
+		if( profiler != null ) {
+			profiler.push( sectionName );
+			runnable.run();
+			profiler.pop();
+		} else {
+			runnable.run();
+		}
 	}
 
-	public static ProfilerFiller getProfiler() {
-		return isServerSide() ? ServerLifecycleHooks.getCurrentServer().getProfiler() : Minecraft.getInstance().getProfiler();
+	@Nullable
+	private static ProfilerFiller getProfiler() {
+		return DistExecutor.unsafeRunForDist( ()->()->{
+			return Minecraft.getInstance() != null ? Minecraft.getInstance().getProfiler() : null;
+		}, ()->()->{
+			return ServerLifecycleHooks.getCurrentServer() != null ? ServerLifecycleHooks.getCurrentServer().getProfiler() : null;
+		} );
 	}
 }

src/main/java/com/mlib/gamemodifiers/contexts/OnFishingTimeSet.java

@@ -0,0 +1,43 @@
+package com.mlib.gamemodifiers.contexts;
+
+import com.mlib.gamemodifiers.Condition;
+import com.mlib.gamemodifiers.Context;
+import com.mlib.gamemodifiers.Contexts;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.projectile.FishingHook;
+
+import javax.annotation.Nullable;
+import java.util.function.Consumer;
+
+public class OnFishingTimeSet {
+	public static Context< Data > listen( Consumer< Data > consumer ) {
+		return Contexts.get( Data.class ).add( consumer );
+	}
+
+	public static Data dispatch( FishingHook hook, int timeUntilLured ) {
+		return Contexts.get( Data.class ).dispatch( new Data( hook, timeUntilLured ) );
+	}
+
+	public static Condition< Data > hasPlayer() {
+		return new Condition<>( data->data.player != null );
+	}
+
+	public static class Data {
+		public FishingHook hook;
+		public final int original;
+		public int ticks;
+		@Nullable
+		public Player player;
+
+		public Data( FishingHook hook, int original ) {
+			this.hook = hook;
+			this.original = original;
+			this.ticks = original;
+			this.player = hook.getPlayerOwner();
+		}
+
+		public int getTicks() {
+			return Math.max( this.ticks, 1 );
+		}
+	}
+}

src/main/java/com/mlib/mixin/MixinFishingHook.java

@@ -0,0 +1,23 @@
+package com.mlib.mixin;
+
+import com.mlib.ObfuscationGetter;
+import com.mlib.gamemodifiers.contexts.OnFishingTimeSet;
+import net.minecraft.world.entity.projectile.FishingHook;
+import org.objectweb.asm.Opcodes;
+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.Redirect;
+
+@Mixin( FishingHook.class )
+public abstract class MixinFishingHook {
+	private static final ObfuscationGetter.Field< FishingHook, Integer > TIME_UNTIL_LURED = new ObfuscationGetter.Field<>( FishingHook.class, "f_37090_" );
+
+	@Shadow( aliases = { "this$0" } )
+	@Redirect( method = "catchingFish (Lnet/minecraft/core/BlockPos;)V", at = @At( value = "FIELD", target = "Lnet/minecraft/world/entity/projectile/FishingHook;timeUntilLured:I", opcode = Opcodes.PUTFIELD, ordinal = 3 ) )
+	private void catchingFish( FishingHook hook, int timeUntilLured ) {
+		if( timeUntilLured > 0 ) {
+			TIME_UNTIL_LURED.set( hook, OnFishingTimeSet.dispatch( hook, timeUntilLured ).getTicks() );
+		}
+	}
+}

src/main/resources/mixins.mlib.json

@@ -5,6 +5,7 @@
   "mixins": [
     "MixinArrow",
     "MixinDifficultyInstance",
+    "MixinFishingHook",
     "MixinItemStack",
     "MixinLivingEntity",
     "MixinLootTableSerializer",