Skip to content

Commit 79ec1b3

Browse files
committed
fix: Fix fishing spots not disappearing with FishingOverhaul #25
1 parent e17dd85 commit 79ec1b3

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

neoforge/dependencies.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ dependencies {
33
changing = balm_version.contains("SNAPSHOT")
44
}
55
implementation("net.blay09.mods:kuma-api-neoforge:${kuma_version}")
6-
implementation("curse.maven:aquaculture-60028:6357107")
6+
compileOnly("curse.maven:aquaculture-60028:6357107")
77
//compileOnly("curse.maven:cloth-config-348521:5729127")
88
compileOnly("curse.maven:tide-884685:6312322")
9+
compileOnly("curse.maven:fishing-overhaul-491332:6297557")
910
}

neoforge/src/main/java/net/blay09/mods/littlejoys/neoforge/NeoForgeLittleJoys.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ public class NeoForgeLittleJoys {
1212
public NeoForgeLittleJoys(IEventBus modEventBus) {
1313
final var context = new NeoForgeLoadContext(modEventBus);
1414
Balm.initialize(LittleJoys.MOD_ID, context, LittleJoys::initialize);
15+
16+
Balm.initializeIfLoaded("fishingoverhaul", "net.blay09.mods.littlejoys.neoforge.compat.FishingOverhaulSupport");
1517
}
1618
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package net.blay09.mods.littlejoys.neoforge.compat;
2+
3+
import net.blay09.mods.littlejoys.api.LittleJoysAPI;
4+
import net.blay09.mods.littlejoys.handler.FishingSpotHolder;
5+
import net.minecraft.server.level.ServerLevel;
6+
import net.neoforged.bus.api.SubscribeEvent;
7+
import net.neoforged.neoforge.common.NeoForge;
8+
import net.neoforged.neoforge.event.entity.player.ItemFishedEvent;
9+
10+
public class FishingOverhaulSupport {
11+
public FishingOverhaulSupport() {
12+
NeoForge.EVENT_BUS.register(this);
13+
}
14+
15+
@SubscribeEvent
16+
public void onItemFished(ItemFishedEvent event) {
17+
final var fishingHook = event.getHookEntity();
18+
if (fishingHook.level() instanceof ServerLevel serverLevel && fishingHook instanceof FishingSpotHolder fishingSpotHolder) {
19+
fishingSpotHolder.getFishingSpot().ifPresent(fishingSpot ->
20+
LittleJoysAPI.consumeFishingSpot(event.getEntity(), serverLevel, fishingSpot));
21+
}
22+
}
23+
}

0 commit comments

Comments
 (0)