From 5deebe7f964f6d5b28b2f48f64dfb6e1de18e114 Mon Sep 17 00:00:00 2001 From: Voomra Date: Wed, 11 Jun 2025 04:21:27 +0300 Subject: [PATCH] =?UTF-8?q?refac:=20=D0=B2=D1=8B=D0=B4=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=B1=D1=89=D0=B5=D0=B3=D0=BE=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=B4=D0=B0=20(part=204)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/main/java/net/minecraft/client/Minecraft.java | 6 +++--- .../src/main/java/net/minecraft/src/CanvasIsomPreview.java | 5 +---- client/src/main/java/net/minecraft/src/GuiGameOver.java | 1 + client/src/main/java/net/minecraft/src/GuiRenameWorld.java | 1 + client/src/main/java/net/minecraft/src/GuiSelectWorld.java | 2 ++ client/src/main/java/net/minecraft/src/GuiWorldSlot.java | 1 + .../java/ru/di9/minecraft/shared}/AnvilChunkLoader.java | 6 +++--- .../ru/di9/minecraft/shared}/AnvilChunkLoaderPending.java | 4 ++-- .../java/ru/di9/minecraft/shared}/AnvilConverterData.java | 3 ++- .../java/ru/di9/minecraft/shared}/AnvilSaveConverter.java | 4 ++-- .../minecraft/shared}/AnvilSaveConverterFileFilter.java | 3 ++- .../java/ru/di9/minecraft/shared}/AnvilSaveHandler.java | 5 ++--- .../main/java/ru/di9/minecraft/shared}/ChunkLoader.java | 5 ++--- .../main/java/ru/di9/minecraft/shared}/ISaveFormat.java | 7 ++----- .../java/ru/di9/minecraft/shared}/MinecraftException.java | 3 ++- .../java/ru/di9/minecraft/shared}/NibbleArrayReader.java | 3 ++- .../src/main/java/ru/di9/minecraft/shared}/RegionFile.java | 3 ++- .../java/ru/di9/minecraft/shared}/RegionFileCache.java | 3 ++- .../ru/di9/minecraft/shared}/RegionFileChunkBuffer.java | 3 ++- .../ru/di9/minecraft/shared}/SaveFormatComparator.java | 3 ++- .../main/java/ru/di9/minecraft/shared}/SaveFormatOld.java | 7 ++----- .../main/java/ru/di9/minecraft/shared}/SaveHandler.java | 4 ++-- 22 files changed, 42 insertions(+), 40 deletions(-) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/AnvilChunkLoader.java (99%) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/AnvilChunkLoaderPending.java (83%) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/AnvilConverterData.java (90%) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/AnvilSaveConverter.java (99%) rename {server/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/AnvilSaveConverterFileFilter.java (87%) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/AnvilSaveHandler.java (95%) rename {server/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/ChunkLoader.java (97%) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/ISaveFormat.java (89%) rename {server/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/MinecraftException.java (71%) rename {server/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/NibbleArrayReader.java (91%) rename {server/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/RegionFile.java (99%) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/RegionFileCache.java (97%) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/RegionFileChunkBuffer.java (89%) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/SaveFormatComparator.java (96%) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/SaveFormatOld.java (96%) rename {client/src/main/java/net/minecraft/src => shared2/src/main/java/ru/di9/minecraft/shared}/SaveHandler.java (99%) diff --git a/client/src/main/java/net/minecraft/client/Minecraft.java b/client/src/main/java/net/minecraft/client/Minecraft.java index 5c76da8..ab3d039 100644 --- a/client/src/main/java/net/minecraft/client/Minecraft.java +++ b/client/src/main/java/net/minecraft/client/Minecraft.java @@ -11,7 +11,7 @@ import java.io.File; import java.text.DecimalFormat; import ru.di9.minecraft.shared.*; -import net.minecraft.src.AnvilSaveConverter; +import ru.di9.minecraft.shared.AnvilSaveConverter; import ru.di9.minecraft.shared.ChunkProviderLoadOrGenerate; import net.minecraft.src.ColorizerWater; import net.minecraft.src.EffectRenderer; @@ -38,13 +38,13 @@ import net.minecraft.src.GuiMainMenu; import net.minecraft.src.GuiMemoryErrorScreen; import net.minecraft.src.GuiScreen; import net.minecraft.src.GuiSleepMP; -import net.minecraft.src.ISaveFormat; +import ru.di9.minecraft.shared.ISaveFormat; import ru.di9.minecraft.shared.ItemBlock; import net.minecraft.src.ItemRenderer; import net.minecraft.src.KeyBinding; import net.minecraft.src.LoadingScreenRenderer; import net.minecraft.src.MinecraftError; -import net.minecraft.src.MinecraftException; +import ru.di9.minecraft.shared.MinecraftException; import net.minecraft.src.MinecraftImpl; import net.minecraft.src.ModelBiped; import net.minecraft.src.MouseHelper; diff --git a/client/src/main/java/net/minecraft/src/CanvasIsomPreview.java b/client/src/main/java/net/minecraft/src/CanvasIsomPreview.java index 6676c59..5e9fdc0 100644 --- a/client/src/main/java/net/minecraft/src/CanvasIsomPreview.java +++ b/client/src/main/java/net/minecraft/src/CanvasIsomPreview.java @@ -1,9 +1,6 @@ package net.minecraft.src; -import ru.di9.minecraft.shared.ChunkCoordinates; -import ru.di9.minecraft.shared.World; -import ru.di9.minecraft.shared.WorldSettings; -import ru.di9.minecraft.shared.WorldType; +import ru.di9.minecraft.shared.*; import java.awt.Canvas; import java.awt.Color; diff --git a/client/src/main/java/net/minecraft/src/GuiGameOver.java b/client/src/main/java/net/minecraft/src/GuiGameOver.java index dcbd3a2..6a9fb19 100644 --- a/client/src/main/java/net/minecraft/src/GuiGameOver.java +++ b/client/src/main/java/net/minecraft/src/GuiGameOver.java @@ -3,6 +3,7 @@ package net.minecraft.src; import java.util.Iterator; import org.lwjgl.opengl.GL11; +import ru.di9.minecraft.shared.ISaveFormat; import ru.di9.minecraft.shared.StatCollector; public class GuiGameOver extends GuiScreen diff --git a/client/src/main/java/net/minecraft/src/GuiRenameWorld.java b/client/src/main/java/net/minecraft/src/GuiRenameWorld.java index 75c6dc3..58a09f5 100644 --- a/client/src/main/java/net/minecraft/src/GuiRenameWorld.java +++ b/client/src/main/java/net/minecraft/src/GuiRenameWorld.java @@ -1,6 +1,7 @@ package net.minecraft.src; import org.lwjgl.input.Keyboard; +import ru.di9.minecraft.shared.ISaveFormat; import ru.di9.minecraft.shared.StringTranslate; import ru.di9.minecraft.shared.WorldInfo; diff --git a/client/src/main/java/net/minecraft/src/GuiSelectWorld.java b/client/src/main/java/net/minecraft/src/GuiSelectWorld.java index 27e1bff..ca2b10e 100644 --- a/client/src/main/java/net/minecraft/src/GuiSelectWorld.java +++ b/client/src/main/java/net/minecraft/src/GuiSelectWorld.java @@ -5,7 +5,9 @@ import java.text.SimpleDateFormat; import java.util.Collections; import java.util.List; +import ru.di9.minecraft.shared.ISaveFormat; import ru.di9.minecraft.shared.MathHelper; +import ru.di9.minecraft.shared.SaveFormatComparator; import ru.di9.minecraft.shared.StringTranslate; public class GuiSelectWorld extends GuiScreen diff --git a/client/src/main/java/net/minecraft/src/GuiWorldSlot.java b/client/src/main/java/net/minecraft/src/GuiWorldSlot.java index e89dc12..681e96f 100644 --- a/client/src/main/java/net/minecraft/src/GuiWorldSlot.java +++ b/client/src/main/java/net/minecraft/src/GuiWorldSlot.java @@ -1,6 +1,7 @@ package net.minecraft.src; import ru.di9.minecraft.shared.MathHelper; +import ru.di9.minecraft.shared.SaveFormatComparator; import ru.di9.minecraft.shared.StatCollector; import java.util.Date; diff --git a/client/src/main/java/net/minecraft/src/AnvilChunkLoader.java b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilChunkLoader.java similarity index 99% rename from client/src/main/java/net/minecraft/src/AnvilChunkLoader.java rename to shared2/src/main/java/ru/di9/minecraft/shared/AnvilChunkLoader.java index 8d18153..0a5bf79 100644 --- a/client/src/main/java/net/minecraft/src/AnvilChunkLoader.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilChunkLoader.java @@ -1,13 +1,13 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; -import ru.di9.minecraft.shared.*; import ru.di9.minecraft.shared.nbt.NBTTagCompound; import ru.di9.minecraft.shared.nbt.NBTTagList; import java.io.*; import java.util.*; -public class AnvilChunkLoader implements IThreadedFileIO, IChunkLoader +@SuppressWarnings("all") +public class AnvilChunkLoader implements IChunkLoader, IThreadedFileIO { private List field_48451_a; private Set field_48449_b; diff --git a/client/src/main/java/net/minecraft/src/AnvilChunkLoaderPending.java b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilChunkLoaderPending.java similarity index 83% rename from client/src/main/java/net/minecraft/src/AnvilChunkLoaderPending.java rename to shared2/src/main/java/ru/di9/minecraft/shared/AnvilChunkLoaderPending.java index 6c80d53..564ac2a 100644 --- a/client/src/main/java/net/minecraft/src/AnvilChunkLoaderPending.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilChunkLoaderPending.java @@ -1,8 +1,8 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; -import ru.di9.minecraft.shared.ChunkCoordIntPair; import ru.di9.minecraft.shared.nbt.NBTTagCompound; +@SuppressWarnings("all") class AnvilChunkLoaderPending { public final ChunkCoordIntPair field_48427_a; diff --git a/client/src/main/java/net/minecraft/src/AnvilConverterData.java b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilConverterData.java similarity index 90% rename from client/src/main/java/net/minecraft/src/AnvilConverterData.java rename to shared2/src/main/java/ru/di9/minecraft/shared/AnvilConverterData.java index 5165de6..ae0f4e8 100644 --- a/client/src/main/java/net/minecraft/src/AnvilConverterData.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilConverterData.java @@ -1,7 +1,8 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; import ru.di9.minecraft.shared.nbt.NBTTagList; +@SuppressWarnings("all") public class AnvilConverterData { public long lastUpdated; diff --git a/client/src/main/java/net/minecraft/src/AnvilSaveConverter.java b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveConverter.java similarity index 99% rename from client/src/main/java/net/minecraft/src/AnvilSaveConverter.java rename to shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveConverter.java index 17f75a1..0077ef5 100644 --- a/client/src/main/java/net/minecraft/src/AnvilSaveConverter.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveConverter.java @@ -1,11 +1,11 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; -import ru.di9.minecraft.shared.*; import ru.di9.minecraft.shared.nbt.NBTTagCompound; import java.io.*; import java.util.*; +@SuppressWarnings("all") public class AnvilSaveConverter extends SaveFormatOld { public AnvilSaveConverter(File par1File) diff --git a/server/src/main/java/net/minecraft/src/AnvilSaveConverterFileFilter.java b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveConverterFileFilter.java similarity index 87% rename from server/src/main/java/net/minecraft/src/AnvilSaveConverterFileFilter.java rename to shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveConverterFileFilter.java index 78fc423..7b2f04e 100644 --- a/server/src/main/java/net/minecraft/src/AnvilSaveConverterFileFilter.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveConverterFileFilter.java @@ -1,8 +1,9 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; import java.io.File; import java.io.FilenameFilter; +@SuppressWarnings("all") class AnvilSaveConverterFileFilter implements FilenameFilter { final AnvilSaveConverter parent; diff --git a/client/src/main/java/net/minecraft/src/AnvilSaveHandler.java b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveHandler.java similarity index 95% rename from client/src/main/java/net/minecraft/src/AnvilSaveHandler.java rename to shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveHandler.java index d670cac..ed3369b 100644 --- a/client/src/main/java/net/minecraft/src/AnvilSaveHandler.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveHandler.java @@ -1,10 +1,9 @@ -package net.minecraft.src; - -import ru.di9.minecraft.shared.*; +package ru.di9.minecraft.shared; import java.io.File; import java.util.List; +@SuppressWarnings("all") public class AnvilSaveHandler extends SaveHandler { public AnvilSaveHandler(File par1File, String par2Str, boolean par3) diff --git a/server/src/main/java/net/minecraft/src/ChunkLoader.java b/shared2/src/main/java/ru/di9/minecraft/shared/ChunkLoader.java similarity index 97% rename from server/src/main/java/net/minecraft/src/ChunkLoader.java rename to shared2/src/main/java/ru/di9/minecraft/shared/ChunkLoader.java index 61a18a6..a3a2c04 100644 --- a/server/src/main/java/net/minecraft/src/ChunkLoader.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/ChunkLoader.java @@ -1,10 +1,9 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; -import ru.di9.minecraft.shared.NibbleArray; -import ru.di9.minecraft.shared.WorldChunkManager; import ru.di9.minecraft.shared.nbt.NBTTagCompound; import ru.di9.minecraft.shared.nbt.NBTTagList; +@SuppressWarnings("all") public class ChunkLoader { public ChunkLoader() diff --git a/client/src/main/java/net/minecraft/src/ISaveFormat.java b/shared2/src/main/java/ru/di9/minecraft/shared/ISaveFormat.java similarity index 89% rename from client/src/main/java/net/minecraft/src/ISaveFormat.java rename to shared2/src/main/java/ru/di9/minecraft/shared/ISaveFormat.java index a4a5cd7..d9b478f 100644 --- a/client/src/main/java/net/minecraft/src/ISaveFormat.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/ISaveFormat.java @@ -1,11 +1,8 @@ -package net.minecraft.src; - -import ru.di9.minecraft.shared.IProgressUpdate; -import ru.di9.minecraft.shared.ISaveHandler; -import ru.di9.minecraft.shared.WorldInfo; +package ru.di9.minecraft.shared; import java.util.List; +@SuppressWarnings("all") public interface ISaveFormat { public abstract String getFormatName(); diff --git a/server/src/main/java/net/minecraft/src/MinecraftException.java b/shared2/src/main/java/ru/di9/minecraft/shared/MinecraftException.java similarity index 71% rename from server/src/main/java/net/minecraft/src/MinecraftException.java rename to shared2/src/main/java/ru/di9/minecraft/shared/MinecraftException.java index 56db655..43751be 100644 --- a/server/src/main/java/net/minecraft/src/MinecraftException.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/MinecraftException.java @@ -1,5 +1,6 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; +@SuppressWarnings("all") public class MinecraftException extends RuntimeException { public MinecraftException(String par1Str) diff --git a/server/src/main/java/net/minecraft/src/NibbleArrayReader.java b/shared2/src/main/java/ru/di9/minecraft/shared/NibbleArrayReader.java similarity index 91% rename from server/src/main/java/net/minecraft/src/NibbleArrayReader.java rename to shared2/src/main/java/ru/di9/minecraft/shared/NibbleArrayReader.java index 7f532e7..08c6031 100644 --- a/server/src/main/java/net/minecraft/src/NibbleArrayReader.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/NibbleArrayReader.java @@ -1,5 +1,6 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; +@SuppressWarnings("all") public class NibbleArrayReader { public final byte data[]; diff --git a/server/src/main/java/net/minecraft/src/RegionFile.java b/shared2/src/main/java/ru/di9/minecraft/shared/RegionFile.java similarity index 99% rename from server/src/main/java/net/minecraft/src/RegionFile.java rename to shared2/src/main/java/ru/di9/minecraft/shared/RegionFile.java index 1e93e84..4752a0c 100644 --- a/server/src/main/java/net/minecraft/src/RegionFile.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/RegionFile.java @@ -1,9 +1,10 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; import java.io.*; import java.util.ArrayList; import java.util.zip.*; +@SuppressWarnings("all") public class RegionFile { private static final byte emptySector[] = new byte[4096]; diff --git a/client/src/main/java/net/minecraft/src/RegionFileCache.java b/shared2/src/main/java/ru/di9/minecraft/shared/RegionFileCache.java similarity index 97% rename from client/src/main/java/net/minecraft/src/RegionFileCache.java rename to shared2/src/main/java/ru/di9/minecraft/shared/RegionFileCache.java index 08bdcd1..90c8ac5 100644 --- a/client/src/main/java/net/minecraft/src/RegionFileCache.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/RegionFileCache.java @@ -1,10 +1,11 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; import java.io.*; import java.lang.ref.Reference; import java.lang.ref.SoftReference; import java.util.*; +@SuppressWarnings("all") public class RegionFileCache { /** A map containing Files and keys and RegionFiles as values */ diff --git a/client/src/main/java/net/minecraft/src/RegionFileChunkBuffer.java b/shared2/src/main/java/ru/di9/minecraft/shared/RegionFileChunkBuffer.java similarity index 89% rename from client/src/main/java/net/minecraft/src/RegionFileChunkBuffer.java rename to shared2/src/main/java/ru/di9/minecraft/shared/RegionFileChunkBuffer.java index edd75f0..0c8e25e 100644 --- a/client/src/main/java/net/minecraft/src/RegionFileChunkBuffer.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/RegionFileChunkBuffer.java @@ -1,7 +1,8 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; import java.io.ByteArrayOutputStream; +@SuppressWarnings("all") class RegionFileChunkBuffer extends ByteArrayOutputStream { private int chunkX; diff --git a/client/src/main/java/net/minecraft/src/SaveFormatComparator.java b/shared2/src/main/java/ru/di9/minecraft/shared/SaveFormatComparator.java similarity index 96% rename from client/src/main/java/net/minecraft/src/SaveFormatComparator.java rename to shared2/src/main/java/ru/di9/minecraft/shared/SaveFormatComparator.java index 82b0a7e..4f4c4b6 100644 --- a/client/src/main/java/net/minecraft/src/SaveFormatComparator.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/SaveFormatComparator.java @@ -1,5 +1,6 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; +@SuppressWarnings("all") public class SaveFormatComparator implements Comparable { /** the file name of this save */ diff --git a/client/src/main/java/net/minecraft/src/SaveFormatOld.java b/shared2/src/main/java/ru/di9/minecraft/shared/SaveFormatOld.java similarity index 96% rename from client/src/main/java/net/minecraft/src/SaveFormatOld.java rename to shared2/src/main/java/ru/di9/minecraft/shared/SaveFormatOld.java index 6cf8b65..1e123b9 100644 --- a/client/src/main/java/net/minecraft/src/SaveFormatOld.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/SaveFormatOld.java @@ -1,15 +1,12 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; -import ru.di9.minecraft.shared.CompressedStreamTools; -import ru.di9.minecraft.shared.IProgressUpdate; -import ru.di9.minecraft.shared.ISaveHandler; -import ru.di9.minecraft.shared.WorldInfo; import ru.di9.minecraft.shared.nbt.NBTTagCompound; import java.io.*; import java.util.ArrayList; import java.util.List; +@SuppressWarnings("all") public class SaveFormatOld implements ISaveFormat { /** diff --git a/client/src/main/java/net/minecraft/src/SaveHandler.java b/shared2/src/main/java/ru/di9/minecraft/shared/SaveHandler.java similarity index 99% rename from client/src/main/java/net/minecraft/src/SaveHandler.java rename to shared2/src/main/java/ru/di9/minecraft/shared/SaveHandler.java index 8d9b29f..3131026 100644 --- a/client/src/main/java/net/minecraft/src/SaveHandler.java +++ b/shared2/src/main/java/ru/di9/minecraft/shared/SaveHandler.java @@ -1,12 +1,12 @@ -package net.minecraft.src; +package ru.di9.minecraft.shared; -import ru.di9.minecraft.shared.*; import ru.di9.minecraft.shared.nbt.NBTTagCompound; import java.io.*; import java.util.List; import java.util.logging.Logger; +@SuppressWarnings("all") public class SaveHandler implements ISaveHandler { /** Reference to the logger. */