Skip to content

Commit e785733

Browse files
committed
- fixed area mining causing issues with apo
1 parent 107588f commit e785733

File tree

5 files changed

+12
-32
lines changed

5 files changed

+12
-32
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
- fixed heavy attack not multiplying damage
77
- actually enabled NBT Property
88
- fixed crash with minecolonies
9-
- fixed enchantment transformers
9+
- fixed enchantment transformers
10+
- added Save Area Mining Config option to only allow area mining to start on blocks the player is looking at

common/src/main/java/smartin/miapi/config/MiapiServerConfig.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ public static class OtherCategory {
3030
@AutoCodec.Name("development_mode")
3131
public boolean developmentMode = Platform.isDevelopmentEnvironment();
3232

33+
@Comment("""
34+
Save Area Mining adds additional checks to prevent explosive behaviour when pared with other mods
35+
""")
36+
@AutoCodec.Name("save_area_mining")
37+
public boolean saveAreaMining = true;
38+
3339
@Comment("""
3440
Truly Modular Logs more aggressivly""")
3541
@AutoCodec.Name("verbose_logging")

common/src/main/java/smartin/miapi/mixin/BCWeaponRegistryMixin.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

common/src/main/java/smartin/miapi/modules/properties/mining/MiningShapeProperty.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import net.minecraft.util.hit.HitResult;
1111
import net.minecraft.util.math.BlockPos;
1212
import net.minecraft.util.math.Direction;
13+
import smartin.miapi.config.MiapiConfig;
1314
import smartin.miapi.item.modular.StatResolver;
1415
import smartin.miapi.modules.ItemModule;
1516
import smartin.miapi.modules.cache.ModularItemCache;
@@ -55,6 +56,9 @@ public MiningShapeProperty() {
5556
List<MiningShapeJson> miningShapeJsons = get(miningItem);
5657
HitResult hitResult = player.raycast(getBlockBreakDistance(player), 0, false);
5758
if (hitResult instanceof BlockHitResult blockHitResult) {
59+
if (MiapiConfig.INSTANCE.server.other.saveAreaMining && !blockHitResult.getBlockPos().equals(pos)) {
60+
return EventResult.pass();
61+
}
5862
Direction facing = blockHitResult.getSide();
5963
miningShapeJsons.stream().filter(miningShapeJson ->
6064
miningShapeJson.miningCondition.canMine(player, level, miningItem, pos, facing)).

common/src/main/resources/miapi-common.mixins.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"ApoliStackPowerMixin",
88
"ArcheryHookMixin",
99
"AxeItemAccessor",
10-
"BCWeaponRegistryMixin",
1110
"ChorusFruitMixin",
1211
"ClientAdvancementManagerAccessor",
1312
"ConduitBlockEntityAccessor",

0 commit comments

Comments
 (0)