Commit Graph

149 Commits

Author SHA1 Message Date
Alexander
636b64f261 Switch from jsr305 to Jetbrains Annotations 2024-08-23 03:16:52 +01:00
okx-code
fefc1ff58d Update to 1.21 2024-08-19 22:49:53 +01:00
okx-code
5a23670b5f update plugins 2024-08-18 15:34:32 +01:00
okx-code
3bf506f7be Use de-obfuscated jars 2024-08-18 14:24:47 +01:00
AngrySoundTech
2018082517 Merge branch 'main' into mc-1.20.6
# Conflicts:
#	plugins/banstick-paper/build.gradle.kts
#	plugins/banstick-paper/src/main/resources/plugin.yml
#	plugins/bastion-paper/build.gradle.kts
#	plugins/bastion-paper/src/main/resources/plugin.yml
#	plugins/castlegates-paper/build.gradle.kts
#	plugins/castlegates-paper/src/main/java/com/aleksey/castlegates/utils/ParticleHelper.java
#	plugins/castlegates-paper/src/main/resources/plugin.yml
#	plugins/citadel-paper/build.gradle.kts
#	plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/listener/EntityListener.java
#	plugins/civchat2-paper/build.gradle.kts
#	plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java
#	plugins/civduties-paper/src/main/resources/plugin.yml
#	plugins/civmodcore-paper/build.gradle.kts
#	plugins/civmodcore-paper/src/main/java/org/bukkit/pseudo/PseudoServer.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigHelper.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemUtils.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MetaUtils.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/SpawnEggUtils.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTHelper.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerialization.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTType.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DisplayLocationSetting.java
#	plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/nbt/NBTTests.java
#	plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/TagListener.java
#	plugins/combattagplus-paper/src/main/resources/plugin.yml
#	plugins/donum-paper/src/main/resources/plugin.yml
#	plugins/essenceglue-paper/build.gradle.kts
#	plugins/essenceglue-paper/src/main/resources/plugin.yml
#	plugins/exilepearl-paper/build.gradle.kts
#	plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/CoreDamageLogger.java
#	plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/CoreExilePearl.java
#	plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/listener/PlayerListener.java
#	plugins/exilepearl-paper/src/main/resources/plugin.yml
#	plugins/factorymod-paper/build.gradle.kts
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/ConfigParser.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/interactionManager/FurnCraftChestInteractionManager.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintBookRecipe.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintNoteRecipe.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintingPlateJsonRecipe.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintingPlateRecipe.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/Upgraderecipe.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/utility/MultiInventoryWrapper.java
#	plugins/factorymod-paper/src/main/resources/plugin.yml
#	plugins/finale-paper/build.gradle.kts
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/CombatUtil.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/DamageListener.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/PotionListener.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/ToolProtectionListener.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/WeaponModificationListener.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/misc/AttributeModifier.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/misc/ItemUtil.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/misc/PotionArrowHandler.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/overlay/ScoreboardHUD.java
#	plugins/finale-paper/src/main/resources/plugin.yml
#	plugins/hiddenore-paper/build.gradle.kts
#	plugins/hiddenore-paper/src/main/java/com/github/devotedmc/hiddenore/PlayerStateConfig.java
#	plugins/hiddenore-paper/src/main/java/com/github/devotedmc/hiddenore/util/FakePlayer.java
#	plugins/itemexchange-paper/build.gradle.kts
#	plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/rules/BulkExchangeRule.java
#	plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/rules/ExchangeRule.java
#	plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/rules/modifiers/PotionModifier.java
#	plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/utility/NBTEncodings.java
#	plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/utility/Utilities.java
#	plugins/itemexchange-paper/src/main/resources/plugin.yml
#	plugins/jukealert-paper/build.gradle.kts
#	plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/gui/SnitchOverviewGUI.java
#	plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/impl/KillPlayerAction.java
#	plugins/jukealert-paper/src/main/resources/plugin.yml
#	plugins/kirabukkitgateway-paper/build.gradle.kts
#	plugins/kirabukkitgateway-paper/src/main/java/com/github/maxopoly/KiraBukkitGateway/impersonation/PseudoPlayer.java
#	plugins/kirabukkitgateway-paper/src/main/java/com/github/maxopoly/KiraBukkitGateway/impersonation/PseudoPlayerIdentity.java
#	plugins/kirabukkitgateway-paper/src/main/resources/plugin.yml
#	plugins/namelayer-paper/build.gradle.kts
#	plugins/namelayer-paper/src/main/java/vg/civcraft/mc/namelayer/gui/GUIGroupOverview.java
#	plugins/namelayer-paper/src/main/java/vg/civcraft/mc/namelayer/gui/MainGroupGUI.java
#	plugins/namelayer-paper/src/main/resources/plugin.yml
#	plugins/railswitch-paper/src/main/resources/plugin.yml
#	plugins/randomspawn-paper/build.gradle.kts
#	plugins/randomspawn-paper/src/main/resources/plugin.yml
#	plugins/realisticbiomes-paper/build.gradle.kts
#	plugins/realisticbiomes-paper/src/main/java/com/untamedears/realisticbiomes/utils/RealisticBiomesGUI.java
#	plugins/realisticbiomes-paper/src/main/resources/plugin.yml
#	plugins/simpleadminhacks-paper/build.gradle.kts
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/GameTuning.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/InvControl.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/SaplingHack.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/AntiFastBreak.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/ArthropodEggHack.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/AttrHider.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/BeeKeeping.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/CopperRail.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/HumbugBatchOne.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/OldEnchanting.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/SafeOreBreak.java
#	plugins/simpleadminhacks-paper/src/main/resources/plugin.yml
2024-07-19 10:52:45 -04:00
MrJeremyFisher
cbaf56cbb3 Format 2024-06-21 17:51:55 -04:00
MrJeremyFisher
9518c14d90 1.20.6 2024-06-18 11:53:29 -04:00
MrJeremyFisher
eba2002953 1.20.4 2024-02-22 10:47:07 -05:00
okx-code
61a5c39207 fix bad plugin name 2024-02-22 00:49:09 +00:00
AngrySoundTech
9385a243b1 Update plugin names 2024-02-16 15:01:09 -05:00
AngrySoundTech
d06a904af6 Relocate banstick 2024-02-16 13:32:24 -05:00
AngrySoundTech
6049375ee6 Update civgradle 2023-02-26 10:46:35 -05:00
AngrySoundTech
2da54d9a3f Update dependency locations 2022-01-02 11:37:59 -05:00
Cola
86d31ea650 My tiny brain doesnt comprehend why this errors 2022-01-02 05:10:24 +00:00
Cola
a826843a1b CivGradle/1.18.1 2022-01-02 05:10:05 +00:00
Cola
3473fa4294 Shadow dependencies 2021-12-28 00:54:38 +00:00
Cola
4d674664cd Fix plugin.yml 2021-12-23 01:32:26 +00:00
AngrySoundTech
e77613ab92 Add workflow files 2021-12-19 13:09:36 -05:00
Cola
82b108eea3 Merge remote-tracking branch 'DevotedMC/master' into 1.18 2021-12-17 05:00:50 +00:00
ProgrammerDan
cdec9c6220 Fixing this thorn in the plugin's side of fkey misapplication. 2021-12-16 23:51:44 -05:00
Cola
70e97085c4 Gradlefication - 1.18 2021-12-17 03:37:00 +00:00
Cola
27f55d9752 Latest CMC 2021-11-02 04:54:39 +00:00
Alexander
c9794294ad Revert "Comply with newer version of com.github.seancfoley:ipaddress"
This reverts commit 0fbab2403e1fddf5892c9d8b6c4b519c9e195267.
2021-11-02 04:54:39 +00:00
Alexander
3d174c6e29 Revert ipaddress version update 2021-11-02 04:54:39 +00:00
Alexander
29f1a3ee28 Comply with CivModCore updates 2021-11-02 04:54:39 +00:00
Alexander
9ba65dc88f Comply with newer version of com.github.seancfoley:ipaddress 2021-11-02 04:54:39 +00:00
Alexander
7aa35f6eb5 Update POM 2021-11-02 04:54:39 +00:00
Gjum
7cefa590d5 add missing import 2021-10-26 18:17:46 +02:00
Gjum
db56734c14 get ban via player instead of share, including transitive 2021-10-26 17:27:38 +02:00
Gjum
f79fa3c5b8 reuse latestSession to cut down on db requests 2021-10-26 16:44:05 +02:00
Gjum
3ec18a783e kick player if they have associated with a banned share 2021-10-26 12:56:49 +02:00
wingzero54
0a410d00f6 Merge pull request #25 from Diet-Cola/lovetapped
Add # of sessions to grab on /lovetap
2021-06-07 09:12:45 -05:00
Cola
9e45c89bf8 Fix IOOB & default to all sessions 2021-06-06 23:13:23 +01:00
Cola
1447e61e72 Increment version 2021-05-23 03:18:42 +01:00
Cola
cd9ec3b5d7 Add # of sessions to pull on /lovetap
Default pulls 25 latest sessions, you can optionally pull any amount of records
2021-05-23 03:18:06 +01:00
Alexander
5f651e185f Fix hasBanExpired() logic 2021-04-30 00:30:29 +01:00
Alexander
3bf9db7b63 Add simple player ban check function 2021-04-11 22:53:40 +01:00
Alexander
a837b61d68 Reformat POM + plugin.yml 2021-01-23 04:25:36 +00:00
Alexander
8594297e4c Update to CivModCore 1.8.2 2021-01-22 16:06:44 +00:00
Maxopoly
1383d092d1 Disable Jenkinsfile 2021-01-05 06:10:20 +01:00
ProgrammerDan
18e65d2c69 Updating pom.xml version to reflect the various nullfixes. Style changes shouldn't impact function, but hopefully the SpotFixes corrections are a nice positive. All public methods now have javadoc, as should all or most classes, so also a positive. 2021-01-03 14:15:52 -05:00
ProgrammerDan
a7689e4a68 package-info fixes from checkstyle 2021-01-03 13:00:04 -05:00
ProgrammerDan
824353b969 UntangleCommand fixes from checkstyle 2021-01-03 12:58:22 -05:00
ProgrammerDan
4b76ebc98b TakeItBackCommand fixes from checkstyle 2021-01-03 12:53:47 -05:00
ProgrammerDan
fe8a06ae49 Checkstyle fixes for ScraperWorker 2021-01-03 12:52:06 -05:00
ProgrammerDan
fc12bf1228 Checkstyle fixes for ScrapeFreeProxyList 2021-01-03 12:48:52 -05:00
ProgrammerDan
b6bead750e Checkstyle fixes for ProxyLoader 2021-01-03 12:47:11 -05:00
ProgrammerDan
be9d84c5b1 LoveTapCommand update for checkstyle 2021-01-03 02:34:31 -05:00
ProgrammerDan
53e1242dba IpCheckImportWorker fixes from checkstyle. 2021-01-03 02:27:12 -05:00
ProgrammerDan
9184f72381 ImportWorker checkstyle fixes. 2021-01-03 02:23:34 -05:00