From 40ca89006614ff70f1acb5033fa248ca16abd406 Mon Sep 17 00:00:00 2001 From: Floral <49110090+floral-qua-floral@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:24:24 -0500 Subject: [PATCH] MarioClientSideData is now used instead of MarioClientSideDataImplementation wherever possible. --- .../com/floralquafloral/bumping/BlockBumpCallback.java | 4 ++-- .../java/com/floralquafloral/bumping/BlockBumpHandler.java | 6 +++--- src/main/java/com/floralquafloral/bumping/BumpManager.java | 6 +++--- .../registries/states/MarioStateDefinition.java | 4 ++-- .../registries/states/ParsedMarioState.java | 4 ++-- .../registries/states/action/ActionDefinition.java | 4 ++-- .../registries/states/action/ParsedAction.java | 7 ++----- .../registries/states/action/baseactions/ActionDebug.java | 3 +-- .../states/action/baseactions/ActionDebugAlt.java | 4 ++-- .../registries/states/action/baseactions/GroundPound.java | 4 ++-- .../states/action/baseactions/GroundPoundWindup.java | 4 ++-- .../registries/states/action/baseactions/Mounted.java | 4 ++-- .../states/action/baseactions/airborne/Fall.java | 4 ++-- .../states/action/baseactions/airborne/Jump.java | 4 ++-- .../states/action/baseactions/airborne/LongJump.java | 4 ++-- .../states/action/baseactions/grounded/ActionBasic.java | 4 ++-- .../states/action/baseactions/grounded/DuckSlide.java | 3 +-- .../states/action/baseactions/grounded/DuckWaddle.java | 3 +-- .../action/baseactions/grounded/GroundPoundLanding.java | 4 ++-- .../states/action/baseactions/grounded/PRun.java | 4 ++-- .../states/action/baseactions/grounded/Skid.java | 3 +-- .../registries/states/character/basecharacters/Luigi.java | 4 ++-- .../registries/states/character/basecharacters/Mario.java | 4 ++-- .../states/character/basecharacters/Toadette.java | 4 ++-- .../registries/states/powerup/basepowerups/SmallForm.java | 4 ++-- .../registries/states/powerup/basepowerups/SuperForm.java | 4 ++-- .../com/floralquafloral/registries/stomp/ParsedStomp.java | 4 ++-- .../floralquafloral/registries/stomp/StompDefinition.java | 4 ++-- .../com/floralquafloral/registries/stomp/StompHandler.java | 4 ++-- .../registries/stomp/basestomptypes/GroundPoundStomp.java | 4 ++-- .../registries/stomp/basestomptypes/JumpStomp.java | 4 ++-- 31 files changed, 60 insertions(+), 67 deletions(-) diff --git a/src/main/java/com/floralquafloral/bumping/BlockBumpCallback.java b/src/main/java/com/floralquafloral/bumping/BlockBumpCallback.java index 3b50d84..1388715 100644 --- a/src/main/java/com/floralquafloral/bumping/BlockBumpCallback.java +++ b/src/main/java/com/floralquafloral/bumping/BlockBumpCallback.java @@ -1,6 +1,6 @@ package com.floralquafloral.bumping; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.MarioData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import net.fabricmc.fabric.api.event.Event; @@ -42,7 +42,7 @@ public interface BlockBumpCallback { ); BlockBumpResult bump( - MarioData marioData, @Nullable MarioClientSideDataImplementation marioClientData, @Nullable MarioTravelData marioTravelData, + MarioData marioData, @Nullable MarioClientSideData marioClientData, @Nullable MarioTravelData marioTravelData, World world, BlockPos blockPos, BlockState blockState, int strength, int modifier, Direction direction ); diff --git a/src/main/java/com/floralquafloral/bumping/BlockBumpHandler.java b/src/main/java/com/floralquafloral/bumping/BlockBumpHandler.java index 4142e18..6d812bd 100644 --- a/src/main/java/com/floralquafloral/bumping/BlockBumpHandler.java +++ b/src/main/java/com/floralquafloral/bumping/BlockBumpHandler.java @@ -1,6 +1,6 @@ package com.floralquafloral.bumping; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.MarioData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import net.minecraft.block.Block; @@ -37,7 +37,7 @@ public class BlockBumpHandler { public static final Set FORCED_SIGNALS_DATA = new HashSet<>(); public static BlockBumpResult processBumpResult( - MarioData marioData, @Nullable MarioClientSideDataImplementation marioClientData, @Nullable MarioTravelData marioTravelData, + MarioData marioData, @Nullable MarioClientSideData marioClientData, @Nullable MarioTravelData marioTravelData, World world, BlockPos blockPos, BlockState blockState, int strength, int modifier, Direction direction ) { @@ -68,7 +68,7 @@ else if(result == BlockBumpResult.DISPLACE) { private static class InvalidBumpResultException extends RuntimeException {} private static BlockBumpResult getBumpResult( - MarioData marioData, @Nullable MarioClientSideDataImplementation marioClientData, @Nullable MarioTravelData marioTravelData, + MarioData marioData, @Nullable MarioClientSideData marioClientData, @Nullable MarioTravelData marioTravelData, World world, BlockPos blockPos, BlockState blockState, int strength, int modifier, Direction direction ) { diff --git a/src/main/java/com/floralquafloral/bumping/BumpManager.java b/src/main/java/com/floralquafloral/bumping/BumpManager.java index 6224281..606efc6 100644 --- a/src/main/java/com/floralquafloral/bumping/BumpManager.java +++ b/src/main/java/com/floralquafloral/bumping/BumpManager.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioPackets; import com.floralquafloral.MarioQuaMario; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.MarioDataManager; import com.floralquafloral.mariodata.moveable.MarioMainClientData; import com.floralquafloral.mariodata.moveable.MarioServerData; @@ -156,7 +156,7 @@ public static void attemptBumpBlocks( } public static Set bumpBlocksClient( - MarioClientSideDataImplementation marioClientData, @Nullable MarioMainClientData marioMainClientData, + MarioClientSideData marioClientData, @Nullable MarioMainClientData marioMainClientData, ClientWorld world, Iterable positions, int strength, Direction direction ) { @@ -275,7 +275,7 @@ private record BumpS2CPayload(int player, Set positions, Direction dir ); public static void registerReceiver() { ClientPlayNetworking.registerGlobalReceiver(ID, (payload, context) -> { - MarioClientSideDataImplementation data = (MarioClientSideDataImplementation) MarioDataManager.getMarioData(context.player()); + MarioClientSideData data = (MarioClientSideData) MarioDataManager.getMarioData(context.player()); bumpBlocksClient( data, null, context.player().clientWorld, payload.positions, diff --git a/src/main/java/com/floralquafloral/registries/states/MarioStateDefinition.java b/src/main/java/com/floralquafloral/registries/states/MarioStateDefinition.java index 6b28abd..66670cd 100644 --- a/src/main/java/com/floralquafloral/registries/states/MarioStateDefinition.java +++ b/src/main/java/com/floralquafloral/registries/states/MarioStateDefinition.java @@ -1,13 +1,13 @@ package com.floralquafloral.registries.states; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import net.minecraft.util.Identifier; import org.jetbrains.annotations.NotNull; public interface MarioStateDefinition { @NotNull Identifier getID(); - void clientTick(MarioClientSideDataImplementation data, boolean isSelf); + void clientTick(MarioClientSideData data, boolean isSelf); void serverTick(MarioAuthoritativeData data); } diff --git a/src/main/java/com/floralquafloral/registries/states/ParsedMarioState.java b/src/main/java/com/floralquafloral/registries/states/ParsedMarioState.java index d64a2d7..054e1d2 100644 --- a/src/main/java/com/floralquafloral/registries/states/ParsedMarioState.java +++ b/src/main/java/com/floralquafloral/registries/states/ParsedMarioState.java @@ -1,6 +1,6 @@ package com.floralquafloral.registries.states; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioServerData; import net.minecraft.util.Identifier; @@ -13,7 +13,7 @@ protected ParsedMarioState(MarioStateDefinition definition) { this.DEFINITION = definition; } - public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + public void clientTick(MarioClientSideData data, boolean isSelf) { this.DEFINITION.clientTick(data, isSelf); } public void serverTick(MarioServerData data) { diff --git a/src/main/java/com/floralquafloral/registries/states/action/ActionDefinition.java b/src/main/java/com/floralquafloral/registries/states/action/ActionDefinition.java index 05beb4c..52c12e4 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/ActionDefinition.java +++ b/src/main/java/com/floralquafloral/registries/states/action/ActionDefinition.java @@ -1,6 +1,6 @@ package com.floralquafloral.registries.states.action; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.MarioStateDefinition; import net.minecraft.util.Identifier; @@ -175,7 +175,7 @@ class ActionTransitionDefinition { void execute(MarioTravelData data); } @FunctionalInterface public interface TransitionExecutorClients { - void execute(MarioClientSideDataImplementation data, boolean isSelf, long seed); + void execute(MarioClientSideData data, boolean isSelf, long seed); } public final Identifier TARGET_IDENTIFIER; diff --git a/src/main/java/com/floralquafloral/registries/states/action/ParsedAction.java b/src/main/java/com/floralquafloral/registries/states/action/ParsedAction.java index 8f540b6..b6e52b2 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/ParsedAction.java +++ b/src/main/java/com/floralquafloral/registries/states/action/ParsedAction.java @@ -1,10 +1,7 @@ package com.floralquafloral.registries.states.action; import com.floralquafloral.MarioQuaMario; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; -import com.floralquafloral.mariodata.MarioData; -import com.floralquafloral.mariodata.MarioDataPackets; -import com.floralquafloral.mariodata.MarioPlayerData; +import com.floralquafloral.mariodata.*; import com.floralquafloral.mariodata.moveable.MarioMainClientData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.ParsedMarioState; @@ -169,7 +166,7 @@ private void execute(MarioData data, long seed) { if(this.EXECUTOR_TRAVELLERS != null && data instanceof MarioTravelData travelData) this.EXECUTOR_TRAVELLERS.execute(travelData); - if(this.EXECUTOR_CLIENTS != null && data instanceof MarioClientSideDataImplementation clientData) + if(this.EXECUTOR_CLIENTS != null && data instanceof MarioClientSideData clientData) this.EXECUTOR_CLIENTS.execute(clientData, data.getMario().isMainPlayer(), seed); } } diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/ActionDebug.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/ActionDebug.java index 95d29e4..51336a5 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/ActionDebug.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/ActionDebug.java @@ -3,7 +3,6 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; import com.floralquafloral.mariodata.MarioClientSideData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.ActionDefinition; import net.minecraft.util.Identifier; @@ -34,7 +33,7 @@ public void travelHook(MarioTravelData data) { } @Override - public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) {} + public void clientTick(MarioClientSideData data, boolean isSelf) {} @Override public void serverTick(MarioAuthoritativeData data) { diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/ActionDebugAlt.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/ActionDebugAlt.java index 2a6467e..2814778 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/ActionDebugAlt.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/ActionDebugAlt.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.ActionDefinition; import net.minecraft.sound.SoundEvents; @@ -36,7 +36,7 @@ public void travelHook(MarioTravelData data) { } @Override - public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) {} + public void clientTick(MarioClientSideData data, boolean isSelf) {} @Override public void serverTick(MarioAuthoritativeData data) { diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/GroundPound.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/GroundPound.java index 4abd4be..b9dda5e 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/GroundPound.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/GroundPound.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.ActionDefinition; import com.floralquafloral.registries.states.action.AirborneActionDefinition; @@ -52,7 +52,7 @@ public class GroundPound implements ActionDefinition { ); } - @Override public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + @Override public void clientTick(MarioClientSideData data, boolean isSelf) { } diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/GroundPoundWindup.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/GroundPoundWindup.java index 43dbc38..94804bc 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/GroundPoundWindup.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/GroundPoundWindup.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.ActionDefinition; import net.minecraft.util.Identifier; @@ -42,7 +42,7 @@ public void travelHook(MarioTravelData data) { } @Override - public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) {} + public void clientTick(MarioClientSideData data, boolean isSelf) {} @Override public void serverTick(MarioAuthoritativeData data) { diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/Mounted.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/Mounted.java index b419152..b558c5a 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/Mounted.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/Mounted.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.MarioPlayerData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.ActionDefinition; @@ -34,7 +34,7 @@ public void travelHook(MarioTravelData data) { } @Override - public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + public void clientTick(MarioClientSideData data, boolean isSelf) { } diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/Fall.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/Fall.java index 2d4cf03..7f896be 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/Fall.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/Fall.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.AirborneActionDefinition; import com.floralquafloral.stats.CharaStat; @@ -50,7 +50,7 @@ public class Fall extends AirborneActionDefinition { airborneAccel(data); } - @Override public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + @Override public void clientTick(MarioClientSideData data, boolean isSelf) { } diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/Jump.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/Jump.java index 9c192a9..8fa4338 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/Jump.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/Jump.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.AirborneActionDefinition; import com.floralquafloral.stats.CharaStat; @@ -54,7 +54,7 @@ public class Jump extends AirborneActionDefinition { airborneAccel(data); } - @Override public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + @Override public void clientTick(MarioClientSideData data, boolean isSelf) { } diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/LongJump.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/LongJump.java index adc8d0a..ca2c212 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/LongJump.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/airborne/LongJump.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.AirborneActionDefinition; import com.floralquafloral.stats.CharaStat; @@ -57,7 +57,7 @@ public class LongJump extends AirborneActionDefinition { airborneAccel(data); } - @Override public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + @Override public void clientTick(MarioClientSideData data, boolean isSelf) { } diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/ActionBasic.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/ActionBasic.java index 79a0643..925ebe8 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/ActionBasic.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/ActionBasic.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.GroundedActionDefinition; import com.floralquafloral.stats.CharaStat; @@ -150,7 +150,7 @@ else if(data.getForwardVel() < BACKPEDAL_SPEED.getAsLimit(data)) { } } - @Override public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) {} + @Override public void clientTick(MarioClientSideData data, boolean isSelf) {} @Override public void serverTick(MarioAuthoritativeData data) {} diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/DuckSlide.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/DuckSlide.java index a2a819c..f2146aa 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/DuckSlide.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/DuckSlide.java @@ -3,7 +3,6 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; import com.floralquafloral.mariodata.MarioClientSideData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.GroundedActionDefinition; import com.floralquafloral.registries.states.action.baseactions.airborne.LongJump; @@ -51,7 +50,7 @@ public void groundedTravel(MarioTravelData data) { ); } - @Override public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) {} + @Override public void clientTick(MarioClientSideData data, boolean isSelf) {} @Override public void serverTick(MarioAuthoritativeData data) {} diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/DuckWaddle.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/DuckWaddle.java index e6f42fe..2c1db98 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/DuckWaddle.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/DuckWaddle.java @@ -3,7 +3,6 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; import com.floralquafloral.mariodata.MarioClientSideData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.GroundedActionDefinition; import com.floralquafloral.registries.states.action.baseactions.airborne.Backflip; @@ -90,7 +89,7 @@ public void groundedTravel(MarioTravelData data) { ); } - @Override public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) {} + @Override public void clientTick(MarioClientSideData data, boolean isSelf) {} @Override public void serverTick(MarioAuthoritativeData data) {} diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/GroundPoundLanding.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/GroundPoundLanding.java index cb112f3..7497a58 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/GroundPoundLanding.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/GroundPoundLanding.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioMainClientData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.GroundedActionDefinition; @@ -31,7 +31,7 @@ public void groundedTravel(MarioTravelData data) { data.getTimers().actionTimer++; } - @Override public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) {} + @Override public void clientTick(MarioClientSideData data, boolean isSelf) {} @Override public void serverTick(MarioAuthoritativeData data) {} diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/PRun.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/PRun.java index 7b77c7c..fca912e 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/PRun.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/PRun.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.GroundedActionDefinition; import com.floralquafloral.stats.CharaStat; @@ -45,7 +45,7 @@ public void groundedTravel(MarioTravelData data) { ); } - @Override public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) {} + @Override public void clientTick(MarioClientSideData data, boolean isSelf) {} @Override public void serverTick(MarioAuthoritativeData data) {} diff --git a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/Skid.java b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/Skid.java index 18f35aa..363bcf0 100644 --- a/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/Skid.java +++ b/src/main/java/com/floralquafloral/registries/states/action/baseactions/grounded/Skid.java @@ -3,7 +3,6 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; import com.floralquafloral.mariodata.MarioClientSideData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.states.action.GroundedActionDefinition; import com.floralquafloral.registries.states.action.baseactions.airborne.Sideflip; @@ -54,7 +53,7 @@ public void groundedTravel(MarioTravelData data) { if(MathHelper.approximatelyEquals(data.getForwardVel(), 0.0)) data.getTimers().actionTimer++; } - @Override public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) {} + @Override public void clientTick(MarioClientSideData data, boolean isSelf) {} @Override public void serverTick(MarioAuthoritativeData data) {} diff --git a/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Luigi.java b/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Luigi.java index eddedc2..5c83ba3 100644 --- a/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Luigi.java +++ b/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Luigi.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.registries.states.character.CharacterDefinition; import com.floralquafloral.stats.StatCategory; import net.minecraft.util.Identifier; @@ -47,7 +47,7 @@ public void populateStatModifiers(Map, Double> modifiers) { } @Override - public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + public void clientTick(MarioClientSideData data, boolean isSelf) { } diff --git a/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Mario.java b/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Mario.java index fe25930..59fdaa9 100644 --- a/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Mario.java +++ b/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Mario.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.registries.states.character.CharacterDefinition; import com.floralquafloral.stats.StatCategory; import net.minecraft.util.Identifier; @@ -33,7 +33,7 @@ public void populateStatModifiers(Map, Double> modifiers) { } @Override - public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + public void clientTick(MarioClientSideData data, boolean isSelf) { } diff --git a/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Toadette.java b/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Toadette.java index b61b8c8..90c17c6 100644 --- a/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Toadette.java +++ b/src/main/java/com/floralquafloral/registries/states/character/basecharacters/Toadette.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.registries.states.character.CharacterDefinition; import com.floralquafloral.stats.StatCategory; import net.minecraft.util.Identifier; @@ -33,7 +33,7 @@ public void populateStatModifiers(Map, Double> modifiers) { } @Override - public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + public void clientTick(MarioClientSideData data, boolean isSelf) { } diff --git a/src/main/java/com/floralquafloral/registries/states/powerup/basepowerups/SmallForm.java b/src/main/java/com/floralquafloral/registries/states/powerup/basepowerups/SmallForm.java index 95a8e5a..b12a1ee 100644 --- a/src/main/java/com/floralquafloral/registries/states/powerup/basepowerups/SmallForm.java +++ b/src/main/java/com/floralquafloral/registries/states/powerup/basepowerups/SmallForm.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.MarioData; import com.floralquafloral.registries.states.powerup.PowerUpDefinition; import com.floralquafloral.stats.StatCategory; @@ -20,7 +20,7 @@ public class SmallForm implements PowerUpDefinition { } @Override - public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + public void clientTick(MarioClientSideData data, boolean isSelf) { } diff --git a/src/main/java/com/floralquafloral/registries/states/powerup/basepowerups/SuperForm.java b/src/main/java/com/floralquafloral/registries/states/powerup/basepowerups/SuperForm.java index 5f69e16..0c11d66 100644 --- a/src/main/java/com/floralquafloral/registries/states/powerup/basepowerups/SuperForm.java +++ b/src/main/java/com/floralquafloral/registries/states/powerup/basepowerups/SuperForm.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioQuaMario; import com.floralquafloral.mariodata.MarioAuthoritativeData; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.MarioData; import com.floralquafloral.registries.states.powerup.PowerUpDefinition; import com.floralquafloral.stats.StatCategory; @@ -20,7 +20,7 @@ public class SuperForm implements PowerUpDefinition { } @Override - public void clientTick(MarioClientSideDataImplementation data, boolean isSelf) { + public void clientTick(MarioClientSideData data, boolean isSelf) { } diff --git a/src/main/java/com/floralquafloral/registries/stomp/ParsedStomp.java b/src/main/java/com/floralquafloral/registries/stomp/ParsedStomp.java index 8b261b3..5ef8455 100644 --- a/src/main/java/com/floralquafloral/registries/stomp/ParsedStomp.java +++ b/src/main/java/com/floralquafloral/registries/stomp/ParsedStomp.java @@ -1,6 +1,6 @@ package com.floralquafloral.registries.stomp; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.moveable.MarioMoveableData; import com.floralquafloral.mariodata.moveable.MarioServerData; import com.floralquafloral.registries.RegistryManager; @@ -108,7 +108,7 @@ else if (entry.attribute().value().equals(EntityAttributes.GENERIC_ARMOR_TOUGHNE } return false; } - public void executeClient(MarioClientSideDataImplementation data, boolean isSelf, Entity target, boolean harmless, long seed) { + public void executeClient(MarioClientSideData data, boolean isSelf, Entity target, boolean harmless, long seed) { data.getMario().fallDistance = 0; if(this.SOUND_EVENT != null) { data.playSoundEvent( diff --git a/src/main/java/com/floralquafloral/registries/stomp/StompDefinition.java b/src/main/java/com/floralquafloral/registries/stomp/StompDefinition.java index 277f11f..5b4adaa 100644 --- a/src/main/java/com/floralquafloral/registries/stomp/StompDefinition.java +++ b/src/main/java/com/floralquafloral/registries/stomp/StompDefinition.java @@ -1,6 +1,6 @@ package com.floralquafloral.registries.stomp; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.MarioData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import net.minecraft.entity.Entity; @@ -28,7 +28,7 @@ public interface StompDefinition { float calculateDamage(MarioData data, ServerPlayerEntity mario, ItemStack equipment, float equipmentArmorValue, Entity target); void executeTravellers(MarioTravelData data, Entity target, boolean harmless); - void executeClients(MarioClientSideDataImplementation data, boolean isSelf, Entity target, boolean harmless, long seed); + void executeClients(MarioClientSideData data, boolean isSelf, Entity target, boolean harmless, long seed); enum PainfulStompResponse { INJURY, diff --git a/src/main/java/com/floralquafloral/registries/stomp/StompHandler.java b/src/main/java/com/floralquafloral/registries/stomp/StompHandler.java index 45a91d3..e2cc769 100644 --- a/src/main/java/com/floralquafloral/registries/stomp/StompHandler.java +++ b/src/main/java/com/floralquafloral/registries/stomp/StompHandler.java @@ -2,7 +2,7 @@ import com.floralquafloral.MarioPackets; import com.floralquafloral.MarioQuaMario; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.MarioPlayerData; import com.floralquafloral.registries.RegistryManager; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; @@ -69,7 +69,7 @@ public static void registerReceiver() { return; } MarioPlayerData data = getMarioData(mario); - stompType.executeClient((MarioClientSideDataImplementation) data, mario.isMainPlayer(), target, payload.harmless, payload.seed); + stompType.executeClient((MarioClientSideData) data, mario.isMainPlayer(), target, payload.harmless, payload.seed); // data.setActionTransitionless(RegistryManager.ACTIONS.get(stompType.POST_STOMP_ACTION)); }); } diff --git a/src/main/java/com/floralquafloral/registries/stomp/basestomptypes/GroundPoundStomp.java b/src/main/java/com/floralquafloral/registries/stomp/basestomptypes/GroundPoundStomp.java index 8710db8..a49e763 100644 --- a/src/main/java/com/floralquafloral/registries/stomp/basestomptypes/GroundPoundStomp.java +++ b/src/main/java/com/floralquafloral/registries/stomp/basestomptypes/GroundPoundStomp.java @@ -1,7 +1,7 @@ package com.floralquafloral.registries.stomp.basestomptypes; import com.floralquafloral.MarioQuaMario; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.MarioData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.stomp.StompDefinition; @@ -63,7 +63,7 @@ public class GroundPoundStomp implements StompDefinition { double deltaY = data.getMario().getY() - (target.getY() - target.getHeight()); } - @Override public void executeClients(MarioClientSideDataImplementation data, boolean isSelf, Entity target, boolean harmless, long seed) { + @Override public void executeClients(MarioClientSideData data, boolean isSelf, Entity target, boolean harmless, long seed) { } } diff --git a/src/main/java/com/floralquafloral/registries/stomp/basestomptypes/JumpStomp.java b/src/main/java/com/floralquafloral/registries/stomp/basestomptypes/JumpStomp.java index 500f2a2..0d252e0 100644 --- a/src/main/java/com/floralquafloral/registries/stomp/basestomptypes/JumpStomp.java +++ b/src/main/java/com/floralquafloral/registries/stomp/basestomptypes/JumpStomp.java @@ -1,7 +1,7 @@ package com.floralquafloral.registries.stomp.basestomptypes; import com.floralquafloral.MarioQuaMario; -import com.floralquafloral.mariodata.MarioClientSideDataImplementation; +import com.floralquafloral.mariodata.MarioClientSideData; import com.floralquafloral.mariodata.MarioData; import com.floralquafloral.mariodata.moveable.MarioTravelData; import com.floralquafloral.registries.stomp.StompDefinition; @@ -75,7 +75,7 @@ public class JumpStomp implements StompDefinition { data.setYVel(BOUNCE_VEL.get(data)); } - @Override public void executeClients(MarioClientSideDataImplementation data, boolean isSelf, Entity target, boolean harmless, long seed) { + @Override public void executeClients(MarioClientSideData data, boolean isSelf, Entity target, boolean harmless, long seed) { } }