diff --git a/common/src/main/java/io/github/foundationgames/automobility/AutomobilityClient.java b/common/src/main/java/io/github/foundationgames/automobility/AutomobilityClient.java index cb2264d..8c7dad7 100644 --- a/common/src/main/java/io/github/foundationgames/automobility/AutomobilityClient.java +++ b/common/src/main/java/io/github/foundationgames/automobility/AutomobilityClient.java @@ -69,7 +69,7 @@ public static void init() { initEntities(); ClientPackets.initClient(); - Platform.get().controllerCompat().initCompat(); + Platform.get().controller().initCompat(); Platform.get().registerMenuScreen(Automobility.AUTO_MECHANIC_SCREEN.require(), AutoMechanicTableScreen::new); Platform.get().registerMenuScreen(Automobility.SINGLE_SLOT_SCREEN.require(), SingleSlotScreen::new); diff --git a/common/src/main/java/io/github/foundationgames/automobility/controller/ControllerCompat.java b/common/src/main/java/io/github/foundationgames/automobility/controller/AutomobileController.java similarity index 86% rename from common/src/main/java/io/github/foundationgames/automobility/controller/ControllerCompat.java rename to common/src/main/java/io/github/foundationgames/automobility/controller/AutomobileController.java index 93433a0..5be0933 100644 --- a/common/src/main/java/io/github/foundationgames/automobility/controller/ControllerCompat.java +++ b/common/src/main/java/io/github/foundationgames/automobility/controller/AutomobileController.java @@ -1,6 +1,6 @@ package io.github.foundationgames.automobility.controller; -public interface ControllerCompat { +public interface AutomobileController { boolean accelerating(); boolean braking(); @@ -15,7 +15,7 @@ default void crashRumble() {} default void initCompat() {} - ControllerCompat INCOMPATIBLE = new ControllerCompat() { + AutomobileController INCOMPATIBLE = new AutomobileController() { @Override public boolean accelerating() { return false; diff --git a/common/src/main/java/io/github/foundationgames/automobility/entity/AutomobileEntity.java b/common/src/main/java/io/github/foundationgames/automobility/entity/AutomobileEntity.java index b00415a..346f54a 100644 --- a/common/src/main/java/io/github/foundationgames/automobility/entity/AutomobileEntity.java +++ b/common/src/main/java/io/github/foundationgames/automobility/entity/AutomobileEntity.java @@ -422,7 +422,7 @@ private void setDrifting(boolean drifting) { } if (this.drifting != drifting) { - Platform.get().controllerCompat().updateDriftRumbleState(drifting); + Platform.get().controller().updateDriftRumbleState(drifting); } } @@ -904,7 +904,7 @@ public void postMovementTick() { if (isVehicle() && level().isClientSide()) { if (getPassengers().stream().anyMatch(p -> p instanceof LocalPlayer)) { - Platform.get().controllerCompat().crashRumble(); + Platform.get().controller().crashRumble(); } } @@ -1224,7 +1224,7 @@ public void createDriftParticles() { } private static boolean inLockedViewMode() { - return Platform.get().controllerCompat().inControllerMode(); + return Platform.get().controller().inControllerMode(); } @Override diff --git a/common/src/main/java/io/github/foundationgames/automobility/mixin/LocalPlayerMixin.java b/common/src/main/java/io/github/foundationgames/automobility/mixin/LocalPlayerMixin.java index 9e3882a..774f684 100644 --- a/common/src/main/java/io/github/foundationgames/automobility/mixin/LocalPlayerMixin.java +++ b/common/src/main/java/io/github/foundationgames/automobility/mixin/LocalPlayerMixin.java @@ -19,13 +19,13 @@ public class LocalPlayerMixin { public void automobility$setAutomobileInputs(CallbackInfo ci) { LocalPlayer self = (LocalPlayer)(Object)this; if (self.getVehicle() instanceof AutomobileEntity vehicle) { - if (Platform.get().controllerCompat().inControllerMode()) { + if (Platform.get().controller().inControllerMode()) { vehicle.provideClientInput( - Platform.get().controllerCompat().accelerating(), - Platform.get().controllerCompat().braking(), + Platform.get().controller().accelerating(), + Platform.get().controller().braking(), input.left, input.right, - Platform.get().controllerCompat().drifting() + Platform.get().controller().drifting() ); } else { vehicle.provideClientInput( diff --git a/common/src/main/java/io/github/foundationgames/automobility/platform/Platform.java b/common/src/main/java/io/github/foundationgames/automobility/platform/Platform.java index 44f778d..4c103f8 100644 --- a/common/src/main/java/io/github/foundationgames/automobility/platform/Platform.java +++ b/common/src/main/java/io/github/foundationgames/automobility/platform/Platform.java @@ -1,7 +1,7 @@ package io.github.foundationgames.automobility.platform; import com.mojang.blaze3d.vertex.PoseStack; -import io.github.foundationgames.automobility.controller.ControllerCompat; +import io.github.foundationgames.automobility.controller.AutomobileController; import io.github.foundationgames.automobility.util.HexCons; import io.github.foundationgames.automobility.util.TriCons; import io.github.foundationgames.automobility.util.TriFunc; @@ -88,6 +88,6 @@ static Platform get() { SimpleParticleType simpleParticleType(boolean z); - ControllerCompat controllerCompat(); + AutomobileController controller(); } diff --git a/common/src/main/java/io/github/foundationgames/automobility/screen/AutomobileHud.java b/common/src/main/java/io/github/foundationgames/automobility/screen/AutomobileHud.java index 16193b7..cab9e29 100644 --- a/common/src/main/java/io/github/foundationgames/automobility/screen/AutomobileHud.java +++ b/common/src/main/java/io/github/foundationgames/automobility/screen/AutomobileHud.java @@ -1,7 +1,6 @@ package io.github.foundationgames.automobility.screen; import com.google.common.collect.Lists; -import com.mojang.blaze3d.vertex.PoseStack; import io.github.foundationgames.automobility.entity.AutomobileEntity; import io.github.foundationgames.automobility.platform.Platform; import io.github.foundationgames.automobility.util.AUtils; @@ -27,7 +26,7 @@ public enum AutomobileHud {; public static void render(GuiGraphics graphics, Player player, AutomobileEntity auto, float tickDelta) { renderSpeedometer(graphics, auto); - if (!Platform.get().controllerCompat().inControllerMode()) { + if (!Platform.get().controller().inControllerMode()) { float alpha = Math.max(0, (auto.getStandStillTime() * 2) - 1); // Check on a 0-255 converted version of alpha, because 0 alpha will render things at 100% alpha for some diff --git a/fabric/build.gradle b/fabric/build.gradle index 4cffc42..db79024 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.3-SNAPSHOT' id 'maven-publish' } diff --git a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/FabricPlatform.java b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/FabricPlatform.java index 0a5dd48..d31c0a3 100644 --- a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/FabricPlatform.java +++ b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/FabricPlatform.java @@ -1,9 +1,9 @@ package io.github.foundationgames.automobility.fabric; import com.mojang.blaze3d.vertex.PoseStack; -import io.github.foundationgames.automobility.controller.ControllerCompat; -import io.github.foundationgames.automobility.fabric.controller.controlify.ControlifyCompat; -import io.github.foundationgames.automobility.fabric.controller.midnightcontrols.AutomobilityMidnightControls; +import io.github.foundationgames.automobility.controller.AutomobileController; +import io.github.foundationgames.automobility.fabric.controller.controlify.ControlifyController; +import io.github.foundationgames.automobility.fabric.controller.midnightcontrols.MidnightController; import io.github.foundationgames.automobility.platform.Platform; import io.github.foundationgames.automobility.util.HexCons; import io.github.foundationgames.automobility.util.TriCons; @@ -65,7 +65,7 @@ public class FabricPlatform implements Platform { private static final FabricPlatform INSTANCE = new FabricPlatform(); - private ControllerCompat controllerCompat = null; + private AutomobileController automobileController = null; public static void init() { Platform.init(INSTANCE); @@ -153,18 +153,18 @@ public SimpleParticleType simpleParticleType(boolean z) { } @Override - public ControllerCompat controllerCompat() { - if (controllerCompat == null) { + public AutomobileController controller() { + if (automobileController == null) { if (FabricLoader.getInstance().isModLoaded("controlify")) { - controllerCompat = new ControlifyCompat(); + automobileController = new ControlifyController(); } else if (FabricLoader.getInstance().isModLoaded("midnightcontrols")) { - controllerCompat = new AutomobilityMidnightControls(); + automobileController = new MidnightController(); } else { - controllerCompat = ControllerCompat.INCOMPATIBLE; + automobileController = AutomobileController.INCOMPATIBLE; } } - return controllerCompat; + return automobileController; } } diff --git a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/controlify/ControlifyCompat.java b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/controlify/ControlifyCompat.java index 7ed3a18..f4f11b2 100644 --- a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/controlify/ControlifyCompat.java +++ b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/controlify/ControlifyCompat.java @@ -1,71 +1,64 @@ package io.github.foundationgames.automobility.fabric.controller.controlify; import dev.isxander.controlify.api.ControlifyApi; -import dev.isxander.controlify.api.bind.BindingSupplier; -import dev.isxander.controlify.api.bind.ControllerBinding; -import dev.isxander.controlify.rumble.BasicRumbleEffect; -import dev.isxander.controlify.rumble.ContinuousRumbleEffect; -import dev.isxander.controlify.rumble.RumbleSource; -import dev.isxander.controlify.rumble.RumbleState; -import io.github.foundationgames.automobility.controller.ControllerCompat; +import dev.isxander.controlify.api.bind.ControlifyBindingsApi; +import dev.isxander.controlify.api.entrypoint.ControlifyEntrypoint; +import dev.isxander.controlify.api.event.ControlifyEvents; +import dev.isxander.controlify.api.guide.ActionPriority; +import dev.isxander.controlify.api.ingameguide.ActionLocation; +import dev.isxander.controlify.bindings.BindContext; +import dev.isxander.controlify.bindings.GamepadBinds; +import io.github.foundationgames.automobility.Automobility; +import io.github.foundationgames.automobility.entity.AutomobileEntity; +import net.minecraft.network.chat.Component; -public class ControlifyCompat implements ControllerCompat { - static BindingSupplier accelerateBinding, brakeBinding, driftBinding; - private ContinuousRumbleEffect driftRumbleEffect = null; +import java.util.Optional; +import java.util.Set; +public class ControlifyCompat implements ControlifyEntrypoint { @Override - public boolean accelerating() { - return isDown(accelerateBinding); - } + public void onControlifyPreInit(ControlifyApi controlify) { + BindContext drivingCtx = new BindContext(Automobility.rl("driving"), Set.of()); + Component category = Component.translatable("controlify.binding_category.driving"); - @Override - public boolean braking() { - return isDown(brakeBinding); - } + ControlifyController.accelerateBinding = ControlifyBindingsApi.get().registerBind(Automobility.rl("accelerate_automobile"), builder -> builder + .defaultBind(GamepadBinds.A_BUTTON) + .context(drivingCtx) + .category(category)); + ControlifyController.brakeBinding = ControlifyBindingsApi.get().registerBind(Automobility.rl("brake_automobile"), builder -> builder + .defaultBind(GamepadBinds.B_BUTTON) + .context(drivingCtx) + .category(category)); + ControlifyController.driftBinding = ControlifyBindingsApi.get().registerBind(Automobility.rl("drift_automobile"), builder -> builder + .defaultBind(GamepadBinds.RIGHT_TRIGGER) + .context(drivingCtx) + .category(category)); - @Override - public boolean drifting() { - return isDown(driftBinding); - } + ControlifyEvents.INGAME_GUIDE_REGISTRY.register((bindings, registry) -> { + var accelerate = bindings.get(Automobility.rl("accelerate_automobile")); + var brake = bindings.get(Automobility.rl("brake_automobile")); + var drift = bindings.get(Automobility.rl("drift_automobile")); - @Override - public boolean inControllerMode() { - return ControlifyApi.get().currentInputMode().isController(); - } - - private boolean isDown(BindingSupplier binding) { - return inControllerMode() && ControlifyApi.get().getCurrentController() - .map(binding::onController) - .map(ControllerBinding::held) - .orElse(false); - } - - @Override - public void crashRumble() { - ControlifyApi.get().getCurrentController().ifPresent(controller -> { - controller.rumbleManager().play( - RumbleSource.DAMAGE, - BasicRumbleEffect.byTime( - t -> new RumbleState(t < 0.5 ? 1 : 0, 1 - t), - 20 - ) - ); + registry.registerGuideAction(accelerate, ActionLocation.LEFT, ActionPriority.LOW, ctx -> { + if (ctx.player().getVehicle() instanceof AutomobileEntity) + return Optional.of(Component.translatable("controlify.binding.automobility.accelerate_automobile")); + return Optional.empty(); + }); + registry.registerGuideAction(brake, ActionLocation.LEFT, ActionPriority.LOW, ctx -> { + if (ctx.player().getVehicle() instanceof AutomobileEntity) + return Optional.of(Component.translatable("controlify.binding.automobility.brake_automobile")); + return Optional.empty(); + }); + registry.registerGuideAction(drift, ActionLocation.LEFT, ActionPriority.LOW, ctx -> { + if (ctx.player().getVehicle() instanceof AutomobileEntity) + return Optional.of(Component.translatable("controlify.binding.automobility.drift_automobile")); + return Optional.empty(); + }); }); } @Override - public void updateDriftRumbleState(boolean drifting) { - if (drifting) { - if (driftRumbleEffect != null && !driftRumbleEffect.isFinished()) - return; + public void onControllersDiscovered(ControlifyApi controlify) { - driftRumbleEffect = ContinuousRumbleEffect.builder() - .constant(0f, 0.8f) - .build(); - ControlifyApi.get().getCurrentController().ifPresent(controller -> - controller.rumbleManager().play(RumbleSource.MASTER, driftRumbleEffect)); - } else if (driftRumbleEffect != null) { - driftRumbleEffect.stop(); - } } } diff --git a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/controlify/ControlifyController.java b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/controlify/ControlifyController.java new file mode 100644 index 0000000..40b5d77 --- /dev/null +++ b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/controlify/ControlifyController.java @@ -0,0 +1,71 @@ +package io.github.foundationgames.automobility.fabric.controller.controlify; + +import dev.isxander.controlify.api.ControlifyApi; +import dev.isxander.controlify.api.bind.BindingSupplier; +import dev.isxander.controlify.api.bind.ControllerBinding; +import dev.isxander.controlify.rumble.BasicRumbleEffect; +import dev.isxander.controlify.rumble.ContinuousRumbleEffect; +import dev.isxander.controlify.rumble.RumbleSource; +import dev.isxander.controlify.rumble.RumbleState; +import io.github.foundationgames.automobility.controller.AutomobileController; + +public class ControlifyController implements AutomobileController { + static BindingSupplier accelerateBinding, brakeBinding, driftBinding; + private ContinuousRumbleEffect driftRumbleEffect = null; + + @Override + public boolean accelerating() { + return isDown(accelerateBinding); + } + + @Override + public boolean braking() { + return isDown(brakeBinding); + } + + @Override + public boolean drifting() { + return isDown(driftBinding); + } + + @Override + public boolean inControllerMode() { + return ControlifyApi.get().currentInputMode().isController(); + } + + private boolean isDown(BindingSupplier binding) { + return inControllerMode() && ControlifyApi.get().getCurrentController() + .map(binding::onController) + .map(ControllerBinding::held) + .orElse(false); + } + + @Override + public void crashRumble() { + ControlifyApi.get().getCurrentController().ifPresent(controller -> { + controller.rumbleManager().play( + RumbleSource.DAMAGE, + BasicRumbleEffect.byTime( + t -> new RumbleState(t < 0.5 ? 1 : 0, 1 - t), + 20 + ) + ); + }); + } + + @Override + public void updateDriftRumbleState(boolean drifting) { + if (drifting) { + if (driftRumbleEffect != null && !driftRumbleEffect.isFinished()) + return; + + driftRumbleEffect = ContinuousRumbleEffect.builder() + .constant(0f, 0.8f) + .build(); + ControlifyApi.get().getCurrentController().ifPresent(controller -> + controller.rumbleManager().play(RumbleSource.MASTER, driftRumbleEffect)); + } else if (driftRumbleEffect != null) { + driftRumbleEffect.stop(); + } + } +} diff --git a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/controlify/ControlifyInit.java b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/controlify/ControlifyInit.java deleted file mode 100644 index fe4868b..0000000 --- a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/controlify/ControlifyInit.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.github.foundationgames.automobility.fabric.controller.controlify; - -import dev.isxander.controlify.api.ControlifyApi; -import dev.isxander.controlify.api.bind.ControlifyBindingsApi; -import dev.isxander.controlify.api.entrypoint.ControlifyEntrypoint; -import dev.isxander.controlify.api.event.ControlifyEvents; -import dev.isxander.controlify.api.guide.ActionPriority; -import dev.isxander.controlify.api.ingameguide.ActionLocation; -import dev.isxander.controlify.bindings.BindContext; -import dev.isxander.controlify.bindings.GamepadBinds; -import io.github.foundationgames.automobility.Automobility; -import io.github.foundationgames.automobility.entity.AutomobileEntity; -import net.minecraft.network.chat.Component; - -import java.util.Optional; -import java.util.Set; - -public class ControlifyInit implements ControlifyEntrypoint { - @Override - public void onControlifyPreInit(ControlifyApi controlify) { - BindContext drivingCtx = new BindContext(Automobility.rl("driving"), Set.of()); - Component category = Component.translatable("controlify.binding_category.driving"); - - ControlifyCompat.accelerateBinding = ControlifyBindingsApi.get().registerBind(Automobility.rl("accelerate_automobile"), builder -> builder - .defaultBind(GamepadBinds.A_BUTTON) - .context(drivingCtx) - .category(category)); - ControlifyCompat.brakeBinding = ControlifyBindingsApi.get().registerBind(Automobility.rl("brake_automobile"), builder -> builder - .defaultBind(GamepadBinds.B_BUTTON) - .context(drivingCtx) - .category(category)); - ControlifyCompat.driftBinding = ControlifyBindingsApi.get().registerBind(Automobility.rl("drift_automobile"), builder -> builder - .defaultBind(GamepadBinds.RIGHT_TRIGGER) - .context(drivingCtx) - .category(category)); - - ControlifyEvents.INGAME_GUIDE_REGISTRY.register((bindings, registry) -> { - var accelerate = bindings.get(Automobility.rl("accelerate_automobile")); - var brake = bindings.get(Automobility.rl("brake_automobile")); - var drift = bindings.get(Automobility.rl("drift_automobile")); - - registry.registerGuideAction(accelerate, ActionLocation.LEFT, ActionPriority.LOW, ctx -> { - if (ctx.player().getVehicle() instanceof AutomobileEntity) - return Optional.of(Component.translatable("controlify.binding.automobility.accelerate_automobile")); - return Optional.empty(); - }); - registry.registerGuideAction(brake, ActionLocation.LEFT, ActionPriority.LOW, ctx -> { - if (ctx.player().getVehicle() instanceof AutomobileEntity) - return Optional.of(Component.translatable("controlify.binding.automobility.brake_automobile")); - return Optional.empty(); - }); - registry.registerGuideAction(drift, ActionLocation.LEFT, ActionPriority.LOW, ctx -> { - if (ctx.player().getVehicle() instanceof AutomobileEntity) - return Optional.of(Component.translatable("controlify.binding.automobility.drift_automobile")); - return Optional.empty(); - }); - }); - } - - @Override - public void onControllersDiscovered(ControlifyApi controlify) { - - } -} diff --git a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/midnightcontrols/AutomobilityMidnightControls.java b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/midnightcontrols/MidnightController.java similarity index 92% rename from fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/midnightcontrols/AutomobilityMidnightControls.java rename to fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/midnightcontrols/MidnightController.java index 3fbc3b4..ded8420 100644 --- a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/midnightcontrols/AutomobilityMidnightControls.java +++ b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/controller/midnightcontrols/MidnightController.java @@ -10,7 +10,7 @@ import eu.midnightdust.midnightcontrols.client.controller.InputManager; import io.github.foundationgames.automobility.Automobility; import io.github.foundationgames.automobility.entity.AutomobileEntity; -import io.github.foundationgames.automobility.controller.ControllerCompat; +import io.github.foundationgames.automobility.controller.AutomobileController; import net.minecraft.client.Minecraft; import org.aperlambda.lambdacommon.Identifier; import org.aperlambda.lambdacommon.utils.function.PairPredicate; @@ -24,7 +24,7 @@ import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_BUTTON_A; import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_BUTTON_B; -public class AutomobilityMidnightControls implements CompatHandler, ControllerCompat { +public class MidnightController implements CompatHandler, AutomobileController { public final PairPredicate ON_AUTOMOBILE = (client, button) -> client.player != null && client.player.getVehicle() instanceof AutomobileEntity; public final Set AUTOMOBILITY_BINDINGS = new HashSet<>(); @@ -44,7 +44,7 @@ public class AutomobilityMidnightControls implements CompatHandler, ControllerCo @Override public void initCompat() { - MidnightControlsCompat.registerCompatHandler(new AutomobilityMidnightControls()); + MidnightControlsCompat.registerCompatHandler(new MidnightController()); } @Override diff --git a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/mixin/midnightcontrols/InputHandlersMixin.java b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/mixin/midnightcontrols/InputHandlersMixin.java index c4358ea..4795c11 100644 --- a/fabric/src/main/java/io/github/foundationgames/automobility/fabric/mixin/midnightcontrols/InputHandlersMixin.java +++ b/fabric/src/main/java/io/github/foundationgames/automobility/fabric/mixin/midnightcontrols/InputHandlersMixin.java @@ -3,7 +3,7 @@ import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding; import eu.midnightdust.midnightcontrols.client.controller.InputHandlers; import io.github.foundationgames.automobility.entity.AutomobileEntity; -import io.github.foundationgames.automobility.fabric.controller.midnightcontrols.AutomobilityMidnightControls; +import io.github.foundationgames.automobility.fabric.controller.midnightcontrols.MidnightController; import io.github.foundationgames.automobility.platform.Platform; import net.minecraft.client.Minecraft; import org.jetbrains.annotations.NotNull; @@ -22,7 +22,7 @@ public class InputHandlersMixin { private static void automobility$makeAutomobileInputsWork(@NotNull Minecraft client, @NotNull ButtonBinding binding, CallbackInfoReturnable cir) { var player = client.player; if (!(player == null || !(player.getVehicle() instanceof AutomobileEntity))) { - for (ButtonBinding ab : ((AutomobilityMidnightControls) Platform.get().controllerCompat()).AUTOMOBILITY_BINDINGS) { + for (ButtonBinding ab : ((MidnightController) Platform.get().controller()).AUTOMOBILITY_BINDINGS) { if (Arrays.equals(ab.getButton(), binding.getButton())) cir.setReturnValue(false); } } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 88d7a7d..0568726 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -22,7 +22,7 @@ "io.github.foundationgames.automobility.fabric.AutomobilityClientFabric" ], "controlify": [ - "io.github.foundationgames.automobility.fabric.controller.controlify.ControlifyInit" + "io.github.foundationgames.automobility.fabric.controller.controlify.ControlifyCompat" ] }, "mixins": [ diff --git a/forge/src/main/java/io/github/foundationgames/automobility/forge/ForgePlatform.java b/forge/src/main/java/io/github/foundationgames/automobility/forge/ForgePlatform.java index f42de87..16eecfd 100644 --- a/forge/src/main/java/io/github/foundationgames/automobility/forge/ForgePlatform.java +++ b/forge/src/main/java/io/github/foundationgames/automobility/forge/ForgePlatform.java @@ -1,7 +1,7 @@ package io.github.foundationgames.automobility.forge; import com.mojang.blaze3d.vertex.PoseStack; -import io.github.foundationgames.automobility.controller.ControllerCompat; +import io.github.foundationgames.automobility.controller.AutomobileController; import io.github.foundationgames.automobility.forge.client.BEWLRs; import io.github.foundationgames.automobility.forge.mixin.BlockColorsAccess; import io.github.foundationgames.automobility.forge.network.AutomobilityPacketHandler; @@ -145,8 +145,8 @@ public SimpleParticleType simpleParticleType(boolean z) { } @Override - public ControllerCompat controllerCompat() { - return ControllerCompat.INCOMPATIBLE; + public AutomobileController controller() { + return AutomobileController.INCOMPATIBLE; } }