CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,558 Commits 31 Branches 181 Tags
d1997b62fb4db33a2ff2b22ae0648df93cd899d2
Commit Graph

127 Commits

Author SHA1 Message Date
okx-code
d1997b62fb fix message 2025-08-26 11:48:19 +01:00
okx-code
53040d87d6 fix import 2025-08-26 11:47:09 +01:00
okx-code
72ec349f73 update 2025-08-26 11:42:22 +01:00
okx-code
4335097316 add clear ores manuallly 2025-08-26 11:15:19 +01: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
bcd87b2dae Nuke FakePlayer 2024-10-20 17:44:47 +01:00
okx-code
4dc1e9f346 fix fakeplayer 2024-10-09 01:37:05 +01:00
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
AngrySoundTech
272895eba5 Fix compile errors 2024-07-19 11:21:49 -04: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
32a270c7a7 Standardize editorconfig 2024-06-21 17:49:37 -04:00
MrJeremyFisher
9518c14d90 1.20.6 2024-06-18 11:53:29 -04:00
okx-code
79edc91825 Update FakePlayer 2024-04-23 20:46:29 +01:00
okx-code
ddcbbe6355 Update HiddenOre to 1.20 2024-02-23 01:35:45 +00:00
okx-code
aa9f07e886 Add HiddenOre 2024-02-22 21:31:00 +00:00
Cola
c5566f6dfc Implement Paper Methods 2022-04-26 23:51:23 +01:00
Cola
aefb0781ed 1.18.2 2022-03-07 21:27:47 +00:00
Cola
82fb064366 We now have CAVE_AIR + VOID_AIR 2022-01-25 02:41:54 +00:00
Cola
ee1be9844d Remove system.out 2022-01-25 02:31:17 +00:00
Cola
5878a57604 Part 2 2022-01-25 02:30:37 +00:00
Cola
cb40a1da6e this vs getPlugin 2022-01-25 02:30:13 +00:00
Cola
a520acacbf Update readme + convert clear_ores to map intead of 1 replacement mat 2022-01-25 02:28:31 +00:00
Cola
92398215a8 Only register listener if the world is in the config 2022-01-12 13:07:10 +00:00
Cola
096fb2973c Update ore duster to support world height 2022-01-12 03:21:48 +00:00
AngrySoundTech
9b9ca0ddaa Update workflow files 2022-01-08 11:55:54 -05:00
Cola
b4b6438179 CivGradle/1.18.1 2021-12-30 04:25:36 +00:00
Cola
9792e54020 Update plugin.yml 2021-12-21 04:21:09 +00:00
AngrySoundTech
9fed6d1bfc Add Executable bit. How do I forget this every time. 2021-12-14 21:44:02 -05:00
AngrySoundTech
abb785879a Use gradle 2021-12-14 21:39:45 -05:00
Longboyy
9445c9b319 1.18.1 
Updated BreakTracking class to account for extra world height.
 2021-12-13 05:54:24 +00:00
Cola
eeb43c1f30 Update FakePlayer.java 2021-09-08 18:44:04 +01:00
Cola
64a510e228 1.17.1 2021-07-19 00:01:50 +01:00
Cola
f33c85f85e POM fix 2021-06-30 21:56:43 +01:00
Cola
b41b548837 v1.8.0 - 1.17 and Java 16 2021-06-30 16:02:50 +01:00
ProgrammerDan
d4fd1a5591 Being a good citizendev and incrementing pom, sorry 2021-01-03 21:48:54 -05:00
ProgrammerDan
d61087ea51 Adding back in a reverted improvement related to drop amount. 2021-01-03 16:42:57 -05:00
ProgrammerDan
f3e6882087 Maximal refactor to standardize alert building without losing functionality. This replaces the prior reverted commit. Hopefully the additional comments also makes clear how these are unique pieces of code and a reduction like reverted would break functionality. 2021-01-03 16:31:38 -05:00
ProgrammerDan
28a3bf324f Revert "Alerting the player is a separate function now" 
This reverts commit de91bb06cc.

This commit completely removes the use of aggregator alertUser
StringBuilder, and as a result of the constructs here will only alert
people of transforms / discoveries that have a customPrefix. If no
custom prefix for a drop is defined, no notification will ever be sent.
Aggregation of notifications is straight broken by this commit as well.

It also eliminates the " nearby" custom messaging of generation vs.
drop, just straight up gone?

I'll follow up this revert with a new commit to do the same but safely.
 2021-01-03 15:00:36 -05:00
Maxopoly
ffd7a9a9ed Update repo to new github one 2021-01-01 02:15:24 +01:00
Maxopoly
4a6d1f2bdb Update to 1.16.4 2020-12-29 02:04:06 +01:00
Maxopoly
ed75b207a0 Update to 1.16 and integrate our Maven setup 2020-07-28 05:03:05 +02:00
Nuclear-Crow
cf7915a73e brackets, StringBuilder 2020-07-15 23:15:07 +03:00
Nuclear-Crow
883e24843a brackets 2020-07-15 22:54:24 +03:00
Nuclear-Crow
de91bb06cc Alerting the player is a separate function now 2020-07-15 14:15:58 +03:00
Nuclear-Crow
9b9ab921b0 cumChance not affected by negative localChance 
Quite important. Negative values of localChance, which can be output by VeinConfigs, will make next DropConfig chance interval overlap with previous one's, affecting the chance, or nullifying it entirely.
 2020-07-15 13:16:54 +03:00