From 72411f6f2f4332ca56f479b64d5066e3b090c45c Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Sun, 27 Feb 2022 17:25:31 +0100 Subject: [PATCH] better crossplatform method init --- Changelog.md | 4 + .../java/io/github/flemmli97/flan/Flan.java | 32 ++++++++ .../api/permission/ObjectToPermissionMap.java | 12 +-- .../io/github/flemmli97/flan/claim/Claim.java | 6 +- .../flemmli97/flan/claim/ClaimStorage.java | 2 +- .../flemmli97/flan/commands/CommandClaim.java | 56 ++++++------- .../flemmli97/flan/config/BuySellHandler.java | 4 +- .../github/flemmli97/flan/config/Config.java | 10 +-- .../flemmli97/flan/config/LangManager.java | 4 +- .../flan/event/BlockInteractEvents.java | 8 +- .../flan/event/EntityInteractEvents.java | 2 +- .../flan/event/ItemInteractEvents.java | 2 +- .../flan/gui/PotionEditScreenHandler.java | 8 +- .../flan/platform/ClaimPermissionCheck.java | 13 ++- .../flan/platform/CrossPlatformStuff.java | 25 +++--- .../integration/currency/CommandCurrency.java | 15 ++-- .../permissions/PermissionNodeHandler.java | 81 +++++++++---------- .../flan/player/PlayerClaimData.java | 2 +- .../flemmli97/flan/fabric/FlanFabric.java | 8 -- .../platform/ClaimPermissionCheckImpl.java | 6 +- .../platform/CrossPlatformStuffImpl.java | 6 +- .../{fabric => }/CommandCurrencyImpl.java | 8 +- .../PermissionNodeHandlerImpl.java | 8 +- .../flemmli97/flan/forge/FlanForge.java | 8 -- .../platform/ClaimPermissionCheckImpl.java | 6 +- .../platform/CrossPlatformStuffImpl.java | 6 +- .../{forge => }/CommandCurrencyImpl.java | 8 +- .../PermissionNodeHandlerImpl.java | 8 +- gradle.properties | 2 +- 29 files changed, 172 insertions(+), 188 deletions(-) rename fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/currency/{fabric => }/CommandCurrencyImpl.java (95%) rename fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/{fabric => }/PermissionNodeHandlerImpl.java (91%) rename forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/currency/{forge => }/CommandCurrencyImpl.java (95%) rename forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/permissions/{forge => }/PermissionNodeHandlerImpl.java (89%) diff --git a/Changelog.md b/Changelog.md index 57e94ce..b1522e0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +Flan 1.7.3 +================ +- Internal changes + Flan 1.7.2 ================ - Internal changes diff --git a/common/src/main/java/io/github/flemmli97/flan/Flan.java b/common/src/main/java/io/github/flemmli97/flan/Flan.java index a0319a3..edccaa4 100644 --- a/common/src/main/java/io/github/flemmli97/flan/Flan.java +++ b/common/src/main/java/io/github/flemmli97/flan/Flan.java @@ -2,11 +2,15 @@ package io.github.flemmli97.flan; import io.github.flemmli97.flan.api.permission.PermissionRegistry; import io.github.flemmli97.flan.config.ConfigHandler; +import io.github.flemmli97.flan.platform.ClaimPermissionCheck; import net.minecraft.server.MinecraftServer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; import java.time.format.DateTimeFormatter; +import java.util.Arrays; public class Flan { @@ -33,4 +37,32 @@ public class Flan { public static void error(String msg, Object... o) { Flan.logger.error(msg, o); } + + @SuppressWarnings("unchecked") + public static T getPlatformInstance(Class abstractClss, String... impls) { + if(impls == null || impls.length == 0) + throw new IllegalStateException("Couldn't create an instance of " + abstractClss + ". No implementations provided!"); + Class clss = null; + int i = 0; + while(clss == null && i < impls.length) { + try { + clss = Class.forName(impls[i]); + } catch (ClassNotFoundException ignored) { + } + i++; + } + if(clss == null) + Flan.logger.fatal("No Implementation of " + abstractClss + " found with given paths " + Arrays.toString(impls)); + if (clss != null && abstractClss.isAssignableFrom(clss)) { + try { + Constructor constructor = (Constructor) clss.getDeclaredConstructor(); + return constructor.newInstance(); + } catch (NoSuchMethodException e) { + Flan.logger.fatal("Implementation of " + clss + " needs to provide an no arg constructor"); + } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) { + e.printStackTrace(); + } + } + throw new IllegalStateException("Couldn't create an instance of " + abstractClss); + } } diff --git a/common/src/main/java/io/github/flemmli97/flan/api/permission/ObjectToPermissionMap.java b/common/src/main/java/io/github/flemmli97/flan/api/permission/ObjectToPermissionMap.java index c636b6e..0f6d1b6 100644 --- a/common/src/main/java/io/github/flemmli97/flan/api/permission/ObjectToPermissionMap.java +++ b/common/src/main/java/io/github/flemmli97/flan/api/permission/ObjectToPermissionMap.java @@ -56,10 +56,10 @@ public class ObjectToPermissionMap { public static void reload(MinecraftServer server) { blockToPermission.clear(); itemToPermission.clear(); - for (Block block : CrossPlatformStuff.instance().registryBlocks().getIterator()) { + for (Block block : CrossPlatformStuff.INSTANCE.registryBlocks().getIterator()) { blockPermissionBuilder.entrySet().stream().filter(e -> e.getKey().test(block)).map(Map.Entry::getValue).findFirst().ifPresent(sub -> blockToPermission.put(block, sub.get())); } - for (Item item : CrossPlatformStuff.instance().registryItems().getIterator()) { + for (Item item : CrossPlatformStuff.INSTANCE.registryItems().getIterator()) { itemPermissionBuilder.entrySet().stream().filter(e -> e.getKey().test(item)).map(Map.Entry::getValue).findFirst().ifPresent(sub -> itemToPermission.put(item, sub.get())); } for (String s : ConfigHandler.config.itemPermission) { @@ -77,9 +77,9 @@ public class ObjectToPermissionMap { } } else { if (remove) - itemToPermission.remove(CrossPlatformStuff.instance().registryItems().getFromId(new ResourceLocation(sub[0]))); + itemToPermission.remove(CrossPlatformStuff.INSTANCE.registryItems().getFromId(new ResourceLocation(sub[0]))); else - itemToPermission.put(CrossPlatformStuff.instance().registryItems().getFromId(new ResourceLocation(sub[0])), PermissionRegistry.get(sub[1])); + itemToPermission.put(CrossPlatformStuff.INSTANCE.registryItems().getFromId(new ResourceLocation(sub[0])), PermissionRegistry.get(sub[1])); } } for (String s : ConfigHandler.config.blockPermission) { @@ -96,9 +96,9 @@ public class ObjectToPermissionMap { }); } else { if (remove) - blockToPermission.remove(CrossPlatformStuff.instance().registryBlocks().getFromId(new ResourceLocation(sub[0]))); + blockToPermission.remove(CrossPlatformStuff.INSTANCE.registryBlocks().getFromId(new ResourceLocation(sub[0]))); else - blockToPermission.put(CrossPlatformStuff.instance().registryBlocks().getFromId(new ResourceLocation(sub[0])), PermissionRegistry.get(sub[1])); + blockToPermission.put(CrossPlatformStuff.INSTANCE.registryBlocks().getFromId(new ResourceLocation(sub[0])), PermissionRegistry.get(sub[1])); } } } diff --git a/common/src/main/java/io/github/flemmli97/flan/claim/Claim.java b/common/src/main/java/io/github/flemmli97/flan/claim/Claim.java index 600a182..b00f1f5 100644 --- a/common/src/main/java/io/github/flemmli97/flan/claim/Claim.java +++ b/common/src/main/java/io/github/flemmli97/flan/claim/Claim.java @@ -268,7 +268,7 @@ public class Claim implements IPermissionContainer { perm = PermissionRegistry.FAKEPLAYER; } } - InteractionResult res = ClaimPermissionCheck.instance().check(player, perm, pos); + InteractionResult res = ClaimPermissionCheck.INSTANCE.check(player, perm, pos); if (res != InteractionResult.PASS) return res != InteractionResult.FAIL; if (perm != null) { @@ -634,7 +634,7 @@ public class Claim implements IPermissionContainer { else this.leaveSubtitle = null; JsonObject potion = ConfigHandler.fromJson(obj, "Potions"); - potion.entrySet().forEach(e -> this.potions.put(CrossPlatformStuff.instance().registryStatusEffects().getFromId(new ResourceLocation(e.getKey())), e.getValue().getAsInt())); + potion.entrySet().forEach(e -> this.potions.put(CrossPlatformStuff.INSTANCE.registryStatusEffects().getFromId(new ResourceLocation(e.getKey())), e.getValue().getAsInt())); if (ConfigHandler.fromJson(obj, "AdminClaim", false)) this.owner = null; else @@ -704,7 +704,7 @@ public class Claim implements IPermissionContainer { obj.addProperty("LeaveTitle", this.leaveTitle == null ? "" : Component.Serializer.toJson(this.leaveTitle)); obj.addProperty("LeaveSubtitle", this.leaveSubtitle == null ? "" : Component.Serializer.toJson(this.leaveSubtitle)); JsonObject potions = new JsonObject(); - this.potions.forEach((effect, amp) -> potions.addProperty(CrossPlatformStuff.instance().registryStatusEffects().getIDFrom(effect).toString(), amp)); + this.potions.forEach((effect, amp) -> potions.addProperty(CrossPlatformStuff.INSTANCE.registryStatusEffects().getIDFrom(effect).toString(), amp)); obj.add("Potions", potions); if (this.parent != null) obj.addProperty("Parent", this.parent.toString()); diff --git a/common/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java b/common/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java index b6b850e..8e7aca1 100644 --- a/common/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java +++ b/common/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java @@ -90,7 +90,7 @@ public class ClaimStorage implements IPermissionStorage { player.displayClientMessage(PermHelper.simpleColoredText(String.format(ConfigHandler.langManager.get("minClaimSize"), ConfigHandler.config.minClaimsize), ChatFormatting.RED), false); return false; } - if (!data.isAdminIgnoreClaim() && ConfigHandler.config.maxClaims != -1 && !PermissionNodeHandler.instance().permBelowEqVal(player, PermissionNodeHandler.permMaxClaims, this.playerClaimMap.getOrDefault(player.getUUID(), Sets.newHashSet()).size() + 1, ConfigHandler.config.maxClaims)) { + if (!data.isAdminIgnoreClaim() && ConfigHandler.config.maxClaims != -1 && !PermissionNodeHandler.INSTANCE.permBelowEqVal(player, PermissionNodeHandler.permMaxClaims, this.playerClaimMap.getOrDefault(player.getUUID(), Sets.newHashSet()).size() + 1, ConfigHandler.config.maxClaims)) { player.displayClientMessage(PermHelper.simpleColoredText(ConfigHandler.langManager.get("maxClaims"), ChatFormatting.RED), false); return false; } diff --git a/common/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java b/common/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java index 4e5d214..f9532a7 100644 --- a/common/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java +++ b/common/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java @@ -52,46 +52,46 @@ public class CommandClaim { public static void register(CommandDispatcher dispatcher, boolean dedicated) { LiteralArgumentBuilder builder = Commands.literal("flan") - .then(Commands.literal("reload").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdReload, true)).executes(CommandClaim::reloadConfig)) - .then(Commands.literal("addClaim").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.claimCreate)) + .then(Commands.literal("reload").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdReload, true)).executes(CommandClaim::reloadConfig)) + .then(Commands.literal("addClaim").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.claimCreate)) .then(Commands.argument("from", BlockPosArgument.blockPos()).then(Commands.argument("to", BlockPosArgument.blockPos()).executes(CommandClaim::addClaim))) .then(Commands.literal("all").executes(CommandClaim::addClaimAll)) .then(Commands.literal("rect").then(Commands.argument("x", IntegerArgumentType.integer()).then(Commands.argument("z", IntegerArgumentType.integer()).executes(ctx -> CommandClaim.addClaimRect(ctx, IntegerArgumentType.getInteger(ctx, "x"), IntegerArgumentType.getInteger(ctx, "z"))))))) - .then(Commands.literal("menu").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdMenu)).executes(CommandClaim::openMenu)) - .then(Commands.literal("setHome").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdHome)).executes(CommandClaim::setClaimHome)) - .then(Commands.literal("trapped").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdTrapped)).executes(CommandClaim::trapped)) - .then(Commands.literal("name").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdName)).then(Commands.argument("name", StringArgumentType.string()).executes(CommandClaim::nameClaim))) + .then(Commands.literal("menu").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdMenu)).executes(CommandClaim::openMenu)) + .then(Commands.literal("setHome").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdHome)).executes(CommandClaim::setClaimHome)) + .then(Commands.literal("trapped").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdTrapped)).executes(CommandClaim::trapped)) + .then(Commands.literal("name").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdName)).then(Commands.argument("name", StringArgumentType.string()).executes(CommandClaim::nameClaim))) .then(Commands.literal("unlockDrops").executes(CommandClaim::unlockDrops) - .then(Commands.argument("players", GameProfileArgument.gameProfile()).requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdUnlockAll, true)).executes(CommandClaim::unlockDropsPlayers))) - .then(Commands.literal("personalGroups").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdPGroup)).executes(CommandClaim::openPersonalGroups)) - .then(Commands.literal("claimInfo").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdInfo)).executes(ctx -> CommandClaim.claimInfo(ctx, Claim.InfoType.ALL)) + .then(Commands.argument("players", GameProfileArgument.gameProfile()).requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdUnlockAll, true)).executes(CommandClaim::unlockDropsPlayers))) + .then(Commands.literal("personalGroups").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdPGroup)).executes(CommandClaim::openPersonalGroups)) + .then(Commands.literal("claimInfo").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdInfo)).executes(ctx -> CommandClaim.claimInfo(ctx, Claim.InfoType.ALL)) .then(Commands.argument("type", StringArgumentType.word()).suggests((src, b) -> CommandHelpers.enumSuggestion(Claim.InfoType.class, b)).executes(CommandClaim::claimInfo))) - .then(Commands.literal("transferClaim").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdTransfer)).then(Commands.argument("player", GameProfileArgument.gameProfile()).executes(CommandClaim::transferClaim))) - .then(Commands.literal("delete").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdTransfer)).executes(CommandClaim::deleteClaim)) - .then(Commands.literal("deleteAll").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdTransfer)).executes(CommandClaim::deleteAllClaim)) - .then(Commands.literal("deleteSubClaim").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdTransfer)).executes(CommandClaim::deleteSubClaim)) - .then(Commands.literal("deleteAllSubClaims").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdTransfer)).executes(CommandClaim::deleteAllSubClaim)) - .then(Commands.literal("list").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdList)).executes(CommandClaim::listClaims).then(Commands.argument("player", GameProfileArgument.gameProfile()).requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdListAll, true)) + .then(Commands.literal("transferClaim").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdTransfer)).then(Commands.argument("player", GameProfileArgument.gameProfile()).executes(CommandClaim::transferClaim))) + .then(Commands.literal("delete").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdTransfer)).executes(CommandClaim::deleteClaim)) + .then(Commands.literal("deleteAll").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdTransfer)).executes(CommandClaim::deleteAllClaim)) + .then(Commands.literal("deleteSubClaim").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdTransfer)).executes(CommandClaim::deleteSubClaim)) + .then(Commands.literal("deleteAllSubClaims").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdTransfer)).executes(CommandClaim::deleteAllSubClaim)) + .then(Commands.literal("list").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdList)).executes(CommandClaim::listClaims).then(Commands.argument("player", GameProfileArgument.gameProfile()).requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdListAll, true)) .executes(cmd -> listClaims(cmd, GameProfileArgument.getGameProfiles(cmd, "player"))))) - .then(Commands.literal("switchMode").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdClaimMode)).executes(CommandClaim::switchClaimMode)) - .then(Commands.literal("adminMode").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdAdminMode, true)).executes(CommandClaim::switchAdminMode)) - .then(Commands.literal("readGriefPrevention").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdGriefPrevention, true)).executes(CommandClaim::readGriefPreventionData)) - .then(Commands.literal("setAdminClaim").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdAdminSet, true)).then(Commands.argument("toggle", BoolArgumentType.bool()).executes(CommandClaim::toggleAdminClaim))) - .then(Commands.literal("listAdminClaims").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdAdminList, true)).executes(CommandClaim::listAdminClaims)) - .then(Commands.literal("adminDelete").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdAdminDelete, true)).executes(CommandClaim::adminDelete) + .then(Commands.literal("switchMode").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdClaimMode)).executes(CommandClaim::switchClaimMode)) + .then(Commands.literal("adminMode").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdAdminMode, true)).executes(CommandClaim::switchAdminMode)) + .then(Commands.literal("readGriefPrevention").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdGriefPrevention, true)).executes(CommandClaim::readGriefPreventionData)) + .then(Commands.literal("setAdminClaim").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdAdminSet, true)).then(Commands.argument("toggle", BoolArgumentType.bool()).executes(CommandClaim::toggleAdminClaim))) + .then(Commands.literal("listAdminClaims").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdAdminList, true)).executes(CommandClaim::listAdminClaims)) + .then(Commands.literal("adminDelete").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdAdminDelete, true)).executes(CommandClaim::adminDelete) .then(Commands.literal("all").then(Commands.argument("players", GameProfileArgument.gameProfile()) .executes(CommandClaim::adminDeleteAll)))) - .then(Commands.literal("giveClaimBlocks").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdAdminGive, true)).then(Commands.argument("players", GameProfileArgument.gameProfile()) + .then(Commands.literal("giveClaimBlocks").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdAdminGive, true)).then(Commands.argument("players", GameProfileArgument.gameProfile()) .then(Commands.argument("amount", IntegerArgumentType.integer()).executes(CommandClaim::giveClaimBlocks)))) - .then(Commands.literal("buyBlocks").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdBuy, false)) + .then(Commands.literal("buyBlocks").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdBuy, false)) .then(Commands.argument("amount", IntegerArgumentType.integer()).executes(CommandClaim::buyClaimBlocks))) - .then(Commands.literal("sellBlocks").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdSell, false)) + .then(Commands.literal("sellBlocks").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdSell, false)) .then(Commands.argument("amount", IntegerArgumentType.integer()).executes(CommandClaim::sellClaimBlocks))) .then(Commands.literal("claimMessage").then(Commands.argument("type", StringArgumentType.word()).suggests((ctx, b) -> SharedSuggestionProvider.suggest(new String[]{"enter", "leave"}, b)) .then(Commands.argument("title", StringArgumentType.word()).suggests((ctx, b) -> SharedSuggestionProvider.suggest(new String[]{"title", "subtitle"}, b)) .then(Commands.literal("text").then(Commands.argument("component", ComponentArgument.textComponent()).executes(ctx -> CommandClaim.editClaimMessages(ctx, ComponentArgument.getComponent(ctx, "component"))))) .then(Commands.literal("string").then(Commands.argument("message", StringArgumentType.string()).executes(CommandClaim::editClaimMessages)))))) - .then(Commands.literal("group").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdGroup)) + .then(Commands.literal("group").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdGroup)) .then(Commands.literal("add").then(Commands.argument("group", StringArgumentType.string()).executes(CommandClaim::addGroup))) .then(Commands.literal("remove").then(Commands.argument("group", StringArgumentType.string()) .suggests(CommandHelpers::groupSuggestion).executes(CommandClaim::removeGroup))) @@ -111,14 +111,14 @@ public class CommandClaim { } return SharedSuggestionProvider.suggest(list, build); }).executes(CommandClaim::removePlayer)))))) - .then(Commands.literal("teleport").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdTeleport)) + .then(Commands.literal("teleport").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdTeleport)) .then(Commands.literal("self").then(Commands.argument("claim", StringArgumentType.string()).suggests((ctx, b) -> CommandHelpers.claimSuggestions(ctx, b, ctx.getSource().getPlayerOrException().getUUID())) .executes(CommandClaim::teleport))) .then(Commands.literal("admin").then(Commands.argument("claim", StringArgumentType.string()).suggests((ctx, b) -> CommandHelpers.claimSuggestions(ctx, b, null)) .executes(CommandClaim::teleportAdminClaims))) .then(Commands.literal("other").then(Commands.argument("player", GameProfileArgument.gameProfile()).then(Commands.argument("claim", StringArgumentType.string()).suggests((ctx, b) -> CommandHelpers.claimSuggestions(ctx, b, CommandHelpers.singleProfile(ctx, "player").getId())) .executes(src -> CommandClaim.teleport(src, CommandHelpers.singleProfile(src, "player").getId())))))) - .then(Commands.literal("permission").requires(src -> PermissionNodeHandler.instance().perm(src, PermissionNodeHandler.cmdPermission)) + .then(Commands.literal("permission").requires(src -> PermissionNodeHandler.INSTANCE.perm(src, PermissionNodeHandler.cmdPermission)) .then(Commands.literal("personal").then(Commands.argument("group", StringArgumentType.string()).suggests(CommandHelpers::personalGroupSuggestion) .then(Commands.argument("permission", StringArgumentType.word()).suggests((ctx, b) -> CommandHelpers.permSuggestions(ctx, b, true)) .then(Commands.argument("toggle", StringArgumentType.word()) @@ -194,7 +194,7 @@ public class CommandClaim { } if (!enoughBlocks) { player.displayClientMessage(PermHelper.simpleColoredText(ConfigHandler.langManager.get("ownerTransferNoBlocks"), ChatFormatting.RED), false); - if (PermissionNodeHandler.instance().perm(context.getSource(), PermissionNodeHandler.cmdAdminMode, true)) + if (PermissionNodeHandler.INSTANCE.perm(context.getSource(), PermissionNodeHandler.cmdAdminMode, true)) player.displayClientMessage(PermHelper.simpleColoredText(ConfigHandler.langManager.get("ownerTransferNoBlocksAdmin"), ChatFormatting.RED), false); return 0; } diff --git a/common/src/main/java/io/github/flemmli97/flan/config/BuySellHandler.java b/common/src/main/java/io/github/flemmli97/flan/config/BuySellHandler.java index 41add49..bd13809 100644 --- a/common/src/main/java/io/github/flemmli97/flan/config/BuySellHandler.java +++ b/common/src/main/java/io/github/flemmli97/flan/config/BuySellHandler.java @@ -44,7 +44,7 @@ public class BuySellHandler { } switch (this.buyType) { case MONEY -> { - return CommandCurrency.instance().buyClaimBlocks(player, blocks, this.buyAmount, message); + return CommandCurrency.INSTANCE.buyClaimBlocks(player, blocks, this.buyAmount, message); } case ITEM -> { int deduct = Mth.ceil(blocks * this.buyAmount); @@ -111,7 +111,7 @@ public class BuySellHandler { } switch (this.sellType) { case MONEY -> { - return CommandCurrency.instance().sellClaimBlocks(player, blocks, this.sellAmount, message); + return CommandCurrency.INSTANCE.sellClaimBlocks(player, blocks, this.sellAmount, message); } case ITEM -> { ItemStack[] stacks = this.ingredient.getItems(); diff --git a/common/src/main/java/io/github/flemmli97/flan/config/Config.java b/common/src/main/java/io/github/flemmli97/flan/config/Config.java index d37da9c..506c389 100644 --- a/common/src/main/java/io/github/flemmli97/flan/config/Config.java +++ b/common/src/main/java/io/github/flemmli97/flan/config/Config.java @@ -124,7 +124,7 @@ public class Config { }))); public Config(MinecraftServer server) { - File configDir = CrossPlatformStuff.instance().configPath().resolve("flan").toFile(); + File configDir = CrossPlatformStuff.INSTANCE.configPath().resolve("flan").toFile(); try { if (!configDir.exists()) configDir.mkdirs(); @@ -162,9 +162,9 @@ public class Config { this.worldWhitelist = ConfigHandler.fromJson(obj, "worldWhitelist", this.worldWhitelist); if (obj.has("claimingItem")) - this.claimingItem = CrossPlatformStuff.instance().registryItems().getFromId(new ResourceLocation((obj.get("claimingItem").getAsString()))); + this.claimingItem = CrossPlatformStuff.INSTANCE.registryItems().getFromId(new ResourceLocation((obj.get("claimingItem").getAsString()))); if (obj.has("inspectionItem")) - this.inspectionItem = CrossPlatformStuff.instance().registryItems().getFromId(new ResourceLocation((obj.get("inspectionItem").getAsString()))); + this.inspectionItem = CrossPlatformStuff.INSTANCE.registryItems().getFromId(new ResourceLocation((obj.get("inspectionItem").getAsString()))); this.claimDisplayTime = ConfigHandler.fromJson(obj, "claimDisplayTime", this.claimDisplayTime); this.permissionLevel = ConfigHandler.fromJson(obj, "permissionLevel", this.permissionLevel); @@ -259,8 +259,8 @@ public class Config { obj.add("blacklistedWorlds", arr); obj.addProperty("worldWhitelist", this.worldWhitelist); - obj.addProperty("claimingItem", CrossPlatformStuff.instance().registryItems().getIDFrom(this.claimingItem).toString()); - obj.addProperty("inspectionItem", CrossPlatformStuff.instance().registryItems().getIDFrom(this.inspectionItem).toString()); + obj.addProperty("claimingItem", CrossPlatformStuff.INSTANCE.registryItems().getIDFrom(this.claimingItem).toString()); + obj.addProperty("inspectionItem", CrossPlatformStuff.INSTANCE.registryItems().getIDFrom(this.inspectionItem).toString()); obj.addProperty("claimDisplayTime", this.claimDisplayTime); obj.addProperty("permissionLevel", this.permissionLevel); diff --git a/common/src/main/java/io/github/flemmli97/flan/config/LangManager.java b/common/src/main/java/io/github/flemmli97/flan/config/LangManager.java index c862b5d..437160d 100644 --- a/common/src/main/java/io/github/flemmli97/flan/config/LangManager.java +++ b/common/src/main/java/io/github/flemmli97/flan/config/LangManager.java @@ -229,7 +229,7 @@ public class LangManager { public LangManager() { this.loadDefault(); - Path configDir = CrossPlatformStuff.instance().configPath().resolve("flan").resolve("lang"); + Path configDir = CrossPlatformStuff.INSTANCE.configPath().resolve("flan").resolve("lang"); this.confDir = configDir; try { File dir = configDir.toFile(); @@ -261,7 +261,7 @@ public class LangManager { } File def = configDir.resolve("en_us.json").toFile(); if (!def.exists()) { - File legacy = CrossPlatformStuff.instance().configPath().resolve("flan").resolve("flan_lang.json").toFile(); + File legacy = CrossPlatformStuff.INSTANCE.configPath().resolve("flan").resolve("flan_lang.json").toFile(); Map translation; Map translationArr; if (legacy.exists()) { diff --git a/common/src/main/java/io/github/flemmli97/flan/event/BlockInteractEvents.java b/common/src/main/java/io/github/flemmli97/flan/event/BlockInteractEvents.java index 8f2fc4a..3b5386c 100644 --- a/common/src/main/java/io/github/flemmli97/flan/event/BlockInteractEvents.java +++ b/common/src/main/java/io/github/flemmli97/flan/event/BlockInteractEvents.java @@ -47,7 +47,7 @@ public class BlockInteractEvents { ClaimStorage storage = ClaimStorage.get((ServerLevel) world); IPermissionContainer claim = storage.getForPermissionCheck(pos); if (claim != null) { - ResourceLocation id = CrossPlatformStuff.instance().registryBlocks().getIDFrom(state.getBlock()); + ResourceLocation id = CrossPlatformStuff.INSTANCE.registryBlocks().getIDFrom(state.getBlock()); if (contains(id, world.getBlockEntity(pos), ConfigHandler.config.breakBlockBlacklist, ConfigHandler.config.breakBETagBlacklist)) return true; if (!claim.canInteract(player, PermissionRegistry.BREAK, pos, true)) { @@ -75,7 +75,7 @@ public class BlockInteractEvents { IPermissionContainer claim = storage.getForPermissionCheck(hitResult.getBlockPos()); if (claim != null) { BlockState state = world.getBlockState(hitResult.getBlockPos()); - ResourceLocation id = CrossPlatformStuff.instance().registryBlocks().getIDFrom(state.getBlock()); + ResourceLocation id = CrossPlatformStuff.INSTANCE.registryBlocks().getIDFrom(state.getBlock()); BlockEntity blockEntity = world.getBlockEntity(hitResult.getBlockPos()); if (contains(id, blockEntity, ConfigHandler.config.interactBlockBlacklist, ConfigHandler.config.interactBETagBlacklist)) return InteractionResult.PASS; @@ -107,7 +107,7 @@ public class BlockInteractEvents { LockedLecternScreenHandler.create(player, (LecternBlockEntity) blockEntity); return InteractionResult.FAIL; } - if (!ConfigHandler.config.lenientBlockEntityCheck || CrossPlatformStuff.instance().isInventoryTile(blockEntity)) { + if (!ConfigHandler.config.lenientBlockEntityCheck || CrossPlatformStuff.INSTANCE.isInventoryTile(blockEntity)) { if (claim.canInteract(player, PermissionRegistry.OPENCONTAINER, hitResult.getBlockPos(), true)) return InteractionResult.PASS; PlayerClaimData.get(player).addDisplayClaim(claim, EnumDisplayType.MAIN, player.blockPosition().getY()); @@ -129,7 +129,7 @@ public class BlockInteractEvents { return true; if (blockEntity != null && !tagList.isEmpty()) { CompoundTag nbt = blockEntity.saveWithoutMetadata(); - return tagList.stream().anyMatch(tag -> CrossPlatformStuff.instance().blockDataContains(nbt, tag)); + return tagList.stream().anyMatch(tag -> CrossPlatformStuff.INSTANCE.blockDataContains(nbt, tag)); } return false; } diff --git a/common/src/main/java/io/github/flemmli97/flan/event/EntityInteractEvents.java b/common/src/main/java/io/github/flemmli97/flan/event/EntityInteractEvents.java index d17cdec..58d798a 100644 --- a/common/src/main/java/io/github/flemmli97/flan/event/EntityInteractEvents.java +++ b/common/src/main/java/io/github/flemmli97/flan/event/EntityInteractEvents.java @@ -105,7 +105,7 @@ public class EntityInteractEvents { } public static boolean canInteract(Entity entity) { - ResourceLocation id = CrossPlatformStuff.instance().registryEntities().getIDFrom(entity.getType()); + ResourceLocation id = CrossPlatformStuff.INSTANCE.registryEntities().getIDFrom(entity.getType()); return ConfigHandler.config.ignoredEntityTypes.contains(id.getNamespace()) || ConfigHandler.config.ignoredEntityTypes.contains(id.toString()) || entity.getTags().stream().anyMatch(ConfigHandler.config.entityTagIgnore::contains); diff --git a/common/src/main/java/io/github/flemmli97/flan/event/ItemInteractEvents.java b/common/src/main/java/io/github/flemmli97/flan/event/ItemInteractEvents.java index df6261b..881dd18 100644 --- a/common/src/main/java/io/github/flemmli97/flan/event/ItemInteractEvents.java +++ b/common/src/main/java/io/github/flemmli97/flan/event/ItemInteractEvents.java @@ -148,7 +148,7 @@ public class ItemInteractEvents { } public static void claimLandHandling(ServerPlayer player, BlockPos target) { - if (!PermissionNodeHandler.instance().perm(player, PermissionNodeHandler.claimCreate, false)) { + if (!PermissionNodeHandler.INSTANCE.perm(player, PermissionNodeHandler.claimCreate, false)) { player.displayClientMessage(PermHelper.simpleColoredText(ConfigHandler.langManager.get("noPermission"), ChatFormatting.DARK_RED), true); return; } diff --git a/common/src/main/java/io/github/flemmli97/flan/gui/PotionEditScreenHandler.java b/common/src/main/java/io/github/flemmli97/flan/gui/PotionEditScreenHandler.java index 00c3eb3..0636cd9 100644 --- a/common/src/main/java/io/github/flemmli97/flan/gui/PotionEditScreenHandler.java +++ b/common/src/main/java/io/github/flemmli97/flan/gui/PotionEditScreenHandler.java @@ -60,7 +60,7 @@ public class PotionEditScreenHandler extends ServerOnlyScreenHandler { protected void fillInventoryWith(Player player, SeparateInv inv, Claim claim) { Map potions = claim.getPotions(); List key = Lists.newArrayList(potions.keySet()); - key.sort(Comparator.comparing(eff -> CrossPlatformStuff.instance().registryStatusEffects().getIDFrom(eff).toString())); + key.sort(Comparator.comparing(eff -> CrossPlatformStuff.INSTANCE.registryStatusEffects().getIDFrom(eff).toString())); for (int i = 0; i < 54; i++) { if (i == 0) { ItemStack close = new ItemStack(Items.TNT); @@ -84,7 +84,7 @@ public class PotionEditScreenHandler extends ServerOnlyScreenHandler { ItemStack effectStack = new ItemStack(Items.POTION); TranslatableComponent txt = new TranslatableComponent(effect.getDescriptionId()); Collection inst = Collections.singleton(new MobEffectInstance(effect, 0, potions.get(effect))); - effectStack.getOrCreateTag().putString("FlanEffect", CrossPlatformStuff.instance().registryStatusEffects().getIDFrom(effect).toString()); + effectStack.getOrCreateTag().putString("FlanEffect", CrossPlatformStuff.INSTANCE.registryStatusEffects().getIDFrom(effect).toString()); effectStack.getTag().putInt("CustomPotionColor", PotionUtils.getColor(inst)); effectStack.setHoverName(txt.setStyle(txt.getStyle().withItalic(false).applyFormat(ChatFormatting.DARK_BLUE)).append(ServerScreenHelper.coloredGuiText("-" + potions.get(effect), ChatFormatting.DARK_BLUE))); inv.updateStack(i, effectStack); @@ -111,7 +111,7 @@ public class PotionEditScreenHandler extends ServerOnlyScreenHandler { player.getServer().execute(() -> StringResultScreenHandler.createNewStringResult(player, (s) -> { String[] potion = s.split(";"); int amp = 1; - MobEffect effect = CrossPlatformStuff.instance().registryStatusEffects().getFromId(new ResourceLocation(potion[0])); + MobEffect effect = CrossPlatformStuff.INSTANCE.registryStatusEffects().getFromId(new ResourceLocation(potion[0])); if (effect == null || (effect == MobEffects.LUCK && !potion[0].equals("minecraft:luck"))) { ServerScreenHelper.playSongToPlayer(player, SoundEvents.VILLAGER_NO, 1, 1f); return; @@ -145,7 +145,7 @@ public class PotionEditScreenHandler extends ServerOnlyScreenHandler { ItemStack stack = slot.getItem(); if (!stack.isEmpty() && this.removeMode) { String effect = stack.getOrCreateTag().getString("FlanEffect"); - this.claim.removePotion(CrossPlatformStuff.instance().registryStatusEffects().getFromId(new ResourceLocation(effect))); + this.claim.removePotion(CrossPlatformStuff.INSTANCE.registryStatusEffects().getFromId(new ResourceLocation(effect))); slot.set(ItemStack.EMPTY); ServerScreenHelper.playSongToPlayer(player, SoundEvents.BAT_DEATH, 1, 1f); } diff --git a/common/src/main/java/io/github/flemmli97/flan/platform/ClaimPermissionCheck.java b/common/src/main/java/io/github/flemmli97/flan/platform/ClaimPermissionCheck.java index 6ac0363..a440a56 100644 --- a/common/src/main/java/io/github/flemmli97/flan/platform/ClaimPermissionCheck.java +++ b/common/src/main/java/io/github/flemmli97/flan/platform/ClaimPermissionCheck.java @@ -1,17 +1,16 @@ package io.github.flemmli97.flan.platform; +import io.github.flemmli97.flan.Flan; import io.github.flemmli97.flan.api.permission.ClaimPermission; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionResult; -public abstract class ClaimPermissionCheck { +public interface ClaimPermissionCheck { - protected static ClaimPermissionCheck INSTANCE; + ClaimPermissionCheck INSTANCE = Flan.getPlatformInstance(ClaimPermissionCheck.class, + "io.github.flemmli97.flan.fabric.platform.ClaimPermissionCheckImpl", + "io.github.flemmli97.flan.forge.platform.ClaimPermissionCheckImpl"); - public static ClaimPermissionCheck instance() { - return INSTANCE; - } - - public abstract InteractionResult check(ServerPlayer player, ClaimPermission permission, BlockPos pos); + InteractionResult check(ServerPlayer player, ClaimPermission permission, BlockPos pos); } diff --git a/common/src/main/java/io/github/flemmli97/flan/platform/CrossPlatformStuff.java b/common/src/main/java/io/github/flemmli97/flan/platform/CrossPlatformStuff.java index 9714a84..b367467 100644 --- a/common/src/main/java/io/github/flemmli97/flan/platform/CrossPlatformStuff.java +++ b/common/src/main/java/io/github/flemmli97/flan/platform/CrossPlatformStuff.java @@ -1,5 +1,6 @@ package io.github.flemmli97.flan.platform; +import io.github.flemmli97.flan.Flan; import io.github.flemmli97.flan.SimpleRegistryWrapper; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.effect.MobEffect; @@ -10,25 +11,23 @@ import net.minecraft.world.level.block.entity.BlockEntity; import java.nio.file.Path; -public abstract class CrossPlatformStuff { +public interface CrossPlatformStuff { - protected static CrossPlatformStuff INSTANCE; + CrossPlatformStuff INSTANCE = Flan.getPlatformInstance(CrossPlatformStuff.class, + "io.github.flemmli97.flan.fabric.platform.CrossPlatformStuffImpl", + "io.github.flemmli97.flan.forge.platform.CrossPlatformStuffImpl"); - public static CrossPlatformStuff instance() { - return INSTANCE; - } + Path configPath(); - public abstract Path configPath(); + SimpleRegistryWrapper registryStatusEffects(); - public abstract SimpleRegistryWrapper registryStatusEffects(); + SimpleRegistryWrapper registryBlocks(); - public abstract SimpleRegistryWrapper registryBlocks(); + SimpleRegistryWrapper registryItems(); - public abstract SimpleRegistryWrapper registryItems(); + SimpleRegistryWrapper> registryEntities(); - public abstract SimpleRegistryWrapper> registryEntities(); + boolean isInventoryTile(BlockEntity blockEntity); - public abstract boolean isInventoryTile(BlockEntity blockEntity); - - public abstract boolean blockDataContains(CompoundTag nbt, String tag); + boolean blockDataContains(CompoundTag nbt, String tag); } diff --git a/common/src/main/java/io/github/flemmli97/flan/platform/integration/currency/CommandCurrency.java b/common/src/main/java/io/github/flemmli97/flan/platform/integration/currency/CommandCurrency.java index d439699..8753a69 100644 --- a/common/src/main/java/io/github/flemmli97/flan/platform/integration/currency/CommandCurrency.java +++ b/common/src/main/java/io/github/flemmli97/flan/platform/integration/currency/CommandCurrency.java @@ -1,19 +1,18 @@ package io.github.flemmli97.flan.platform.integration.currency; +import io.github.flemmli97.flan.Flan; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import java.util.function.Consumer; -public abstract class CommandCurrency { +public interface CommandCurrency { - protected static CommandCurrency INSTANCE; + CommandCurrency INSTANCE = Flan.getPlatformInstance(CommandCurrency.class, + "io.github.flemmli97.flan.fabric.platform.integration.currency.CommandCurrencyImpl", + "io.github.flemmli97.flan.forge.platform.integration.currency.CommandCurrencyImpl"); - public static CommandCurrency instance() { - return INSTANCE; - } + boolean sellClaimBlocks(ServerPlayer player, int blocks, float value, Consumer message); - public abstract boolean sellClaimBlocks(ServerPlayer player, int blocks, float value, Consumer message); - - public abstract boolean buyClaimBlocks(ServerPlayer player, int blocks, float value, Consumer message); + boolean buyClaimBlocks(ServerPlayer player, int blocks, float value, Consumer message); } diff --git a/common/src/main/java/io/github/flemmli97/flan/platform/integration/permissions/PermissionNodeHandler.java b/common/src/main/java/io/github/flemmli97/flan/platform/integration/permissions/PermissionNodeHandler.java index ca200a8..77abb60 100644 --- a/common/src/main/java/io/github/flemmli97/flan/platform/integration/permissions/PermissionNodeHandler.java +++ b/common/src/main/java/io/github/flemmli97/flan/platform/integration/permissions/PermissionNodeHandler.java @@ -1,64 +1,63 @@ package io.github.flemmli97.flan.platform.integration.permissions; +import io.github.flemmli97.flan.Flan; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerPlayer; -public abstract class PermissionNodeHandler { +public interface PermissionNodeHandler { - public static final String cmdReload = "flan.command.reload"; - public static final String cmdGriefPrevention = "flan.command.read.griefprevention"; + String cmdReload = "flan.command.reload"; + String cmdGriefPrevention = "flan.command.read.griefprevention"; - public static final String claimCreate = "flan.claim.create"; + String claimCreate = "flan.claim.create"; - public static final String cmdMenu = "flan.command.menu"; - public static final String cmdTrapped = "flan.command.trapped"; - public static final String cmdPGroup = "flan.command.personal"; - public static final String cmdInfo = "flan.command.info"; - public static final String cmdTransfer = "flan.command.transfer"; + String cmdMenu = "flan.command.menu"; + String cmdTrapped = "flan.command.trapped"; + String cmdPGroup = "flan.command.personal"; + String cmdInfo = "flan.command.info"; + String cmdTransfer = "flan.command.transfer"; - public static final String cmdDelete = "flan.command.delete"; - public static final String cmdDeleteAll = "flan.command.delete.all"; - public static final String cmdDeleteSub = "flan.command.delete.sub"; - public static final String cmdDeleteSubAll = "flan.command.delete.sub.all"; + String cmdDelete = "flan.command.delete"; + String cmdDeleteAll = "flan.command.delete.all"; + String cmdDeleteSub = "flan.command.delete.sub"; + String cmdDeleteSubAll = "flan.command.delete.sub.all"; - public static final String cmdList = "flan.command.list"; - public static final String cmdListAll = "flan.command.list.all"; + String cmdList = "flan.command.list"; + String cmdListAll = "flan.command.list.all"; - public static final String cmdClaimMode = "flan.command.claim.mode"; - public static final String cmdAdminMode = "flan.command.admin.mode"; - public static final String cmdAdminSet = "flan.command.admin.claim"; - public static final String cmdAdminList = "flan.command.admin.list"; - public static final String cmdAdminDelete = "flan.command.admin.delete"; - public static final String cmdAdminGive = "flan.command.admin.give"; + String cmdClaimMode = "flan.command.claim.mode"; + String cmdAdminMode = "flan.command.admin.mode"; + String cmdAdminSet = "flan.command.admin.claim"; + String cmdAdminList = "flan.command.admin.list"; + String cmdAdminDelete = "flan.command.admin.delete"; + String cmdAdminGive = "flan.command.admin.give"; - public static final String cmdGroup = "flan.command.group"; - public static final String cmdPermission = "flan.command.permission"; + String cmdGroup = "flan.command.group"; + String cmdPermission = "flan.command.permission"; - public static final String cmdSell = "flan.command.buy"; - public static final String cmdBuy = "flan.command.sell"; + String cmdSell = "flan.command.buy"; + String cmdBuy = "flan.command.sell"; - public static final String cmdUnlockAll = "flan.command.unlock.all"; - public static final String cmdName = "flan.command.name"; + String cmdUnlockAll = "flan.command.unlock.all"; + String cmdName = "flan.command.name"; - public static final String cmdHome = "flan.command.home"; - public static final String cmdTeleport = "flan.command.teleport"; + String cmdHome = "flan.command.home"; + String cmdTeleport = "flan.command.teleport"; - public static final String permClaimBlocks = "flan.claim.blocks.max"; - public static final String permMaxClaims = "flan.claims.amount"; + String permClaimBlocks = "flan.claim.blocks.max"; + String permMaxClaims = "flan.claims.amount"; - protected static PermissionNodeHandler INSTANCE; + PermissionNodeHandler INSTANCE = Flan.getPlatformInstance(PermissionNodeHandler.class, + "io.github.flemmli97.flan.fabric.platform.integration.permissions.PermissionNodeHandlerImpl", + "io.github.flemmli97.flan.forge.platform.integration.permissions.PermissionNodeHandlerImpl"); - public static PermissionNodeHandler instance() { - return INSTANCE; + default boolean perm(CommandSourceStack src, String perm) { + return this.perm(src, perm, false); } - public boolean perm(CommandSourceStack src, String perm) { - return perm(src, perm, false); - } + boolean perm(CommandSourceStack src, String perm, boolean adminCmd); - public abstract boolean perm(CommandSourceStack src, String perm, boolean adminCmd); + boolean perm(ServerPlayer src, String perm, boolean adminCmd); - public abstract boolean perm(ServerPlayer src, String perm, boolean adminCmd); - - public abstract boolean permBelowEqVal(ServerPlayer src, String perm, int val, int fallback); + boolean permBelowEqVal(ServerPlayer src, String perm, int val, int fallback); } \ No newline at end of file diff --git a/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java b/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java index c678f7d..bf642f3 100644 --- a/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java +++ b/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java @@ -105,7 +105,7 @@ public class PlayerClaimData implements IPlayerData { } private boolean canIncrease(int blocks) { - return PermissionNodeHandler.instance().permBelowEqVal(this.player, PermissionNodeHandler.permClaimBlocks, blocks, ConfigHandler.config.maxClaimBlocks); + return PermissionNodeHandler.INSTANCE.permBelowEqVal(this.player, PermissionNodeHandler.permClaimBlocks, blocks, ConfigHandler.config.maxClaimBlocks); } @Override diff --git a/fabric/src/main/java/io/github/flemmli97/flan/fabric/FlanFabric.java b/fabric/src/main/java/io/github/flemmli97/flan/fabric/FlanFabric.java index e02fe3d..f2f8096 100644 --- a/fabric/src/main/java/io/github/flemmli97/flan/fabric/FlanFabric.java +++ b/fabric/src/main/java/io/github/flemmli97/flan/fabric/FlanFabric.java @@ -8,10 +8,6 @@ import io.github.flemmli97.flan.event.EntityInteractEvents; import io.github.flemmli97.flan.event.ItemInteractEvents; import io.github.flemmli97.flan.event.PlayerEvents; import io.github.flemmli97.flan.event.WorldEvents; -import io.github.flemmli97.flan.fabric.platform.ClaimPermissionCheckImpl; -import io.github.flemmli97.flan.fabric.platform.CrossPlatformStuffImpl; -import io.github.flemmli97.flan.fabric.platform.integration.currency.fabric.CommandCurrencyImpl; -import io.github.flemmli97.flan.fabric.platform.integration.permissions.fabric.PermissionNodeHandlerImpl; import io.github.flemmli97.flan.fabric.platform.integration.playerability.PlayerAbilityEvents; import io.github.flemmli97.flan.player.PlayerDataHandler; import io.github.flemmli97.flan.scoreboard.ClaimCriterias; @@ -44,10 +40,6 @@ public class FlanFabric implements ModInitializer { @Override public void onInitialize() { - CrossPlatformStuffImpl.init(); - ClaimPermissionCheckImpl.init(); - CommandCurrencyImpl.init(); - PermissionNodeHandlerImpl.init(); PlayerBlockBreakEvents.BEFORE.register(BlockInteractEvents::breakBlocks); AttackBlockCallback.EVENT.register(BlockInteractEvents::startBreakBlocks); UseBlockCallback.EVENT.addPhaseOrdering(EventPhase, Event.DEFAULT_PHASE); diff --git a/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/ClaimPermissionCheckImpl.java b/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/ClaimPermissionCheckImpl.java index 66507ef..98d74af 100644 --- a/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/ClaimPermissionCheckImpl.java +++ b/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/ClaimPermissionCheckImpl.java @@ -7,11 +7,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionResult; -public class ClaimPermissionCheckImpl extends ClaimPermissionCheck { - - public static void init() { - INSTANCE = new ClaimPermissionCheckImpl(); - } +public class ClaimPermissionCheckImpl implements ClaimPermissionCheck { @Override public InteractionResult check(ServerPlayer player, ClaimPermission permission, BlockPos pos) { diff --git a/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/CrossPlatformStuffImpl.java b/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/CrossPlatformStuffImpl.java index 5bb4f48..b6c582b 100644 --- a/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/CrossPlatformStuffImpl.java +++ b/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/CrossPlatformStuffImpl.java @@ -16,11 +16,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import java.nio.file.Path; -public class CrossPlatformStuffImpl extends CrossPlatformStuff { - - public static void init() { - INSTANCE = new CrossPlatformStuffImpl(); - } +public class CrossPlatformStuffImpl implements CrossPlatformStuff { @Override public Path configPath() { diff --git a/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/currency/fabric/CommandCurrencyImpl.java b/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/currency/CommandCurrencyImpl.java similarity index 95% rename from fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/currency/fabric/CommandCurrencyImpl.java rename to fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/currency/CommandCurrencyImpl.java index e8ffe98..b5e623a 100644 --- a/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/currency/fabric/CommandCurrencyImpl.java +++ b/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/currency/CommandCurrencyImpl.java @@ -1,4 +1,4 @@ -package io.github.flemmli97.flan.fabric.platform.integration.currency.fabric; +package io.github.flemmli97.flan.fabric.platform.integration.currency; import io.github.flemmli97.flan.Flan; import io.github.flemmli97.flan.claim.PermHelper; @@ -14,11 +14,7 @@ import net.minecraft.server.level.ServerPlayer; import java.math.BigDecimal; import java.util.function.Consumer; -public class CommandCurrencyImpl extends CommandCurrency { - - public static void init() { - INSTANCE = new CommandCurrencyImpl(); - } +public class CommandCurrencyImpl implements CommandCurrency { @Override public boolean sellClaimBlocks(ServerPlayer player, int blocks, float value, Consumer message) { diff --git a/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/fabric/PermissionNodeHandlerImpl.java b/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/PermissionNodeHandlerImpl.java similarity index 91% rename from fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/fabric/PermissionNodeHandlerImpl.java rename to fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/PermissionNodeHandlerImpl.java index c558f82..7746ce2 100644 --- a/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/fabric/PermissionNodeHandlerImpl.java +++ b/fabric/src/main/java/io/github/flemmli97/flan/fabric/platform/integration/permissions/PermissionNodeHandlerImpl.java @@ -1,4 +1,4 @@ -package io.github.flemmli97.flan.fabric.platform.integration.permissions.fabric; +package io.github.flemmli97.flan.fabric.platform.integration.permissions; import dev.ftb.mods.ftbranks.api.FTBRanksAPI; import io.github.flemmli97.flan.Flan; @@ -8,11 +8,7 @@ import me.lucko.fabric.api.permissions.v0.Permissions; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerPlayer; -public class PermissionNodeHandlerImpl extends PermissionNodeHandler { - - public static void init() { - INSTANCE = new PermissionNodeHandlerImpl(); - } +public class PermissionNodeHandlerImpl implements PermissionNodeHandler { @Override public boolean perm(CommandSourceStack src, String perm, boolean adminCmd) { diff --git a/forge/src/main/java/io/github/flemmli97/flan/forge/FlanForge.java b/forge/src/main/java/io/github/flemmli97/flan/forge/FlanForge.java index d8b92f7..aa57392 100644 --- a/forge/src/main/java/io/github/flemmli97/flan/forge/FlanForge.java +++ b/forge/src/main/java/io/github/flemmli97/flan/forge/FlanForge.java @@ -6,10 +6,6 @@ import io.github.flemmli97.flan.forge.forgeevent.EntityInteractEventsForge; import io.github.flemmli97.flan.forge.forgeevent.ItemInteractEventsForge; import io.github.flemmli97.flan.forge.forgeevent.ServerEvents; import io.github.flemmli97.flan.forge.forgeevent.WorldEventsForge; -import io.github.flemmli97.flan.forge.platform.ClaimPermissionCheckImpl; -import io.github.flemmli97.flan.forge.platform.CrossPlatformStuffImpl; -import io.github.flemmli97.flan.forge.platform.integration.currency.forge.CommandCurrencyImpl; -import io.github.flemmli97.flan.forge.platform.integration.permissions.forge.PermissionNodeHandlerImpl; import io.github.flemmli97.flan.scoreboard.ClaimCriterias; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.EventPriority; @@ -23,10 +19,6 @@ public class FlanForge { public static final String MODID = "flan"; public FlanForge() { - CrossPlatformStuffImpl.init(); - ClaimPermissionCheckImpl.init(); - CommandCurrencyImpl.init(); - PermissionNodeHandlerImpl.init(); Flan.ftbRanks = ModList.get().isLoaded("ftbranks"); Flan.diceMCMoneySign = ModList.get().isLoaded("dicemcmm"); diff --git a/forge/src/main/java/io/github/flemmli97/flan/forge/platform/ClaimPermissionCheckImpl.java b/forge/src/main/java/io/github/flemmli97/flan/forge/platform/ClaimPermissionCheckImpl.java index c9759f8..1ac4155 100644 --- a/forge/src/main/java/io/github/flemmli97/flan/forge/platform/ClaimPermissionCheckImpl.java +++ b/forge/src/main/java/io/github/flemmli97/flan/forge/platform/ClaimPermissionCheckImpl.java @@ -8,11 +8,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionResult; import net.minecraftforge.common.MinecraftForge; -public class ClaimPermissionCheckImpl extends ClaimPermissionCheck { - - public static void init() { - INSTANCE = new ClaimPermissionCheckImpl(); - } +public class ClaimPermissionCheckImpl implements ClaimPermissionCheck { @Override public InteractionResult check(ServerPlayer player, ClaimPermission permission, BlockPos pos) { diff --git a/forge/src/main/java/io/github/flemmli97/flan/forge/platform/CrossPlatformStuffImpl.java b/forge/src/main/java/io/github/flemmli97/flan/forge/platform/CrossPlatformStuffImpl.java index 32569c8..99210f5 100644 --- a/forge/src/main/java/io/github/flemmli97/flan/forge/platform/CrossPlatformStuffImpl.java +++ b/forge/src/main/java/io/github/flemmli97/flan/forge/platform/CrossPlatformStuffImpl.java @@ -17,11 +17,7 @@ import net.minecraftforge.registries.ForgeRegistries; import java.nio.file.Path; -public class CrossPlatformStuffImpl extends CrossPlatformStuff { - - public static void init() { - INSTANCE = new CrossPlatformStuffImpl(); - } +public class CrossPlatformStuffImpl implements CrossPlatformStuff { @Override public Path configPath() { diff --git a/forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/currency/forge/CommandCurrencyImpl.java b/forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/currency/CommandCurrencyImpl.java similarity index 95% rename from forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/currency/forge/CommandCurrencyImpl.java rename to forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/currency/CommandCurrencyImpl.java index 5d0209b..5e1093e 100644 --- a/forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/currency/forge/CommandCurrencyImpl.java +++ b/forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/currency/CommandCurrencyImpl.java @@ -1,4 +1,4 @@ -package io.github.flemmli97.flan.forge.platform.integration.currency.forge; +package io.github.flemmli97.flan.forge.platform.integration.currency; import dicemc.money.MoneyMod; import dicemc.money.storage.MoneyWSD; @@ -14,11 +14,7 @@ import net.minecraft.server.level.ServerPlayer; import java.util.UUID; import java.util.function.Consumer; -public class CommandCurrencyImpl extends CommandCurrency { - - public static void init() { - INSTANCE = new CommandCurrencyImpl(); - } +public class CommandCurrencyImpl implements CommandCurrency { @Override public boolean sellClaimBlocks(ServerPlayer player, int blocks, float value, Consumer message) { diff --git a/forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/permissions/forge/PermissionNodeHandlerImpl.java b/forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/permissions/PermissionNodeHandlerImpl.java similarity index 89% rename from forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/permissions/forge/PermissionNodeHandlerImpl.java rename to forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/permissions/PermissionNodeHandlerImpl.java index 6d67340..025b4d3 100644 --- a/forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/permissions/forge/PermissionNodeHandlerImpl.java +++ b/forge/src/main/java/io/github/flemmli97/flan/forge/platform/integration/permissions/PermissionNodeHandlerImpl.java @@ -1,4 +1,4 @@ -package io.github.flemmli97.flan.forge.platform.integration.permissions.forge; +package io.github.flemmli97.flan.forge.platform.integration.permissions; import dev.ftb.mods.ftbranks.api.FTBRanksAPI; import io.github.flemmli97.flan.Flan; @@ -7,11 +7,7 @@ import io.github.flemmli97.flan.platform.integration.permissions.PermissionNodeH import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.level.ServerPlayer; -public class PermissionNodeHandlerImpl extends PermissionNodeHandler { - - public static void init() { - INSTANCE = new PermissionNodeHandlerImpl(); - } +public class PermissionNodeHandlerImpl implements PermissionNodeHandler { @Override public boolean perm(CommandSourceStack src, String perm, boolean adminCmd) { diff --git a/gradle.properties b/gradle.properties index e15419c..ceb209f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ forge_version=1.18.1-39.0.14 loader_version=0.12.8 # Mod Properties -mod_version=1.7.2 +mod_version=1.7.3 maven_group=io.github.flemmli97 archives_base_name=flan