many @Pseudo

xiewuzhiying · Aug 4, 2024 · 2fd1a45 · 2fd1a45
1 parent 7f31138
commit 2fd1a45
Show file tree

Hide file tree

Showing 71 changed files with 142 additions and 35 deletions.
diff --git a/...in/java/io/github/xiewuzhiying/vs_addition/mixin/computercraft/MixinComputerExecutor.java b/...in/java/io/github/xiewuzhiying/vs_addition/mixin/computercraft/MixinComputerExecutor.java
@@ -3,8 +3,10 @@
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import io.github.xiewuzhiying.vs_addition.VSAdditionConfig;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
 
+@Pseudo
 @Mixin(targets = "dan200.computercraft.core.computer.ComputerExecutor")
 public abstract class MixinComputerExecutor {
     @ModifyExpressionValue(

diff --git a/...main/java/io/github/xiewuzhiying/vs_addition/mixin/computercraft/MixinComputerThread.java b/...main/java/io/github/xiewuzhiying/vs_addition/mixin/computercraft/MixinComputerThread.java
@@ -3,9 +3,11 @@
 import dan200.computercraft.core.computer.ComputerThread;
 import io.github.xiewuzhiying.vs_addition.VSAdditionConfig;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 
+@Pseudo
 @Mixin(ComputerThread.class)
 public abstract class MixinComputerThread {
     @ModifyArg(

diff --git a/...rc/main/java/io/github/xiewuzhiying/vs_addition/mixin/computercraft/MixinRedstoneAPI.java b/...rc/main/java/io/github/xiewuzhiying/vs_addition/mixin/computercraft/MixinRedstoneAPI.java
@@ -7,6 +7,7 @@
 import dan200.computercraft.core.computer.ComputerSide;
 import org.spongepowered.asm.mixin.*;
 
+@Pseudo
 @Mixin(RedstoneAPI.class)
 public abstract class MixinRedstoneAPI{
 

diff --git a/.../io/github/xiewuzhiying/vs_addition/mixin/computercraft/MixinWirelessModemPeripheral.java b/.../io/github/xiewuzhiying/vs_addition/mixin/computercraft/MixinWirelessModemPeripheral.java
@@ -5,10 +5,12 @@
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessModemPeripheral;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 
+@Pseudo
 @Mixin(WirelessModemPeripheral.class)
 public abstract class MixinWirelessModemPeripheral extends ModemPeripheral{
     protected MixinWirelessModemPeripheral(ModemState state) {

diff --git a/...c/main/java/io/github/xiewuzhiying/vs_addition/mixin/create/MixinContraptionCollider.java b/...c/main/java/io/github/xiewuzhiying/vs_addition/mixin/create/MixinContraptionCollider.java
@@ -5,13 +5,15 @@
 import com.simibubi.create.content.contraptions.ContraptionCollider;
 import net.minecraft.world.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.valkyrienskies.core.api.ships.Ship;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 import org.valkyrienskies.mod.common.util.IEntityDraggingInformationProvider;
 
+@Pseudo
 @Mixin(ContraptionCollider.class)
 public abstract class MixinContraptionCollider {
     @Inject(

diff --git a/...main/java/io/github/xiewuzhiying/vs_addition/mixin/create/MixinHosePulleyBlockEntity.java b/...main/java/io/github/xiewuzhiying/vs_addition/mixin/create/MixinHosePulleyBlockEntity.java
@@ -14,9 +14,11 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
+@Pseudo
 @Mixin(HosePulleyBlockEntity.class)
 public abstract class MixinHosePulleyBlockEntity extends KineticBlockEntity {
 

diff --git a/...rc/main/java/io/github/xiewuzhiying/vs_addition/mixin/create/MixinStickerBlockEntity.java b/...rc/main/java/io/github/xiewuzhiying/vs_addition/mixin/create/MixinStickerBlockEntity.java
@@ -16,6 +16,7 @@
 import org.joml.Quaterniondc;
 import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -34,6 +35,7 @@
 
 import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING;
 
+@Pseudo
 @Mixin(StickerBlockEntity.class)
 public abstract class MixinStickerBlockEntity extends SmartBlockEntity {
 

diff --git a/...rc/main/java/io/github/xiewuzhiying/vs_addition/mixin/create/MixinTreeFertilizerItem.java b/...rc/main/java/io/github/xiewuzhiying/vs_addition/mixin/create/MixinTreeFertilizerItem.java
@@ -18,6 +18,7 @@
 import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
 import org.valkyrienskies.core.api.ships.ServerShip;
 import org.valkyrienskies.core.api.world.ServerShipWorld;
@@ -34,6 +35,7 @@
 
 import static org.valkyrienskies.mod.common.assembly.ShipAssemblyKt.createNewShipWithBlocks;
 
+@Pseudo
 @Mixin(TreeFertilizerItem.class)
 public abstract class MixinTreeFertilizerItem extends Item {
 

diff --git a/...xiewuzhiying/vs_addition/mixin/create/client/mechanical_arm/MixinArmInteractionPoint.java b/...xiewuzhiying/vs_addition/mixin/create/client/mechanical_arm/MixinArmInteractionPoint.java
@@ -9,6 +9,7 @@
 import org.joml.Quaterniond;
 import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -18,6 +19,7 @@
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 import org.valkyrienskies.mod.common.util.VectorConversionsMCKt;
 
+@Pseudo
 @Mixin(ArmInteractionPoint.class)
 public abstract class MixinArmInteractionPoint {
 

diff --git a/...ient/MixinArmInteractionPointHandler.java → ..._arm/MixinArmInteractionPointHandler.java b/...ient/MixinArmInteractionPointHandler.java → ..._arm/MixinArmInteractionPointHandler.java
@@ -1,4 +1,4 @@
-package io.github.xiewuzhiying.vs_addition.mixin.create.client.mechanical_arm.client;
+package io.github.xiewuzhiying.vs_addition.mixin.create.client.mechanical_arm;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPoint;
@@ -8,10 +8,12 @@
 import net.minecraft.core.Vec3i;
 import net.minecraft.util.Mth;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 
+@Pseudo
 @Mixin(ArmInteractionPointHandler.class)
 public abstract class MixinArmInteractionPointHandler {
 

diff --git a/...va/io/github/xiewuzhiying/vs_addition/mixin/create/deployer/MixinDeployerBlockEntity.java b/...va/io/github/xiewuzhiying/vs_addition/mixin/create/deployer/MixinDeployerBlockEntity.java
@@ -14,13 +14,15 @@
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Unique;
 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.List;
 
+@Pseudo
 @Mixin(DeployerBlockEntity.class)
 public abstract class MixinDeployerBlockEntity extends KineticBlockEntity implements IDeployerBehavior {
 

diff --git a/...n/java/io/github/xiewuzhiying/vs_addition/mixin/create/deployer/MixinDeployerHandler.java b/...n/java/io/github/xiewuzhiying/vs_addition/mixin/create/deployer/MixinDeployerHandler.java
@@ -1,6 +1,5 @@
 package io.github.xiewuzhiying.vs_addition.mixin.create.deployer;
 
-
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -20,11 +19,13 @@
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 import org.valkyrienskies.mod.common.world.RaycastUtilsKt;
 
+@Pseudo
 @Mixin(DeployerHandler.class)
 public abstract class MixinDeployerHandler {
     @ModifyExpressionValue(

diff --git a/...ithub/xiewuzhiying/vs_addition/mixin/create/display_link/MixinDisplayLinkBlockEntity.java b/...ithub/xiewuzhiying/vs_addition/mixin/create/display_link/MixinDisplayLinkBlockEntity.java
@@ -10,9 +10,11 @@
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 
+@Pseudo
 @Mixin(DisplayLinkBlockEntity.class)
 public abstract class MixinDisplayLinkBlockEntity extends SmartBlockEntity {
     public MixinDisplayLinkBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {

diff --git a/.../github/xiewuzhiying/vs_addition/mixin/create/display_link/MixinDisplayLinkBlockItem.java b/.../github/xiewuzhiying/vs_addition/mixin/create/display_link/MixinDisplayLinkBlockItem.java
@@ -10,14 +10,15 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 
-
+@Pseudo
 @Mixin(DisplayLinkBlockItem.class)
 public abstract class MixinDisplayLinkBlockItem extends BlockItem {
 

diff --git a/...on/src/main/java/io/github/xiewuzhiying/vs_addition/mixin/create/fan/MixinAirCurrent.java b/...on/src/main/java/io/github/xiewuzhiying/vs_addition/mixin/create/fan/MixinAirCurrent.java
@@ -26,10 +26,7 @@
 import net.minecraft.world.phys.Vec3;
 import org.apache.commons.lang3.tuple.Pair;
 import org.joml.Vector3d;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -42,6 +39,7 @@
 import java.util.List;
 import java.util.Optional;
 
+@Pseudo
 @Mixin(AirCurrent.class)
 public abstract class MixinAirCurrent {
     @Shadow public AABB bounds;

diff --git a/...main/java/io/github/xiewuzhiying/vs_addition/mixin/create/fan/MixinNozzleBlockEntity.java b/...main/java/io/github/xiewuzhiying/vs_addition/mixin/create/fan/MixinNozzleBlockEntity.java
@@ -10,9 +10,11 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
+@Pseudo
 @Mixin(NozzleBlockEntity.class)
 public abstract class MixinNozzleBlockEntity extends SmartBlockEntity {
     public MixinNozzleBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {

diff --git a/...a/io/github/xiewuzhiying/vs_addition/mixin/create/mechanical_arm/MixinArmBlockEntity.java b/...a/io/github/xiewuzhiying/vs_addition/mixin/create/mechanical_arm/MixinArmBlockEntity.java
@@ -13,6 +13,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -21,6 +22,7 @@
 
 import static com.simibubi.create.content.kinetics.mechanicalArm.ArmBlockEntity.getRange;
 
+@Pseudo
 @Mixin(ArmBlockEntity.class)
 public abstract class MixinArmBlockEntity extends KineticBlockEntity implements ITransformableBlockEntity {
 

diff --git a/...vs_addition/mixin/create/portable_interface/MixinPortableStorageInterfaceBlockEntity.java b/...vs_addition/mixin/create/portable_interface/MixinPortableStorageInterfaceBlockEntity.java
@@ -19,10 +19,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 import org.joml.Vector3d;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -32,6 +29,7 @@
 
 import java.util.List;
 
+@Pseudo
 @Mixin(PortableStorageInterfaceBlockEntity.class)
 public abstract class MixinPortableStorageInterfaceBlockEntity extends SmartBlockEntity implements IPSIBehavior {
     @Shadow(remap = false) protected float distance;

diff --git a/...ng/vs_addition/mixin/create/portable_interface/MixinPortableStorageInterfaceMovement.java b/...ng/vs_addition/mixin/create/portable_interface/MixinPortableStorageInterfaceMovement.java
@@ -20,6 +20,7 @@
 import net.minecraft.world.phys.Vec3;
 import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -29,6 +30,7 @@
 
 import java.util.List;
 
+@Pseudo
 @Mixin(PortableStorageInterfaceMovement.class)
 public abstract class MixinPortableStorageInterfaceMovement implements MovementBehaviour {
 

diff --git a/...iying/vs_addition/mixin/createbigcannons/AbstractAutocannonBreechBlockEntityAccessor.java b/...iying/vs_addition/mixin/createbigcannons/AbstractAutocannonBreechBlockEntityAccessor.java
@@ -1,10 +1,11 @@
 package io.github.xiewuzhiying.vs_addition.mixin.createbigcannons;
 
-
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import rbasamoyai.createbigcannons.cannons.autocannon.breech.AbstractAutocannonBreechBlockEntity;
 
+@Pseudo
 @Mixin(AbstractAutocannonBreechBlockEntity.class)
 public interface AbstractAutocannonBreechBlockEntityAccessor {
     @Accessor(remap = false)

diff --git a/...ithub/xiewuzhiying/vs_addition/mixin/createbigcannons/CannonMountBlockEntityAccessor.java b/...ithub/xiewuzhiying/vs_addition/mixin/createbigcannons/CannonMountBlockEntityAccessor.java
@@ -2,10 +2,12 @@
 
 import org.checkerframework.checker.units.qual.A;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
 import rbasamoyai.createbigcannons.cannon_control.cannon_mount.CannonMountBlockEntity;
 
+@Pseudo
 @Mixin(CannonMountBlockEntity.class)
 public interface CannonMountBlockEntityAccessor {
 

diff --git a/...ub/xiewuzhiying/vs_addition/mixin/createbigcannons/MixinMountedAutoCannonContraption.java b/...ub/xiewuzhiying/vs_addition/mixin/createbigcannons/MixinMountedAutoCannonContraption.java
@@ -7,6 +7,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -24,6 +25,7 @@
 
 import java.util.List;
 
+@Pseudo
 @Mixin(MountedAutocannonContraption.class)
 public abstract class MixinMountedAutoCannonContraption extends AbstractMountedCannonContraption implements ItemCannon {
 

diff --git a/...hub/xiewuzhiying/vs_addition/mixin/createbigcannons/MixinMountedBigCannonContraption.java b/...hub/xiewuzhiying/vs_addition/mixin/createbigcannons/MixinMountedBigCannonContraption.java
@@ -7,6 +7,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -20,6 +21,7 @@
 import rbasamoyai.createbigcannons.cannon_control.contraption.PitchOrientedContraptionEntity;
 import rbasamoyai.createbigcannons.munitions.big_cannon.AbstractBigCannonProjectile;
 
+@Pseudo
 @Mixin(MountedBigCannonContraption.class)
 public abstract class MixinMountedBigCannonContraption extends AbstractMountedCannonContraption {
 

diff --git a/.../java/io/github/xiewuzhiying/vs_addition/mixin/ftbchunks/client/MixinFTBChunksClient.java b/.../java/io/github/xiewuzhiying/vs_addition/mixin/ftbchunks/client/MixinFTBChunksClient.java
@@ -7,11 +7,13 @@
 import org.joml.Matrix4dc;
 import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.valkyrienskies.core.api.ships.ClientShip;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 
+@Pseudo
 @Mixin(FTBChunksClient.class)
 public abstract  class MixinFTBChunksClient {
     @Unique

diff --git a/...rc/main/java/io/github/xiewuzhiying/vs_addition/mixin/journeymap/client/MixinMiniMap.java b/...rc/main/java/io/github/xiewuzhiying/vs_addition/mixin/journeymap/client/MixinMiniMap.java
@@ -6,14 +6,12 @@
 import org.joml.Matrix4d;
 import org.joml.Matrix4dc;
 import org.joml.Vector3d;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.valkyrienskies.core.api.ships.Ship;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
 
+@Pseudo
 @Mixin(MiniMap.class)
 public abstract class MixinMiniMap {
     @Shadow @Final private Minecraft mc;

diff --git a/.../xiewuzhiying/vs_addition/mixin/kontraption/client/MixinKontraptionClientTickHandler.java b/.../xiewuzhiying/vs_addition/mixin/kontraption/client/MixinKontraptionClientTickHandler.java
@@ -2,10 +2,12 @@
 
 import net.illuc.kontraption.client.KontraptionClientTickHandler;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+@Pseudo
 @Mixin(KontraptionClientTickHandler.class)
 public class MixinKontraptionClientTickHandler {
     @Inject(