From c3802fd37ad4eaeb3b7bd4a9689074c1200cc243 Mon Sep 17 00:00:00 2001 From: Voomra Date: Tue, 17 Jun 2025 22:36:36 +0300 Subject: [PATCH] =?UTF-8?q?refac:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/main/java/net/minecraft/client/Minecraft.java | 8 ++++---- .../java/net/minecraft/client/entity/EntityRenderer.java | 2 ++ .../java/net/minecraft/client/model/ModelRenderer.java | 2 +- .../minecraft/{src => client/render}/ItemRenderer.java | 6 ++++-- .../java/net/minecraft/client/render/RenderEndPortal.java | 2 +- .../java/net/minecraft/client/render/RenderEngine.java | 1 + .../java/net/minecraft/client/render/RenderGlobal.java | 1 + .../java/net/minecraft/client/render/RenderHelper.java | 2 +- .../main/java/net/minecraft/client/render/RenderList.java | 2 +- .../java/net/minecraft/client/render/RenderManager.java | 2 +- .../net/minecraft/client/utils/ClippingHelperImpl.java | 1 - .../net/minecraft/{src => client/utils}/GLAllocation.java | 3 ++- .../main/java/net/minecraft/client/utils/MouseHelper.java | 1 - .../src/main/java/net/minecraft/src/ActiveRenderInfo.java | 3 +++ client/src/main/java/net/minecraft/src/Tessellator.java | 1 + .../di9/minecraft/shared/container/ContainerPlayer.java | 2 +- .../minecraft/shared/container/ContainerWorkbench.java | 2 +- .../minecraft/shared/{ => recipe}/CraftingManager.java | 3 +-- .../java/ru/di9/minecraft/shared/recipe/RecipeSorter.java | 4 ---- .../java/ru/di9/minecraft/shared/recipe/RecipesArmor.java | 1 - .../ru/di9/minecraft/shared/recipe/RecipesCrafting.java | 1 - .../java/ru/di9/minecraft/shared/recipe/RecipesDyes.java | 1 - .../java/ru/di9/minecraft/shared/recipe/RecipesFood.java | 1 - .../ru/di9/minecraft/shared/recipe/RecipesIngots.java | 1 - .../java/ru/di9/minecraft/shared/recipe/RecipesTools.java | 1 - .../ru/di9/minecraft/shared/recipe/RecipesWeapons.java | 1 - .../di9/minecraft/shared/{ => recipe}/ShapedRecipes.java | 3 +-- .../minecraft/shared/{ => recipe}/ShapelessRecipes.java | 3 +-- .../main/java/ru/di9/minecraft/shared/stat/StatList.java | 2 +- 29 files changed, 29 insertions(+), 34 deletions(-) rename client/src/main/java/net/minecraft/{src => client/render}/ItemRenderer.java (99%) rename client/src/main/java/net/minecraft/{src => client/utils}/GLAllocation.java (98%) rename shared/src/main/java/ru/di9/minecraft/shared/{ => recipe}/CraftingManager.java (99%) rename shared/src/main/java/ru/di9/minecraft/shared/{ => recipe}/ShapedRecipes.java (97%) rename shared/src/main/java/ru/di9/minecraft/shared/{ => recipe}/ShapelessRecipes.java (96%) diff --git a/client/src/main/java/net/minecraft/client/Minecraft.java b/client/src/main/java/net/minecraft/client/Minecraft.java index 3391e7a..37d9237 100644 --- a/client/src/main/java/net/minecraft/client/Minecraft.java +++ b/client/src/main/java/net/minecraft/client/Minecraft.java @@ -10,6 +10,8 @@ import java.awt.Graphics; import java.io.File; import java.text.DecimalFormat; +import net.minecraft.client.render.ItemRenderer; +import net.minecraft.client.utils.*; import net.minecraft.src.*; import ru.di9.minecraft.shared.*; import ru.di9.minecraft.shared.anvil.AnvilSaveConverter; @@ -19,7 +21,6 @@ import ru.di9.minecraft.shared.chunk.ChunkProviderLoadOrGenerate; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.entity.EntityRenderer; -import net.minecraft.client.utils.EnumOS; import net.minecraft.client.gui.GuiAchievement; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiConflictWarning; @@ -39,8 +40,7 @@ import ru.di9.minecraft.shared.item.Item; import ru.di9.minecraft.shared.item.ItemBlock; import ru.di9.minecraft.shared.MinecraftException; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.utils.MouseHelper; -import net.minecraft.client.utils.OpenGlHelper; + import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.entity.EntityLiving; import ru.di9.minecraft.shared.entity.EntityPlayer; @@ -60,7 +60,7 @@ import net.minecraft.client.texture.TexturePortalFX; import net.minecraft.client.texture.TextureWatchFX; import net.minecraft.client.texture.TextureWaterFX; import net.minecraft.client.texture.TextureWaterFlowFX; -import net.minecraft.client.utils.Timer; + import ru.di9.minecraft.shared.player.Profiler; import ru.di9.minecraft.shared.player.ProfilerResult; import ru.di9.minecraft.shared.utils.EnumMovingObjectType; diff --git a/client/src/main/java/net/minecraft/client/entity/EntityRenderer.java b/client/src/main/java/net/minecraft/client/entity/EntityRenderer.java index d7c4666..59ee1a6 100644 --- a/client/src/main/java/net/minecraft/client/entity/EntityRenderer.java +++ b/client/src/main/java/net/minecraft/client/entity/EntityRenderer.java @@ -6,9 +6,11 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.fx.EntityRainFX; import net.minecraft.client.entity.fx.EntitySmokeFX; +import net.minecraft.client.render.ItemRenderer; import net.minecraft.client.render.RenderGlobal; import net.minecraft.client.render.RenderHelper; import net.minecraft.client.utils.ClippingHelperImpl; +import net.minecraft.client.utils.GLAllocation; import net.minecraft.client.utils.MouseFilter; import net.minecraft.client.utils.OpenGlHelper; import net.minecraft.src.*; diff --git a/client/src/main/java/net/minecraft/client/model/ModelRenderer.java b/client/src/main/java/net/minecraft/client/model/ModelRenderer.java index d7864ff..1fe84d3 100644 --- a/client/src/main/java/net/minecraft/client/model/ModelRenderer.java +++ b/client/src/main/java/net/minecraft/client/model/ModelRenderer.java @@ -3,7 +3,7 @@ package net.minecraft.client.model; import java.util.ArrayList; import java.util.List; -import net.minecraft.src.GLAllocation; +import net.minecraft.client.utils.GLAllocation; import net.minecraft.src.Tessellator; import net.minecraft.client.texture.TextureOffset; import org.lwjgl.opengl.GL11; diff --git a/client/src/main/java/net/minecraft/src/ItemRenderer.java b/client/src/main/java/net/minecraft/client/render/ItemRenderer.java similarity index 99% rename from client/src/main/java/net/minecraft/src/ItemRenderer.java rename to client/src/main/java/net/minecraft/client/render/ItemRenderer.java index b3a847f..853a688 100644 --- a/client/src/main/java/net/minecraft/src/ItemRenderer.java +++ b/client/src/main/java/net/minecraft/client/render/ItemRenderer.java @@ -1,10 +1,12 @@ -package net.minecraft.src; +package net.minecraft.client.render; import net.minecraft.client.GlobalBeans; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.client.render.*; import net.minecraft.client.utils.OpenGlHelper; +import net.minecraft.src.MapItemRenderer; +import net.minecraft.src.Tessellator; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import ru.di9.minecraft.shared.block.Block; diff --git a/client/src/main/java/net/minecraft/client/render/RenderEndPortal.java b/client/src/main/java/net/minecraft/client/render/RenderEndPortal.java index c475293..da922d5 100644 --- a/client/src/main/java/net/minecraft/client/render/RenderEndPortal.java +++ b/client/src/main/java/net/minecraft/client/render/RenderEndPortal.java @@ -4,7 +4,7 @@ import java.nio.FloatBuffer; import java.util.Random; import net.minecraft.src.ActiveRenderInfo; -import net.minecraft.src.GLAllocation; +import net.minecraft.client.utils.GLAllocation; import net.minecraft.src.Tessellator; import net.minecraft.client.entity.tile.TileEntitySpecialRenderer; import org.lwjgl.opengl.GL11; diff --git a/client/src/main/java/net/minecraft/client/render/RenderEngine.java b/client/src/main/java/net/minecraft/client/render/RenderEngine.java index 2374787..8073f12 100644 --- a/client/src/main/java/net/minecraft/client/render/RenderEngine.java +++ b/client/src/main/java/net/minecraft/client/render/RenderEngine.java @@ -18,6 +18,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import net.minecraft.client.texture.TextureFX; import net.minecraft.client.texture.TexturePackBase; import net.minecraft.client.texture.TexturePackList; +import net.minecraft.client.utils.GLAllocation; import net.minecraft.src.*; import org.lwjgl.opengl.GL11; diff --git a/client/src/main/java/net/minecraft/client/render/RenderGlobal.java b/client/src/main/java/net/minecraft/client/render/RenderGlobal.java index e33d00e..6db8200 100644 --- a/client/src/main/java/net/minecraft/client/render/RenderGlobal.java +++ b/client/src/main/java/net/minecraft/client/render/RenderGlobal.java @@ -7,6 +7,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.*; import net.minecraft.client.entity.fx.*; import net.minecraft.client.entity.tile.TileEntityRenderer; +import net.minecraft.client.utils.GLAllocation; import net.minecraft.src.*; import org.lwjgl.opengl.ARBOcclusionQuery; import org.lwjgl.opengl.GL11; diff --git a/client/src/main/java/net/minecraft/client/render/RenderHelper.java b/client/src/main/java/net/minecraft/client/render/RenderHelper.java index 099cb18..4147985 100644 --- a/client/src/main/java/net/minecraft/client/render/RenderHelper.java +++ b/client/src/main/java/net/minecraft/client/render/RenderHelper.java @@ -2,7 +2,7 @@ package net.minecraft.client.render; import java.nio.FloatBuffer; -import net.minecraft.src.GLAllocation; +import net.minecraft.client.utils.GLAllocation; import org.lwjgl.opengl.GL11; import ru.di9.minecraft.shared.utils.Vec3D; diff --git a/client/src/main/java/net/minecraft/client/render/RenderList.java b/client/src/main/java/net/minecraft/client/render/RenderList.java index d9d77e1..e367e4b 100644 --- a/client/src/main/java/net/minecraft/client/render/RenderList.java +++ b/client/src/main/java/net/minecraft/client/render/RenderList.java @@ -2,7 +2,7 @@ package net.minecraft.client.render; import java.nio.IntBuffer; -import net.minecraft.src.GLAllocation; +import net.minecraft.client.utils.GLAllocation; import org.lwjgl.opengl.GL11; public class RenderList diff --git a/client/src/main/java/net/minecraft/client/render/RenderManager.java b/client/src/main/java/net/minecraft/client/render/RenderManager.java index f533f3e..463c732 100644 --- a/client/src/main/java/net/minecraft/client/render/RenderManager.java +++ b/client/src/main/java/net/minecraft/client/render/RenderManager.java @@ -6,7 +6,7 @@ import net.minecraft.client.model.*; import net.minecraft.client.utils.OpenGlHelper; import net.minecraft.src.FontRenderer; import net.minecraft.src.GameSettings; -import net.minecraft.src.ItemRenderer; + import org.lwjgl.opengl.GL11; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.entity.*; diff --git a/client/src/main/java/net/minecraft/client/utils/ClippingHelperImpl.java b/client/src/main/java/net/minecraft/client/utils/ClippingHelperImpl.java index a712e72..fd12f01 100644 --- a/client/src/main/java/net/minecraft/client/utils/ClippingHelperImpl.java +++ b/client/src/main/java/net/minecraft/client/utils/ClippingHelperImpl.java @@ -2,7 +2,6 @@ package net.minecraft.client.utils; import java.nio.FloatBuffer; -import net.minecraft.src.GLAllocation; import org.lwjgl.opengl.GL11; import ru.di9.minecraft.shared.utils.MathHelper; diff --git a/client/src/main/java/net/minecraft/src/GLAllocation.java b/client/src/main/java/net/minecraft/client/utils/GLAllocation.java similarity index 98% rename from client/src/main/java/net/minecraft/src/GLAllocation.java rename to client/src/main/java/net/minecraft/client/utils/GLAllocation.java index 4123f47..75e250c 100644 --- a/client/src/main/java/net/minecraft/src/GLAllocation.java +++ b/client/src/main/java/net/minecraft/client/utils/GLAllocation.java @@ -1,10 +1,11 @@ -package net.minecraft.src; +package net.minecraft.client.utils; import java.nio.*; import java.util.ArrayList; import java.util.List; import org.lwjgl.opengl.GL11; +@SuppressWarnings("all") public class GLAllocation { /** diff --git a/client/src/main/java/net/minecraft/client/utils/MouseHelper.java b/client/src/main/java/net/minecraft/client/utils/MouseHelper.java index fd5f95e..25644f5 100644 --- a/client/src/main/java/net/minecraft/client/utils/MouseHelper.java +++ b/client/src/main/java/net/minecraft/client/utils/MouseHelper.java @@ -3,7 +3,6 @@ package net.minecraft.client.utils; import java.awt.Component; import java.nio.IntBuffer; -import net.minecraft.src.GLAllocation; import org.lwjgl.LWJGLException; import org.lwjgl.input.Cursor; import org.lwjgl.input.Mouse; diff --git a/client/src/main/java/net/minecraft/src/ActiveRenderInfo.java b/client/src/main/java/net/minecraft/src/ActiveRenderInfo.java index ec4e4d7..a2e4ae3 100644 --- a/client/src/main/java/net/minecraft/src/ActiveRenderInfo.java +++ b/client/src/main/java/net/minecraft/src/ActiveRenderInfo.java @@ -4,6 +4,9 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import org.lwjgl.opengl.GL11; import org.lwjgl.util.glu.GLU; + +import net.minecraft.client.utils.GLAllocation; + import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.block.BlockFluid; import ru.di9.minecraft.shared.chunk.ChunkPosition; diff --git a/client/src/main/java/net/minecraft/src/Tessellator.java b/client/src/main/java/net/minecraft/src/Tessellator.java index fd3ba56..c4958c3 100644 --- a/client/src/main/java/net/minecraft/src/Tessellator.java +++ b/client/src/main/java/net/minecraft/src/Tessellator.java @@ -2,6 +2,7 @@ package net.minecraft.src; import java.nio.*; +import net.minecraft.client.utils.GLAllocation; import net.minecraft.client.utils.OpenGlHelper; import org.lwjgl.opengl.*; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/container/ContainerPlayer.java b/shared/src/main/java/ru/di9/minecraft/shared/container/ContainerPlayer.java index aee3504..11481fe 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/container/ContainerPlayer.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/container/ContainerPlayer.java @@ -1,12 +1,12 @@ package ru.di9.minecraft.shared.container; -import ru.di9.minecraft.shared.*; import ru.di9.minecraft.shared.entity.EntityPlayer; import ru.di9.minecraft.shared.inventory.IInventory; import ru.di9.minecraft.shared.inventory.InventoryCraftResult; import ru.di9.minecraft.shared.inventory.InventoryCrafting; import ru.di9.minecraft.shared.inventory.InventoryPlayer; import ru.di9.minecraft.shared.item.ItemStack; +import ru.di9.minecraft.shared.recipe.CraftingManager; import ru.di9.minecraft.shared.slot.Slot; import ru.di9.minecraft.shared.slot.SlotArmor; import ru.di9.minecraft.shared.slot.SlotCrafting; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/container/ContainerWorkbench.java b/shared/src/main/java/ru/di9/minecraft/shared/container/ContainerWorkbench.java index 37555a4..0f8adc8 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/container/ContainerWorkbench.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/container/ContainerWorkbench.java @@ -1,6 +1,5 @@ package ru.di9.minecraft.shared.container; -import ru.di9.minecraft.shared.*; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.entity.EntityPlayer; import ru.di9.minecraft.shared.inventory.IInventory; @@ -8,6 +7,7 @@ import ru.di9.minecraft.shared.inventory.InventoryCraftResult; import ru.di9.minecraft.shared.inventory.InventoryCrafting; import ru.di9.minecraft.shared.inventory.InventoryPlayer; import ru.di9.minecraft.shared.item.ItemStack; +import ru.di9.minecraft.shared.recipe.CraftingManager; import ru.di9.minecraft.shared.slot.Slot; import ru.di9.minecraft.shared.slot.SlotCrafting; import ru.di9.minecraft.shared.world.World; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/CraftingManager.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/CraftingManager.java similarity index 99% rename from shared/src/main/java/ru/di9/minecraft/shared/CraftingManager.java rename to shared/src/main/java/ru/di9/minecraft/shared/recipe/CraftingManager.java index 015ee1f..e2e43b7 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/CraftingManager.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/CraftingManager.java @@ -1,10 +1,9 @@ -package ru.di9.minecraft.shared; +package ru.di9.minecraft.shared.recipe; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.inventory.InventoryCrafting; import ru.di9.minecraft.shared.item.Item; import ru.di9.minecraft.shared.item.ItemStack; -import ru.di9.minecraft.shared.recipe.*; import java.util.*; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipeSorter.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipeSorter.java index e8dfe5e..622cad9 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipeSorter.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipeSorter.java @@ -1,9 +1,5 @@ package ru.di9.minecraft.shared.recipe; -import ru.di9.minecraft.shared.CraftingManager; -import ru.di9.minecraft.shared.ShapedRecipes; -import ru.di9.minecraft.shared.ShapelessRecipes; - import java.util.Comparator; @SuppressWarnings("ALL") diff --git a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesArmor.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesArmor.java index f9dcb56..a698956 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesArmor.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesArmor.java @@ -1,6 +1,5 @@ package ru.di9.minecraft.shared.recipe; -import ru.di9.minecraft.shared.CraftingManager; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.item.Item; import ru.di9.minecraft.shared.item.ItemStack; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesCrafting.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesCrafting.java index edbe893..9479265 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesCrafting.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesCrafting.java @@ -1,6 +1,5 @@ package ru.di9.minecraft.shared.recipe; -import ru.di9.minecraft.shared.CraftingManager; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.item.Item; import ru.di9.minecraft.shared.item.ItemStack; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesDyes.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesDyes.java index 60c0c07..5d0fe68 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesDyes.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesDyes.java @@ -1,6 +1,5 @@ package ru.di9.minecraft.shared.recipe; -import ru.di9.minecraft.shared.CraftingManager; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.block.BlockCloth; import ru.di9.minecraft.shared.item.Item; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesFood.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesFood.java index bf3d931..9afe0e5 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesFood.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesFood.java @@ -1,6 +1,5 @@ package ru.di9.minecraft.shared.recipe; -import ru.di9.minecraft.shared.CraftingManager; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.item.Item; import ru.di9.minecraft.shared.item.ItemStack; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesIngots.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesIngots.java index 74491dd..40571c5 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesIngots.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesIngots.java @@ -1,6 +1,5 @@ package ru.di9.minecraft.shared.recipe; -import ru.di9.minecraft.shared.CraftingManager; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.item.Item; import ru.di9.minecraft.shared.item.ItemStack; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesTools.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesTools.java index 514b531..2b1123d 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesTools.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesTools.java @@ -1,6 +1,5 @@ package ru.di9.minecraft.shared.recipe; -import ru.di9.minecraft.shared.CraftingManager; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.item.Item; import ru.di9.minecraft.shared.item.ItemStack; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesWeapons.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesWeapons.java index 6072713..94e7453 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesWeapons.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/RecipesWeapons.java @@ -1,6 +1,5 @@ package ru.di9.minecraft.shared.recipe; -import ru.di9.minecraft.shared.CraftingManager; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.item.Item; import ru.di9.minecraft.shared.item.ItemStack; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/ShapedRecipes.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/ShapedRecipes.java similarity index 97% rename from shared/src/main/java/ru/di9/minecraft/shared/ShapedRecipes.java rename to shared/src/main/java/ru/di9/minecraft/shared/recipe/ShapedRecipes.java index 64a60be..3874f4f 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/ShapedRecipes.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/ShapedRecipes.java @@ -1,8 +1,7 @@ -package ru.di9.minecraft.shared; +package ru.di9.minecraft.shared.recipe; import ru.di9.minecraft.shared.inventory.InventoryCrafting; import ru.di9.minecraft.shared.item.ItemStack; -import ru.di9.minecraft.shared.recipe.IRecipe; @SuppressWarnings("ALL") public class ShapedRecipes implements IRecipe diff --git a/shared/src/main/java/ru/di9/minecraft/shared/ShapelessRecipes.java b/shared/src/main/java/ru/di9/minecraft/shared/recipe/ShapelessRecipes.java similarity index 96% rename from shared/src/main/java/ru/di9/minecraft/shared/ShapelessRecipes.java rename to shared/src/main/java/ru/di9/minecraft/shared/recipe/ShapelessRecipes.java index 4d409ae..d0fc41e 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/ShapelessRecipes.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/recipe/ShapelessRecipes.java @@ -1,8 +1,7 @@ -package ru.di9.minecraft.shared; +package ru.di9.minecraft.shared.recipe; import ru.di9.minecraft.shared.inventory.InventoryCrafting; import ru.di9.minecraft.shared.item.ItemStack; -import ru.di9.minecraft.shared.recipe.IRecipe; import java.util.*; diff --git a/shared/src/main/java/ru/di9/minecraft/shared/stat/StatList.java b/shared/src/main/java/ru/di9/minecraft/shared/stat/StatList.java index 2896eb3..33d596c 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/stat/StatList.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/stat/StatList.java @@ -1,7 +1,7 @@ package ru.di9.minecraft.shared.stat; import ru.di9.minecraft.shared.achievement.AchievementList; -import ru.di9.minecraft.shared.CraftingManager; +import ru.di9.minecraft.shared.recipe.CraftingManager; import ru.di9.minecraft.shared.FurnaceRecipes; import ru.di9.minecraft.shared.block.Block; import ru.di9.minecraft.shared.item.Item;