Added an option to remove source blocks with the canteen. Closes #666

Glitchfiend · Jan 8, 2024 · a4d19c8 · a4d19c8
1 parent f5053d9
commit a4d19c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/common/src/main/java/toughasnails/config/ThirstConfig.java b/common/src/main/java/toughasnails/config/ThirstConfig.java
@@ -14,6 +14,7 @@ public class ThirstConfig extends Config
 {
     public boolean enableThirst;
     public boolean enableHandDrinking;
+    public boolean removeSourceBlocks;
     public boolean thirstPreventSprint;
     public boolean thirstPreventHealthRegen;
     public double thirstExhaustionThreshold;
@@ -31,6 +32,7 @@ public void load()
         // Toggles
         enableThirst = add("toggles.enable_thirst", true, "Enable or disable thirst.");
         enableHandDrinking = add("toggles.enable_hand_drinking", false, "Enable or disable hand drinking.");
+        removeSourceBlocks = add("toggles.remove_source_blocks", false, "Remove source blocks when filling the canteen.");
         thirstPreventSprint = add("toggles.thirst_prevent_sprint", true, "Prevent sprinting when thirsty.");
         thirstPreventHealthRegen = add("toggles.thirst_prevent_health_regen", true, "Prevent health regeneration when thirsty.");
 

diff --git a/common/src/main/java/toughasnails/item/EmptyCanteenItem.java b/common/src/main/java/toughasnails/item/EmptyCanteenItem.java
@@ -20,6 +20,7 @@
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.LayeredCauldronBlock;
 import net.minecraft.world.level.block.state.BlockState;
@@ -30,6 +31,7 @@
 import toughasnails.api.enchantment.TANEnchantments;
 import toughasnails.api.item.TANItems;
 import toughasnails.block.RainCollectorBlock;
+import toughasnails.init.ModConfig;
 import toughasnails.init.ModTags;
 
 public class EmptyCanteenItem extends Item
@@ -89,6 +91,9 @@ else if (level.getFluidState(pos).is(FluidTags.WATER))
                     // Fill the canteen with water in the world
                     level.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F);
 
+                    if (ModConfig.thirst.removeSourceBlocks)
+                        level.setBlock(pos, Blocks.AIR.defaultBlockState(), Block.UPDATE_ALL_IMMEDIATE);
+
                     Holder<Biome> biome = player.level().getBiome(player.blockPosition());
                     Item canteenItem;