diff --git a/README.md b/README.md index d24e414a..2b98f08b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # AnsibleSetup -Civclassic 1.16.1 Ansible setup +Civclassic 1.17.1 Ansible setup ## How to deploy: diff --git a/jarfiles/public/bungee_plugins/BungeeGuard-1.2.2.jar b/jarfiles/public/bungee_plugins/BungeeGuard-1.2.2.jar new file mode 100644 index 00000000..225086ab Binary files /dev/null and b/jarfiles/public/bungee_plugins/BungeeGuard-1.2.2.jar differ diff --git a/jarfiles/public/bungee_plugins/BungeeGuard-1.2.jar b/jarfiles/public/bungee_plugins/BungeeGuard-1.2.jar deleted file mode 100644 index 82c400fd..00000000 Binary files a/jarfiles/public/bungee_plugins/BungeeGuard-1.2.jar and /dev/null differ diff --git a/jarfiles/public/plugins/Spark-1.5.2.jar b/jarfiles/public/bungee_plugins/Spark-1.6.1.jar similarity index 74% rename from jarfiles/public/plugins/Spark-1.5.2.jar rename to jarfiles/public/bungee_plugins/Spark-1.6.1.jar index a74b5d06..8fc43826 100644 Binary files a/jarfiles/public/plugins/Spark-1.5.2.jar and b/jarfiles/public/bungee_plugins/Spark-1.6.1.jar differ diff --git a/jarfiles/public/bungee_plugins/ViaBackwards-3.3.0.jar b/jarfiles/public/bungee_plugins/ViaBackwards-3.3.0.jar deleted file mode 100644 index 6de4e118..00000000 Binary files a/jarfiles/public/bungee_plugins/ViaBackwards-3.3.0.jar and /dev/null differ diff --git a/jarfiles/public/bungee_plugins/ViaBackwards-4.0.1.jar b/jarfiles/public/bungee_plugins/ViaBackwards-4.0.1.jar new file mode 100644 index 00000000..0b5ad8dd Binary files /dev/null and b/jarfiles/public/bungee_plugins/ViaBackwards-4.0.1.jar differ diff --git a/jarfiles/public/bungee_plugins/ViaVersion-3.3.0.jar b/jarfiles/public/bungee_plugins/ViaVersion-3.3.0.jar deleted file mode 100644 index 35fdffef..00000000 Binary files a/jarfiles/public/bungee_plugins/ViaVersion-3.3.0.jar and /dev/null differ diff --git a/jarfiles/public/bungee_plugins/ViaVersion-4.0.1.jar b/jarfiles/public/bungee_plugins/ViaVersion-4.0.1.jar new file mode 100644 index 00000000..2d635b85 Binary files /dev/null and b/jarfiles/public/bungee_plugins/ViaVersion-4.0.1.jar differ diff --git a/jarfiles/public/plugins/BanStick-1.2.3.jar b/jarfiles/public/plugins/BanStick-1.3.0.jar similarity index 74% rename from jarfiles/public/plugins/BanStick-1.2.3.jar rename to jarfiles/public/plugins/BanStick-1.3.0.jar index 9cc966b7..8f897115 100644 Binary files a/jarfiles/public/plugins/BanStick-1.2.3.jar and b/jarfiles/public/plugins/BanStick-1.3.0.jar differ diff --git a/jarfiles/public/plugins/Bastion-2.4.1.jar b/jarfiles/public/plugins/Bastion-2.4.1.jar deleted file mode 100644 index b7df58fc..00000000 Binary files a/jarfiles/public/plugins/Bastion-2.4.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/Bastion-2.5.0.jar b/jarfiles/public/plugins/Bastion-2.5.0.jar new file mode 100644 index 00000000..acfffdb0 Binary files /dev/null and b/jarfiles/public/plugins/Bastion-2.5.0.jar differ diff --git a/jarfiles/public/plugins/BetterChairs-1.2.0.jar b/jarfiles/public/plugins/BetterChairs-1.2.0.jar deleted file mode 100644 index 93ac5208..00000000 Binary files a/jarfiles/public/plugins/BetterChairs-1.2.0.jar and /dev/null differ diff --git a/jarfiles/public/plugins/BetterChairs-1.4.0.jar b/jarfiles/public/plugins/BetterChairs-1.4.0.jar new file mode 100644 index 00000000..447fac92 Binary files /dev/null and b/jarfiles/public/plugins/BetterChairs-1.4.0.jar differ diff --git a/jarfiles/public/plugins/Brewery-3.0.jar b/jarfiles/public/plugins/Brewery-3.0.jar deleted file mode 100644 index 5b14cef0..00000000 Binary files a/jarfiles/public/plugins/Brewery-3.0.jar and /dev/null differ diff --git a/jarfiles/public/plugins/Brewery-3.1.jar b/jarfiles/public/plugins/Brewery-3.1.jar new file mode 100644 index 00000000..f7da6310 Binary files /dev/null and b/jarfiles/public/plugins/Brewery-3.1.jar differ diff --git a/jarfiles/public/plugins/BungeeGuard-1.2.2.jar b/jarfiles/public/plugins/BungeeGuard-1.2.2.jar new file mode 100644 index 00000000..225086ab Binary files /dev/null and b/jarfiles/public/plugins/BungeeGuard-1.2.2.jar differ diff --git a/jarfiles/public/plugins/BungeeGuard-1.2.jar b/jarfiles/public/plugins/BungeeGuard-1.2.jar deleted file mode 100644 index 82c400fd..00000000 Binary files a/jarfiles/public/plugins/BungeeGuard-1.2.jar and /dev/null differ diff --git a/jarfiles/public/plugins/Citadel-4.1.1.jar b/jarfiles/public/plugins/Citadel-4.1.1.jar deleted file mode 100644 index cd9201a5..00000000 Binary files a/jarfiles/public/plugins/Citadel-4.1.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/Citadel-4.2.0.jar b/jarfiles/public/plugins/Citadel-4.2.0.jar new file mode 100644 index 00000000..996ced58 Binary files /dev/null and b/jarfiles/public/plugins/Citadel-4.2.0.jar differ diff --git a/jarfiles/public/plugins/CivChat2-1.8.1.jar b/jarfiles/public/plugins/CivChat2-1.9.0.jar similarity index 91% rename from jarfiles/public/plugins/CivChat2-1.8.1.jar rename to jarfiles/public/plugins/CivChat2-1.9.0.jar index 610afb96..c868051f 100644 Binary files a/jarfiles/public/plugins/CivChat2-1.8.1.jar and b/jarfiles/public/plugins/CivChat2-1.9.0.jar differ diff --git a/jarfiles/public/plugins/CivDuties-1.3.1.jar b/jarfiles/public/plugins/CivDuties-1.3.1.jar deleted file mode 100644 index 7cb4fa5f..00000000 Binary files a/jarfiles/public/plugins/CivDuties-1.3.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/CivDuties-1.4.0.jar b/jarfiles/public/plugins/CivDuties-1.4.0.jar new file mode 100644 index 00000000..eb948317 Binary files /dev/null and b/jarfiles/public/plugins/CivDuties-1.4.0.jar differ diff --git a/jarfiles/public/plugins/CivModCore-1.8.3.jar b/jarfiles/public/plugins/CivModCore-1.9.0.jar similarity index 60% rename from jarfiles/public/plugins/CivModCore-1.8.3.jar rename to jarfiles/public/plugins/CivModCore-1.9.0.jar index 6c2f6b7e..56e26bee 100644 Binary files a/jarfiles/public/plugins/CivModCore-1.8.3.jar and b/jarfiles/public/plugins/CivModCore-1.9.0.jar differ diff --git a/jarfiles/public/plugins/CivSpy-1.5.1.jar b/jarfiles/public/plugins/CivSpy-1.5.1.jar deleted file mode 100644 index c2965ea7..00000000 Binary files a/jarfiles/public/plugins/CivSpy-1.5.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/CombatTagPlus-1.3.3.jar b/jarfiles/public/plugins/CombatTagPlus-1.3.3.jar deleted file mode 100644 index 9e5e7ea1..00000000 Binary files a/jarfiles/public/plugins/CombatTagPlus-1.3.3.jar and /dev/null differ diff --git a/jarfiles/public/plugins/CombatTagPlus-1.4.0.jar b/jarfiles/public/plugins/CombatTagPlus-1.4.0.jar new file mode 100644 index 00000000..bda8ee54 Binary files /dev/null and b/jarfiles/public/plugins/CombatTagPlus-1.4.0.jar differ diff --git a/jarfiles/public/plugins/Donum-1.0.1.jar b/jarfiles/public/plugins/Donum-1.0.1.jar deleted file mode 100644 index b8158562..00000000 Binary files a/jarfiles/public/plugins/Donum-1.0.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/Donum-1.1.0.jar b/jarfiles/public/plugins/Donum-1.1.0.jar new file mode 100644 index 00000000..df4ce458 Binary files /dev/null and b/jarfiles/public/plugins/Donum-1.1.0.jar differ diff --git a/jarfiles/public/plugins/EssenceGlue-1.1.1.jar b/jarfiles/public/plugins/EssenceGlue-1.1.1.jar deleted file mode 100644 index fe9b63ce..00000000 Binary files a/jarfiles/public/plugins/EssenceGlue-1.1.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/EssenceGlue-1.2.0.jar b/jarfiles/public/plugins/EssenceGlue-1.2.0.jar new file mode 100644 index 00000000..a348c836 Binary files /dev/null and b/jarfiles/public/plugins/EssenceGlue-1.2.0.jar differ diff --git a/jarfiles/public/plugins/ExilePearl-1.4.3.jar b/jarfiles/public/plugins/ExilePearl-1.4.3.jar deleted file mode 100644 index dfc17e21..00000000 Binary files a/jarfiles/public/plugins/ExilePearl-1.4.3.jar and /dev/null differ diff --git a/jarfiles/public/plugins/ExilePearl-1.5.0.jar b/jarfiles/public/plugins/ExilePearl-1.5.0.jar new file mode 100644 index 00000000..870b8e60 Binary files /dev/null and b/jarfiles/public/plugins/ExilePearl-1.5.0.jar differ diff --git a/jarfiles/public/plugins/FactoryMod-2.5.1.jar b/jarfiles/public/plugins/FactoryMod-2.5.1.jar deleted file mode 100644 index 56b9a2cc..00000000 Binary files a/jarfiles/public/plugins/FactoryMod-2.5.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/FactoryMod-2.6.0.jar b/jarfiles/public/plugins/FactoryMod-2.6.0.jar new file mode 100644 index 00000000..8e91ccd2 Binary files /dev/null and b/jarfiles/public/plugins/FactoryMod-2.6.0.jar differ diff --git a/jarfiles/public/plugins/Finale-1.5.1.jar b/jarfiles/public/plugins/Finale-1.5.1.jar deleted file mode 100644 index 181887ea..00000000 Binary files a/jarfiles/public/plugins/Finale-1.5.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/Finale-1.6.0.jar b/jarfiles/public/plugins/Finale-1.6.0.jar new file mode 100644 index 00000000..8c446c29 Binary files /dev/null and b/jarfiles/public/plugins/Finale-1.6.0.jar differ diff --git a/jarfiles/public/plugins/HiddenOre-1.7.0.jar b/jarfiles/public/plugins/HiddenOre-1.7.0.jar deleted file mode 100644 index f2d79d67..00000000 Binary files a/jarfiles/public/plugins/HiddenOre-1.7.0.jar and /dev/null differ diff --git a/jarfiles/public/plugins/HiddenOre-1.8.0.jar b/jarfiles/public/plugins/HiddenOre-1.8.0.jar new file mode 100644 index 00000000..32cee0cc Binary files /dev/null and b/jarfiles/public/plugins/HiddenOre-1.8.0.jar differ diff --git a/jarfiles/public/plugins/HolographicDisplays-2.4.5.jar b/jarfiles/public/plugins/HolographicDisplays-2.4.8.jar similarity index 58% rename from jarfiles/public/plugins/HolographicDisplays-2.4.5.jar rename to jarfiles/public/plugins/HolographicDisplays-2.4.8.jar index bac056dc..fd43da7e 100644 Binary files a/jarfiles/public/plugins/HolographicDisplays-2.4.5.jar and b/jarfiles/public/plugins/HolographicDisplays-2.4.8.jar differ diff --git a/jarfiles/public/plugins/ItemExchange-1.4.4.jar b/jarfiles/public/plugins/ItemExchange-1.4.4.jar deleted file mode 100644 index 6faa8990..00000000 Binary files a/jarfiles/public/plugins/ItemExchange-1.4.4.jar and /dev/null differ diff --git a/jarfiles/public/plugins/ItemExchange-1.5.0.jar b/jarfiles/public/plugins/ItemExchange-1.5.0.jar new file mode 100644 index 00000000..0a1befa4 Binary files /dev/null and b/jarfiles/public/plugins/ItemExchange-1.5.0.jar differ diff --git a/jarfiles/public/plugins/JukeAlert-2.1.2.jar b/jarfiles/public/plugins/JukeAlert-2.1.2.jar deleted file mode 100644 index f41d66c8..00000000 Binary files a/jarfiles/public/plugins/JukeAlert-2.1.2.jar and /dev/null differ diff --git a/jarfiles/public/plugins/JukeAlert-2.2.0.jar b/jarfiles/public/plugins/JukeAlert-2.2.0.jar new file mode 100644 index 00000000..7e2f8db1 Binary files /dev/null and b/jarfiles/public/plugins/JukeAlert-2.2.0.jar differ diff --git a/jarfiles/public/plugins/KiraBukkitGateway-1.2.0.jar b/jarfiles/public/plugins/KiraBukkitGateway-1.3.0.jar similarity index 85% rename from jarfiles/public/plugins/KiraBukkitGateway-1.2.0.jar rename to jarfiles/public/plugins/KiraBukkitGateway-1.3.0.jar index a2f501e3..17319e30 100644 Binary files a/jarfiles/public/plugins/KiraBukkitGateway-1.2.0.jar and b/jarfiles/public/plugins/KiraBukkitGateway-1.3.0.jar differ diff --git a/jarfiles/public/plugins/LuckPerms-5.3.3.jar b/jarfiles/public/plugins/LuckPerms-5.3.3.jar deleted file mode 100644 index 7c2a6bc3..00000000 Binary files a/jarfiles/public/plugins/LuckPerms-5.3.3.jar and /dev/null differ diff --git a/jarfiles/public/plugins/LuckPerms-5.3.53.jar b/jarfiles/public/plugins/LuckPerms-5.3.53.jar new file mode 100644 index 00000000..aa842e7b Binary files /dev/null and b/jarfiles/public/plugins/LuckPerms-5.3.53.jar differ diff --git a/jarfiles/public/plugins/NameColors-1.1.1.jar b/jarfiles/public/plugins/NameColors-1.1.1.jar deleted file mode 100644 index 4c0e929b..00000000 Binary files a/jarfiles/public/plugins/NameColors-1.1.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/NameColors-1.2.0.jar b/jarfiles/public/plugins/NameColors-1.2.0.jar new file mode 100644 index 00000000..601fc115 Binary files /dev/null and b/jarfiles/public/plugins/NameColors-1.2.0.jar differ diff --git a/jarfiles/public/plugins/NameLayer-2.14.1.jar b/jarfiles/public/plugins/NameLayer-2.14.1.jar deleted file mode 100644 index b0d21007..00000000 Binary files a/jarfiles/public/plugins/NameLayer-2.14.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/NameLayer-2.15.0.jar b/jarfiles/public/plugins/NameLayer-2.15.0.jar new file mode 100644 index 00000000..ff260e77 Binary files /dev/null and b/jarfiles/public/plugins/NameLayer-2.15.0.jar differ diff --git a/jarfiles/public/plugins/Orebfuscator-5.1.4.jar b/jarfiles/public/plugins/Orebfuscator-5.1.4.jar deleted file mode 100644 index 26dd1127..00000000 Binary files a/jarfiles/public/plugins/Orebfuscator-5.1.4.jar and /dev/null differ diff --git a/jarfiles/public/plugins/Orebfuscator-5.1.5.jar b/jarfiles/public/plugins/Orebfuscator-5.1.5.jar new file mode 100644 index 00000000..e41d438b Binary files /dev/null and b/jarfiles/public/plugins/Orebfuscator-5.1.5.jar differ diff --git a/jarfiles/public/plugins/ProtocolLib-4.6.0.jar b/jarfiles/public/plugins/ProtocolLib-4.6.0.jar deleted file mode 100644 index 51b03066..00000000 Binary files a/jarfiles/public/plugins/ProtocolLib-4.6.0.jar and /dev/null differ diff --git a/jarfiles/public/plugins/ProtocolLib-4.7.0.jar b/jarfiles/public/plugins/ProtocolLib-4.7.0.jar new file mode 100644 index 00000000..bbca4283 Binary files /dev/null and b/jarfiles/public/plugins/ProtocolLib-4.7.0.jar differ diff --git a/jarfiles/public/plugins/RailSwitch-1.5.1.jar b/jarfiles/public/plugins/RailSwitch-1.5.1.jar deleted file mode 100644 index 0abbfac6..00000000 Binary files a/jarfiles/public/plugins/RailSwitch-1.5.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/RailSwitch-1.6.0.jar b/jarfiles/public/plugins/RailSwitch-1.6.0.jar new file mode 100644 index 00000000..f304c171 Binary files /dev/null and b/jarfiles/public/plugins/RailSwitch-1.6.0.jar differ diff --git a/jarfiles/public/plugins/RandomSpawn-2.9.1.jar b/jarfiles/public/plugins/RandomSpawn-2.9.1.jar deleted file mode 100644 index c55a7e6c..00000000 Binary files a/jarfiles/public/plugins/RandomSpawn-2.9.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/RandomSpawn-3.0.0.jar b/jarfiles/public/plugins/RandomSpawn-3.0.0.jar new file mode 100644 index 00000000..1fd944c5 Binary files /dev/null and b/jarfiles/public/plugins/RandomSpawn-3.0.0.jar differ diff --git a/jarfiles/public/plugins/RealisticBiomes-2.1.1.jar b/jarfiles/public/plugins/RealisticBiomes-2.2.0.jar similarity index 90% rename from jarfiles/public/plugins/RealisticBiomes-2.1.1.jar rename to jarfiles/public/plugins/RealisticBiomes-2.2.0.jar index 76c1e474..67416906 100644 Binary files a/jarfiles/public/plugins/RealisticBiomes-2.1.1.jar and b/jarfiles/public/plugins/RealisticBiomes-2.2.0.jar differ diff --git a/jarfiles/public/plugins/SimpleAdminHacks-1.4.1.jar b/jarfiles/public/plugins/SimpleAdminHacks-1.4.1.jar deleted file mode 100644 index a6be13b4..00000000 Binary files a/jarfiles/public/plugins/SimpleAdminHacks-1.4.1.jar and /dev/null differ diff --git a/jarfiles/public/plugins/SimpleAdminHacks-1.5.0.jar b/jarfiles/public/plugins/SimpleAdminHacks-1.5.0.jar new file mode 100644 index 00000000..d1ba15c7 Binary files /dev/null and b/jarfiles/public/plugins/SimpleAdminHacks-1.5.0.jar differ diff --git a/jarfiles/public/bungee_plugins/Spark-1.5.2.jar b/jarfiles/public/plugins/Spark-1.6.1.jar similarity index 74% rename from jarfiles/public/bungee_plugins/Spark-1.5.2.jar rename to jarfiles/public/plugins/Spark-1.6.1.jar index a74b5d06..8fc43826 100644 Binary files a/jarfiles/public/bungee_plugins/Spark-1.5.2.jar and b/jarfiles/public/plugins/Spark-1.6.1.jar differ diff --git a/jarfiles/public/plugins/SuperVanish-6.2.3.jar b/jarfiles/public/plugins/SuperVanish-6.2.6.jar similarity index 59% rename from jarfiles/public/plugins/SuperVanish-6.2.3.jar rename to jarfiles/public/plugins/SuperVanish-6.2.6.jar index d140b0ea..dfb0a434 100644 Binary files a/jarfiles/public/plugins/SuperVanish-6.2.3.jar and b/jarfiles/public/plugins/SuperVanish-6.2.6.jar differ diff --git a/jarfiles/public/plugins/TAB-2.8.10.jar b/jarfiles/public/plugins/TAB-2.8.10.jar deleted file mode 100644 index f07fcb03..00000000 Binary files a/jarfiles/public/plugins/TAB-2.8.10.jar and /dev/null differ diff --git a/jarfiles/public/plugins/TAB-2.9.2.jar b/jarfiles/public/plugins/TAB-2.9.2.jar new file mode 100644 index 00000000..54630176 Binary files /dev/null and b/jarfiles/public/plugins/TAB-2.9.2.jar differ diff --git a/jarfiles/public/plugins/Votifier-2.7.1.jar b/jarfiles/public/plugins/Votifier-2.7.3.jar similarity index 85% rename from jarfiles/public/plugins/Votifier-2.7.1.jar rename to jarfiles/public/plugins/Votifier-2.7.3.jar index dc929494..7a59a1da 100644 Binary files a/jarfiles/public/plugins/Votifier-2.7.1.jar and b/jarfiles/public/plugins/Votifier-2.7.3.jar differ diff --git a/jarfiles/public/plugins/WordBank-1.3.0.jar b/jarfiles/public/plugins/WordBank-1.3.0.jar new file mode 100644 index 00000000..f476fd22 Binary files /dev/null and b/jarfiles/public/plugins/WordBank-1.3.0.jar differ diff --git a/jarfiles/public/plugins/WorldBorder-1.10.1.jar b/jarfiles/public/plugins/WorldBorder-1.10.2.jar similarity index 65% rename from jarfiles/public/plugins/WorldBorder-1.10.1.jar rename to jarfiles/public/plugins/WorldBorder-1.10.2.jar index 144ce675..89d4c7f6 100644 Binary files a/jarfiles/public/plugins/WorldBorder-1.10.1.jar and b/jarfiles/public/plugins/WorldBorder-1.10.2.jar differ diff --git a/jarfiles/public/plugins/WorldEdit-7.2.4.jar b/jarfiles/public/plugins/WorldEdit-7.2.6.jar similarity index 64% rename from jarfiles/public/plugins/WorldEdit-7.2.4.jar rename to jarfiles/public/plugins/WorldEdit-7.2.6.jar index 746f084c..16bee93c 100644 Binary files a/jarfiles/public/plugins/WorldEdit-7.2.4.jar and b/jarfiles/public/plugins/WorldEdit-7.2.6.jar differ diff --git a/templates/public/plugins/Citadel/config.yml.j2 b/templates/public/plugins/Citadel/config.yml.j2 index 753368b2..35c1ba23 100644 --- a/templates/public/plugins/Citadel/config.yml.j2 +++ b/templates/public/plugins/Citadel/config.yml.j2 @@ -227,6 +227,8 @@ non_reinforceables: - COBWEB - NETHER_PORTAL - END_PORTAL + - POWDER_SNOW + - POWDER_SNOW_BUCKET acidblock_material: - GOLD_BLOCK @@ -237,7 +239,7 @@ hangers_inherit_reinforcement: true # reinforcement_damageMultiplier is m where BlockDamage = 2 ^ (n/m) where n is equal to the number of days the group has been inactive reinforcement_damageMultiplier: 365 database: - ==: vg.civcraft.mc.civmodcore.dao.ManagedDatasource + ==: vg.civcraft.mc.civmodcore.dao.DatabaseCredentials plugin: Citadel user: '{{ mysql_user }}' password: '{{ mysql_non_root_pass }}' diff --git a/templates/public/plugins/CivDuties/config.yml.j2 b/templates/public/plugins/CivDuties/config.yml.j2 index ca040a63..1e62276f 100644 --- a/templates/public/plugins/CivDuties/config.yml.j2 +++ b/templates/public/plugins/CivDuties/config.yml.j2 @@ -29,7 +29,7 @@ tiers: groups: - dutied database: - ==: vg.civcraft.mc.civmodcore.dao.ManagedDatasource + ==: vg.civcraft.mc.civmodcore.dao.DatabaseCredentials plugin: CivDuties user: '{{ mysql_user }}' password: '{{ mysql_non_root_pass }}' diff --git a/templates/public/plugins/CivModCore/config.yml.j2 b/templates/public/plugins/CivModCore/config.yml.j2 index 0ce4d468..11722b3d 100644 --- a/templates/public/plugins/CivModCore/config.yml.j2 +++ b/templates/public/plugins/CivModCore/config.yml.j2 @@ -1,5 +1,5 @@ database: - ==: vg.civcraft.mc.civmodcore.dao.ManagedDatasource + ==: vg.civcraft.mc.civmodcore.dao.DatabaseCredentials plugin: CivModCore user: '{{ mysql_user }}' password: '{{ mysql_non_root_pass }}' diff --git a/templates/public/plugins/ClearLag/config.yml.j2 b/templates/public/plugins/ClearLag/config.yml.j2 index ebe3c7ef..7a687a71 100644 --- a/templates/public/plugins/ClearLag/config.yml.j2 +++ b/templates/public/plugins/ClearLag/config.yml.j2 @@ -230,6 +230,7 @@ chunk-entity-limiter: enabled: true limit: 20 entities: + - axolotl !hasName - bat !hasName - bee !hasName - blaze !hasName @@ -246,6 +247,8 @@ chunk-entity-limiter: - endermite !hasName - fox !hasName - ghast !hasName + - glow_squid !hasName + - goat !hasName - guardian !hasName - guardian liveTime=1200 - hoglin !hasName diff --git a/templates/public/plugins/EssenceGlue/config.yml.j2 b/templates/public/plugins/EssenceGlue/config.yml.j2 index 5f3af6da..9f32eae0 100644 --- a/templates/public/plugins/EssenceGlue/config.yml.j2 +++ b/templates/public/plugins/EssenceGlue/config.yml.j2 @@ -42,7 +42,7 @@ voting_sites: internal_key: 'MinecraftServers.org' name: 'minecraftservers.org' database: - ==: vg.civcraft.mc.civmodcore.dao.ManagedDatasource + ==: vg.civcraft.mc.civmodcore.dao.DatabaseCredentials plugin: EssenceGlue user: '{{ mysql_user }}' password: '{{ mysql_non_root_pass }}' diff --git a/templates/public/plugins/FactoryMod/config.yml.j2 b/templates/public/plugins/FactoryMod/config.yml.j2 index 25c2e5d3..fcbb6d3e 100644 --- a/templates/public/plugins/FactoryMod/config.yml.j2 +++ b/templates/public/plugins/FactoryMod/config.yml.j2 @@ -25,6 +25,7 @@ factories: recipes: - smelt_stone - smelt_smooth_stone + - smelt_deepslate - smelt_cracked_stone_bricks - smelt_glass - smelt_glass_red @@ -85,6 +86,10 @@ factories: - make_basalt - make_blackstone - make_crying_obsidian + - make_budding_amethyst + - make_calcite + - make_cobbled_deepslate + - make_tuff - repair_aesthetics dye_wool: type: FCC @@ -162,6 +167,7 @@ factories: - dye_glass_green - dye_glass_red - dye_glass_black + - tint_glass - repair_glass grill: type: FCC @@ -219,9 +225,10 @@ factories: amount: 64 recipes: - smelt_coal_ore - - smelt_iron_ore + - smelt_raw_copper + - smelt_raw_iron - smelt_diamond_ore - - smelt_gold_ore + - smelt_raw_gold - smelt_redstone_ore - smelt_lapis_ore - make_refractor @@ -235,9 +242,10 @@ factories: recipes: - adv_smelt_ancient_debris - smelt_coal_ore - - smelt_iron_ore + - smelt_raw_copper + - smelt_raw_iron - smelt_diamond_ore - - adv_smelt_gold_ore + - adv_smelt_raw_gold - adv_smelt_redstone_ore - adv_smelt_lapis_ore - make_refractor @@ -442,6 +450,8 @@ factories: - dirt_to_grass - dirt_to_podzol - dirt_to_mycelium + - dirt_to_moss_block + - dirt_to_rooted_dirt - netherrack_to_crimson_nylium - netherrack_to_warped_nylium - sapling_to_spruce @@ -481,6 +491,10 @@ factories: - make_horn_coral_block - make_wither_rose - make_bamboo + - sweet_berries_to_glow_berries + - make_small_dripleaf + - make_glow_lichen + - make_pointed_dripstone - repair_bio_lab carpentry: type: FCC @@ -715,6 +729,7 @@ factories: - adv_xp_5 - adv_xp_6 - uncarve_pumpkins + - uncarve_compacted_pumpkins - wither_skull - make_energizer - repair_advanced_cauldron @@ -837,6 +852,35 @@ factories: - crush_coarse - shave_snow - repair_grinding_mill + copper_workshop: + type: FCC + name: Copper Workshop + citadelBreakReduction: 1.0 + setupcost: + copper_block: + material: COPPER_BLOCK + amount: 64 + exposed_copper: + material: EXPOSED_COPPER + amount: 64 + weathered_copper: + material: WEATHERED_COPPER + amount: 64 + oxidized_copper: + material: OXIDIZED_COPPER + amount: 64 + honeycomb: + material: HONEYCOMB + amount: 32 + recipes: + - wax_copper_block + - wax_exposed_copper + - wax_weathered_copper + - wax_oxidized_copper + - weather_copper_block + - weather_exposed_copper + - weather_weathered_copper + - repair_copper_workshop #RECIPES recipes: smelt_stone: @@ -863,6 +907,18 @@ recipes: stone: material: SMOOTH_STONE amount: 80 + smelt_deepslate: + production_time: 4s + name: Smelt Deepslate + type: PRODUCTION + input: + cobbled_deepslate: + material: COBBLED_DEEPSLATE + amount: 64 + output: + deepslate: + material: DEEPSLATE + amount: 96 smelt_cracked_stone_bricks: production_time: 4s name: Smelt Cracked Stone Bricks @@ -1021,18 +1077,30 @@ recipes: coal: material: COAL amount: 256 - smelt_iron_ore: + smelt_raw_copper: production_time: 4s - name: Smelt Iron Ore + name: Smelt Raw Copper type: PRODUCTION input: - iron_ore: - material: IRON_ORE + raw_copper: + material: RAW_COPPER + amount: 64 + output: + copper: + material: COPPER_INGOT + amount: 96 + smelt_raw_iron: + production_time: 4s + name: Smelt Raw Iron + type: PRODUCTION + input: + raw_iron: + material: RAW_IRON amount: 64 output: iron: material: IRON_INGOT - amount: 96 + amount: 80 smelt_diamond_ore: production_time: 4s name: Smelt Diamond Ore @@ -1045,30 +1113,30 @@ recipes: diamond: material: DIAMOND amount: 48 - smelt_gold_ore: + smelt_raw_gold: production_time: 4s - name: Smelt Gold Ore + name: Smelt Raw Gold type: PRODUCTION input: - gold_ore: - material: GOLD_ORE - amount: 32 + raw_gold: + material: RAW_GOLD + amount: 64 output: gold: material: GOLD_INGOT - amount: 48 - adv_smelt_gold_ore: + amount: 80 + adv_smelt_raw_gold: production_time: 4s - name: Advanced Smelt Gold Ore + name: Advanced Smelt Raw Gold type: PRODUCTION input: - gold_ore: - material: GOLD_ORE - amount: 32 + raw_gold: + material: RAW_GOLD + amount: 64 output: gold: material: GOLD_INGOT - amount: 64 + amount: 112 smelt_redstone_ore: production_time: 4s name: Smelt Redstone Ore @@ -1799,6 +1867,30 @@ recipes: mycelium: material: MYCELIUM amount: 64 + dirt_to_moss_block: + production_time: 4s + name: Convert Dirt to Moss Block + type: PRODUCTION + input: + dirt: + material: DIRT + amount: 64 + output: + moss_block: + material: MOSS_BLOCK + amount: 64 + dirt_to_rooted_dirt: + production_time: 4s + name: Convert Dirt to Rooted Dirt + type: PRODUCTION + input: + dirt: + material: DIRT + amount: 64 + output: + rooted_dirt: + material: ROOTED_DIRT + amount: 64 netherrack_to_crimson_nylium: production_time: 4s name: Convert Netherrack to Crimson Nylium @@ -2690,6 +2782,21 @@ recipes: black_glass: material: BLACK_STAINED_GLASS amount: 64 + tint_glass: + production_time: 4s + name: Tint Glass + type: PRODUCTION + input: + glass: + material: GLASS + amount: 64 + amethyst_shard: + material: AMETHYST_SHARD + amount: 16 + output: + tinted_glass: + material: TINTED_GLASS + amount: 64 mix_concrete_white: production_time: 4s name: Mix White Concrete @@ -4532,6 +4639,72 @@ recipes: bamboo: material: BAMBOO amount: 8 + sweet_berries_to_glow_berries: + production_time: 4s + name: Convert Sweet berries to Glow berries + type: PRODUCTION + input: + sweet_berries: + material: SWEET_BERRIES + amount: 8 + glowstone_dust: + material: GLOWSTONE_DUST + amount: 8 + output: + bamboo: + material: GLOW_BERRIES + amount: 8 + make_small_dripleaf: + production_time: 4s + name: Make Small Dripleaf + type: PRODUCTION + input: + sugar_cane: + material: SUGAR_CANE + amount: 8 + lily_pad: + material: LILY_PAD + amount: 8 + output: + small_dripleaf: + material: SMALL_DRIPLEAF + amount: 8 + make_glow_lichen: + production_time: 4s + name: Make Glow Lichen + type: PRODUCTION + input: + red_mushroom: + material: RED_MUSHROOM + amount: 8 + brown_mushroom: + material: BROWN_MUSHROOM + amount: 8 + glowstone_dust: + material: GLOWSTONE_DUST + amount: 8 + output: + glow_lichen: + material: GLOW_LICHEN + amount: 8 + make_pointed_dripstone: + production_time: 4s + name: Make Pointed Dripstone + type: PRODUCTION + input: + calcite: + material: CALCITE + amount: 8 + water_bucket: + material: WATER_BUCKET + amount: 1 + output: + pointed_dripstone: + material: POINTED_DRIPSTONE + amount: 8 + bucket: + material: BUCKET + amount: 1 make_wither_rose: forceInclude: true production_time: 4s @@ -4564,6 +4737,23 @@ recipes: pumpkins: material: PUMPKIN amount: 64 + uncarve_compacted_pumpkins: + forceInclude: true + production_time: 1s + name: Uncarve Pumpkins + type: PRODUCTION + input: + carved_pumpkins: + material: CARVED_PUMPKIN + amount: 8 + lore: + - Compacted Item + output: + pumpkins: + material: PUMPKIN + amount: 8 + lore: + - Compacted Item make_bell: forceInclude: true production_time: 4s @@ -5854,6 +6044,66 @@ recipes: crying_obsidian: material: CRYING_OBSIDIAN amount: 128 + make_budding_amethyst: + production_time: 4s + name: Make Budding Amethyst + type: PRODUCTION + input: + quartz: + material: QUARTZ_BLOCK + amount: 64 + purple_dye: + material: PURPLE_DYE + amount: 8 + output: + budding_amethyst: + material: BUDDING_AMETHYST + amount: 16 + make_calcite: + production_time: 4s + name: Make Calcite + type: PRODUCTION + input: + bone: + material: BONE + amount: 16 + coal: + material: COAL + amount: 16 + output: + calcite: + material: CALCITE + amount: 64 + make_cobbled_deepslate: + production_time: 4s + name: Make Cobbled Deepslate + type: PRODUCTION + input: + cobblestone: + material: COBBLESTONE + amount: 64 + output: + cobbled_deepslate: + material: COBBLED_DEEPSLATE + amount: 64 + make_tuff: + production_time: 4s + name: Make Tuff + type: PRODUCTION + input: + cobblestone: + material: COBBLESTONE + amount: 64 + lava: + material: LAVA_BUCKET + amount: 1 + output: + tuff: + material: TUFF + amount: 64 + bucket: + material: BUCKET + amount: 1 crush_coarse: production_time: 4s name: Crush Coarse Dirt @@ -5949,8 +6199,142 @@ recipes: leather: material: LEATHER amount: 4 - health_gained: 10000 - + health_gained: 10000 + wax_copper_block: + production_time: 4s + name: Wax Copper Block + type: PRODUCTION + input: + copper_block: + material: COPPER_BLOCK + amount: 64 + honeycomb: + material: HONEYCOMB + amount: 4 + output: + waxed_copper_block: + material: WAXED_COPPER_BLOCK + amount: 64 + wax_exposed_copper: + production_time: 4s + name: Wax Exposed Copper + type: PRODUCTION + input: + exposed_copper: + material: EXPOSED_COPPER + amount: 64 + honeycomb: + material: HONEYCOMB + amount: 4 + output: + waxed_exposed_copper: + material: WAXED_EXPOSED_COPPER + amount: 64 + wax_weathered_copper: + production_time: 4s + name: Wax Weathered Copper + type: PRODUCTION + input: + weathered_copper: + material: WEATHERED_COPPER + amount: 64 + honeycomb: + material: HONEYCOMB + amount: 4 + output: + waxed_weathered_copper: + material: WAXED_WEATHERED_COPPER + amount: 64 + wax_oxidized_copper: + production_time: 4s + name: Wax Oxidized Copper + type: PRODUCTION + input: + oxidized_copper: + material: OXIDIZED_COPPER + amount: 64 + honeycomb: + material: HONEYCOMB + amount: 4 + output: + waxed_oxidized_copper: + material: WAXED_OXIDIZED_COPPER + amount: 64 + weather_copper_block: + production_time: 4s + name: Weather Copper Block + type: PRODUCTION + input: + copper_Block: + material: COPPER_BLOCK + amount: 64 + water_bucket: + material: WATER_BUCKET + amount: 1 + output: + exposed_copper: + material: EXPOSED_COPPER + amount: 64 + bucket: + material: BUCKET + amount: 1 + weather_exposed_copper: + production_time: 4s + name: Weather Exposed Copper + type: PRODUCTION + input: + exposed_copper: + material: EXPOSED_COPPER + amount: 64 + water_bucket: + material: WATER_BUCKET + amount: 1 + output: + weathered_copper: + material: WEATHERED_COPPER + amount: 64 + bucket: + material: BUCKET + amount: 1 + weather_weathered_copper: + production_time: 4s + name: Weather Weathered Copper + type: PRODUCTION + input: + weathered_copper: + material: WEATHERED_COPPER + amount: 64 + water_bucket: + material: WATER_BUCKET + amount: 1 + output: + oxidized_copper: + material: OXIDIZED_COPPER + amount: 64 + bucket: + material: BUCKET + amount: 1 + repair_copper_workshop: + production_time: 4s + name: Repair Factory + type: REPAIR + input: + copper_block: + material: COPPER_BLOCK + amount: 16 + exposed_copper: + material: EXPOSED_COPPER + amount: 16 + weathered_copper: + material: WEATHERED_COPPER + amount: 16 + oxidized_copper: + material: OXIDIZED_COPPER + amount: 16 + honeycomb: + material: HONEYCOMB + amount: 16 + health_gained: 10000 bind_books: type: PRODUCTION name: Bind Books diff --git a/templates/public/plugins/HiddenOre/config.yml.j2 b/templates/public/plugins/HiddenOre/config.yml.j2 index 6b06fff9..d21e9738 100644 --- a/templates/public/plugins/HiddenOre/config.yml.j2 +++ b/templates/public/plugins/HiddenOre/config.yml.j2 @@ -82,6 +82,7 @@ blocks: dropList: - coal_ore_transform - iron_ore_transform + - copper_ore_transform - redstone_ore_transform - gold_ore_transform - lapis_ore_transform @@ -204,17 +205,28 @@ drops: amount: 1 minY: 1 maxY: 256 - chance: 0.015 + chance: 0.0083 minAmount: 1 maxAmount: 4 transformIfAble: true biomes: MESA: - chance: 0.01 + chance: 0.0055 MESA_ROCK: - chance: 0.01 + chance: 0.0055 MESA_CLEAR_ROCK: - chance: 0.01 + chance: 0.0055 + copper_ore_transform: + package: + - ==: org.bukkit.inventory.ItemStack + type: COPPER_ORE + amount: 1 + minY: 1 + maxY: 96 + chance: 0.0035 + minAmount: 2 + maxAmount: 6 + transformIfAble: true gold_ore_transform: package: - ==: org.bukkit.inventory.ItemStack @@ -222,7 +234,7 @@ drops: amount: 1 minY: 1 maxY: 70 - chance: 0.0035 + chance: 0.0019 minAmount: 1 maxAmount: 4 transformIfAble: true diff --git a/templates/public/plugins/JukeAlert/config.yml.j2 b/templates/public/plugins/JukeAlert/config.yml.j2 index 39934ded..808a51f7 100644 --- a/templates/public/plugins/JukeAlert/config.yml.j2 +++ b/templates/public/plugins/JukeAlert/config.yml.j2 @@ -54,7 +54,7 @@ snitchConfigs: database: - ==: vg.civcraft.mc.civmodcore.dao.ManagedDatasource + ==: vg.civcraft.mc.civmodcore.dao.DatabaseCredentials plugin: JukeAlert user: '{{ mysql_user }}' password: '{{ mysql_non_root_pass }}' diff --git a/templates/public/plugins/MemeMana/config.yml.j2 b/templates/public/plugins/MemeMana/config.yml.j2 deleted file mode 100644 index 7bd4e6de..00000000 --- a/templates/public/plugins/MemeMana/config.yml.j2 +++ /dev/null @@ -1,18 +0,0 @@ -mysql: - user: '{{ mysql_user }}' - password: '{{ mysql_non_root_pass }}' - host: '{{ mysql_host }}' - database: '{{ mysql_db_name }}' - port: 3306 - poolsize: 10 - connectionTimeout: 10000 - idleTimout: 600000 - maxLifetime: 7200000 -manaRotTime: 30d -manaGainTimeout: 22h -maximumDailyMana: 0 -pearlRefillAmount: - EXILE: 84 # 1344 pearl hp units per week divided by 16 mana per week = 84 pearl hp units per mana - PRISON: 21 # 1344 pearl hp units per week divided by 64 mana per week = 21 pearl hp units per mana -pearlUpgradeAmount: 64 - diff --git a/templates/public/plugins/RealisticBiomes/config.yml.j2 b/templates/public/plugins/RealisticBiomes/config.yml.j2 index 6c36121d..342e2dda 100644 --- a/templates/public/plugins/RealisticBiomes/config.yml.j2 +++ b/templates/public/plugins/RealisticBiomes/config.yml.j2 @@ -668,7 +668,7 @@ plants: freshwater: 0.5 database: - ==: vg.civcraft.mc.civmodcore.dao.ManagedDatasource + ==: vg.civcraft.mc.civmodcore.dao.DatabaseCredentials plugin: RealisticBiomes user: '{{ mysql_user }}' password: '{{ mysql_non_root_pass }}' diff --git a/templates/public/plugins/SimpleAdminHacks/config.yml.j2 b/templates/public/plugins/SimpleAdminHacks/config.yml.j2 index c316cbe3..6b5c05e8 100644 --- a/templates/public/plugins/SimpleAdminHacks/config.yml.j2 +++ b/templates/public/plugins/SimpleAdminHacks/config.yml.j2 @@ -90,7 +90,7 @@ hacks: - '["",{"text":"[CivClassic] ","color":"gold"},{"text":"Type /g ! to join global chat","color":"green"}]' - '["",{"text":"[CivClassic] ","color":"gold"},{"text":"Type /vote to vote for CivClassic and receive essence!","color":"green"}]' - '["",{"text":"[CivClassic] ","color":"gold"},{"text":"Gold blocks work as elevators, shift to go down and spacebar to go up","color":"green"}]' - - '["",{"text":"[CivClassic] ","color":"gold"},{"text":"For the best experience use 1.16.5 - other versions are not officially supported","color":"green"}]' + - '["",{"text":"[CivClassic] ","color":"gold"},{"text":"For the best experience use 1.17.1 - other versions are not officially supported","color":"green"}]' - '["",{"text":"[CivClassic] ","color":"gold"},{"text":"Do not put buttons or signs over an elevator - or it will be blocked and you will not be able to teleport back to that block!","color":"green"}]' - '["",{"text":"[CivClassic] ","color":"gold"},{"text":"Consider donating to the server at patreon.com/civclassic!","color":"green","clickEvent":{"action":"open_url","value":"https://www.patreon.com/civclassic"}}]' - '["",{"text":"[CivClassic] ","color":"gold"},{"text":"Diamonds spawn in big veins - all other ores spawns randomly as you dig","color":"green"}]' diff --git a/variables/all.yml b/variables/all.yml index fb41cb6b..3d89581d 100644 --- a/variables/all.yml +++ b/variables/all.yml @@ -33,10 +33,10 @@ shard_mem: 52G bungee_mem: 2048M #Use PaperMC instead of Spigot? -use_paper: false +use_paper: true #Use Tuinity instead of Spigot or Paper? IF USING THIS SETTING, SET PAPER TO FALSE -use_tuinity: true +use_tuinity: false #Mysql socket location, you likely want to changes this something like "/var/run/mysqld/mysqld.sock". You can find the correct path in '/etc/my.cnf' under [mysqld] --> socket mysql_socket_location: "/var/run/mysqld/mysqld.sock" @@ -129,21 +129,21 @@ bungee_top_level_templates: bungee_secret_top_level_templates: #Minecraft version -mc_version: "1.16.5" +mc_version: "1.17.1" #Version of PaperMC to use -paper_version: "581" +paper_version: "233" #Version of Tuinity to use -tuinity_version: "234" +tuinity_version: "31" #Raw Bungee version, used in the URL of Waterfall downloads -raw_bungee_version: 1.16 +raw_bungee_version: 1.17 #Specific waterfall version to use -waterfall_version: 415 +waterfall_version: 448 #URL to pull BuildTools from for building Spigot spigot_url: "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar" #URL to pull Paper build from paper_url: "https://papermc.io/api/v2/projects/paper/versions/{{ mc_version }}/builds/{{ paper_version }}/downloads/paper-{{ mc_version }}-{{ paper_version }}.jar" #URL to pull Tuinity build from -tuinity_url: "https://ci.codemc.io/job/Spottedleaf/job/Tuinity/{{ tuinity_version }}/artifact/tuinity-paperclip.jar" +tuinity_url: "https://ci.codemc.io/job/Spottedleaf/job/Tuinity-1.17/{{ tuinity_version }}/artifact/tuinity-paperclip.jar" #URL to pull bungeecord/waterfall build from bungee_url: "https://papermc.io/api/v2/projects/waterfall/versions/{{ raw_bungee_version }}/builds/{{ waterfall_version }}/downloads/waterfall-{{ raw_bungee_version }}-{{ waterfall_version }}.jar" #Name of the final server jar put into the server folder