MarioClientSideData is now used instead of MarioClientSideDataImpleme…

…ntation wherever possible.
floral-qua-floral · Nov 19, 2024 · 40ca890 · 40ca890
1 parent 96fdd8b
commit 40ca890
Show file tree

Hide file tree

Showing 31 changed files with 60 additions and 67 deletions.
diff --git 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
@@ -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<ForcedSignalSpot> 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
@@ -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<BlockPos> bumpBlocksClient(
-			MarioClientSideDataImplementation marioClientData, @Nullable MarioMainClientData marioMainClientData,
+			MarioClientSideData marioClientData, @Nullable MarioMainClientData marioMainClientData,
 			ClientWorld world, Iterable<BlockPos> positions,
 			int strength, Direction direction
 	) {
@@ -275,7 +275,7 @@ private record BumpS2CPayload(int player, Set<BlockPos> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...main/java/com/floralquafloral/registries/states/action/baseactions/GroundPoundWindup.java b/...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
@@ -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
@@ -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
@@ -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/...main/java/com/floralquafloral/registries/states/action/baseactions/airborne/LongJump.java b/...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/...n/java/com/floralquafloral/registries/states/action/baseactions/grounded/ActionBasic.java b/...n/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/...ain/java/com/floralquafloral/registries/states/action/baseactions/grounded/DuckSlide.java b/...ain/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/...in/java/com/floralquafloral/registries/states/action/baseactions/grounded/DuckWaddle.java b/...in/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/...com/floralquafloral/registries/states/action/baseactions/grounded/GroundPoundLanding.java b/...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
@@ -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
@@ -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) {}