Fix (#46)

Crystal-Nest · Jun 21, 2024 · a1c6675 · a1c6675
1 parent 881873e
commit a1c6675
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/common/src/main/java/it/crystalnest/soul_fire_d/api/Fire.java b/common/src/main/java/it/crystalnest/soul_fire_d/api/Fire.java
@@ -17,7 +17,9 @@
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.StandingAndWallBlockItem;
+import net.minecraft.world.item.enchantment.ArrowFireEnchantment;
 import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.FireAspectEnchantment;
 import net.minecraft.world.level.block.Block;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -258,12 +260,12 @@ public static final class Component<R, T extends R> {
     /**
      * Fire Aspect enchantment component.
      */
-    public static final Component<Enchantment, FireTypedFireAspectEnchantment> FIRE_ASPECT_ENCHANTMENT = new Component<>(Registry.ENCHANTMENT_REGISTRY, "_fire_aspect");
+    public static final Component<Enchantment, FireAspectEnchantment> FIRE_ASPECT_ENCHANTMENT = new Component<>(Registry.ENCHANTMENT_REGISTRY, "_fire_aspect");
 
     /**
      * Flame enchantment component.
      */
-    public static final Component<Enchantment, FireTypedFlameEnchantment> FLAME_ENCHANTMENT = new Component<>(Registry.ENCHANTMENT_REGISTRY, "_flame");
+    public static final Component<Enchantment, ArrowFireEnchantment> FLAME_ENCHANTMENT = new Component<>(Registry.ENCHANTMENT_REGISTRY, "_flame");
 
     /**
      * Registry key where the value associated to this component is stored.
@@ -752,14 +754,18 @@ public Builder reset(String fireId) {
     public Fire build() throws IllegalStateException {
       if (FireManager.isValidFireId(fireId) && FireManager.isValidModId(modId)) {
         ResourceLocation fireType = FireManager.sanitize(modId, fireId);
-        if (fireAspectConfigurator != null && fireAspectConfigurator.isEmpty()) {
-          fireAspectConfigurator = Optional.of(builder -> builder);
+        if (fireAspectConfigurator != null) {
+          if (fireAspectConfigurator.isEmpty()) {
+            fireAspectConfigurator = Optional.of(builder -> builder);
+          }
+          components.put(Component.FIRE_ASPECT_ENCHANTMENT, register(fireType, fireAspectConfigurator, FireAspectBuilder::new));
         }
-        if (flameConfigurator != null && flameConfigurator.isEmpty()) {
-          flameConfigurator = Optional.of(builder -> builder);
+        if (flameConfigurator != null) {
+          if (flameConfigurator.isEmpty()) {
+            flameConfigurator = Optional.of(builder -> builder);
+          }
+          components.put(Component.FLAME_ENCHANTMENT, register(fireType, flameConfigurator, FlameBuilder::new));
         }
-        components.put(Component.FIRE_ASPECT_ENCHANTMENT, register(fireType, fireAspectConfigurator, FireAspectBuilder::new));
-        components.put(Component.FLAME_ENCHANTMENT, register(fireType, flameConfigurator, FlameBuilder::new));
         return new Fire(fireType, light, damage, invertHealAndHarm, canRainDouse, inFire, onFire, behavior, components);
       }
       throw new IllegalStateException("Attempted to build a Fire with a non-valid fireId [" + fireId + "] or modId [" + modId + "].");

diff --git a/common/src/main/java/it/crystalnest/soul_fire_d/mixin/AbstractArrowMixin.java b/common/src/main/java/it/crystalnest/soul_fire_d/mixin/AbstractArrowMixin.java
@@ -28,8 +28,7 @@ public abstract class AbstractArrowMixin implements FireTypeChanger {
    */
   @Redirect(method = "onHitEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;setSecondsOnFire(I)V"))
   private void redirectSetSecondsOnFire(Entity caller, int seconds) {
-    FireTypedFlameEnchantment flame = FireManager.getComponent(getFireType(), Fire.Component.FLAME_ENCHANTMENT);
-    FireManager.setOnFire(caller, flame != null ? flame.duration(((Projectile) (Object) this).getOwner(), caller, seconds) : seconds, getFireType());
+    FireManager.setOnFire(caller, FireManager.getComponent(getFireType(), Fire.Component.FLAME_ENCHANTMENT) instanceof FireTypedFlameEnchantment flame ? flame.duration(((Projectile) (Object) this).getOwner(), caller, seconds) : seconds, getFireType());
   }
 
   /**