fix: extinguish fires when there is no oxygen

src/main/java/dev/galacticraft/mod/mixin/AbstractCandleBlockMixin.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2019-2024 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.mod.mixin;
+
+import dev.galacticraft.api.universe.celestialbody.CelestialBody;
+import net.minecraft.core.Holder;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.AbstractCandleBlock;
+import net.minecraft.world.level.block.Block;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArgs;
+import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
+
+@Mixin(AbstractCandleBlock.class)
+public abstract class AbstractCandleBlockMixin extends Block {
+    public AbstractCandleBlockMixin(Properties settings) {
+        super(settings);
+    }
+
+    @ModifyArgs(method = "onProjectileHit", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/AbstractCandleBlock;setLit(Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Z)V"))
+    protected void onProjectileHit(Args args) {
+        Level level = args.get(0);
+        boolean original = args.get(3);
+        Holder<CelestialBody<?, ?>> holder = level.galacticraft$getCelestialBody();
+        args.set(3, original && (holder == null || holder.value().atmosphere().breathable()));
+    }
+}

src/main/java/dev/galacticraft/mod/mixin/CampfireBlockMixin.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019-2024 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.mod.mixin;
+
+import dev.galacticraft.api.universe.celestialbody.CelestialBody;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.CampfireBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(CampfireBlock.class)
+public abstract class CampfireBlockMixin extends Block {
+    public CampfireBlockMixin(Properties settings) {
+        super(settings);
+    }
+
+    @Override
+    @Deprecated
+    public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean moved) {
+        super.onPlace(state, world, pos, oldState, moved);
+        Holder<CelestialBody<?, ?>> body = world.galacticraft$getCelestialBody();
+        if (body != null && !body.value().atmosphere().breathable()) {
+            world.setBlockAndUpdate(pos, state.setValue(BlockStateProperties.LIT, false));
+            world.addParticle(ParticleTypes.SMOKE, pos.getX(), pos.getY(), pos.getZ(), 0.0D, 0.0D, 0.0D);
+            world.playLocalSound(pos.getX(), pos.getY(), pos.getZ(), SoundEvents.GENERIC_EXTINGUISH_FIRE, SoundSource.BLOCKS, 1.0F, 0.9F, false);
+        }
+    }
+}

src/main/java/dev/galacticraft/mod/mixin/FireChargeItemMixin.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019-2024 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.mod.mixin;
+
+import dev.galacticraft.api.universe.celestialbody.CelestialBody;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.world.item.FireChargeItem;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(FireChargeItem.class)
+public abstract class FireChargeItemMixin extends Item {
+    FireChargeItemMixin() {
+        super(null);
+    }
+
+    @Redirect(method = "useOn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;setBlockAndUpdate(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z"))
+    public boolean useOn(Level level, BlockPos blockPos, BlockState blockState) {
+        Holder<CelestialBody<?, ?>> holder = level.galacticraft$getCelestialBody();
+        if (holder != null && !holder.value().atmosphere().breathable()) {
+            return false;
+        }
+        return level.setBlockAndUpdate(blockPos, blockState);
+    }
+}

src/main/java/dev/galacticraft/mod/mixin/FlintAndSteelItemMixin.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019-2024 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.mod.mixin;
+
+import dev.galacticraft.api.universe.celestialbody.CelestialBody;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.world.item.FlintAndSteelItem;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(FlintAndSteelItem.class)
+public abstract class FlintAndSteelItemMixin extends Item {
+    FlintAndSteelItemMixin() {
+        super(null);
+    }
+
+    @Redirect(method = "useOn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"))
+    public boolean useOn(Level level, BlockPos blockPos, BlockState blockState, int n) {
+        Holder<CelestialBody<?, ?>> holder = level.galacticraft$getCelestialBody();
+        if (holder != null && !holder.value().atmosphere().breathable()) {
+            return false;
+        }
+        return level.setBlock(blockPos, blockState, n);
+    }
+}

src/main/java/dev/galacticraft/mod/mixin/LanternBlockMixin.java

@@ -48,7 +48,7 @@ public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldS
         super.onPlace(state, world, pos, oldState, moved);
         Holder<CelestialBody<?, ?>> holder = world.galacticraft$getCelestialBody();
         if (holder != null && !holder.value().atmosphere().breathable()) {
-            if (state.getBlock() == Blocks.LANTERN) {
+            if (state.getBlock() instanceof LanternBlock lantern && lantern != GCBlocks.GLOWSTONE_LANTERN) {
                 world.setBlockAndUpdate(pos, GCBlocks.UNLIT_LANTERN.defaultBlockState().setValue(LanternBlock.HANGING, state.getValue(LanternBlock.HANGING)).setValue(LanternBlock.WATERLOGGED, state.getValue(LanternBlock.WATERLOGGED)));
             }
             world.addParticle(ParticleTypes.SMOKE, pos.getX(), pos.getY(), pos.getZ(), 0.0D, 0.0D, 0.0D);

src/main/java/dev/galacticraft/mod/mixin/TorchBlockMixin.java

@@ -49,9 +49,9 @@ public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldS
         super.onPlace(state, world, pos, oldState, moved);
         Holder<CelestialBody<?, ?>> body = world.galacticraft$getCelestialBody();
         if (body != null && !body.value().atmosphere().breathable()) {
-            if (state.getBlock() == Blocks.TORCH) {
+            if (state.getBlock() instanceof TorchBlock torch && torch != GCBlocks.GLOWSTONE_TORCH) {
                 world.setBlockAndUpdate(pos, GCBlocks.UNLIT_TORCH.defaultBlockState());
-            } else if (state.getBlock() == Blocks.WALL_TORCH) {
+            } else if (state.getBlock() instanceof WallTorchBlock torch && torch != GCBlocks.GLOWSTONE_TORCH) {
                 world.setBlockAndUpdate(pos, GCBlocks.UNLIT_WALL_TORCH.defaultBlockState().setValue(WallTorchBlock.FACING, state.getValue(WallTorchBlock.FACING)));
             }
             world.addParticle(ParticleTypes.SMOKE, pos.getX(), pos.getY(), pos.getZ(), 0.0D, 0.0D, 0.0D);

src/main/resources/galacticraft.mixins.json

@@ -4,13 +4,17 @@
   "plugin": "dev.galacticraft.mod.GalacticraftMixinPlugin",
   "compatibilityLevel": "JAVA_21",
   "mixins": [
+    "AbstractCandleBlockMixin",
     "AbstractContainerMenuAccessor",
     "AbstractSkeletonEntityAccessor",
     "BlockBehaviourMixin",
     "BucketItemAccessor",
     "BucketItemMixin",
+    "CampfireBlockMixin",
     "DimensionTypeMixin",
     "EntityMixin",
+    "FireChargeItemMixin",
+    "FlintAndSteelItemMixin",
     "FlowingFluidMixin",
     "GiveCommandMixin",
     "ItemEntityMixin",