Commit Graph

387 Commits

Author SHA1 Message Date
okx-code
6bcd58c0ac add location to shop purchase string representation 2026-01-11 06:45:37 +00:00
okx-code
848aefa3d2 Merge pull request #889 from Protonull/fix-ie-set-dedupe
Fix /ies commands from resetting a rule item's amount to 1
2025-11-04 16:16:39 +00:00
Alexander
91250a9e37 Fix /ies commands from resetting a rule item's amount to 1
Fixes #888
2025-10-27 22:50:16 +00:00
Husky
3735707c60 rename NameAPI to NameLayerAPI 2025-10-10 14:55:22 -04:00
okx-code
62e325ef3b fix itemexchange 2025-10-08 03:20:48 +01:00
Husky
744182a004 plugins should also use version catalogue 2025-09-10 22:43:15 -04:00
okx-code
6c24cde085 update plugins 2025-08-04 00:24:43 +01:00
okx-code
e524ca6174 Update nbt (thanks ori) 2025-08-03 23:23:25 +01:00
okx-code
214e83970c use correct access 2025-04-22 00:25:00 +01:00
okx-code
903e1bdc1e fix invert 2025-04-21 23:19:46 +01:00
okx-code
908b1d176f fix lore x3 2025-02-22 10:48:03 +00:00
okx-code
c896d51b11 fix lore x2 2025-02-22 10:40:50 +00:00
okx-code
b7f1cbdef7 fix list 2025-02-22 10:37:51 +00:00
okx-code
efdb27c584 fix null 2025-02-22 10:20:58 +00:00
Alexander
9a36a5c3ad Prune MoreCollectionUtils 2025-02-18 07:07:01 +00:00
Alexander
4fc0b4ad58 Defers paper versioning to libs.versions.toml 2025-01-04 10:46:27 -05:00
okx-code
ab145a621d Reapply "update to 1.21.3"
This reverts commit a2e1c7dd1b.
2024-12-15 01:48:34 +00:00
okx-code
e25b4296b8 fix conforms 2024-10-25 20:39:29 +01:00
okx-code
6c99e5f5bb Fix potions in ItemExchange
Also deleted PotionUtils and made ItemExchange work without JukeAlert
2024-10-25 20:34:55 +01:00
Alexander
636b64f261 Switch from jsr305 to Jetbrains Annotations 2024-08-23 03:16:52 +01:00
okx-code
989f7166ab Merge pull request #539 from Protonull/update-repairables
Updates ItemExchange's repairables
2024-08-22 18:01:23 +01:00
okx-code
86e9349bd7 I'm a liar 2024-08-21 16:00:40 +01:00
okx-code
a5fbdfba8c Fix old potion exchanges 2024-08-21 16:00:28 +01:00
okx-code
7de5891854 fix brewery 2024-08-21 15:47:27 +01:00
okx-code
fefc1ff58d Update to 1.21 2024-08-19 22:49:53 +01:00
okx-code
0ca93df6cb Fix itemexchange 2024-08-18 16:57:30 +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
7aeacd6f13 More autoformat cleanup 2024-06-25 11:14:28 -04:00
MrJeremyFisher
ba1f52d503 Undo autoformatting 2024-06-24 23:00:46 -04:00
MrJeremyFisher
cbaf56cbb3 Format 2024-06-21 17:51:55 -04:00
MrJeremyFisher
6881f7b7a6 Remove debug prints 2024-06-20 11:15:09 -04:00
MrJeremyFisher
3edc0cf107 Fix iec rules 2024-06-19 14:15:06 -04:00
MrJeremyFisher
9518c14d90 1.20.6 2024-06-18 11:53:29 -04:00
Alexander
aed07c98b9 Updates ItemExchange's repairables
These are the items that'll receive RepairModifier by default.
2024-05-16 03:04:44 +01:00
okx-code
f83f7bb0c0 Merge branch 'main' into mc/1.20
# Conflicts:
#	plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/listener/BlockListener.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/SaplingHack.java
2024-04-23 20:31:08 +01:00
RedDevel2
2774855435 Update plugin name 2024-02-25 18:46:10 +01:00
RedDevel2
6d7b314a37 Update version tags 2024-02-24 18:22:24 +01:00
Alexander
045f39c9f5 Remove Lombok :( 2024-02-23 23:20:10 +00:00
okx-code
4d6532456e Merge branch 'main' into mc/1.20
# Conflicts:
#	plugins/civduties-paper/build.gradle.kts
#	settings.gradle.kts
2024-02-23 22:33:27 +00:00
Alexander
0ce87475af Replace MoreClassUtils.castOrNull() with instanceof pattern matching 2024-02-23 21:53:22 +00:00
okx-code
caf6479515 Update ItemExchange to 1.20 2024-02-22 02:44:51 +00:00
AngrySoundTech
037a3a9d89 Relocate ItemExchange 2024-02-20 20:16:48 -05:00
AngrySoundTech
05a25124d4 Update to civgradle2 2023-11-29 20:31:52 -05:00
wingzero54
2c03e25b2e Increment plugin version 2022-07-13 21:33:03 -05:00
wingzero54
7a118d5f32 Increment plugin version 2022-07-13 21:25:42 -05:00
Alexander
76277d8e9f Re-add NameLayer, Citadel, and JukeAlert integrations 2022-06-18 14:20:19 +01:00
Cola
81707325ad 1.18.2 2022-03-08 01:06:49 +00:00
Alexander
5eec2c7bc7 Fix NBT issue 2022-01-19 18:03:31 +00:00
Alexander
35b3d24381 Update Lombok version 2022-01-19 18:03:00 +00:00
Alexander
31e326013e Update Gradle wrapper to 7.3.3 2022-01-19 18:02:03 +00:00