Skip to content

Commit 08ad22c

Browse files
committed
Uncomment Team ProjectE integration code so it may (hopefully) continue to work uninterrupted when that also updates
1 parent c89cd47 commit 08ad22c

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ neoForge {
5555

5656
tasks {
5757
jar {
58+
exclude("cn/**")
59+
5860
from(rootProject.file("LICENSE")) {
5961
rename { "${it}_$modId" }
6062
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package cn.leomc.teamprojecte;
2+
3+
import net.neoforged.bus.api.Event;
4+
5+
/**
6+
* Temporary dummy class until the Team ProjectE dependency is updated to use NeoForge's package namespace rather than
7+
* the old Minecraft Forge namespace when extending {@code Event}. Excluded at compile-time, only exists to suppress a
8+
* compilation error.
9+
*/
10+
public class TeamChangeEvent extends Event {}

src/main/java/gripe/_90/appliede/me/service/TeamProjectEHandler.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
import appeng.api.features.IPlayerRegistry;
1515

1616
import cn.leomc.teamprojecte.TPTeam;
17+
import cn.leomc.teamprojecte.TeamChangeEvent;
1718
import moze_intel.projecte.api.capabilities.IKnowledgeProvider;
1819

1920
final class TeamProjectEHandler {
2021
private final Map<TPTeam, Supplier<IKnowledgeProvider>> providersPerTeam = new HashMap<>();
2122

2223
private TeamProjectEHandler() {
2324
NeoForge.EVENT_BUS.addListener(ServerStoppedEvent.class, event -> clear());
24-
// NeoForge.EVENT_BUS.addListener(TeamChangeEvent.class, event -> clear());
25+
NeoForge.EVENT_BUS.addListener(TeamChangeEvent.class, event -> clear());
2526
}
2627

2728
private boolean notSharingEmc(Map.Entry<UUID, Supplier<IKnowledgeProvider>> entry) {
@@ -81,10 +82,7 @@ private void clear() {
8182
}
8283

8384
static class Proxy {
84-
private static final boolean DISABLE = true;
85-
86-
private final Object handler =
87-
!DISABLE && ModList.get().isLoaded("teamprojecte") ? new TeamProjectEHandler() : null;
85+
private final Object handler = ModList.get().isLoaded("teamprojecte") ? new TeamProjectEHandler() : null;
8886

8987
boolean notSharingEmc(Map.Entry<UUID, Supplier<IKnowledgeProvider>> provider) {
9088
return handler == null || ((TeamProjectEHandler) handler).notSharingEmc(provider);

0 commit comments

Comments
 (0)