Skip to content

Commit b60fb89

Browse files
committed
Fix forge support
1 parent 245e08d commit b60fb89

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

forge/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ minecraft {
2424
workingDirectory(project.file("run"))
2525
ideaModule("${rootProject.name}.${project.name}.main")
2626
args("-mixin.config=${Properties.MODID}.mixins.json")
27+
property("eventbus.api.strictRuntimeChecks", "true")
2728
mods {
2829
create(Properties.MODID) {
2930
source(sourceSets.main.get())
@@ -49,6 +50,7 @@ dependencies {
4950
"minecraft"("net.minecraftforge:forge:${Versions.MINECRAFT}-${Versions.FORGE}")
5051
annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT:processor")
5152
implementation("net.sf.jopt-simple:jopt-simple:5.0.4") { version { strictly("5.0.4") } }
53+
annotationProcessor("net.minecraftforge:eventbus-validator:7.0-beta.10")
5254
}
5355

5456
sourceSets.configureEach {

forge/src/main/java/com/blamejared/clumps/Clumps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class Clumps {
99

1010
public Clumps() {
1111

12-
ClumpsCommon.pickupXPEvent = (player, experienceOrb) -> MinecraftForge.EVENT_BUS.post(new PlayerXpEvent.PickupXp(player, experienceOrb));
12+
ClumpsCommon.pickupXPEvent = (player, experienceOrb) -> PlayerXpEvent.BUS.post(new PlayerXpEvent.PickupXp(player, experienceOrb));
1313
}
1414

1515
}

forge/src/main/java/com/blamejared/clumps/api/events/RepairEvent.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
package com.blamejared.clumps.api.events;
22

33
import net.minecraft.world.entity.player.Player;
4-
import net.minecraftforge.eventbus.api.Event;
4+
import net.minecraftforge.eventbus.api.bus.EventBus;
5+
import net.minecraftforge.eventbus.api.event.MutableEvent;
56

67
/**
78
* Fired before an item is repaired, if a repair is performed, then any leftover experience should be set back to this event.
89
*/
9-
public class RepairEvent extends Event implements IRepairEvent {
10+
public class RepairEvent extends MutableEvent implements IRepairEvent {
11+
12+
public static final EventBus<RepairEvent> BUS = EventBus.create(RepairEvent.class);
1013

1114
private final Player player;
1215
private int value;

forge/src/main/java/com/blamejared/clumps/api/events/ValueEvent.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package com.blamejared.clumps.api.events;
22

33
import net.minecraft.world.entity.player.Player;
4-
import net.minecraftforge.eventbus.api.Event;
4+
import net.minecraftforge.eventbus.api.bus.EventBus;
5+
import net.minecraftforge.eventbus.api.event.MutableEvent;
56

6-
public class ValueEvent extends Event implements IValueEvent {
7+
public class ValueEvent extends MutableEvent implements IValueEvent {
8+
9+
public static final EventBus<ValueEvent> BUS = EventBus.create(ValueEvent.class);
710

811
private final Player player;
912
private int value;

forge/src/main/java/com/blamejared/clumps/platform/ForgeEventHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ public class ForgeEventHandler implements IEventHelper {
1414
public Either<IValueEvent, Integer> fireValueEvent(Player player, int value) {
1515

1616
ValueEvent event = new ValueEvent(player, value);
17-
MinecraftForge.EVENT_BUS.post(event);
17+
ValueEvent.BUS.post(event);
1818
return Either.left(event);
1919
}
2020

2121
@Override
2222
public Either<IRepairEvent, Integer> fireRepairEvent(Player player, int value) {
2323

2424
RepairEvent event = new RepairEvent(player, value);
25-
MinecraftForge.EVENT_BUS.post(event);
25+
RepairEvent.BUS.post(event);
2626
return Either.left(event);
2727
}
2828

0 commit comments

Comments
 (0)