ftbsc/bscv
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: moved boatpatch stuff into boatpatch class

Browse source
This commit is contained in:
əlemi 2023-03-11 22:52:05 +01:00
parent 0a2609ac0c
commit f0488fdd5d
Signed by: alemi
GPG key ID: A4895B84D311642C
3 changed files with 31 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/ftbsc/bscv/events/BoatEvent.java
View file

@ -1,22 +0,0 @@
package ftbsc.bscv.events;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
public class BoatEvent {
@Cancelable
public static class Control extends Event {
public Control() { super(); }
}
@Cancelable
public static class ClampRotation extends Event {
public ClampRotation() { super(); }
}
@Cancelable
public static class Gravity extends Event {
public Gravity() { super(); }
}
}

5
src/main/java/ftbsc/bscv/modules/motion/BoatFly.java
View file

@ -1,10 +1,9 @@
package ftbsc.bscv.modules.motion;
import com.google.auto.service.AutoService;
import ftbsc.bscv.ICommons;
import ftbsc.bscv.api.ILoadable;
import ftbsc.bscv.events.BoatEvent;
import ftbsc.bscv.modules.AbstractModule;
import ftbsc.bscv.patches.BoatPatch.BoatEvent;
import ftbsc.bscv.tools.Keyboard;
import ftbsc.bscv.tools.Setting;
import net.minecraft.entity.Entity;
@ -15,7 +14,7 @@ import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@AutoService(ILoadable.class)
public class BoatFly extends AbstractModule implements ICommons {
public class BoatFly extends AbstractModule {
public final ForgeConfigSpec.ConfigValue<Double> speed;
public final ForgeConfigSpec.ConfigValue<Double> rise;

47
src/main/java/ftbsc/bscv/patches/BoatPatch.java
View file

@ -1,7 +1,6 @@
package ftbsc.bscv.patches;
import ftbsc.bscv.ICommons;
import ftbsc.bscv.events.BoatEvent;
import ftbsc.lll.processor.annotations.Injector;
import ftbsc.lll.processor.annotations.Patch;
import ftbsc.lll.processor.annotations.Target;
@ -9,26 +8,38 @@ import ftbsc.lll.tools.InsnSequence;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.BoatEntity;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.*;
public class BoatPatch {
public class BoatPatch implements ICommons {
public static class BoatHook implements ICommons {
public static boolean boatControl() {
return MinecraftForge.EVENT_BUS.post(new BoatEvent.Control());
}
public static class BoatEvent {
@Cancelable
public static class Control extends Event { }
public static boolean boatClampRotation() {
return MinecraftForge.EVENT_BUS.post(new BoatEvent.ClampRotation());
}
@Cancelable
public static class ClampRotation extends Event { }
public static boolean boatGravityCheck(Entity entity) {
if (MC.player == null) return false;
if (MC.player.getVehicle() == null) return false;
if (MC.player.getVehicle() != entity) return false;
return MinecraftForge.EVENT_BUS.post(new BoatEvent.Gravity());
}
@Cancelable
public static class Gravity extends Event { }
}
public static boolean boatControl() {
return MinecraftForge.EVENT_BUS.post(new BoatEvent.Control());
}
public static boolean boatClampRotation() {
return MinecraftForge.EVENT_BUS.post(new BoatEvent.ClampRotation());
}
public static boolean boatGravityCheck(Entity entity) {
if (MC.player == null) return false;
if (MC.player.getVehicle() == null) return false;
if (MC.player.getVehicle() != entity) return false;
return MinecraftForge.EVENT_BUS.post(new BoatEvent.Gravity());
}
@Patch(value = BoatEntity.class, reason = "add hook to cancel vanilla boat controls")
@ -43,7 +54,7 @@ public class BoatPatch {
InsnSequence is = new InsnSequence();
is.add(new MethodInsnNode(
INVOKESTATIC,
"ftbsc/bscv/patches/BoatPatch$BoatHook",
"ftbsc/bscv/patches/BoatPatch",
"boatControl",
"()Z"
));
@ -67,7 +78,7 @@ public class BoatPatch {
InsnSequence is = new InsnSequence();
is.add(new MethodInsnNode(
INVOKESTATIC,
"ftbsc/bscv/patches/BoatPatch$BoatHook",
"ftbsc/bscv/patches/BoatPatch",
"boatClampRotation",
"()Z"
));
@ -92,7 +103,7 @@ public class BoatPatch {
is.add(new VarInsnNode(ALOAD, 0));
is.add(new MethodInsnNode(
INVOKESTATIC,
"ftbsc/bscv/patches/BoatPatch$BoatHook",
"ftbsc/bscv/patches/BoatPatch",
"boatGravityCheck",
"(Lnet/minecraft/entity/Entity;)Z"
));