Skip to content

Improve resiliency in FUUID support #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mbax wants to merge 2 commits into from
Closed

Improve resiliency in FUUID support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77ed99c
Upgrade maven shade plugin
mbax Apr 13, 2025
7907ae1
Improve resiliency in FUUID support.
mbax Apr 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FactionsBridge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
13 changes: 8 additions & 5 deletions Factions_FactionsUUID/src/main/java/factionsuuid/FactionsUUIDAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ public Claim getClaim(@NotNull Chunk chunk) {
@Nullable
@Override
public Faction getFaction(@NotNull String id) {
return new FactionsUUIDFaction(Factions.getInstance().getFactionById(id));
com.massivecraft.factions.Faction faction = Factions.getInstance().getFactionById(id);
return faction == null ? null : new FactionsUUIDFaction(faction);
}

/**
Expand All @@ -68,7 +69,8 @@ public Faction getFaction(@NotNull String id) {
@Nullable
@Override
public Faction getFactionByTag(@NotNull String tag) {
return new FactionsUUIDFaction(Factions.getInstance().getByTag(tag));
com.massivecraft.factions.Faction faction = Factions.getInstance().getByTag(tag);
return faction == null ? null : new FactionsUUIDFaction(faction);
}

/**
Expand Down Expand Up @@ -129,8 +131,7 @@ public Faction getWilderness() {
@NotNull
@Override
public Faction createFaction(@NotNull String name) throws IllegalStateException {
Faction fac = getFactionByName(name);
if (fac != null && !fac.isServerFaction()) throw new IllegalStateException("Faction already exists.");
if (Factions.getInstance().getByTag(name) != null) throw new IllegalStateException("Faction already exists.");
com.massivecraft.factions.Faction faction = Factions.getInstance().createFaction();
faction.setTag(name);
return new FactionsUUIDFaction(faction);
Expand All @@ -144,7 +145,9 @@ public Faction createFaction(@NotNull String name) throws IllegalStateException
*/
@Override
public void deleteFaction(@NotNull Faction faction) throws IllegalStateException {
Factions.getInstance().removeFaction(faction.getId());
com.massivecraft.factions.Faction fac = Factions.getInstance().getFactionById(faction.getId());
if (fac == null) throw new IllegalStateException("Faction does not exist.");
Factions.getInstance().removeFaction(fac.getId());
}

/**
Expand Down
46 changes: 20 additions & 26 deletions Factions_FactionsUUID/src/main/java/factionsuuid/events/FactionsUUIDListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@

import cc.javajobs.factionsbridge.FactionsBridge;
import cc.javajobs.factionsbridge.bridge.events.*;
import cc.javajobs.factionsbridge.bridge.infrastructure.struct.FactionsAPI;
import com.massivecraft.factions.event.LandClaimEvent;
import com.massivecraft.factions.event.LandUnclaimAllEvent;
import com.massivecraft.factions.event.LandUnclaimEvent;
import factionsuuid.FactionsUUIDClaim;
import factionsuuid.FactionsUUIDFPlayer;
import factionsuuid.FactionsUUIDFaction;
import org.bukkit.event.Cancellable;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.jetbrains.annotations.NotNull;

import java.util.Objects;
import java.util.UUID;

import static org.bukkit.Bukkit.getPluginManager;
import static org.bukkit.Bukkit.getScheduler;

Expand All @@ -25,11 +24,6 @@
*/
public class FactionsUUIDListener implements Listener {

/**
* Instance of the {@link FactionsAPI} created by FactionsBridge.
*/
private final FactionsAPI api = FactionsBridge.getFactionsAPI();

/**
* Listener for the {@link LandClaimEvent}.
* <p>
Expand All @@ -41,9 +35,9 @@ public class FactionsUUIDListener implements Listener {
@EventHandler
public void onClaim(@NotNull LandClaimEvent event) {
FactionClaimEvent bridgeEvent = new FactionClaimEvent(
api.getClaim(event.getLocation().getChunk()),
Objects.requireNonNull(api.getFaction(event.getFaction().getId())),
api.getFPlayer(UUID.fromString(event.getfPlayer().getId())),
new FactionsUUIDClaim(event.getLocation()),
new FactionsUUIDFaction(event.getFaction()),
new FactionsUUIDFPlayer(event.getfPlayer()),
event
);
getPluginManager().callEvent(bridgeEvent);
Expand All @@ -61,8 +55,8 @@ public void onClaim(@NotNull LandClaimEvent event) {
@EventHandler
public void onJoin(@NotNull com.massivecraft.factions.event.FPlayerJoinEvent event) {
FactionJoinEvent bridgeEvent = new FactionJoinEvent(
Objects.requireNonNull(api.getFaction(event.getFaction().getId())),
api.getFPlayer(UUID.fromString(event.getfPlayer().getId())),
new FactionsUUIDFaction(event.getFaction()),
new FactionsUUIDFPlayer(event.getfPlayer()),
event
);
getPluginManager().callEvent(bridgeEvent);
Expand All @@ -80,8 +74,8 @@ public void onJoin(@NotNull com.massivecraft.factions.event.FPlayerJoinEvent eve
@EventHandler
public void onLeave(@NotNull com.massivecraft.factions.event.FPlayerLeaveEvent event) {
FactionLeaveEvent bridgeEvent = new FactionLeaveEvent(
Objects.requireNonNull(api.getFaction(event.getFaction().getId())),
api.getFPlayer(UUID.fromString(event.getfPlayer().getId())),
new FactionsUUIDFaction(event.getFaction()),
new FactionsUUIDFPlayer(event.getfPlayer()),
FactionLeaveEvent.LeaveReason.fromString(event.getReason().name()),
event
);
Expand All @@ -100,8 +94,8 @@ public void onLeave(@NotNull com.massivecraft.factions.event.FPlayerLeaveEvent e
@EventHandler
public void onUnclaimAll(@NotNull LandUnclaimAllEvent event) {
FactionUnclaimAllEvent bridgeEvent = new FactionUnclaimAllEvent(
Objects.requireNonNull(api.getFaction(event.getFaction().getId())),
api.getFPlayer(UUID.fromString(event.getfPlayer().getId())),
new FactionsUUIDFaction(event.getFaction()),
new FactionsUUIDFPlayer(event.getfPlayer()),
event
);
getPluginManager().callEvent(bridgeEvent);
Expand All @@ -119,9 +113,9 @@ public void onUnclaimAll(@NotNull LandUnclaimAllEvent event) {
@EventHandler
public void onUnclaim(@NotNull LandUnclaimEvent event) {
FactionUnclaimEvent bridgeEvent = new FactionUnclaimEvent(
api.getClaim(event.getLocation().getChunk()),
Objects.requireNonNull(api.getFaction(event.getFaction().getId())),
api.getFPlayer(UUID.fromString(event.getfPlayer().getId())),
new FactionsUUIDClaim(event.getLocation()),
new FactionsUUIDFaction(event.getFaction()),
new FactionsUUIDFPlayer(event.getfPlayer()),
event
);
getPluginManager().callEvent(bridgeEvent);
Expand All @@ -140,8 +134,8 @@ public void onUnclaim(@NotNull LandUnclaimEvent event) {
public void onFactionCreate(@NotNull com.massivecraft.factions.event.FactionCreateEvent event) {
getScheduler().runTaskLater(FactionsBridge.get().getDevelopmentPlugin(), () -> {
FactionCreateEvent bridgeEvent = new FactionCreateEvent(
Objects.requireNonNull(api.getFaction(event.getFaction().getId())),
api.getFPlayer(UUID.fromString(event.getFPlayer().getId())),
new FactionsUUIDFaction(event.getFaction()),
new FactionsUUIDFPlayer(event.getFPlayer()),
event
);
getPluginManager().callEvent(bridgeEvent);
Expand All @@ -160,8 +154,8 @@ public void onFactionCreate(@NotNull com.massivecraft.factions.event.FactionCrea
@EventHandler
public void onFactionDisband(@NotNull com.massivecraft.factions.event.FactionDisbandEvent event) {
FactionDisbandEvent bridgeEvent = new FactionDisbandEvent(
api.getFPlayer(event.getPlayer()),
Objects.requireNonNull(api.getFaction(event.getFaction().getId())),
new FactionsUUIDFPlayer(event.getFPlayer()),
new FactionsUUIDFaction(event.getFaction()),
FactionDisbandEvent.DisbandReason.UNKNOWN,
event
);
Expand All @@ -180,7 +174,7 @@ public void onFactionDisband(@NotNull com.massivecraft.factions.event.FactionDis
@EventHandler
public void onRename(@NotNull com.massivecraft.factions.event.FactionRenameEvent event) {
FactionRenameEvent bridgeEvent = new FactionRenameEvent(
Objects.requireNonNull(api.getFaction(event.getFaction().getId())),
new FactionsUUIDFaction(event.getFaction()),
event.getFactionTag(),
event
);
Expand Down