Add splashOxidize rule

RubixDev · Jun 27, 2022 · 7da491f · 7da491f
1 parent 74bbf89
commit 7da491f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 0 deletions.
diff --git a/src/main/java/de/rubixdev/rug/RugSettings.java b/src/main/java/de/rubixdev/rug/RugSettings.java
@@ -1256,6 +1256,12 @@ public String description() {
         category = { SURVIVAL, CRAFTING, BUGFIX, RUG }
     )
     public static boolean missingCobbleRecipes = false;
+
+    @Rule(
+        desc = "Copper blocks oxidize one stage when hit with a water bottle",
+        category = { FEATURE, DISPENSER, SURVIVAL, RUG }
+    )
+    public static boolean splashOxidize = false;
 }
 
 // BUGFIX

diff --git a/src/main/java/de/rubixdev/rug/mixins/PotionEntityMixin.java b/src/main/java/de/rubixdev/rug/mixins/PotionEntityMixin.java
@@ -0,0 +1,35 @@
+package de.rubixdev.rug.mixins;
+
+import de.rubixdev.rug.RugSettings;
+import net.minecraft.block.*;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.projectile.thrown.PotionEntity;
+import net.minecraft.entity.projectile.thrown.ThrownEntity;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Optional;
+
+@Mixin(PotionEntity.class)
+public abstract class PotionEntityMixin extends ThrownEntity {
+    protected PotionEntityMixin(EntityType<? extends ThrownEntity> entityType, World world) {
+        super(entityType, world);
+    }
+
+    @Inject(method = "onBlockHit", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/projectile/thrown/PotionEntity;extinguishFire(Lnet/minecraft/util/math/BlockPos;)V", ordinal = 0))
+    private void ageCopper(BlockHitResult blockHitResult, CallbackInfo ci) {
+        BlockPos blockPos = blockHitResult.getBlockPos();
+        BlockState blockState = this.world.getBlockState(blockPos);
+        Block block = blockState.getBlock();
+
+        if (block instanceof Oxidizable && RugSettings.splashOxidize) {
+            Optional<BlockState> oxidized = ((Oxidizable) block).getDegradationResult(blockState);
+            oxidized.ifPresent(state -> this.world.setBlockState(blockPos, state));
+        }
+    }
+}
diff --git a/src/main/resources/rug.mixins.json b/src/main/resources/rug.mixins.json
@@ -45,6 +45,7 @@
     "PistonHandlerMixin",
     "PlayerEntityMixin",
     "PointedDripstoneBlockMixin",
+    "PotionEntityMixin",
     "PressurePlateBlockMixin",
     "RedstoneLampBlockMixin",
     "RepeaterBlockMixin",