Skip to content

Commit ef37d3d

Browse files
ryanhcoderyanhcode
committed
Cleanup sculk vibration mixins
1 parent 165cf38 commit ef37d3d

5 files changed

Lines changed: 15 additions & 14 deletions

File tree

common/src/main/java/dev/ryanhcode/sable/mixin/sculk/EuclideanGameEventListenerRegistryMixin.java renamed to common/src/main/java/dev/ryanhcode/sable/mixin/sculk_vibrations/EuclideanGameEventListenerRegistryMixin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.ryanhcode.sable.mixin.sculk;
1+
package dev.ryanhcode.sable.mixin.sculk_vibrations;
22

33
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
44
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -19,4 +19,5 @@ public class EuclideanGameEventListenerRegistryMixin {
1919
private static double replaceDistance(final BlockPos from, final Vec3i to, final Operation<Double> original, @Local(argsOnly = true) final ServerLevel level) {
2020
return Sable.HELPER.distanceSquaredWithSubLevels(level, JOMLConversion.atLowerCornerOf(from), JOMLConversion.atLowerCornerOf(to));
2121
}
22+
2223
}

common/src/main/java/dev/ryanhcode/sable/mixin/sculk/GameEventDispatcherMixin.java renamed to common/src/main/java/dev/ryanhcode/sable/mixin/sculk_vibrations/GameEventDispatcherMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.ryanhcode.sable.mixin.sculk;
1+
package dev.ryanhcode.sable.mixin.sculk_vibrations;
22

33
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
44
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -33,7 +33,7 @@ public class GameEventDispatcherMixin {
3333
private ServerLevel level;
3434

3535
@Inject(method = "post", at = @At(value = "NEW", target = "java/util/ArrayList"))
36-
private void useBBIntersection(final Holder<GameEvent> gameEvent, final Vec3 pos, final GameEvent.Context context, final CallbackInfo ci, @Share("bb") final LocalRef<BoundingBox3ic> bbRef,
36+
private void sable$useBBIntersection(final Holder<GameEvent> gameEvent, final Vec3 pos, final GameEvent.Context context, final CallbackInfo ci, @Share("bb") final LocalRef<BoundingBox3ic> bbRef,
3737
@Local(ordinal = 1) final LocalIntRef x1, @Local(ordinal = 2) final LocalIntRef y1, @Local(ordinal = 3) final LocalIntRef z1,
3838
@Local(ordinal = 4) final LocalIntRef x2, @Local(ordinal = 5) final LocalIntRef y2, @Local(ordinal = 6) final LocalIntRef z2) {
3939
final BoundingBox3ic bb = bbRef.get();
@@ -48,7 +48,7 @@ private void useBBIntersection(final Holder<GameEvent> gameEvent, final Vec3 pos
4848
}
4949

5050
@WrapMethod(method = "post")
51-
private void visitShipListeners(final Holder<GameEvent> gameEvent, final Vec3 pos, final GameEvent.Context context, final Operation<Void> original, @Share("bb") final LocalRef<BoundingBox3ic> bbRef) {
51+
private void sable$visitShipListeners(final Holder<GameEvent> gameEvent, final Vec3 pos, final GameEvent.Context context, final Operation<Void> original, @Share("bb") final LocalRef<BoundingBox3ic> bbRef) {
5252
final Vec3 globalPos = Sable.HELPER.projectOutOfSubLevel(this.level, pos);
5353
original.call(gameEvent, globalPos, context);
5454
if (bbRef.get() != null) {

common/src/main/java/dev/ryanhcode/sable/mixin/sculk/VibrationSystemListenerMixin.java renamed to common/src/main/java/dev/ryanhcode/sable/mixin/sculk_vibrations/VibrationSystemListenerMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.ryanhcode.sable.mixin.sculk;
1+
package dev.ryanhcode.sable.mixin.sculk_vibrations;
22

33
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
44
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -17,12 +17,12 @@
1717
public class VibrationSystemListenerMixin {
1818

1919
@WrapMethod(method = "scheduleVibration")
20-
private void useGlobalPos(final ServerLevel level, final VibrationSystem.Data data, final Holder<GameEvent> gameEvent, final GameEvent.Context context, final Vec3 pos, final Vec3 sensorPos, final Operation<Void> original) {
20+
private void sable$useGlobalPos(final ServerLevel level, final VibrationSystem.Data data, final Holder<GameEvent> gameEvent, final GameEvent.Context context, final Vec3 pos, final Vec3 sensorPos, final Operation<Void> original) {
2121
original.call(level, data, gameEvent, context, Sable.HELPER.projectOutOfSubLevel(level, pos), Sable.HELPER.projectOutOfSubLevel(level, sensorPos));
2222
}
2323

2424
@WrapMethod(method = "isOccluded")
25-
private static boolean occlusionChecks(final Level level, final Vec3 pos1, final Vec3 pos2, final Operation<Boolean> original) {
25+
private static boolean sable$occlusionChecks(final Level level, final Vec3 pos1, final Vec3 pos2, final Operation<Boolean> original) {
2626
final ActiveSableCompanion helper = Sable.HELPER;
2727

2828
// Check occlusion in global space

common/src/main/java/dev/ryanhcode/sable/mixin/sculk/VibrationSystemTickerMixin.java renamed to common/src/main/java/dev/ryanhcode/sable/mixin/sculk_vibrations/VibrationSystemTickerMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.ryanhcode.sable.mixin.sculk;
1+
package dev.ryanhcode.sable.mixin.sculk_vibrations;
22

33
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
44
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -20,13 +20,13 @@
2020
public interface VibrationSystemTickerMixin {
2121

2222
@WrapOperation(method = "receiveVibration", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/gameevent/vibrations/VibrationInfo;pos()Lnet/minecraft/world/phys/Vec3;"))
23-
private static Vec3 useGlobalPos(final VibrationInfo instance, final Operation<Vec3> original, @Local(argsOnly = true) final ServerLevel level) {
23+
private static Vec3 sable$useGlobalPos(final VibrationInfo instance, final Operation<Vec3> original, @Local(argsOnly = true) final ServerLevel level) {
2424
return Sable.HELPER.projectOutOfSubLevel(level, original.call(instance));
2525
}
2626

2727
@WrapOperation(method = {"receiveVibration", "lambda$trySelectAndScheduleVibration$0", "method_51408", "tryReloadVibrationParticle"}, expect = 3, require = 3,
2828
at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/gameevent/vibrations/VibrationSystem$User;getPositionSource()Lnet/minecraft/world/level/gameevent/PositionSource;"))
29-
private static PositionSource useGlobalDestPos(final VibrationSystem.User instance, final Operation<PositionSource> original, @Local(argsOnly = true) final ServerLevel level) {
29+
private static PositionSource sable$useGlobalDestPos(final VibrationSystem.User instance, final Operation<PositionSource> original, @Local(argsOnly = true) final ServerLevel level) {
3030
final PositionSource origSource = original.call(instance);
3131
final Optional<Vec3> optPos = origSource.getPosition(level);
3232
if (optPos.isPresent()) {

‎common/src/main/resources/sable.mixins.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@
196196
"respawn_point.ServerPlayerMixin",
197197
"respawn_point.sleeping.LivingEntityMixin",
198198
"respawn_point.sleeping.ServerPlayerMixin",
199-
"sculk.EuclideanGameEventListenerRegistryMixin",
200-
"sculk.GameEventDispatcherMixin",
201-
"sculk.VibrationSystemListenerMixin",
202-
"sculk.VibrationSystemTickerMixin",
199+
"sculk_vibrations.EuclideanGameEventListenerRegistryMixin",
200+
"sculk_vibrations.GameEventDispatcherMixin",
201+
"sculk_vibrations.VibrationSystemListenerMixin",
202+
"sculk_vibrations.VibrationSystemTickerMixin",
203203
"sign_interaction.SignBlockEntityMixin",
204204
"tracking_points.EntityMixin",
205205
"tracking_points.ServerPlayerMixin",

0 commit comments

Comments
 (0)