Merge branch 'main' into merge-branch-between-main-and-dev

Merge branch 'development' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development
Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod
2025-07-29 22:34:04 +00:00 · 2023-07-11 12:12:09 -05:00 · 2023-07-11 12:11:25 -05:00 · 2023-07-11 12:10:51 -05:00 · 2023-07-11 12:07:18 -05:00 · 2023-07-11 12:07:18 -05:00
3 changed files with 53 additions and 5 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -39,30 +39,68 @@
    </scm>

    <repositories>
+        
        <repository>
            <id>atlas-nexus-01-totalfreedom-development</id>
            <url>https://nexus-01.core.atlas-media.co.uk/repository/totalfreedom-development/</url>
        </repository>

+        <repository>
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
+        </repository>
+
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+
        <repository>
            <id>enginehub</id>
            <url>https://maven.enginehub.org/repo/</url>
        </repository>

+        <repository>
+            <id>elmakers-repo</id>
+            <url>https://maven.elmakers.com/repository/</url>
+        </repository>
+
+        <repository>
+            <id>sk89q-snapshots</id>
+            <url>https://maven.sk89q.com/artifactory/repo</url>
+        </repository>
+
+        <repository>
+            <id>dv8tion</id>
+            <name>m2-dv8tion</name>
+            <url>https://m2.dv8tion.net/releases/</url>
+        </repository>
+
        <repository>
            <id>playpro</id>
            <url>https://maven.playpro.com/</url>
        </repository>

        <repository>
-            <id>essentialsx-repo</id>
-            <url>https://repo.essentialsx.net/releases/</url>
+            <id>md_5-public</id>
+            <url>https://repo.md-5.net/content/groups/public/</url>
        </repository>

        <repository>
-            <id>jitpack</id>
-            <url>https://jitpack.io/</url>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
        </repository>
+
+        <repository>
+            <id>sk89q-repo</id>
+            <url>https://maven.sk89q.com/repo/</url>
+        </repository>
+
+        <repository>
+            <id>esentialsx-repo</id>
+            <url>https://repo.essentialsx.net/releases/</url>
+        </repository>
+
    </repositories>

    <dependencies>
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
@@ -108,6 +108,16 @@ public class EventBlocker extends FreedomService

        event.setRadius(ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue());
    }
+    
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockExplode(BlockExplodeEvent event) {
+        if(!ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) {
+            event.setCancelled(true);
+            return;
+        }
+
+        event.setYield(ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue());
+    }

    @EventHandler(priority = EventPriority.HIGH)
    public void onBlockExplode(BlockExplodeEvent event)
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -18,4 +18,4 @@ libraries:
  - org.apache.commons:commons-lang3:3.12.0
  - commons-io:commons-io:2.11.0
  - org.jetbrains:annotations:23.0.0
-  - org.javassist:javassist:3.29.1-GA
+  - org.javassist:javassist:3.29.1-GA
Author	SHA1	Message	Date
Paul Reilly	beddbe42dd	Merge branch 'main' into merge-branch-between-main-and-dev	2023-07-11 12:12:09 -05:00
Paul Reilly	fefb750b47	Merge branch 'development' of https://github.com/AtlasMediaGroup/TotalFreedomMod into development	2023-07-11 12:11:25 -05:00
Paul Reilly	bd5edc3156	Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod	2023-07-11 12:10:51 -05:00
allinkdev	cc13d9cf49	Remove UUID from vanished list on removal (#298 ) Co-authored-by: Ryan <Wild1145@users.noreply.github.com> Co-authored-by: Paldiu <pawereus@gmail.com>	2023-07-11 12:07:18 -05:00
dependabot[bot]	96be5f1149	Bump worldedit-bukkit from 7.2.12 to 7.2.15 Bumps worldedit-bukkit from 7.2.12 to 7.2.15. --- updated-dependencies: - dependency-name: com.sk89q.worldedit:worldedit-bukkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-11 12:07:18 -05:00
dependabot[bot]	d7da199d26	Bump actions/setup-java from 3.6.0 to 3.9.0 (#291 ) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.6.0 to 3.9.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.6.0...v3.9.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ryan <Wild1145@users.noreply.github.com>	2023-07-11 12:07:14 -05:00
Nathan Curran	64f4fbfe18	Add logging to ro command - FS-233 (#282 ) * Add logging to ro command - FS-233 * Create a variable for API instead of calling method every time Co-authored-by: Paldiu <pawereus@gmail.com> Co-authored-by: Ryan <Wild1145@users.noreply.github.com>	2023-07-11 12:07:14 -05:00
Video	fa1b6dde4c	Go fuck yourself Codacy Codacy complained about me forgetting a "default" case in my rewrite of /moblimiter, so I have to do this shit.	2023-07-11 12:06:59 -05:00
Video	6a5b5c241e	A few more changes - Cleans up /potion a tiny bit - Rewrites part of /moblimiter - Resolves FS-346 by cleaning up /setlever - Modernizes /opall a bit - Changes more components to use Adventure	2023-07-11 12:06:59 -05:00
Video	cec506f148	Too much shit to list in the commit name - Removes ancient unused code - General code cleanup in some places - Rewrites a few components to use Adventure (testing needed) - Rewrites a few commands to use more modern Java features like Streams - Fixes oversight where vanishing still worked by names and not UUIDs - Removes unused Pterodactyl integration - Removes AutoEject's IP range banning functionality - Does some minor cleanup to HTTPD's list & players modules - Fixes ages-old bug in the AntiSpam that caused it to falsely mute players	2023-07-11 12:06:59 -05:00
Focusvity	4602e2246b	Remove indefinite wording for bans with expiry	2023-07-11 12:06:58 -05:00
Focusvity	3ac893db50	Remove ParseException from IConfig	2023-07-11 12:06:58 -05:00
Focusvity	bcf8c2f04a	Add expiry to indefinite bans	2023-07-11 12:06:58 -05:00
Video	88eceab480	Codacy is incredibly picky and I hope it burns in hell	2023-07-11 12:06:58 -05:00
Video	df756d43ef	Completely rewrites the Block Inspector, fixes bug in BukkitTelnetBridge caused when Essentials is not installed	2023-07-11 12:06:58 -05:00
Video	91c4153037	Resolves FS-464 Banners had a cap in them to mitigate the effects of chunk bans back in like 2019. This removes that ancient broken cap.	2023-07-11 12:06:58 -05:00
Video	c5f0886df6	Resolves FS-339 by aggressively rewriting /list and removing ancient unused code	2023-07-11 12:06:58 -05:00
Video	ca990bc526	Resolves FS-321 by aggressively rewriting /plugincontrol	2023-07-11 12:06:58 -05:00
Video	546827cd5a	Resolves FS-320 and fixes FS-471	2023-07-11 12:06:57 -05:00
Video	e7e08c060e	Attempts to resolve FS-311 and mitigates FS-396	2023-07-11 12:06:57 -05:00
Video	eb6a91323d	Resolves FS-322	2023-07-11 12:06:57 -05:00
Video	2fbd7578ab	Resolves FS-331	2023-07-11 12:06:57 -05:00
Video	75cd1864f6	God fucking dammit	2023-07-11 12:06:57 -05:00
Video	a420339017	Resolves FS-348	2023-07-11 12:06:57 -05:00
Video	2b5ea048cc	Resolves FS-340 and improves some surrounding code a bit	2023-07-11 12:06:57 -05:00
Video	20f341ea45	Resolves FS-338	2023-07-11 12:06:57 -05:00
Video	eadbc504e5	Resolves FS-337	2023-07-11 12:06:57 -05:00
Video	760ab3c622	Resolves FS-333	2023-07-11 12:06:56 -05:00
Video	b804459dcc	Resolves FS-325	2023-07-11 12:06:56 -05:00
Video	63f805935f	Resolves FS-341	2023-07-11 12:06:56 -05:00
Video	1937a3d4de	Resolves FS-318 by rewriting the /mute command This has the fortunate side-effect of also fixing several bugs present in the original command.	2023-07-11 12:06:56 -05:00
Video	36663385ab	Resolves FS-316 by aggressively rewriting /blockedit Disclaimer: I did this whilst sleep deprvied. I didn't know how the fuck NPath is calculated so to play it safe I aggressively rewrote the command. I also took the opportunity to make some of the command's messages more consistent with eachother (using restrict/restore instead of block/unblock).	2023-07-11 12:06:56 -05:00
Video	5d4085ab07	Fixes FS-323 by rewriting ride modes to make sense	2023-07-11 12:06:53 -05:00
Video	0686419ce3	Fixes FS-349	2023-07-11 12:06:53 -05:00
Video	9998392b1a	Fixes FS-343	2023-07-11 12:06:53 -05:00
dependabot[bot]	90c276668b	Bump codacy/codacy-analysis-cli-action from 4.1.0 to 4.2.0 (#269 ) Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases) - [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: codacy/codacy-analysis-cli-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ryan <Wild1145@users.noreply.github.com>	2023-07-11 12:06:53 -05:00
Allink	19db8a14dc	Remove unused imports, variables and other minor oversights in the Discord bridge (#280 ) * Fix player names not being deformatted * Remove unused imports and variables * Rectify usage of deprecated methods * Clarify comment * Update JDA plugin warning repository URL * Fix possible NPEs Co-authored-by: Ryan <Wild1145@users.noreply.github.com>	2023-07-11 12:06:53 -05:00
Ryan	7f0eeab09c	Remove Broken Downstream Merge Action (#281 ) This never worked, let's just remove it.	2023-07-11 12:06:53 -05:00
dependabot[bot]	410f26f76f	Bump actions/setup-java from 3.5.1 to 3.6.0 (#279 ) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.5.1 to 3.6.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.5.1...v3.6.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-11 12:06:53 -05:00
Video	2d918fe17b	Removes /nh and code associated with it (except this time its based on the right branch)	2023-07-11 12:06:53 -05:00
Allink	44bae8ab00	Remove /sit command FS-460	2023-07-11 12:06:53 -05:00
Video	6cc9b26661	Removes TFGuilds integration (#264 ) TFGuilds was shitcanned the other day (good riddence), so there's no point in bridging it anymore. Co-authored-by: Allink <44676012+allinkdev@users.noreply.github.com> Co-authored-by: Ryan <Wild1145@users.noreply.github.com>	2023-07-11 12:06:52 -05:00
dependabot[bot]	6761ab8035	Bump actions/setup-java from 3.3.0 to 3.5.1 (#271 ) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.3.0 to 3.5.1. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.3.0...v3.5.1) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-11 12:06:52 -05:00
dependabot[bot]	9490dacf36	Bump junit-jupiter from 5.8.2 to 5.9.0 Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-11 12:06:46 -05:00
dependabot[bot]	173f37d55e	Bump javassist from 3.29.0-GA to 3.29.1-GA Bumps [javassist](https://github.com/jboss-javassist/javassist) from 3.29.0-GA to 3.29.1-GA. - [Release notes](https://github.com/jboss-javassist/javassist/releases) - [Changelog](https://github.com/jboss-javassist/javassist/blob/master/Changes.md) - [Commits](https://github.com/jboss-javassist/javassist/commits) --- updated-dependencies: - dependency-name: org.javassist:javassist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-11 12:06:46 -05:00
dependabot[bot]	25c8c0b654	Bump EssentialsX from 2.19.4 to 2.19.6 Bumps [EssentialsX](https://github.com/EssentialsX/Essentials) from 2.19.4 to 2.19.6. - [Release notes](https://github.com/EssentialsX/Essentials/releases) - [Commits](https://github.com/EssentialsX/Essentials/compare/2.19.4...2.19.6) --- updated-dependencies: - dependency-name: net.essentialsx:EssentialsX dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-11 12:06:46 -05:00
dependabot[bot]	217e5fd62e	Bump worldedit-bukkit from 7.2.10 to 7.2.12 Bumps worldedit-bukkit from 7.2.10 to 7.2.12. --- updated-dependencies: - dependency-name: com.sk89q.worldedit:worldedit-bukkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-11 12:06:46 -05:00
Allink	2eef02ef13	Fix beds exploding in the Nether & End dimensions with explosions off	2023-07-11 12:06:32 -05:00
Paldiu	41cf62c8c0	Merge pull request #333 from AtlasMediaGroup/Paldiu-patch-1 Update plugin.yml	2023-07-11 11:49:44 -05:00
Paldiu	268b71f8a3	Update plugin.yml	2023-07-11 11:38:45 -05:00
Paldiu	a84a47980a	Merge pull request #331 from AtlasMediaGroup/manual-patch-conflict-1 Update pom.xml	2023-07-11 11:33:47 -05:00
Paldiu	3a502713ea	Merge branch 'main' into manual-patch-conflict-1	2023-07-11 09:18:06 -05:00
Paldiu	5dc5e5dcc5	Merge pull request #332 from AtlasMediaGroup/manual-patch-conflict-2 Update plugin.yml	2023-07-11 09:17:54 -05:00
Paldiu	171daf25a4	Update plugin.yml	2023-07-11 09:06:11 -05:00
Paldiu	2fa7b6855b	Update pom.xml	2023-07-11 09:05:04 -05:00
Paul Reilly	38de6f9e67	Merge branch 'main' of https://github.com/AtlasMediaGroup/TotalFreedomMod	2023-07-11 08:02:35 -05:00