Option to change spore cloud duration

Author: evanbones

CHANGELOG-LATEST.md

@@ -4,6 +4,7 @@
     - Changes jukebox sound to be non-directional.
 - Setting in music and sounds menu to control jukebox fade distance.
 - Config option to disable Ecologics penguins dropping feathers.
+- Config option to modify Savage & Ravage creeper spore cloud durations.
 
 ### Fixed
 - Swap Arrows can no longer force Withers into boats.

README.md

@@ -38,6 +38,7 @@ Raspberry Core is a client and server mod for Forge 1.19.2. While it was created
 - [Gliders](https://modrinth.com/mod/gliders) is optional.
 - [Neapolitan](https://modrinth.com/mod/neapolitan) is optional.
 - [Quark](https://modrinth.com/mod/quark) is optional.
+- [Savage and Ravage](https://modrinth.com/mod/savage-and-ravage) is optional.
 - [Sully's Mod](https://modrinth.com/mod/sullysmod) is optional.
 - [Upgrade Aquatic](https://modrinth.com/mod/upgrade-aquatic) is optional.
 

build.gradle

@@ -243,6 +243,7 @@ dependencies {
     modImplementation("maven.modrinth:buzzier-bees:$buzzier_bees_version")
     modImplementation("maven.modrinth:autumnity:$autumnity_version")
     modImplementation("maven.modrinth:atmospheric:$atmospheric_version")
+    modImplementation("maven.modrinth:savage-and-ravage:$savage_and_ravage_version")
 
     // Recipe viewers
     modImplementation("dev.emi:emi-forge:${emi_version}+$minecraft_version")

gradle.properties

@@ -1,6 +1,7 @@
 # Done to increase the memory available to Gradle.
 org.gradle.jvmargs=-Xmx1G
 loom.platform = forge
+org.gradle.vfs.watch=true
 
 # Mod properties
 mod_version = 1.11-pre1
@@ -83,6 +84,7 @@ endergetic_version = 4.0.0
 buzzier_bees_version = 5.0.1
 autumnity_version = 4.0.1
 atmospheric_version = 5.1.2
+savage_and_ravage_version = 5.0.5
 
 # Beacons
 better_beacons_version = 4834935

src/main/java/cc/cassian/raspberry/config/ModConfig.java

@@ -67,6 +67,7 @@ public class ModConfig {
     public boolean betterJukeboxes = true;
     public double jukeboxDistance = 64.0;
     public boolean disablePenguinShedding = false;
+    public double creeperSporesDurationModifier = 1.0;
 
     public static void load() {
         if (!Files.exists(configPath())) {

src/main/java/cc/cassian/raspberry/mixin/savageandravage/SporeCloudMixin.java

@@ -0,0 +1,23 @@
+package cc.cassian.raspberry.mixin.savageandravage;
+
+import cc.cassian.raspberry.config.ModConfig;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.teamabnormals.savage_and_ravage.common.entity.projectile.SporeCloud;
+import net.minecraft.world.entity.AreaEffectCloud;
+import net.minecraft.world.entity.player.Player;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(SporeCloud.class)
+public class SporeCloudMixin {
+
+    @WrapOperation(method = "spawnAreaEffectCloud", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/AreaEffectCloud;setDuration(I)V"))
+    private void raspberry_modifySporeDuration(AreaEffectCloud aoe, int duration, Operation<Void> original) {
+        if (ModConfig.get().creeperSporesDurationModifier != 1.0 && ((SporeCloud) (Object) this).getOwner() instanceof Player) {
+            duration = (int) (duration * ModConfig.get().creeperSporesDurationModifier);
+        }
+
+        original.call(aoe, duration);
+    }
+}

src/main/resources/assets/raspberry/lang/en_us.json

@@ -125,6 +125,8 @@
   "config.raspberry.config.disableFaucetSourceBlocks": "Disable waterlogged blocks as valid sources for Faucets",
   "config.raspberry.config.betterJukeboxes": "Playing music in a jukebox fades out vanilla music",
   "config.raspberry.config.disablePenguinShedding": "Disable Ecologics penguin feather shedding",
+  "raspberry.config.creeper_spores_duration_modifier": "Creeper Spore Duration Modifier",
+  "raspberry.config.creeper_spores_duration_modifier.tooltip": "Multiplies the duration of the spore cloud created when a player throws Creeper Spores (0.5 is half duration, 2.0 is double duration).",
 
   "emi.cooking.time_minute": "%s Minute",
   "emi.cooking.time_minutes": "%s Minutes",

src/main/resources/raspberry.mixins.json

@@ -131,6 +131,7 @@
     "quark.QuickArmorSwappingModuleMixin",
     "quark.TrowelItemMixin",
     "quark.WoodPostBlockMixin",
+    "savageandravage.SporeCloudMixin",
     "screenshot_viewer.ScreenshotViewerMixin",
     "spelunkery.PointedDripstoneBlockMixin",
     "spyglass_improvements.EventsHandlerMixin",