Skip to content

Commit 22510ba

Browse files
mrsternermrsterner
committed
reorganising api
1 parent c895f16 commit 22510ba

37 files changed

+283
-292
lines changed

Diff for: ‎src/main/java/dev/sterner/mixin/ServerPlayerGameModeMixin.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package dev.sterner.mixin;
22

3-
import dev.sterner.api.VoidBoundApi;
43
import dev.sterner.api.item.HammerLikeItem;
54
import dev.sterner.api.item.ItemAbility;
5+
import dev.sterner.api.util.VoidBoundItemUtils;
66
import net.minecraft.core.BlockPos;
77
import net.minecraft.server.level.ServerLevel;
88
import net.minecraft.server.level.ServerPlayer;
@@ -35,8 +35,8 @@ public class ServerPlayerGameModeMixin {
3535
public void voidbound$beforeDestroyBlock(BlockPos blockPos, CallbackInfoReturnable<Boolean> cir) {
3636
ItemStack itemStack = this.player.getMainHandItem();
3737
if (itemStack.getItem() instanceof HammerLikeItem hammerLikeItem) {
38-
var three = VoidBoundApi.INSTANCE.getActiveAbility(itemStack) == ItemAbility.MINING_3X3;
39-
var five = VoidBoundApi.INSTANCE.getActiveAbility(itemStack) == ItemAbility.MINING_5X5;
38+
var three = VoidBoundItemUtils.INSTANCE.getActiveAbility(itemStack) == ItemAbility.MINING_3X3;
39+
var five = VoidBoundItemUtils.INSTANCE.getActiveAbility(itemStack) == ItemAbility.MINING_5X5;
4040
if (three || five || !hammerLikeItem.isIchor()) {
4141
BlockState blockState = this.level.getBlockState(blockPos);
4242
hammerLikeItem.executeHammerAction(this.level, blockPos, blockState, itemStack, this.player, five);

Diff for: ‎src/main/java/dev/sterner/mixin/client/ward/ClientLevelMixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
44
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
5-
import dev.sterner.api.VoidBoundApi;
5+
import dev.sterner.api.util.VoidBoundPlayerUtils;
66
import net.minecraft.client.Minecraft;
77
import net.minecraft.client.multiplayer.ClientLevel;
88
import net.minecraft.client.renderer.LevelRenderer;
@@ -16,7 +16,7 @@ public class ClientLevelMixin {
1616
@WrapOperation(method = "destroyBlockProgress", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;destroyBlockProgress(ILnet/minecraft/core/BlockPos;I)V"))
1717
private void voidbound$wardDestroyBlockProgress(LevelRenderer instance, int breakerId, BlockPos pos, int progress, Operation<Void> original) {
1818
ClientLevel clientLevel = ClientLevel.class.cast(this);
19-
if (Minecraft.getInstance().player == null || VoidBoundApi.INSTANCE.canPlayerBreakBlock(clientLevel, Minecraft.getInstance().player, pos)) {
19+
if (Minecraft.getInstance().player == null || VoidBoundPlayerUtils.INSTANCE.canPlayerBreakBlock(clientLevel, Minecraft.getInstance().player, pos)) {
2020
original.call(instance, breakerId, pos, progress);
2121
}
2222
}

Diff for: ‎src/main/java/dev/sterner/mixin/ward/BlockBehaviourMixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
44
import com.llamalad7.mixinextras.sugar.Local;
5-
import dev.sterner.api.VoidBoundApi;
5+
import dev.sterner.api.util.VoidBoundPlayerUtils;
66
import net.minecraft.core.BlockPos;
77
import net.minecraft.world.entity.player.Player;
88
import net.minecraft.world.level.BlockGetter;
@@ -16,7 +16,7 @@ public class BlockBehaviourMixin {
1616

1717
@ModifyReturnValue(method = "getDestroyProgress", at = @At("RETURN"))
1818
private float voidbound$ward(float original, @Local(argsOnly = true) BlockState state, @Local(argsOnly = true) Player player, @Local(argsOnly = true) BlockGetter level, @Local(argsOnly = true) BlockPos pos) {
19-
if (!VoidBoundApi.INSTANCE.canPlayerBreakBlock(player.level(), player, pos)) {
19+
if (!VoidBoundPlayerUtils.INSTANCE.canPlayerBreakBlock(player.level(), player, pos)) {
2020
return 0f;
2121
}
2222
return original;

Diff for: ‎src/main/java/dev/sterner/mixin/ward/EndermanTakeBlockGoalMixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
44
import com.llamalad7.mixinextras.sugar.Local;
5-
import dev.sterner.api.VoidBoundApi;
5+
import dev.sterner.api.util.VoidBoundBlockUtils;
66
import net.minecraft.core.BlockPos;
77
import net.minecraft.world.entity.monster.EnderMan;
88
import net.minecraft.world.level.Level;
@@ -14,7 +14,7 @@ public class EndermanTakeBlockGoalMixin {
1414

1515
@ModifyExpressionValue(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/tags/TagKey;)Z"))
1616
private boolean voidbound$tick(boolean original, @Local Level level, @Local BlockPos blockPos) {
17-
if (!VoidBoundApi.INSTANCE.canBlockBreak(level, blockPos)) {
17+
if (!VoidBoundBlockUtils.INSTANCE.canBlockBreak(level, blockPos)) {
1818
return false;
1919
}
2020
return original;

Diff for: ‎src/main/java/dev/sterner/mixin/ward/ExplosionMixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
44
import com.llamalad7.mixinextras.sugar.Local;
5-
import dev.sterner.api.VoidBoundApi;
5+
import dev.sterner.api.util.VoidBoundBlockUtils;
66
import net.minecraft.core.BlockPos;
77
import net.minecraft.world.level.Explosion;
88
import net.minecraft.world.level.Level;
@@ -22,6 +22,6 @@ public class ExplosionMixin {
2222

2323
@WrapWithCondition(method = "explode", at = @At(value = "INVOKE", target = "Ljava/util/Set;add(Ljava/lang/Object;)Z"))
2424
private boolean voidbound$wardExplosion(Set<BlockPos> instance, Object e, @Local BlockPos blockPos) {
25-
return VoidBoundApi.INSTANCE.canBlockBreak(this.level, blockPos);
25+
return VoidBoundBlockUtils.INSTANCE.canBlockBreak(this.level, blockPos);
2626
}
2727
}

Diff for: ‎src/main/java/dev/sterner/mixin/ward/FallingBlockMixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.sterner.mixin.ward;
22

3-
import dev.sterner.api.VoidBoundApi;
3+
import dev.sterner.api.util.VoidBoundBlockUtils;
44
import net.minecraft.core.BlockPos;
55
import net.minecraft.server.level.ServerLevel;
66
import net.minecraft.util.RandomSource;
@@ -16,7 +16,7 @@ public class FallingBlockMixin {
1616

1717
@Inject(method = "tick", at = @At("HEAD"), cancellable = true)
1818
private void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random, CallbackInfo ci) {
19-
if (!VoidBoundApi.INSTANCE.canBlockBreak(level, pos)) {
19+
if (!VoidBoundBlockUtils.INSTANCE.canBlockBreak(level, pos)) {
2020
ci.cancel();
2121
}
2222
}

Diff for: ‎src/main/java/dev/sterner/mixin/ward/ItemMixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
44
import com.llamalad7.mixinextras.sugar.Local;
5-
import dev.sterner.api.VoidBoundApi;
5+
import dev.sterner.api.util.VoidBoundPlayerUtils;
66
import net.minecraft.core.BlockPos;
77
import net.minecraft.world.entity.player.Player;
88
import net.minecraft.world.item.Item;
@@ -16,7 +16,7 @@ public class ItemMixin {
1616

1717
@ModifyReturnValue(method = "canAttackBlock", at = @At("RETURN"))
1818
private boolean voidbound$ward(boolean original, @Local(argsOnly = true) BlockState state, @Local(argsOnly = true) Level level, @Local(argsOnly = true) BlockPos pos, @Local(argsOnly = true) Player player) {
19-
if (!VoidBoundApi.INSTANCE.canPlayerBreakBlock(level, player, pos)) {
19+
if (!VoidBoundPlayerUtils.INSTANCE.canPlayerBreakBlock(level, player, pos)) {
2020
return false;
2121
}
2222
return original;

Diff for: ‎src/main/java/dev/sterner/mixin/ward/LevelMixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.sterner.mixin.ward;
22

3-
import dev.sterner.api.VoidBoundApi;
3+
import dev.sterner.api.util.VoidBoundBlockUtils;
44
import dev.sterner.registry.VoidBoundComponentRegistry;
55
import net.minecraft.core.BlockPos;
66
import net.minecraft.core.GlobalPos;
@@ -25,7 +25,7 @@ public class LevelMixin {
2525

2626
@Inject(method = "destroyBlock", at = @At("HEAD"), cancellable = true)
2727
private void voidbound$destroyBlock2(BlockPos pos, boolean dropBlock, Entity entity, int recursionLeft, CallbackInfoReturnable<Boolean> cir){
28-
if (!VoidBoundApi.INSTANCE.canBlockBreak((Level) (Object) this, pos)) {
28+
if (!VoidBoundBlockUtils.INSTANCE.canBlockBreak((Level) (Object) this, pos)) {
2929
cir.setReturnValue(false);
3030
}
3131
}

Diff for: ‎src/main/java/dev/sterner/mixin/ward/PistonBaseBlockMixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.sterner.mixin.ward;
22

3-
import dev.sterner.api.VoidBoundApi;
3+
import dev.sterner.api.util.VoidBoundBlockUtils;
44
import net.minecraft.core.BlockPos;
55
import net.minecraft.core.Direction;
66
import net.minecraft.world.level.Level;
@@ -16,7 +16,7 @@ public class PistonBaseBlockMixin {
1616

1717
@Inject(method = "isPushable", at = @At("HEAD"), cancellable = true)
1818
private static void isPushable(BlockState state, Level level, BlockPos pos, Direction movementDirection, boolean allowDestroy, Direction pistonFacing, CallbackInfoReturnable<Boolean> cir) {
19-
boolean warded = !VoidBoundApi.INSTANCE.canBlockBreak(level, pos);
19+
boolean warded = !VoidBoundBlockUtils.INSTANCE.canBlockBreak(level, pos);
2020
if (warded) {
2121
cir.setReturnValue(false);
2222
}

Diff for: ‎src/main/kotlin/dev/sterner/api/VoidBoundApi.kt

-217
This file was deleted.

Diff for: ‎src/main/kotlin/dev/sterner/api/rift/RiftType.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.sterner.api.rift
22

3-
import dev.sterner.api.VoidBoundApi
3+
import dev.sterner.api.util.VoidBoundPlayerUtils
44
import dev.sterner.common.blockentity.SpiritRiftBlockEntity
55
import net.minecraft.client.Minecraft
66
import net.minecraft.core.BlockPos
@@ -33,7 +33,7 @@ abstract class RiftType {
3333
ColorParticleData.create(firstColorAlpha, secondColorAlpha).setEasing(Easing.SINE_IN).setCoefficient(0.75f)
3434
.build()
3535
if (Minecraft.getInstance().player != null) {
36-
if (VoidBoundApi.hasGoggles()) {
36+
if (VoidBoundPlayerUtils.hasGoggles()) {
3737
transparency = GenericParticleData.create(0.2f, 0.8f).build()
3838
color =
3939
ColorParticleData.create(firstColor, secondColor).setEasing(Easing.SINE_IN).setCoefficient(0.75f)

0 commit comments

Comments
 (0)