Merge pull request #138

4.1.9a

.github/workflows/publish.yml

@@ -10,8 +10,8 @@ on:
 env:
   MINECRAFT_VERSION: 1.20.1
   JAVA_VERSION: 17
-  VERSION: 4.1.8+1.20.1
-  VERSION_TYPE: beta
+  VERSION: 4.1.9+1.20.1
+  VERSION_TYPE: alpha
 
 permissions:
   contents: write

CHANGELOG.md

@@ -1,3 +1,2 @@
-- Fixed evokers always being replaced by illusioners in raids.
-  - Note that this spell is not affected by havens right now.
-- 
+- Spells now decay over time
+- Fixed turboChickens being utterly broken

gradle.properties

@@ -6,7 +6,7 @@ minecraft_version=1.20.1
 yarn_mappings=1.20.1+build.10
 loader_version=0.15.0
 # Mod Properties
-mod_version=4.1.8+1.20.1
+mod_version=4.1.9+1.20.1
 maven_group=com.skycat
 archives_base_name=mystical
 modid=mystical

src/main/generated/assets/mystical/lang/en_us.json

@@ -25,22 +25,28 @@
   "text.config.mysticalConfig.enum.logLevel.info": "Info",
   "text.config.mysticalConfig.enum.logLevel.off": "No logging",
   "text.config.mysticalConfig.enum.logLevel.warn": "Warn",
+  "text.config.mysticalConfig.option.aggressiveGolems.change": "% chance",
   "text.config.mysticalConfig.option.aggressiveGolems.enabled": "Enable?",
   "text.config.mysticalConfig.option.aggressiveGolems.logLevel": "Logging",
   "text.config.mysticalConfig.option.aggressiveGolems.weight": "Weight",
+  "text.config.mysticalConfig.option.bigCreeperExplosion.change": "% chance",
   "text.config.mysticalConfig.option.bigCreeperExplosion.enabled": "Enable?",
   "text.config.mysticalConfig.option.bigCreeperExplosion.logLevel": "Logging",
   "text.config.mysticalConfig.option.bigCreeperExplosion.weight": "Weight",
+  "text.config.mysticalConfig.option.catVariantChange.change": "% chance",
   "text.config.mysticalConfig.option.catVariantChange.enabled": "Enable?",
   "text.config.mysticalConfig.option.catVariantChange.logLevel": "Logging",
   "text.config.mysticalConfig.option.catVariantChange.weight": "Weight",
   "text.config.mysticalConfig.option.devMode": "Dev mode",
+  "text.config.mysticalConfig.option.disableDaylightBurning.change": "% chance",
   "text.config.mysticalConfig.option.disableDaylightBurning.enabled": "Enable?",
   "text.config.mysticalConfig.option.disableDaylightBurning.logLevel": "Logging",
   "text.config.mysticalConfig.option.disableDaylightBurning.weight": "Weight",
+  "text.config.mysticalConfig.option.enderTypeChange.change": "% chance",
   "text.config.mysticalConfig.option.enderTypeChange.enabled": "Enable?",
   "text.config.mysticalConfig.option.enderTypeChange.logLevel": "Logging",
   "text.config.mysticalConfig.option.enderTypeChange.weight": "Weight",
+  "text.config.mysticalConfig.option.explosionsInfest.change": "% chance",
   "text.config.mysticalConfig.option.explosionsInfest.enabled": "Enable?",
   "text.config.mysticalConfig.option.explosionsInfest.logLevel": "Logging",
   "text.config.mysticalConfig.option.explosionsInfest.weight": "Weight",
@@ -49,56 +55,75 @@
   "text.config.mysticalConfig.option.failedToLoadSpellHandlerLogLevel": "Failed to load spell handler",
   "text.config.mysticalConfig.option.failedToSaveSpellHandlerLogLevel": "Failed to save spell manager",
   "text.config.mysticalConfig.option.failedToSetNightTimerLogLevel": "Failed to set night timer",
+  "text.config.mysticalConfig.option.fishingRodLaunch.change": "% chance",
   "text.config.mysticalConfig.option.fishingRodLaunch.enabled": "Enable?",
   "text.config.mysticalConfig.option.fishingRodLaunch.logLevel": "Logging",
   "text.config.mysticalConfig.option.fishingRodLaunch.weight": "Weight",
+  "text.config.mysticalConfig.option.illusionersReplaceEvokers.change": "% chance",
   "text.config.mysticalConfig.option.illusionersReplaceEvokers.enabled": "Enable?",
   "text.config.mysticalConfig.option.illusionersReplaceEvokers.logLevel": "Logging",
   "text.config.mysticalConfig.option.illusionersReplaceEvokers.weight": "Weight",
+  "text.config.mysticalConfig.option.levitate.change": "% chance",
   "text.config.mysticalConfig.option.levitate.enabled": "Enable?",
   "text.config.mysticalConfig.option.levitate.logLevel": "Logging",
   "text.config.mysticalConfig.option.levitate.weight": "Weight",
+  "text.config.mysticalConfig.option.mobSpawnSwap.change": "% chance",
   "text.config.mysticalConfig.option.mobSpawnSwap.enabled": "Enable?",
   "text.config.mysticalConfig.option.mobSpawnSwap.logLevel": "Logging",
   "text.config.mysticalConfig.option.mobSpawnSwap.weight": "Weight",
   "text.config.mysticalConfig.option.newSpellCommandBroadcast": "New spell command (in-game)",
   "text.config.mysticalConfig.option.newSpellCommandLogLevel": "New spell command (console)",
+  "text.config.mysticalConfig.option.noFuse.change": "% chance",
   "text.config.mysticalConfig.option.noFuse.enabled": "Enable?",
   "text.config.mysticalConfig.option.noFuse.logLevel": "Logging",
   "text.config.mysticalConfig.option.noFuse.weight": "Weight",
+  "text.config.mysticalConfig.option.oneStrikeWardens.change": "% chance",
   "text.config.mysticalConfig.option.oneStrikeWardens.enabled": "Enable?",
   "text.config.mysticalConfig.option.oneStrikeWardens.logLevel": "Logging",
   "text.config.mysticalConfig.option.oneStrikeWardens.weight": "Weight",
+  "text.config.mysticalConfig.option.randomCreeperEffectClouds.change": "% chance",
   "text.config.mysticalConfig.option.randomCreeperEffectClouds.enabled": "Enable?",
   "text.config.mysticalConfig.option.randomCreeperEffectClouds.logLevel": "Logging",
   "text.config.mysticalConfig.option.randomCreeperEffectClouds.weight": "Weight",
+  "text.config.mysticalConfig.option.randomEvokerSummons.change": "% chance",
   "text.config.mysticalConfig.option.randomEvokerSummons.enabled": "Enable?",
   "text.config.mysticalConfig.option.randomEvokerSummons.logLevel": "Logging",
   "text.config.mysticalConfig.option.randomEvokerSummons.weight": "Weight",
+  "text.config.mysticalConfig.option.randomTreeType.change": "% chance",
   "text.config.mysticalConfig.option.randomTreeType.enabled": "Enable?",
   "text.config.mysticalConfig.option.randomTreeType.logLevel": "Logging",
   "text.config.mysticalConfig.option.randomTreeType.weight": "Weight",
+  "text.config.mysticalConfig.option.sheepColorChange.change": "% chance",
   "text.config.mysticalConfig.option.sheepColorChange.enabled": "Enable?",
   "text.config.mysticalConfig.option.sheepColorChange.logLevel": "Logging",
   "text.config.mysticalConfig.option.sheepColorChange.weight": "Weight",
+  "text.config.mysticalConfig.option.skeletonTypeChange.change": "% chance",
   "text.config.mysticalConfig.option.skeletonTypeChange.enabled": "Enable?",
   "text.config.mysticalConfig.option.skeletonTypeChange.logLevel": "Logging",
   "text.config.mysticalConfig.option.skeletonTypeChange.weight": "Weight",
   "text.config.mysticalConfig.option.spellContributionLogLevel": "Spell contribution",
+  "text.config.mysticalConfig.option.spellDecay": "Spell decay (%)",
+  "text.config.mysticalConfig.option.spellDecay.tooltip": "How much spells will decay each night.",
+  "text.config.mysticalConfig.option.spellDecayLinear": "Decay spells linearly?",
+  "text.config.mysticalConfig.option.spellDecayLinear.tooltip": "If true, spells will decay based on the full requirement of the spell.\nIf false, they will decay based on what's left.",
   "text.config.mysticalConfig.option.spellMaxHard": "Max spells (Hard)",
   "text.config.mysticalConfig.option.spellMaxHard.tooltip": "The maximum number of spells active at a time.\nMystical will not delete extra spells, but won't make any past this point.",
   "text.config.mysticalConfig.option.spellMinHard": "Min spells (Hard)",
   "text.config.mysticalConfig.option.spellMinHard.tooltip": "The minimum number of spells active at a time.\nMystical will make sure there are this many spells active whenever spell rewards are paid out.",
   "text.config.mysticalConfig.option.timeOfDayAtStartupLogLevel": "Time of day at startup",
+  "text.config.mysticalConfig.option.turboChickens.change": "% chance",
   "text.config.mysticalConfig.option.turboChickens.enabled": "Enable?",
   "text.config.mysticalConfig.option.turboChickens.logLevel": "Logging",
   "text.config.mysticalConfig.option.turboChickens.weight": "Weight",
+  "text.config.mysticalConfig.option.turboMobs.change": "% chance",
   "text.config.mysticalConfig.option.turboMobs.enabled": "Enable?",
   "text.config.mysticalConfig.option.turboMobs.logLevel": "Logging",
   "text.config.mysticalConfig.option.turboMobs.weight": "Weight",
+  "text.config.mysticalConfig.option.unbreakableLocation.change": "% chance",
   "text.config.mysticalConfig.option.unbreakableLocation.enabled": "Enable?",
   "text.config.mysticalConfig.option.unbreakableLocation.logLevel": "Logging",
   "text.config.mysticalConfig.option.unbreakableLocation.weight": "Weight",
+  "text.config.mysticalConfig.option.zombieTypeChange.change": "% chance",
   "text.config.mysticalConfig.option.zombieTypeChange.enabled": "Enable?",
   "text.config.mysticalConfig.option.zombieTypeChange.logLevel": "Logging",
   "text.config.mysticalConfig.option.zombieTypeChange.weight": "Weight",
@@ -195,6 +220,11 @@
   "text.mystical.consequence.zombieTypeChange.fired": "Spell zombieTypeChange: Zombie type changed..",
   "text.mystical.consequence.zombieTypeChange.longName": "Zombie Type Change",
   "text.mystical.consequence.zombieTypeChange.shortName": "zombieTypeChange",
+  "text.mystical.events.cureSpell": "1 spell was cured this night.",
+  "text.mystical.events.cureSpells": "%d spells were cured this night.",
+  "text.mystical.events.newSpell": "1 new spell fell over the world.",
+  "text.mystical.events.newSpells": "%d new spells fell over the world.",
+  "text.mystical.events.spellsChange": "The world shifts...",
   "text.mystical.logging.failedToGetRandomBlock": "Failed to get random block, using a command block instead.",
   "text.mystical.logging.failedToLoadHavenManager": "Failed to load haven manager, making a new one instead.",
   "text.mystical.logging.failedToLoadSpellHandler": "Failed to load spell handler, making a new one instead.",