Minecraft/mc-1.2.5
0
Fork 0
Code Issues 5 Activity

refac: выделение общего кода (part 4)

Browse Source
This commit is contained in:
Voomra
2025-06-11 04:21:27 +03:00
parent 96f5ec2b23
commit 5deebe7f96
22 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/main/java/net/minecraft/client/Minecraft.java
View File

@@ -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;

5
client/src/main/java/net/minecraft/src/CanvasIsomPreview.java
View File

@@ -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;

1
client/src/main/java/net/minecraft/src/GuiGameOver.java
View File

@@ -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

1
client/src/main/java/net/minecraft/src/GuiRenameWorld.java
View File

@@ -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;

2
client/src/main/java/net/minecraft/src/GuiSelectWorld.java
View File

@@ -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

1
client/src/main/java/net/minecraft/src/GuiWorldSlot.java
View File

@@ -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;

6
client/src/main/java/net/minecraft/src/AnvilChunkLoader.java → shared2/src/main/java/ru/di9/minecraft/shared/AnvilChunkLoader.java
View File

@@ -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;

4
client/src/main/java/net/minecraft/src/AnvilChunkLoaderPending.java → shared2/src/main/java/ru/di9/minecraft/shared/AnvilChunkLoaderPending.java
View File

@@ -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;

3
client/src/main/java/net/minecraft/src/AnvilConverterData.java → shared2/src/main/java/ru/di9/minecraft/shared/AnvilConverterData.java
View File

@@ -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;

4
client/src/main/java/net/minecraft/src/AnvilSaveConverter.java → shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveConverter.java
View File

@@ -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)

3
server/src/main/java/net/minecraft/src/AnvilSaveConverterFileFilter.java → shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveConverterFileFilter.java
View File

@@ -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;

5
client/src/main/java/net/minecraft/src/AnvilSaveHandler.java → shared2/src/main/java/ru/di9/minecraft/shared/AnvilSaveHandler.java
View File

@@ -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)

5
server/src/main/java/net/minecraft/src/ChunkLoader.java → shared2/src/main/java/ru/di9/minecraft/shared/ChunkLoader.java
View File

@@ -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()

7
client/src/main/java/net/minecraft/src/ISaveFormat.java → shared2/src/main/java/ru/di9/minecraft/shared/ISaveFormat.java
View File

@@ -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();

3
server/src/main/java/net/minecraft/src/MinecraftException.java → shared2/src/main/java/ru/di9/minecraft/shared/MinecraftException.java
View File

@@ -1,5 +1,6 @@
package net.minecraft.src;
package ru.di9.minecraft.shared;
@SuppressWarnings("all")
public class MinecraftException extends RuntimeException
{
public MinecraftException(String par1Str)

3
server/src/main/java/net/minecraft/src/NibbleArrayReader.java → shared2/src/main/java/ru/di9/minecraft/shared/NibbleArrayReader.java
View File

@@ -1,5 +1,6 @@
package net.minecraft.src;
package ru.di9.minecraft.shared;
@SuppressWarnings("all")
public class NibbleArrayReader
{
public final byte data[];

3
server/src/main/java/net/minecraft/src/RegionFile.java → shared2/src/main/java/ru/di9/minecraft/shared/RegionFile.java
View File

@@ -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];

3
client/src/main/java/net/minecraft/src/RegionFileCache.java → shared2/src/main/java/ru/di9/minecraft/shared/RegionFileCache.java
View File

@@ -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 */

3
client/src/main/java/net/minecraft/src/RegionFileChunkBuffer.java → shared2/src/main/java/ru/di9/minecraft/shared/RegionFileChunkBuffer.java
View File

@@ -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;

3
client/src/main/java/net/minecraft/src/SaveFormatComparator.java → shared2/src/main/java/ru/di9/minecraft/shared/SaveFormatComparator.java
View File

@@ -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 */

7
client/src/main/java/net/minecraft/src/SaveFormatOld.java → shared2/src/main/java/ru/di9/minecraft/shared/SaveFormatOld.java
View File

@@ -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
{
/**

4
client/src/main/java/net/minecraft/src/SaveHandler.java → shared2/src/main/java/ru/di9/minecraft/shared/SaveHandler.java
View File

@@ -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. */