Cleaned up unused imports, why not

floral-qua-floral · Dec 16, 2024 · 86d0aa7 · 86d0aa7
1 parent 4b3671b
commit 86d0aa7
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 41 deletions.
diff --git a/api/src/main/java/com/fqf/mario_qua_mario/MarioQuaMarioAPI.java b/api/src/main/java/com/fqf/mario_qua_mario/MarioQuaMarioAPI.java
@@ -1,9 +1,6 @@
 package com.fqf.mario_qua_mario;
 
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.api.ModInitializer;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/api/src/main/java/com/fqf/mario_qua_mario/definitions/AttackInterceptingStateDefinition.java b/api/src/main/java/com/fqf/mario_qua_mario/definitions/AttackInterceptingStateDefinition.java
@@ -10,7 +10,6 @@
 import net.minecraft.util.Identifier;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.EntityHitResult;
-import net.minecraft.util.hit.HitResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/api/src/main/java/com/fqf/mario_qua_mario/mariodata/IMarioAuthoritativeData.java b/api/src/main/java/com/fqf/mario_qua_mario/mariodata/IMarioAuthoritativeData.java
@@ -1,6 +1,5 @@
 package com.fqf.mario_qua_mario.mariodata;
 
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 

diff --git a/api/src/main/java/com/fqf/mario_qua_mario/mariodata/IMarioData.java b/api/src/main/java/com/fqf/mario_qua_mario/mariodata/IMarioData.java
@@ -4,9 +4,6 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.Identifier;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public interface IMarioData {
 	PlayerEntity getMario();
 	boolean isClient();

diff --git a/api/src/main/java/com/fqf/mario_qua_mario/mariodata/IMarioTravelData.java b/api/src/main/java/com/fqf/mario_qua_mario/mariodata/IMarioTravelData.java
@@ -1,6 +1,5 @@
 package com.fqf.mario_qua_mario.mariodata;
 
-import net.minecraft.util.Pair;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
 import org.jetbrains.annotations.NotNull;

diff --git a/content/src/main/java/com/fqf/mario_qua_mario/MarioQuaMarioContent.java b/content/src/main/java/com/fqf/mario_qua_mario/MarioQuaMarioContent.java
@@ -1,7 +1,6 @@
 package com.fqf.mario_qua_mario;
 
 import net.fabricmc.api.ModInitializer;
-
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/content/src/main/java/com/fqf/mario_qua_mario/actions/generic/DebugSprint.java b/content/src/main/java/com/fqf/mario_qua_mario/actions/generic/DebugSprint.java
@@ -1,7 +1,8 @@
 package com.fqf.mario_qua_mario.actions.generic;
 
 import com.fqf.mario_qua_mario.MarioQuaMarioContent;
-import com.fqf.mario_qua_mario.definitions.actions.util.*;
+import com.fqf.mario_qua_mario.definitions.actions.util.EvaluatorEnvironment;
+import com.fqf.mario_qua_mario.definitions.actions.util.TransitionDefinition;
 import com.fqf.mario_qua_mario.mariodata.IMarioTravelData;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Identifier;

diff --git a/mod/src/client/java/com/fqf/mario_qua_mario/MarioQuaMarioClient.java b/mod/src/client/java/com/fqf/mario_qua_mario/MarioQuaMarioClient.java
@@ -1,11 +1,6 @@
 package com.fqf.mario_qua_mario;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.network.OtherClientPlayerEntity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.server.network.ServerPlayerEntity;
 
 public class MarioQuaMarioClient implements ClientModInitializer {
 	// This is in the client sources

diff --git a/mod/src/client/java/com/fqf/mario_qua_mario/mariodata/MarioMainClientData.java b/mod/src/client/java/com/fqf/mario_qua_mario/mariodata/MarioMainClientData.java
@@ -4,7 +4,6 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.player.PlayerEntity;
-import org.jetbrains.annotations.Nullable;
 
 public class MarioMainClientData extends MarioMoveableData implements IMarioClientDataImpl {
 	private ClientPlayerEntity mario;

diff --git a/...rc/client/java/com/fqf/mario_qua_mario/mixin/client/ClientPlayerEntityMarioDataMixin.java b/...rc/client/java/com/fqf/mario_qua_mario/mixin/client/ClientPlayerEntityMarioDataMixin.java
@@ -1,9 +1,8 @@
 package com.fqf.mario_qua_mario.mixin.client;
 
-import com.fqf.mario_qua_mario.mariodata.injections.MarioMainClientDataHolder;
 import com.fqf.mario_qua_mario.mariodata.MarioMainClientData;
 import com.fqf.mario_qua_mario.mariodata.MarioPlayerData;
-import com.fqf.mario_qua_mario.mixin.PlayerEntityMarioDataMixin;
+import com.fqf.mario_qua_mario.mariodata.injections.MarioMainClientDataHolder;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.ClientPlayerEntity;

diff --git a/...ient/java/com/fqf/mario_qua_mario/mixin/client/OtherClientPlayerEntityMarioDataMixin.java b/...ient/java/com/fqf/mario_qua_mario/mixin/client/OtherClientPlayerEntityMarioDataMixin.java
@@ -1,9 +1,8 @@
 package com.fqf.mario_qua_mario.mixin.client;
 
 import com.fqf.mario_qua_mario.mariodata.MarioOtherClientData;
-import com.fqf.mario_qua_mario.mariodata.injections.MarioOtherClientDataHolder;
 import com.fqf.mario_qua_mario.mariodata.MarioPlayerData;
-import com.fqf.mario_qua_mario.mixin.PlayerEntityMarioDataMixin;
+import com.fqf.mario_qua_mario.mariodata.injections.MarioOtherClientDataHolder;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.network.OtherClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;

diff --git a/mod/src/main/java/com/fqf/mario_qua_mario/MarioCommand.java b/mod/src/main/java/com/fqf/mario_qua_mario/MarioCommand.java
@@ -1,6 +1,5 @@
 package com.fqf.mario_qua_mario;
 
-import com.fqf.mario_qua_mario.mariodata.MarioServerPlayerData;
 import com.fqf.mario_qua_mario.packets.MarioDataPackets;
 import com.fqf.mario_qua_mario.registries.RegistryManager;
 import com.fqf.mario_qua_mario.registries.actions.AbstractParsedAction;

diff --git a/mod/src/main/java/com/fqf/mario_qua_mario/MarioQuaMario.java b/mod/src/main/java/com/fqf/mario_qua_mario/MarioQuaMario.java
@@ -2,9 +2,6 @@
 
 import com.fqf.mario_qua_mario.registries.RegistryManager;
 import net.fabricmc.api.ModInitializer;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/mod/src/main/java/com/fqf/mario_qua_mario/mariodata/MarioServerPlayerData.java b/mod/src/main/java/com/fqf/mario_qua_mario/mariodata/MarioServerPlayerData.java
@@ -1,6 +1,5 @@
 package com.fqf.mario_qua_mario.mariodata;
 
-import com.fqf.mario_qua_mario.MarioQuaMario;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;

diff --git a/mod/src/main/java/com/fqf/mario_qua_mario/packets/MarioDataPackets.java b/mod/src/main/java/com/fqf/mario_qua_mario/packets/MarioDataPackets.java
@@ -1,7 +1,6 @@
 package com.fqf.mario_qua_mario.packets;
 
 import com.fqf.mario_qua_mario.MarioQuaMario;
-import com.fqf.mario_qua_mario.mariodata.MarioServerPlayerData;
 import com.fqf.mario_qua_mario.registries.RegistryManager;
 import com.fqf.mario_qua_mario.registries.actions.AbstractParsedAction;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
@@ -10,7 +9,6 @@
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.codec.PacketCodecs;
 import net.minecraft.network.packet.CustomPayload;
-import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.server.network.ServerPlayerEntity;
 
 public class MarioDataPackets {

diff --git a/mod/src/main/java/com/fqf/mario_qua_mario/packets/MarioPackets.java b/mod/src/main/java/com/fqf/mario_qua_mario/packets/MarioPackets.java
@@ -1,15 +1,10 @@
 package com.fqf.mario_qua_mario.packets;
 
-import com.fqf.mario_qua_mario.mariodata.MarioPlayerData;
-import com.fqf.mario_qua_mario.mariodata.MarioServerPlayerData;
-import com.fqf.mario_qua_mario.registries.actions.AbstractParsedAction;
 import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.network.packet.CustomPayload;
 import net.minecraft.server.network.ServerPlayerEntity;
 
-import java.util.Collection;
-
 public class MarioPackets {
 	public static void register() {
 		MarioDataPackets.SetActionS2CPayload.register();

diff --git a/mod/src/main/java/com/fqf/mario_qua_mario/registries/actions/AbstractParsedAction.java b/mod/src/main/java/com/fqf/mario_qua_mario/registries/actions/AbstractParsedAction.java
@@ -1,7 +1,6 @@
 package com.fqf.mario_qua_mario.registries.actions;
 
 import com.fqf.mario_qua_mario.MarioQuaMario;
-import com.fqf.mario_qua_mario.definitions.actions.util.IncompleteActionDefinition;
 import com.fqf.mario_qua_mario.definitions.actions.util.*;
 import com.fqf.mario_qua_mario.mariodata.MarioMoveableData;
 import com.fqf.mario_qua_mario.registries.ParsedMarioThing;

diff --git a/mod/src/main/java/com/fqf/mario_qua_mario/registries/actions/ParsedActionHelper.java b/mod/src/main/java/com/fqf/mario_qua_mario/registries/actions/ParsedActionHelper.java
@@ -1,20 +1,16 @@
 package com.fqf.mario_qua_mario.registries.actions;
 
-import com.fqf.mario_qua_mario.MarioAbstractClientHelper;
 import com.fqf.mario_qua_mario.MarioQuaMario;
 import com.fqf.mario_qua_mario.definitions.actions.*;
 import com.fqf.mario_qua_mario.definitions.actions.util.IncompleteActionDefinition;
 import com.fqf.mario_qua_mario.definitions.actions.util.TransitionInjectionDefinition;
 import com.fqf.mario_qua_mario.mariodata.IMarioClientData;
-import com.fqf.mario_qua_mario.mariodata.IMarioData;
 import com.fqf.mario_qua_mario.mariodata.MarioMoveableData;
 import com.fqf.mario_qua_mario.mariodata.MarioPlayerData;
 import com.fqf.mario_qua_mario.registries.actions.parsed.*;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.random.RandomSeed;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Set;
 
 public class ParsedActionHelper {

diff --git a/mod/src/main/java/com/fqf/mario_qua_mario/registries/actions/ParsedTransition.java b/mod/src/main/java/com/fqf/mario_qua_mario/registries/actions/ParsedTransition.java
@@ -8,8 +8,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 public record ParsedTransition(
 		@NotNull AbstractParsedAction targetAction,
 		@NotNull TransitionDefinition.Evaluator evaluator,

diff --git a/...main/java/com/fqf/mario_qua_mario/registries/actions/UniversalActionDefinitionHelper.java b/...main/java/com/fqf/mario_qua_mario/registries/actions/UniversalActionDefinitionHelper.java
@@ -1,6 +1,9 @@
 package com.fqf.mario_qua_mario.registries.actions;
 
-import com.fqf.mario_qua_mario.definitions.actions.*;
+import com.fqf.mario_qua_mario.definitions.actions.AirborneActionDefinition;
+import com.fqf.mario_qua_mario.definitions.actions.AquaticActionDefinition;
+import com.fqf.mario_qua_mario.definitions.actions.GroundedActionDefinition;
+import com.fqf.mario_qua_mario.definitions.actions.WallboundActionDefinition;
 import com.fqf.mario_qua_mario.definitions.actions.util.IncompleteActionDefinition;
 import com.fqf.mario_qua_mario.definitions.actions.util.TransitionDefinition;
 import com.fqf.mario_qua_mario.mariodata.IMarioReadableMotionData;