Optimized imports and cherrypicked form 1.17

aleksilassila · Apr 8, 2022 · f874302 · f874302
1 parent d8e2c1b
commit f874302
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 14 deletions.
diff --git a/src/main/java/me/aleksilassila/litematica/printer/LitematicaMixinMod.java b/src/main/java/me/aleksilassila/litematica/printer/LitematicaMixinMod.java
@@ -7,7 +7,6 @@
 import fi.dy.masa.malilib.config.options.ConfigBoolean;
 import fi.dy.masa.malilib.config.options.ConfigHotkey;
 import fi.dy.masa.malilib.config.options.ConfigInteger;
-import fi.dy.masa.malilib.gui.GuiKeybindSettings;
 import fi.dy.masa.malilib.hotkeys.KeyCallbackToggleBooleanConfigWithMessage;
 import fi.dy.masa.malilib.hotkeys.KeybindSettings;
 import net.fabricmc.api.ModInitializer;

diff --git a/src/main/java/me/aleksilassila/litematica/printer/interfaces/Implementation.java b/src/main/java/me/aleksilassila/litematica/printer/interfaces/Implementation.java
@@ -1,8 +1,6 @@
 package me.aleksilassila.litematica.printer.interfaces;
 
 import me.aleksilassila.litematica.printer.mixin.PlayerMoveC2SPacketAccessor;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.MappingResolver;
 import net.minecraft.block.*;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.player.PlayerAbilities;

diff --git a/src/main/java/me/aleksilassila/litematica/printer/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/me/aleksilassila/litematica/printer/mixin/ClientPlayNetworkHandlerMixin.java
@@ -6,7 +6,6 @@
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.Packet;
-import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.util.math.Direction;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;

diff --git a/...n/java/me/aleksilassila/litematica/printer/mixin/MixinClientPlayerInteractionManager.java b/...n/java/me/aleksilassila/litematica/printer/mixin/MixinClientPlayerInteractionManager.java
@@ -3,10 +3,6 @@
 import me.aleksilassila.litematica.printer.interfaces.IClientPlayerInteractionManager;
 import me.aleksilassila.litematica.printer.printer.PlacementGuide;
 import me.aleksilassila.litematica.printer.printer.Printer;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.MappingResolver;
-import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
@@ -25,8 +21,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.lang.reflect.Method;
-
 @Mixin(ClientPlayerInteractionManager.class)
 public abstract class MixinClientPlayerInteractionManager implements IClientPlayerInteractionManager {
 	@Shadow

diff --git a/src/main/java/me/aleksilassila/litematica/printer/mixin/WorldLoadListenerMixin.java b/src/main/java/me/aleksilassila/litematica/printer/mixin/WorldLoadListenerMixin.java
@@ -5,13 +5,12 @@
 import me.aleksilassila.litematica.printer.printer.Printer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.world.ClientWorld;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import javax.annotation.Nullable;
-
 @Mixin(value = WorldLoadListener.class, remap = false)
 public class WorldLoadListenerMixin {
     @Inject(at = @At("TAIL"), method = "onWorldLoadPost")

diff --git a/src/main/java/me/aleksilassila/litematica/printer/printer/PrinterUtils.java b/src/main/java/me/aleksilassila/litematica/printer/printer/PrinterUtils.java
@@ -1,7 +1,8 @@
 package me.aleksilassila.litematica.printer.printer;
 
 import me.aleksilassila.litematica.printer.interfaces.Implementation;
-import net.minecraft.block.*;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.SlabBlock;
 import net.minecraft.block.enums.BlockHalf;
 import net.minecraft.block.enums.SlabType;
 import net.minecraft.client.network.ClientPlayerEntity;
@@ -15,7 +16,6 @@
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.World;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;