Exploit fixes for media_consumption attribute

CHANGELOG.md

@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [UNRELEASED]
 
+### Added
+
+- Added the `cannot_modify_cost` tag for patterns that should ignore the `media_consumption` attribute when calculating cost, by Robotgiggle in [987](https://github.com/FallingColors/HexMod/pull/987)
+
+### Changed
+
+- Changed the `media_consumption` attribute to only apply to player-based casting, by Robotgiggle in [987](https://github.com/FallingColors/HexMod/pull/987)
+
 ### Fixed
 
 - Fixed a crash loop when trying to generate a creative-mode ancient scroll for a Great Spell whose per-world pattern hasn't been calculated yet, by Robotgiggle in [992](https://github.com/FallingColors/HexMod/pull/992).

Common/src/main/java/at/petrak/hexcasting/api/casting/eval/CastingEnvironment.java

@@ -2,6 +2,7 @@
 
 import at.petrak.hexcasting.api.casting.ParticleSpray;
 import at.petrak.hexcasting.api.casting.PatternShapeMatch;
+import at.petrak.hexcasting.api.casting.eval.env.PlayerBasedCastEnv;
 import at.petrak.hexcasting.api.casting.eval.vm.CastingImage;
 import at.petrak.hexcasting.api.casting.mishaps.Mishap;
 import at.petrak.hexcasting.api.casting.mishaps.MishapBadLocation;
@@ -186,11 +187,20 @@ public <T extends CastingEnvironmentComponent> T getExtension(@NotNull CastingEn
     public void precheckAction(PatternShapeMatch match) throws Mishap {
         // TODO: this doesn't let you select special handlers.
         // Might be worth making a "no casting" tag on each thing
-        ResourceLocation key = actionKey(match);
+        ResourceLocation loc = actionKey(match);
 
-        if (!HexConfig.server().isActionAllowed(key)) {
-            throw new MishapDisallowedSpell("disallowed", key);
+        if (!HexConfig.server().isActionAllowed(loc)) {
+            throw new MishapDisallowedSpell("disallowed", loc);
         }
+
+        costModifier = this.checkCostModifier(loc);
+    }
+
+    /**
+     * Casting env subclasses can override this to modify the cost for a given action
+     */
+    protected double checkCostModifier(ResourceLocation loc) {
+        return 1.0;
     }
 
     @Nullable
@@ -241,16 +251,16 @@ public boolean isEnlightened() {
         return false;
     }
 
+    protected double costModifier = 1.0;
+
     /**
      * Attempt to extract the given amount of media. Returns the amount of media left in the cost.
      * <p>
      * If there was enough media found, it will return less or equal to zero; if there wasn't, it will be
      * positive.
      */
     public long extractMedia(long cost, boolean simulate) {
-        if (this.getCastingEntity() != null){
-            cost = (long) (cost * this.getCastingEntity().getAttributeValue(HexAttributes.MEDIA_CONSUMPTION_MODIFIER));
-        }
+        cost = (long) (cost * costModifier);
         for (var extractMediaComponent : preMediaExtract)
             cost = extractMediaComponent.onExtractMedia(cost, simulate);
         cost = extractMediaEnvironment(cost, simulate);

Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/PlayerBasedCastEnv.java

@@ -11,6 +11,7 @@
 import at.petrak.hexcasting.api.casting.mishaps.Mishap;
 import at.petrak.hexcasting.api.mod.HexConfig;
 import at.petrak.hexcasting.api.mod.HexStatistics;
+import at.petrak.hexcasting.api.mod.HexTags;
 import at.petrak.hexcasting.api.pigment.FrozenPigment;
 import at.petrak.hexcasting.api.utils.HexUtils;
 import at.petrak.hexcasting.api.utils.MediaHelper;
@@ -21,6 +22,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.Mth;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Inventory;
@@ -34,6 +36,7 @@
 import java.util.function.Predicate;
 
 import static at.petrak.hexcasting.api.HexAPI.modLoc;
+import static at.petrak.hexcasting.api.utils.HexUtils.isOfTag;
 
 public abstract class PlayerBasedCastEnv extends CastingEnvironment {
     public static final double DEFAULT_AMBIT_RADIUS = 32.0;
@@ -62,6 +65,14 @@ public ServerPlayer getCaster() {
         return this.caster;
     }
 
+    @Override
+    protected double checkCostModifier(ResourceLocation loc) {
+        if (this.getCastingEntity() != null && !isOfTag(IXplatAbstractions.INSTANCE.getActionRegistry(), loc, HexTags.Actions.CANNOT_MODIFY_COST)) {
+            return this.getCastingEntity().getAttributeValue(HexAttributes.MEDIA_CONSUMPTION_MODIFIER);
+        }
+        return 1.0;
+    }
+
     @Override
     public void postExecution(CastResult result) {
         super.postExecution(result);

Common/src/main/java/at/petrak/hexcasting/api/mod/HexTags.java

@@ -86,6 +86,11 @@ public static final class Actions {
          */
         public static final TagKey<ActionRegistryEntry> CAN_START_ENLIGHTEN = create("can_start_enlighten");
 
+        /**
+         * Actions that should not be affected by the media_consumption attribute
+         */
+        public static final TagKey<ActionRegistryEntry> CANNOT_MODIFY_COST = create("cannot_modify_cost");
+
         public static TagKey<ActionRegistryEntry> create(String name) {
             return TagKey.create(IXplatAbstractions.INSTANCE.getActionRegistry().key(), modLoc(name));
         }

Fabric/src/generated/resources/data/hexcasting/tags/action/cannot_modify_cost.json

@@ -0,0 +1,4 @@
+{
+  "replace": false,
+  "values": []
+}

Forge/src/generated/resources/data/hexcasting/tags/hexcasting/action/cannot_modify_cost.json

@@ -0,0 +1,3 @@
+{
+  "values": []
+}