From 707561aca88e84268bb9c5e85079c3ec388a2e7e Mon Sep 17 00:00:00 2001 From: Voomra Date: Sun, 15 Jun 2025 01:29:40 +0300 Subject: [PATCH] =?UTF-8?q?refac:=20=D0=BF=D0=BE=D0=BF=D1=8B=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=80=D0=B5=D1=88=D0=B8=D1=82=D1=8C=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D1=83=20=D0=B8=D0=B7=D0=BB=D0=B8?= =?UTF-8?q?=D1=88=D0=BD=D0=B8=D1=85=20static'=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/main/java/Start.java | 8 ++++++++ .../net/minecraft/client/GlobalBeans.java | 20 +++++++++++++++++++ .../java/net/minecraft/client/Minecraft.java | 3 +-- .../client/entity/fx/EntityPickupFX.java | 5 +++-- .../tile/TileEntityMobSpawnerRenderer.java | 5 +++-- .../minecraft/client/gui/GuiInventory.java | 6 +++--- .../minecraft/client/render/RenderGlobal.java | 9 +++++---- .../client/render/RenderManager.java | 5 +---- .../java/net/minecraft/src/ItemRenderer.java | 5 +++-- .../ru/di9/minecraft/shared/item/Item.java | 2 +- .../di9/minecraft/shared/stat/StatList.java | 2 +- 11 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 client/src/main/java/net/minecraft/client/GlobalBeans.java diff --git a/client/src/main/java/Start.java b/client/src/main/java/Start.java index e9cd424..1a2741e 100644 --- a/client/src/main/java/Start.java +++ b/client/src/main/java/Start.java @@ -1,4 +1,8 @@ +import net.minecraft.client.GlobalBeans; import net.minecraft.client.Minecraft; +import net.minecraft.client.render.RenderManager; +import ru.di9.minecraft.shared.item.Item; +import ru.di9.minecraft.shared.stat.StatList; import java.io.File; @@ -6,6 +10,10 @@ public class Start { public static void main(String[] args) { + Item.init(); + StatList.init(); + GlobalBeans.INSTANCE.setRenderManager(new RenderManager()); + Minecraft.minecraftDir = new File("."); Minecraft.main(args); } diff --git a/client/src/main/java/net/minecraft/client/GlobalBeans.java b/client/src/main/java/net/minecraft/client/GlobalBeans.java new file mode 100644 index 0000000..e9902a1 --- /dev/null +++ b/client/src/main/java/net/minecraft/client/GlobalBeans.java @@ -0,0 +1,20 @@ +package net.minecraft.client; + +import net.minecraft.client.render.RenderManager; + +public final class GlobalBeans { + public static final GlobalBeans INSTANCE = new GlobalBeans(); + + private RenderManager renderManager; + + private GlobalBeans() { + } + + public RenderManager getRenderManager() { + return renderManager; + } + + public void setRenderManager(RenderManager renderManager) { + this.renderManager = renderManager; + } +} diff --git a/client/src/main/java/net/minecraft/client/Minecraft.java b/client/src/main/java/net/minecraft/client/Minecraft.java index feec86b..962fbff 100644 --- a/client/src/main/java/net/minecraft/client/Minecraft.java +++ b/client/src/main/java/net/minecraft/client/Minecraft.java @@ -49,7 +49,6 @@ import ru.di9.minecraft.shared.network.packet.Packet3Chat; import net.minecraft.client.render.RenderBlocks; import net.minecraft.client.render.RenderEngine; import net.minecraft.client.render.RenderGlobal; -import net.minecraft.client.render.RenderManager; import net.minecraft.client.sound.SoundManager; import ru.di9.minecraft.shared.Teleporter; import net.minecraft.client.texture.TextureCompassFX; @@ -513,7 +512,7 @@ public class Minecraft implements Runnable ColorizerGrass.setGrassBiomeColorizer(renderEngine.getTextureContents("/misc/grasscolor.png")); ColorizerFoliage.getFoilageBiomeColorizer(renderEngine.getTextureContents("/misc/foliagecolor.png")); entityRenderer = new EntityRenderer(this); - RenderManager.instance.itemRenderer = new ItemRenderer(this); + GlobalBeans.INSTANCE.getRenderManager().itemRenderer = new ItemRenderer(this); statFileWriter = new StatFileWriter(session, mcDataDir); AchievementList.openInventory.setStatStringFormatter(new StatStringFormatKeyInv(this)); loadScreen(); diff --git a/client/src/main/java/net/minecraft/client/entity/fx/EntityPickupFX.java b/client/src/main/java/net/minecraft/client/entity/fx/EntityPickupFX.java index 8899a94..a6b3f34 100644 --- a/client/src/main/java/net/minecraft/client/entity/fx/EntityPickupFX.java +++ b/client/src/main/java/net/minecraft/client/entity/fx/EntityPickupFX.java @@ -1,13 +1,14 @@ package net.minecraft.client.entity.fx; +import net.minecraft.client.GlobalBeans; import net.minecraft.client.utils.OpenGlHelper; -import net.minecraft.client.render.RenderManager; import net.minecraft.src.Tessellator; import org.lwjgl.opengl.GL11; import ru.di9.minecraft.shared.entity.Entity; import ru.di9.minecraft.shared.utils.MathHelper; import ru.di9.minecraft.shared.world.World; +@SuppressWarnings("all") public class EntityPickupFX extends EntityFX { private Entity entityToPickUp; @@ -53,7 +54,7 @@ public class EntityPickupFX extends EntityFX d6 -= interpPosX; d7 -= interpPosY; d8 -= interpPosZ; - RenderManager.instance.renderEntityWithPosYaw(entityToPickUp, (float)d6, (float)d7, (float)d8, entityToPickUp.rotationYaw, par2); + GlobalBeans.INSTANCE.getRenderManager().renderEntityWithPosYaw(entityToPickUp, (float)d6, (float)d7, (float)d8, entityToPickUp.rotationYaw, par2); } /** diff --git a/client/src/main/java/net/minecraft/client/entity/tile/TileEntityMobSpawnerRenderer.java b/client/src/main/java/net/minecraft/client/entity/tile/TileEntityMobSpawnerRenderer.java index caff84d..3ca5fe8 100644 --- a/client/src/main/java/net/minecraft/client/entity/tile/TileEntityMobSpawnerRenderer.java +++ b/client/src/main/java/net/minecraft/client/entity/tile/TileEntityMobSpawnerRenderer.java @@ -3,13 +3,14 @@ package net.minecraft.client.entity.tile; import java.util.HashMap; import java.util.Map; -import net.minecraft.client.render.RenderManager; +import net.minecraft.client.GlobalBeans; import org.lwjgl.opengl.GL11; import ru.di9.minecraft.shared.entity.Entity; import ru.di9.minecraft.shared.entity.EntityList; import ru.di9.minecraft.shared.entity.tile.TileEntity; import ru.di9.minecraft.shared.entity.tile.TileEntityMobSpawner; +@SuppressWarnings("all") public class TileEntityMobSpawnerRenderer extends TileEntitySpecialRenderer { /** @@ -44,7 +45,7 @@ public class TileEntityMobSpawnerRenderer extends TileEntitySpecialRenderer GL11.glTranslatef(0.0F, -0.4F, 0.0F); GL11.glScalef(f, f, f); entity.setLocationAndAngles(par2, par4, par6, 0.0F, 0.0F); - RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, par8); + GlobalBeans.INSTANCE.getRenderManager().renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, par8); } GL11.glPopMatrix(); diff --git a/client/src/main/java/net/minecraft/client/gui/GuiInventory.java b/client/src/main/java/net/minecraft/client/gui/GuiInventory.java index 558bae2..62615d5 100644 --- a/client/src/main/java/net/minecraft/client/gui/GuiInventory.java +++ b/client/src/main/java/net/minecraft/client/gui/GuiInventory.java @@ -2,8 +2,8 @@ package net.minecraft.client.gui; import java.util.*; +import net.minecraft.client.GlobalBeans; import net.minecraft.client.render.RenderHelper; -import net.minecraft.client.render.RenderManager; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import ru.di9.minecraft.shared.achievement.AchievementList; @@ -116,8 +116,8 @@ public class GuiInventory extends GuiContainer mc.getThePlayer().rotationPitch = -(float)Math.atan(f5 / 40F) * 20F; mc.getThePlayer().rotationYawHead = mc.getThePlayer().rotationYaw; GL11.glTranslatef(0.0F, mc.getThePlayer().yOffset, 0.0F); - RenderManager.instance.playerViewY = 180F; - RenderManager.instance.renderEntityWithPosYaw(mc.getThePlayer(), 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); + GlobalBeans.INSTANCE.getRenderManager().playerViewY = 180F; + GlobalBeans.INSTANCE.getRenderManager().renderEntityWithPosYaw(mc.getThePlayer(), 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); mc.getThePlayer().renderYawOffset = f1; mc.getThePlayer().rotationYaw = f2; mc.getThePlayer().rotationPitch = f3; 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 5e85045..e33d00e 100644 --- a/client/src/main/java/net/minecraft/client/render/RenderGlobal.java +++ b/client/src/main/java/net/minecraft/client/render/RenderGlobal.java @@ -2,6 +2,7 @@ package net.minecraft.client.render; import java.nio.IntBuffer; import java.util.*; +import net.minecraft.client.GlobalBeans; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.*; import net.minecraft.client.entity.fx.*; @@ -308,7 +309,7 @@ public class RenderGlobal implements IWorldAccess prevSortX = -9999D; prevSortY = -9999D; prevSortZ = -9999D; - RenderManager.instance.set(par1World); + GlobalBeans.INSTANCE.getRenderManager().set(par1World); worldObj = par1World; globalRenderBlocks = new RenderBlocks(par1World); @@ -421,7 +422,7 @@ public class RenderGlobal implements IWorldAccess Profiler.startSection("prepare"); TileEntityRenderer.instance.cacheActiveRenderInfo(worldObj, renderEngine, mc.getFontRenderer(), mc.getRenderViewEntity(), par3); - RenderManager.instance.cacheActiveRenderInfo(worldObj, renderEngine, mc.getFontRenderer(), mc.getRenderViewEntity(), mc.getGameSettings(), par3); + GlobalBeans.INSTANCE.getRenderManager().cacheActiveRenderInfo(worldObj, renderEngine, mc.getFontRenderer(), mc.getRenderViewEntity(), mc.getGameSettings(), par3); TileEntityRenderer.instance.func_40742_a(); countEntitiesTotal = 0; countEntitiesRendered = 0; @@ -445,7 +446,7 @@ public class RenderGlobal implements IWorldAccess if (entity.isInRangeToRenderVec3D(par1Vec3D)) { - RenderManager.instance.renderEntity(entity, par3); + GlobalBeans.INSTANCE.getRenderManager().renderEntity(entity, par3); } } @@ -458,7 +459,7 @@ public class RenderGlobal implements IWorldAccess if (entity1.isInRangeToRenderVec3D(par1Vec3D) && (entity1.ignoreFrustumCheck || par2ICamera.isBoundingBoxInFrustum(entity1.boundingBox)) && (entity1 != mc.getRenderViewEntity() || mc.getGameSettings().thirdPersonView != 0 || mc.getRenderViewEntity().isPlayerSleeping()) && worldObj.blockExists(MathHelper.floor_double(entity1.posX), 0, MathHelper.floor_double(entity1.posZ))) { countEntitiesRendered++; - RenderManager.instance.renderEntity(entity1, par3); + GlobalBeans.INSTANCE.getRenderManager().renderEntity(entity1, par3); } } 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 bdd7029..f533f3e 100644 --- a/client/src/main/java/net/minecraft/client/render/RenderManager.java +++ b/client/src/main/java/net/minecraft/client/render/RenderManager.java @@ -20,9 +20,6 @@ public class RenderManager /** A map of entity classes and the associated renderer. */ private Map entityRenderMap; - /** The static instance of RenderManager. */ - public static RenderManager instance = new RenderManager(); - /** Renders fonts */ private FontRenderer fontRenderer; public static double renderPosX; @@ -45,7 +42,7 @@ public class RenderManager public double field_1221_m; public double field_1220_n; - private RenderManager() + public RenderManager() { entityRenderMap = new HashMap(); entityRenderMap.put(EntitySpider.class, new RenderSpider()); diff --git a/client/src/main/java/net/minecraft/src/ItemRenderer.java b/client/src/main/java/net/minecraft/src/ItemRenderer.java index 1560398..b3a847f 100644 --- a/client/src/main/java/net/minecraft/src/ItemRenderer.java +++ b/client/src/main/java/net/minecraft/src/ItemRenderer.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import net.minecraft.client.GlobalBeans; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.render.*; @@ -288,7 +289,7 @@ public class ItemRenderer GL11.glRotatef(-90F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(59F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(-65 * f20, 0.0F, 1.0F, 0.0F); - Render render1 = RenderManager.instance.getEntityRenderObject(mc.getThePlayer()); + Render render1 = GlobalBeans.INSTANCE.getRenderManager().getEntityRenderObject(mc.getThePlayer()); RenderPlayer renderplayer1 = (RenderPlayer)render1; float f34 = 1.0F; GL11.glScalef(f34, f34, f34); @@ -457,7 +458,7 @@ public class ItemRenderer GL11.glRotatef(-135F, 0.0F, 1.0F, 0.0F); GL11.glScalef(1.0F, 1.0F, 1.0F); GL11.glTranslatef(5.6F, 0.0F, 0.0F); - Render render = RenderManager.instance.getEntityRenderObject(mc.getThePlayer()); + Render render = GlobalBeans.INSTANCE.getRenderManager().getEntityRenderObject(mc.getThePlayer()); RenderPlayer renderplayer = (RenderPlayer)render; f26 = 1.0F; GL11.glScalef(f26, f26, f26); diff --git a/shared/src/main/java/ru/di9/minecraft/shared/item/Item.java b/shared/src/main/java/ru/di9/minecraft/shared/item/Item.java index bcd5d62..8fc70c2 100644 --- a/shared/src/main/java/ru/di9/minecraft/shared/item/Item.java +++ b/shared/src/main/java/ru/di9/minecraft/shared/item/Item.java @@ -628,7 +628,7 @@ public class Item return getIconFromDamage(par1); } - static + public static void init() { shovelSteel = (new ItemSpade(0, EnumToolMaterial.IRON)).setIconCoord(2, 5).setItemName("shovelIron"); pickaxeSteel = (new ItemPickaxe(1, EnumToolMaterial.IRON)).setIconCoord(2, 6).setItemName("pickaxeIron"); 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 bc192a0..2896eb3 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 @@ -297,7 +297,7 @@ public class StatList return (StatBase)oneShotStats.get(Integer.valueOf(par0)); } - static + public static void init() { minutesPlayedStat = (new StatBasic(1100, "stat.playOneMinute", StatBase.timeStatType)).initIndependentStat().registerStat(); distanceWalkedStat = (new StatBasic(2000, "stat.walkOneCm", StatBase.distanceStatType)).initIndependentStat().registerStat();