diff --git a/client/src/main/java/client/renderer/BlockRenderer.java b/client/src/main/java/client/renderer/BlockRenderer.java index 3be97f8a..8b48f6f6 100755 --- a/client/src/main/java/client/renderer/BlockRenderer.java +++ b/client/src/main/java/client/renderer/BlockRenderer.java @@ -11,7 +11,7 @@ import client.renderer.blockmodel.BakedModel; import client.renderer.blockmodel.BakedQuad; import client.renderer.blockmodel.IBakedModel; import client.renderer.blockmodel.ModelManager; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import client.renderer.texture.TextureMap; import common.block.Block; import common.block.Material; @@ -33,7 +33,7 @@ public class BlockRenderer { private ModelManager manager; private final Client gm; - private final Map fluids = Maps.newHashMap(); + private final Map fluids = Maps.newHashMap(); public BlockRenderer(ModelManager manager, Client gm) { @@ -47,7 +47,7 @@ public class BlockRenderer return this.manager; } - public void renderBlockDamage(State state, BlockPos pos, TextureAtlasSprite texture, IWorldAccess blockAccess) + public void renderBlockDamage(State state, BlockPos pos, Sprite texture, IWorldAccess blockAccess) { Block block = state.getBlock(); if (block.getRenderType() == 3) @@ -386,7 +386,7 @@ public class BlockRenderer TextureMap texturemap = Client.CLIENT.getTextureMapBlocks(); for(Pair liquid : BlockLiquid.LIQUIDS) { String name = BlockRegistry.getName(liquid.first()); - TextureAtlasSprite[] sprites = new TextureAtlasSprite[] {texturemap.getAtlasSprite("blocks/" + name + "_still"), texturemap.getAtlasSprite("blocks/" + name + "_flow")}; + Sprite[] sprites = new Sprite[] {texturemap.getAtlasSprite("blocks/" + name + "_still"), texturemap.getAtlasSprite("blocks/" + name + "_flow")}; this.fluids.put(liquid.second(), sprites); this.fluids.put(liquid.first(), sprites); } @@ -396,7 +396,7 @@ public class BlockRenderer { BlockLiquid blockliquid = (BlockLiquid)blockStateIn.getBlock(); blockliquid.setBlockBounds(blockAccess, blockPosIn); - TextureAtlasSprite[] atextureatlassprite = this.fluids.get(blockliquid); + Sprite[] atextureatlassprite = this.fluids.get(blockliquid); int i = blockliquid.colorMultiplier(blockAccess, blockPosIn, 0); float f = (float)(i >> 16 & 255) / 255.0F; float f1 = (float)(i >> 8 & 255) / 255.0F; @@ -429,7 +429,7 @@ public class BlockRenderer if (flag) { flag2 = true; - TextureAtlasSprite textureatlassprite = atextureatlassprite[0]; + Sprite textureatlassprite = atextureatlassprite[0]; float f12 = (float)BlockLiquid.getFlowDirection(blockAccess, blockPosIn, blockliquid); if (f12 > -999.0F) @@ -538,7 +538,7 @@ public class BlockRenderer } BlockPos blockpos = blockPosIn.add(j1, 0, k1); - TextureAtlasSprite textureatlassprite1 = atextureatlassprite[1]; + Sprite textureatlassprite1 = atextureatlassprite[1]; if (aboolean[i1]) { diff --git a/client/src/main/java/client/renderer/EffectRenderer.java b/client/src/main/java/client/renderer/EffectRenderer.java index 123beef7..fd1b4464 100755 --- a/client/src/main/java/client/renderer/EffectRenderer.java +++ b/client/src/main/java/client/renderer/EffectRenderer.java @@ -6,7 +6,7 @@ import java.util.Map; import org.lwjgl.opengl.GL11; import client.Client; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import client.renderer.texture.TextureManager; import client.renderer.texture.TextureMap; import common.block.Block; @@ -691,7 +691,7 @@ public class EffectRenderer { } private class Icon extends Moveable { - private final TextureAtlasSprite icon; + private final Sprite icon; private final float offsetX; private final float offsetY; private final float size; @@ -700,7 +700,7 @@ public class EffectRenderer { protected float green; protected float blue; - private Icon(double x, double y, double z, float size, TextureAtlasSprite icon) { + private Icon(double x, double y, double z, float size, Sprite icon) { super(x, y, z, 0.0, 0.0, 0.0); this.size = (rng.floatv() * 0.5F + 0.5F) * size * 0.1f; this.icon = icon; diff --git a/client/src/main/java/client/renderer/ItemModelMesher.java b/client/src/main/java/client/renderer/ItemModelMesher.java index ca010af5..2a5dbcac 100755 --- a/client/src/main/java/client/renderer/ItemModelMesher.java +++ b/client/src/main/java/client/renderer/ItemModelMesher.java @@ -4,7 +4,7 @@ import java.util.Map; import client.renderer.blockmodel.IBakedModel; import client.renderer.blockmodel.ModelManager; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import common.collect.Maps; import common.init.ItemRegistry; import common.item.Item; @@ -18,7 +18,7 @@ public class ItemModelMesher { this.manager = manager; } - public TextureAtlasSprite getParticleIcon(Item item) { + public Sprite getParticleIcon(Item item) { return this.getItemModel(new ItemStack(item)).getBaseTexture(); } diff --git a/client/src/main/java/client/renderer/ItemRenderer.java b/client/src/main/java/client/renderer/ItemRenderer.java index cb63ca7d..d4905345 100755 --- a/client/src/main/java/client/renderer/ItemRenderer.java +++ b/client/src/main/java/client/renderer/ItemRenderer.java @@ -12,7 +12,7 @@ import client.renderer.entity.RenderItem; import client.renderer.entity.RenderManager; import client.renderer.entity.RenderNpc; import client.renderer.texture.EntityTexManager; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import client.renderer.texture.TextureMap; import common.block.Block; import common.entity.npc.EntityNPC; @@ -442,7 +442,7 @@ public class ItemRenderer GlState.enableAlpha(); } - private void renderBlockInside(float partialTicks, TextureAtlasSprite atlas) + private void renderBlockInside(float partialTicks, Sprite atlas) { this.gm.getTextureManager().bindTexture(TextureMap.BLOCKS); RenderBuffer worldrenderer = Tessellator.getBuffer(); @@ -481,7 +481,7 @@ public class ItemRenderer for (int i = 0; i < 2; ++i) { GL11.glPushMatrix(); - TextureAtlasSprite textureatlassprite = this.gm.getTextureMapBlocks().getAtlasSprite("blocks/fire_layer_1"); + Sprite textureatlassprite = this.gm.getTextureMapBlocks().getAtlasSprite("blocks/fire_layer_1"); this.gm.getTextureManager().bindTexture(TextureMap.BLOCKS); float f1 = textureatlassprite.getMinU(); float f2 = textureatlassprite.getMaxU(); diff --git a/client/src/main/java/client/renderer/RenderGlobal.java b/client/src/main/java/client/renderer/RenderGlobal.java index 28ad9f82..104aaad7 100755 --- a/client/src/main/java/client/renderer/RenderGlobal.java +++ b/client/src/main/java/client/renderer/RenderGlobal.java @@ -21,10 +21,10 @@ import client.renderer.chunk.CompiledChunk; import client.renderer.chunk.RenderChunk; import client.renderer.chunk.VisGraph; import client.renderer.entity.RenderManager; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import client.renderer.texture.TextureManager; import client.renderer.texture.TextureMap; -import client.renderer.tileentity.TileEntityRendererDispatcher; +import client.renderer.tileentity.TileEntityRenderer; import client.world.ChunkClient; import client.world.WorldClient; import common.block.Block; @@ -132,7 +132,7 @@ public class RenderGlobal private int cloudTickCounter; private final Map damagedBlocks = Maps.newHashMap(); private final Map mapSoundPositions = Maps.newHashMap(); - private final TextureAtlasSprite[] destroyBlockIcons = new TextureAtlasSprite[10]; + private final Sprite[] destroyBlockIcons = new Sprite[10]; private double frustumUpdatePosX = Double.MIN_VALUE; private double frustumUpdatePosY = Double.MIN_VALUE; private double frustumUpdatePosZ = Double.MIN_VALUE; @@ -495,7 +495,7 @@ public class RenderGlobal double d0 = renderViewEntity.prevX + (renderViewEntity.posX - renderViewEntity.prevX) * (double)partialTicks; double d1 = renderViewEntity.prevY + (renderViewEntity.posY - renderViewEntity.prevY) * (double)partialTicks; double d2 = renderViewEntity.prevZ + (renderViewEntity.posZ - renderViewEntity.prevZ) * (double)partialTicks; - TileEntityRendererDispatcher.instance.setPosition(this.theWorld, this.gm.getTextureManager(), this.gm.getRenderViewEntity(), partialTicks); + TileEntityRenderer.instance.setPosition(this.theWorld, this.gm.getTextureManager(), this.gm.getRenderViewEntity(), partialTicks); this.renderManager.cacheActiveRenderInfo(this.theWorld, this.gm.getRenderViewEntity(), this.gm.getPointedEntity(), this.gm, partialTicks); this.countEntitiesTotal = 0; this.countEntitiesRendered = 0; @@ -504,9 +504,9 @@ public class RenderGlobal double d3 = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * (double)partialTicks; double d4 = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * (double)partialTicks; double d5 = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * (double)partialTicks; - TileEntityRendererDispatcher.entityX = d3; - TileEntityRendererDispatcher.entityY = d4; - TileEntityRendererDispatcher.entityZ = d5; + TileEntityRenderer.entityX = d3; + TileEntityRenderer.entityY = d4; + TileEntityRenderer.entityZ = d5; this.renderManager.setRenderPosition(d3, d4, d5); this.gm.entityRenderer.enableLightmap(); List list = this.theWorld.getLoadedEntityList(); @@ -661,7 +661,7 @@ public class RenderGlobal { for (TileEntity tileentity2 : list1) { - TileEntityRendererDispatcher.instance.renderTile(tileentity2, partialTicks, -1); + TileEntityRenderer.instance.renderTile(tileentity2, partialTicks, -1); } } } @@ -670,7 +670,7 @@ public class RenderGlobal { for (TileEntity tileentity : this.setTileEntities) { - TileEntityRendererDispatcher.instance.renderTile(tileentity, partialTicks, -1); + TileEntityRenderer.instance.renderTile(tileentity, partialTicks, -1); } } @@ -684,7 +684,7 @@ public class RenderGlobal if (tileentity1 != null && (block instanceof BlockChest || block instanceof BlockSign)) { - TileEntityRendererDispatcher.instance.renderTile(tileentity1, partialTicks, destroyblockprogress.getPartialBlockDamage()); + TileEntityRenderer.instance.renderTile(tileentity1, partialTicks, destroyblockprogress.getPartialBlockDamage()); } } @@ -1578,7 +1578,7 @@ public class RenderGlobal if (iblockstate.getBlock() != Blocks.air) { int i = destroyblockprogress.getPartialBlockDamage(); - TextureAtlasSprite textureatlassprite = this.destroyBlockIcons[i]; + Sprite textureatlassprite = this.destroyBlockIcons[i]; BlockRenderer blockrendererdispatcher = this.gm.getBlockRendererDispatcher(); blockrendererdispatcher.renderBlockDamage(iblockstate, blockpos, textureatlassprite, this.theWorld); } diff --git a/client/src/main/java/client/renderer/blockmodel/BakedModel.java b/client/src/main/java/client/renderer/blockmodel/BakedModel.java index c238b987..66a3f299 100755 --- a/client/src/main/java/client/renderer/blockmodel/BakedModel.java +++ b/client/src/main/java/client/renderer/blockmodel/BakedModel.java @@ -3,12 +3,12 @@ package client.renderer.blockmodel; import java.util.ArrayList; import java.util.List; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import common.collect.Lists; import common.model.Transform; import common.util.Facing; -public record BakedModel(List getQuads, List> getFace, boolean isGui3d, TextureAtlasSprite getBaseTexture, Transform getTransforms) implements IBakedModel { +public record BakedModel(List getQuads, List> getFace, boolean isGui3d, Sprite getBaseTexture, Transform getTransforms) implements IBakedModel { public List getFace(Facing face) { return this.getFace.get(face.ordinal()); } @@ -20,7 +20,7 @@ public record BakedModel(List getQuads, List> getFace public static class Builder { private final List quads; private final List> faces; - private TextureAtlasSprite texture; + private Sprite texture; private boolean gui3d; private Transform transforms; @@ -28,7 +28,7 @@ public record BakedModel(List getQuads, List> getFace this(model.isGui3d(), model.getTransform()); } - public Builder(IBakedModel model, TextureAtlasSprite texture) { + public Builder(IBakedModel model, Sprite texture) { this(model.isGui3d(), model.getTransforms()); this.texture = model.getBaseTexture(); @@ -39,13 +39,13 @@ public record BakedModel(List getQuads, List> getFace this.addGeneralBreakingFours(model, texture); } - private void addFaceBreakingFours(IBakedModel model, TextureAtlasSprite texture, Facing facing) { + private void addFaceBreakingFours(IBakedModel model, Sprite texture, Facing facing) { for(BakedQuad quad : model.getFace(facing)) { this.addFaceQuad(facing, new BreakingFour(quad, texture)); } } - private void addGeneralBreakingFours(IBakedModel model, TextureAtlasSprite texture) { + private void addGeneralBreakingFours(IBakedModel model, Sprite texture) { for(BakedQuad quad : model.getQuads()) { this.addGeneralQuad(new BreakingFour(quad, texture)); } @@ -73,7 +73,7 @@ public record BakedModel(List getQuads, List> getFace return this; } - public BakedModel.Builder setTexture(TextureAtlasSprite texture) { + public BakedModel.Builder setTexture(Sprite texture) { this.texture = texture; return this; } diff --git a/client/src/main/java/client/renderer/blockmodel/BreakingFour.java b/client/src/main/java/client/renderer/blockmodel/BreakingFour.java index ec2cbc97..7e4d04eb 100755 --- a/client/src/main/java/client/renderer/blockmodel/BreakingFour.java +++ b/client/src/main/java/client/renderer/blockmodel/BreakingFour.java @@ -2,13 +2,13 @@ package client.renderer.blockmodel; import java.util.Arrays; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; public class BreakingFour extends BakedQuad { - private final TextureAtlasSprite texture; + private final Sprite texture; - public BreakingFour(BakedQuad quad, TextureAtlasSprite texture) { + public BreakingFour(BakedQuad quad, Sprite texture) { super(Arrays.copyOf(quad.getVertexData(), quad.getVertexData().length), quad.tint, FaceBakery.getFacingFromVertexData(quad.getVertexData())); this.texture = texture; diff --git a/client/src/main/java/client/renderer/blockmodel/BuiltInModel.java b/client/src/main/java/client/renderer/blockmodel/BuiltInModel.java index b35656fe..59e962a6 100755 --- a/client/src/main/java/client/renderer/blockmodel/BuiltInModel.java +++ b/client/src/main/java/client/renderer/blockmodel/BuiltInModel.java @@ -2,7 +2,7 @@ package client.renderer.blockmodel; import java.util.List; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import common.model.Transform; import common.util.Facing; @@ -23,7 +23,7 @@ public record BuiltInModel(Transform getTransforms) implements IBakedModel { return true; } - public TextureAtlasSprite getBaseTexture() { + public Sprite getBaseTexture() { return null; } } diff --git a/client/src/main/java/client/renderer/blockmodel/FaceBakery.java b/client/src/main/java/client/renderer/blockmodel/FaceBakery.java index cb73b49e..68808bb8 100755 --- a/client/src/main/java/client/renderer/blockmodel/FaceBakery.java +++ b/client/src/main/java/client/renderer/blockmodel/FaceBakery.java @@ -1,6 +1,6 @@ package client.renderer.blockmodel; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import common.model.ModelRotation; import common.util.ExtMath; import common.util.Facing; @@ -73,7 +73,7 @@ public class FaceBakery FACINGS[Constants.EAST_INDEX] = EnumFaceDirection.EAST; } - public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face, TextureAtlasSprite sprite, Facing facing, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade) + public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face, Sprite sprite, Facing facing, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade) { int[] aint = this.makeQuadVertexData(face, sprite, facing, this.getPositionsDiv16(posFrom, posTo), modelRotationIn, partRotation, uvLocked, shade); Facing enumfacing = getFacingFromVertexData(aint); @@ -91,7 +91,7 @@ public class FaceBakery return new BakedQuad(aint, face.tint, enumfacing); } - private int[] makeQuadVertexData(BlockPartFace partFace, TextureAtlasSprite sprite, Facing facing, float[] p_178405_4_, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade) + private int[] makeQuadVertexData(BlockPartFace partFace, Sprite sprite, Facing facing, float[] p_178405_4_, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade) { int[] aint = new int[28]; @@ -145,7 +145,7 @@ public class FaceBakery return afloat; } - private void fillVertexData(int[] faceData, int vertexIndex, Facing facing, BlockPartFace partFace, float[] p_178402_5_, TextureAtlasSprite sprite, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade) + private void fillVertexData(int[] faceData, int vertexIndex, Facing facing, BlockPartFace partFace, float[] p_178402_5_, Sprite sprite, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade) { Facing enumfacing = modelRotationIn.rotateFace(facing); int i = shade ? this.getFaceShadeColor(enumfacing) : -1; @@ -156,7 +156,7 @@ public class FaceBakery this.storeVertexData(faceData, j, vertexIndex, vector3f, i, sprite, partFace.uv); } - private void storeVertexData(int[] faceData, int storeIndex, int vertexIndex, Vector3f position, int shadeColor, TextureAtlasSprite sprite, BlockFaceUV faceUV) + private void storeVertexData(int[] faceData, int storeIndex, int vertexIndex, Vector3f position, int shadeColor, Sprite sprite, BlockFaceUV faceUV) { int i = storeIndex * 7; faceData[i] = Float.floatToRawIntBits(position.x); @@ -284,7 +284,7 @@ public class FaceBakery } } - public void lockUv(int[] p_178409_1_, Facing facing, BlockFaceUV p_178409_3_, TextureAtlasSprite p_178409_4_) + public void lockUv(int[] p_178409_1_, Facing facing, BlockFaceUV p_178409_3_, Sprite p_178409_4_) { for (int i = 0; i < 4; ++i) { @@ -371,7 +371,7 @@ public class FaceBakery } } - private void lockVertexUv(int p_178401_1_, int[] p_178401_2_, Facing facing, BlockFaceUV p_178401_4_, TextureAtlasSprite p_178401_5_) + private void lockVertexUv(int p_178401_1_, int[] p_178401_2_, Facing facing, BlockFaceUV p_178401_4_, Sprite p_178401_5_) { int i = 7 * p_178401_1_; float f = Float.intBitsToFloat(p_178401_2_[i]); diff --git a/client/src/main/java/client/renderer/blockmodel/IBakedModel.java b/client/src/main/java/client/renderer/blockmodel/IBakedModel.java index a3d98209..15a65980 100755 --- a/client/src/main/java/client/renderer/blockmodel/IBakedModel.java +++ b/client/src/main/java/client/renderer/blockmodel/IBakedModel.java @@ -2,7 +2,7 @@ package client.renderer.blockmodel; import java.util.List; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import common.model.Transform; import common.util.Facing; @@ -16,7 +16,7 @@ public interface IBakedModel boolean isBuiltin(); - TextureAtlasSprite getBaseTexture(); + Sprite getBaseTexture(); Transform getTransforms(); } diff --git a/client/src/main/java/client/renderer/blockmodel/ModelBakery.java b/client/src/main/java/client/renderer/blockmodel/ModelBakery.java index 0433e5aa..13813dc7 100755 --- a/client/src/main/java/client/renderer/blockmodel/ModelBakery.java +++ b/client/src/main/java/client/renderer/blockmodel/ModelBakery.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import client.renderer.texture.TextureMap; import common.block.Block; import common.block.liquid.BlockDynamicLiquid; @@ -51,7 +51,7 @@ public abstract class ModelBakery public static Map setupModelRegistry(TextureMap textureMap, Map map) { - final Map sprites = Maps.newHashMap(); + final Map sprites = Maps.newHashMap(); Map models = Maps.newLinkedHashMap(); List variants = Lists.newArrayList(); FaceBakery faceBakery = new FaceBakery(); @@ -160,7 +160,7 @@ public abstract class ModelBakery } } - for (TextureAtlasSprite textureatlassprite : sprites.values()) + for (Sprite textureatlassprite : sprites.values()) { if (!textureatlassprite.isAnimated()) { @@ -223,17 +223,17 @@ public abstract class ModelBakery return new ModelBlock(Transform.IDENTITY, item.getTextures(name)); } - private static IBakedModel bakeModel(Map sprites, FaceBakery faceBakery, - TextureAtlasSprite fallback, ModelBlock modelBlockIn, ModelRotation modelRotationIn, boolean uvLocked) + private static IBakedModel bakeModel(Map sprites, FaceBakery faceBakery, + Sprite fallback, ModelBlock modelBlockIn, ModelRotation modelRotationIn, boolean uvLocked) { - TextureAtlasSprite particle = sprites.get(modelBlockIn.getPrimary()); + Sprite particle = sprites.get(modelBlockIn.getPrimary()); BakedModel.Builder builder = new BakedModel.Builder(modelBlockIn).setTexture(particle == null ? fallback : particle); for (BlockPart blockpart : modelBlockIn.getElements()) { for (Facing enumfacing : blockpart.mapFaces.keySet()) { BlockPartFace face = blockpart.mapFaces.get(enumfacing); - TextureAtlasSprite sprite = sprites.get(face.texture); + Sprite sprite = sprites.get(face.texture); sprite = sprite == null ? fallback : sprite; if (face.cull == null) diff --git a/client/src/main/java/client/renderer/blockmodel/ModelGenerator.java b/client/src/main/java/client/renderer/blockmodel/ModelGenerator.java index 4436c0af..2fefcfa6 100755 --- a/client/src/main/java/client/renderer/blockmodel/ModelGenerator.java +++ b/client/src/main/java/client/renderer/blockmodel/ModelGenerator.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; import client.renderer.model.ModelBox; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import client.renderer.texture.TextureMap; import client.renderer.texture.TextureUtil; import common.collect.Lists; @@ -122,7 +122,7 @@ public abstract class ModelGenerator { } } - private static List compileParts(int layer, String tex, TextureAtlasSprite sprite) { + private static List compileParts(int layer, String tex, Sprite sprite) { Map map = Maps.newHashMap(); map.put(Facing.SOUTH, new BlockPartFace(null, layer, tex, new BlockFaceUV(new float[] {0.0F, 0.0F, 16.0F, 16.0F}, 0))); map.put(Facing.NORTH, new BlockPartFace(null, layer, tex, new BlockFaceUV(new float[] {16.0F, 0.0F, 0.0F, 16.0F}, 0))); @@ -132,7 +132,7 @@ public abstract class ModelGenerator { return parts; } - private static List bakeParts(TextureAtlasSprite sprite, String tex, int layer) { + private static List bakeParts(Sprite sprite, String tex, int layer) { float w = (float)sprite.getIconWidth(); float h = (float)sprite.getIconHeight(); List parts = Lists.newArrayList(); @@ -229,7 +229,7 @@ public abstract class ModelGenerator { return parts; } - private static List compileSpans(TextureAtlasSprite sprite) { + private static List compileSpans(Sprite sprite) { int w = sprite.getIconWidth(); int h = sprite.getIconHeight(); List spans = Lists.newArrayList(); diff --git a/client/src/main/java/client/renderer/blockmodel/ModelManager.java b/client/src/main/java/client/renderer/blockmodel/ModelManager.java index 96ec8763..95e80ac7 100755 --- a/client/src/main/java/client/renderer/blockmodel/ModelManager.java +++ b/client/src/main/java/client/renderer/blockmodel/ModelManager.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import client.renderer.texture.TextureMap; import common.block.Block; import common.collect.Maps; @@ -69,7 +69,7 @@ public class ModelManager return this.texMap; } - public TextureAtlasSprite getTexture(State state) + public Sprite getTexture(State state) { Block block = state.getBlock(); IBakedModel model = this.getModelForState(state); diff --git a/client/src/main/java/client/renderer/chunk/RenderChunk.java b/client/src/main/java/client/renderer/chunk/RenderChunk.java index cdc5a79c..be0c25ed 100755 --- a/client/src/main/java/client/renderer/chunk/RenderChunk.java +++ b/client/src/main/java/client/renderer/chunk/RenderChunk.java @@ -17,7 +17,7 @@ import client.renderer.RegionRenderCache; import client.renderer.RenderBuffer; import client.renderer.RenderGlobal; import client.renderer.VertexBuffer; -import client.renderer.tileentity.TileEntityRendererDispatcher; +import client.renderer.tileentity.TileEntityRenderer; import client.renderer.tileentity.TileRenderer; import client.world.WorldClient; import common.block.Block; @@ -157,7 +157,7 @@ public class RenderChunk if (block instanceof ITileEntityProvider) { TileEntity tileentity = iblockaccess.getTileEntity(new BlockPos(blockpos$mutableblockpos)); - TileRenderer tileentityspecialrenderer = TileEntityRendererDispatcher.instance.getRenderer(tileentity); + TileRenderer tileentityspecialrenderer = TileEntityRenderer.instance.getRenderer(tileentity); if (tileentity != null && tileentityspecialrenderer != null) { diff --git a/client/src/main/java/client/renderer/entity/RenderFireball.java b/client/src/main/java/client/renderer/entity/RenderFireball.java index 97e62ce7..cdc1caa2 100755 --- a/client/src/main/java/client/renderer/entity/RenderFireball.java +++ b/client/src/main/java/client/renderer/entity/RenderFireball.java @@ -7,7 +7,7 @@ import client.renderer.DefaultVertexFormats; import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.Tessellator; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import client.renderer.texture.TextureMap; import common.entity.projectile.EntityProjectile; import common.init.Items; @@ -33,7 +33,7 @@ public class RenderFireball extends Render GL11.glTranslatef((float)x, (float)y, (float)z); GlState.enableRescaleNormal(); GL11.glScalef(this.scale, this.scale, this.scale); - TextureAtlasSprite textureatlassprite = Client.CLIENT.getRenderItem().getItemModelMesher().getParticleIcon(Items.fireball); + Sprite textureatlassprite = Client.CLIENT.getRenderItem().getItemModelMesher().getParticleIcon(Items.fireball); // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); float f = textureatlassprite.getMinU(); diff --git a/client/src/main/java/client/renderer/entity/RenderItem.java b/client/src/main/java/client/renderer/entity/RenderItem.java index 679718ad..aa287fe6 100755 --- a/client/src/main/java/client/renderer/entity/RenderItem.java +++ b/client/src/main/java/client/renderer/entity/RenderItem.java @@ -17,7 +17,7 @@ import client.renderer.layers.LayerArmor; import client.renderer.model.ModelHorse; import client.renderer.texture.TextureManager; import client.renderer.texture.TextureMap; -import client.renderer.tileentity.TileEntityRendererDispatcher; +import client.renderer.tileentity.TileEntityRenderer; import common.block.tech.BlockChest; import common.block.tile.BlockStandingSign; import common.entity.npc.EntityNPC; @@ -138,12 +138,12 @@ public class RenderItem private void renderBuiltin(ItemStack stack) { if(stack.getItem().getBlock() instanceof BlockChest chest) { this.state = chest.getState().withProperty(BlockChest.FACING, Facing.SOUTH); - TileEntityRendererDispatcher.instance.renderItem(this.chest, 0.0D, 0.0D, 0.0D, 0.0F); + TileEntityRenderer.instance.renderItem(this.chest, 0.0D, 0.0D, 0.0D, 0.0F); this.state = null; } else if(stack.getItem().getBlock() instanceof BlockStandingSign sign) { this.state = sign.getState().withProperty(BlockStandingSign.ROTATION, 8); - TileEntityRendererDispatcher.instance.renderItem(this.sign, 0.0D, 0.0D, 0.0D, 0.0F); + TileEntityRenderer.instance.renderItem(this.sign, 0.0D, 0.0D, 0.0D, 0.0F); this.state = null; } else if(stack.getItem() instanceof ItemArmor armor) { diff --git a/client/src/main/java/client/renderer/entity/RenderManager.java b/client/src/main/java/client/renderer/entity/RenderManager.java index a4c14af1..887b728a 100755 --- a/client/src/main/java/client/renderer/entity/RenderManager.java +++ b/client/src/main/java/client/renderer/entity/RenderManager.java @@ -13,7 +13,7 @@ import client.renderer.GlState; import client.renderer.RenderBuffer; import client.renderer.RenderGlobal; import client.renderer.Tessellator; -import client.renderer.texture.TextureAtlasSprite; +import client.renderer.texture.Sprite; import client.renderer.texture.TextureManager; import client.renderer.texture.TextureMap; import common.collect.Maps; @@ -302,8 +302,8 @@ public class RenderManager { GlState.disableLighting(); TextureMap map = this.gm.getTextureMapBlocks(); - TextureAtlasSprite layer0 = map.getAtlasSprite("blocks/fire_layer_0"); - TextureAtlasSprite layer1 = map.getAtlasSprite("blocks/fire_layer_1"); + Sprite layer0 = map.getAtlasSprite("blocks/fire_layer_0"); + Sprite layer1 = map.getAtlasSprite("blocks/fire_layer_1"); GL11.glPushMatrix(); GL11.glTranslatef((float)x, (float)y, (float)z); float scale = entity.width * 1.4F; @@ -322,7 +322,7 @@ public class RenderManager while (f3 > 0.0F) { - TextureAtlasSprite layer = i % 2 == 0 ? layer0 : layer1; + Sprite layer = i % 2 == 0 ? layer0 : layer1; this.renderEngine.bindTexture(TextureMap.BLOCKS); float f6 = layer.getMinU(); float f7 = layer.getMinV(); diff --git a/client/src/main/java/client/renderer/texture/TextureAtlasSprite.java b/client/src/main/java/client/renderer/texture/Sprite.java similarity index 97% rename from client/src/main/java/client/renderer/texture/TextureAtlasSprite.java rename to client/src/main/java/client/renderer/texture/Sprite.java index fb18431c..16118d05 100755 --- a/client/src/main/java/client/renderer/texture/TextureAtlasSprite.java +++ b/client/src/main/java/client/renderer/texture/Sprite.java @@ -6,7 +6,7 @@ import java.util.List; import common.collect.Lists; -public class TextureAtlasSprite +public class Sprite { private final String iconName; protected List framesTextureData = Lists.newArrayList(); @@ -25,7 +25,7 @@ public class TextureAtlasSprite protected int tickCounter; private TextureTicked tickedTexture; - protected TextureAtlasSprite(String spriteName) + protected Sprite(String spriteName) { this.iconName = spriteName; } @@ -43,7 +43,7 @@ public class TextureAtlasSprite this.maxV = (float)(originInY + this.height) / (float)inY - f1; } - public void copyFrom(TextureAtlasSprite atlasSpirit) + public void copyFrom(Sprite atlasSpirit) { this.originX = atlasSpirit.originX; this.originY = atlasSpirit.originY; diff --git a/client/src/main/java/client/renderer/texture/Stitcher.java b/client/src/main/java/client/renderer/texture/Stitcher.java index 223ad999..9c422875 100755 --- a/client/src/main/java/client/renderer/texture/Stitcher.java +++ b/client/src/main/java/client/renderer/texture/Stitcher.java @@ -36,7 +36,7 @@ public class Stitcher return this.currentHeight; } - public void addSprite(TextureAtlasSprite p_110934_1_) + public void addSprite(Sprite p_110934_1_) { Stitcher.Holder stitcher$holder = new Stitcher.Holder(p_110934_1_); this.holders.add(stitcher$holder); @@ -56,7 +56,7 @@ public class Stitcher this.currentHeight = roundUpToPowerOfTwo(this.currentHeight); } - public List getStichSlots() + public List getStichSlots() { List list = Lists.newArrayList(); @@ -65,12 +65,12 @@ public class Stitcher stitcher$slot.getAllStitchSlots(list); } - List list1 = Lists.newArrayList(); + List list1 = Lists.newArrayList(); for (Stitcher.Slot stitcher$slot1 : list) { Stitcher.Holder stitcher$holder = stitcher$slot1.getStitchHolder(); - TextureAtlasSprite textureatlassprite = stitcher$holder.getAtlasSprite(); + Sprite textureatlassprite = stitcher$holder.getAtlasSprite(); textureatlassprite.initSprite(this.currentWidth, this.currentHeight, stitcher$slot1.getOriginX(), stitcher$slot1.getOriginY(), stitcher$holder.isRotated()); list1.add(textureatlassprite); } @@ -151,13 +151,13 @@ public class Stitcher public static class Holder implements Comparable { - private final TextureAtlasSprite theTexture; + private final Sprite theTexture; private final int width; private final int height; private boolean rotated; private float scaleFactor = 1.0F; - public Holder(TextureAtlasSprite p_i45094_1_) + public Holder(Sprite p_i45094_1_) { this.theTexture = p_i45094_1_; this.width = p_i45094_1_.getIconWidth(); @@ -165,7 +165,7 @@ public class Stitcher this.rotated = this.height > this.width; } - public TextureAtlasSprite getAtlasSprite() + public Sprite getAtlasSprite() { return this.theTexture; } diff --git a/client/src/main/java/client/renderer/texture/TextureMap.java b/client/src/main/java/client/renderer/texture/TextureMap.java index 4d0c1595..77f65bc1 100755 --- a/client/src/main/java/client/renderer/texture/TextureMap.java +++ b/client/src/main/java/client/renderer/texture/TextureMap.java @@ -23,21 +23,21 @@ public class TextureMap extends Texture public static final String MISSING = "missingno"; public static final String BLOCKS = "textures/atlas/blocks.png"; - private final List listAnimatedSprites; - private final Map mapRegisteredSprites; - private final Map mapUploadedSprites; + private final List listAnimatedSprites; + private final Map mapRegisteredSprites; + private final Map mapUploadedSprites; private final Map> tickedTextures; private final Map animTextures; - private final TextureAtlasSprite missingImage; + private final Sprite missingImage; public TextureMap() { - this.listAnimatedSprites = Lists.newArrayList(); - this.mapRegisteredSprites = Maps.newHashMap(); - this.mapUploadedSprites = Maps.newHashMap(); + this.listAnimatedSprites = Lists.newArrayList(); + this.mapRegisteredSprites = Maps.newHashMap(); + this.mapUploadedSprites = Maps.newHashMap(); this.tickedTextures = Maps.>newHashMap(); this.animTextures = Maps.newHashMap(); - this.missingImage = new TextureAtlasSprite(MISSING); + this.missingImage = new Sprite(MISSING); Map map = Maps.newHashMap(); Map> anim = Maps.newHashMap(); RenderRegistry.registerAnimations(anim); @@ -70,12 +70,12 @@ public class TextureMap extends Texture { } - public void loadSprites(Set set, Map sprites) + public void loadSprites(Set set, Map sprites) { this.mapRegisteredSprites.clear(); for (String loc : set) { - TextureAtlasSprite sprite = this.registerSprite(loc); + Sprite sprite = this.registerSprite(loc); sprites.put(loc, sprite); } this.initMissingImage(); @@ -90,9 +90,9 @@ public class TextureMap extends Texture this.listAnimatedSprites.clear(); int j = Integer.MAX_VALUE; - for (Entry entry : this.mapRegisteredSprites.entrySet()) + for (Entry entry : this.mapRegisteredSprites.entrySet()) { - TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)entry.getValue(); + Sprite textureatlassprite = (Sprite)entry.getValue(); String name = String.format("textures/%s.png", textureatlassprite.getIconName()); try @@ -143,9 +143,9 @@ public class TextureMap extends Texture Log.RENDER.info("Textur-Atlas in Größe " + stitcher.getCurrentWidth() + "x" + stitcher.getCurrentHeight() + " erstellt"); TextureUtil.allocateTexture(this.getGlTextureId(), stitcher.getCurrentWidth(), stitcher.getCurrentHeight()); - Map map = Maps.newHashMap(this.mapRegisteredSprites); + Map map = Maps.newHashMap(this.mapRegisteredSprites); - for (TextureAtlasSprite textureatlassprite2 : stitcher.getStichSlots()) + for (Sprite textureatlassprite2 : stitcher.getStichSlots()) { String s = textureatlassprite2.getIconName(); map.remove(s); @@ -159,15 +159,15 @@ public class TextureMap extends Texture } } - for (TextureAtlasSprite textureatlassprite3 : map.values()) + for (Sprite textureatlassprite3 : map.values()) { textureatlassprite3.copyFrom(this.missingImage); } } - public TextureAtlasSprite getAtlasSprite(String iconName) + public Sprite getAtlasSprite(String iconName) { - TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)this.mapUploadedSprites.get(iconName); + Sprite textureatlassprite = (Sprite)this.mapUploadedSprites.get(iconName); if (textureatlassprite == null) { @@ -181,13 +181,13 @@ public class TextureMap extends Texture { GlState.bindTexture(this.getGlTextureId()); - for (TextureAtlasSprite textureatlassprite : this.listAnimatedSprites) + for (Sprite textureatlassprite : this.listAnimatedSprites) { textureatlassprite.updateAnimation(); } } - private TextureAtlasSprite registerSprite(String location) + private Sprite registerSprite(String location) { if (location == null) { @@ -195,11 +195,11 @@ public class TextureMap extends Texture } else { - TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)this.mapRegisteredSprites.get(location.toString()); + Sprite textureatlassprite = (Sprite)this.mapRegisteredSprites.get(location.toString()); if (textureatlassprite == null) { - textureatlassprite = new TextureAtlasSprite(location); + textureatlassprite = new Sprite(location); this.mapRegisteredSprites.put(location.toString(), textureatlassprite); } @@ -207,7 +207,7 @@ public class TextureMap extends Texture } } - public TextureAtlasSprite getMissingSprite() + public Sprite getMissingSprite() { return this.missingImage; } diff --git a/client/src/main/java/client/renderer/tileentity/ChestRenderer.java b/client/src/main/java/client/renderer/tileentity/ChestRenderer.java index 0f2e9eff..07e2d841 100755 --- a/client/src/main/java/client/renderer/tileentity/ChestRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/ChestRenderer.java @@ -15,7 +15,7 @@ public class ChestRenderer extends TileRenderer { private final ModelChest model = new ModelChest(); - public ChestRenderer(TileEntityRendererDispatcher renderer) { + public ChestRenderer(TileEntityRenderer renderer) { super(renderer); } diff --git a/client/src/main/java/client/renderer/tileentity/DisplayRenderer.java b/client/src/main/java/client/renderer/tileentity/DisplayRenderer.java index 395236a3..2fbd85db 100644 --- a/client/src/main/java/client/renderer/tileentity/DisplayRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/DisplayRenderer.java @@ -79,7 +79,7 @@ public class DisplayRenderer extends TileRenderer { return tex.texture; } - public DisplayRenderer(TileEntityRendererDispatcher renderer) { + public DisplayRenderer(TileEntityRenderer renderer) { super(renderer); } diff --git a/client/src/main/java/client/renderer/tileentity/SignRenderer.java b/client/src/main/java/client/renderer/tileentity/SignRenderer.java index 0eb0bd91..fe74e108 100755 --- a/client/src/main/java/client/renderer/tileentity/SignRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/SignRenderer.java @@ -18,7 +18,7 @@ public class SignRenderer extends TileRenderer private final ModelSign model = new ModelSign(); - public SignRenderer(TileEntityRendererDispatcher renderer) { + public SignRenderer(TileEntityRenderer renderer) { super(renderer); } diff --git a/client/src/main/java/client/renderer/tileentity/TileEntityRendererDispatcher.java b/client/src/main/java/client/renderer/tileentity/TileEntityRenderer.java similarity index 94% rename from client/src/main/java/client/renderer/tileentity/TileEntityRendererDispatcher.java rename to client/src/main/java/client/renderer/tileentity/TileEntityRenderer.java index cf6bfe1b..7a5e8832 100755 --- a/client/src/main/java/client/renderer/tileentity/TileEntityRendererDispatcher.java +++ b/client/src/main/java/client/renderer/tileentity/TileEntityRenderer.java @@ -15,8 +15,8 @@ import common.tileentity.TileEntityDisplay; import common.tileentity.TileEntitySign; import common.util.BlockPos; -public class TileEntityRendererDispatcher { - public static TileEntityRendererDispatcher instance = new TileEntityRendererDispatcher(); +public class TileEntityRenderer { + public static TileEntityRenderer instance = new TileEntityRenderer(); public static double entityX; // TODO: useless, duplicate render view entity position? public static double entityY; public static double entityZ; @@ -29,7 +29,7 @@ public class TileEntityRendererDispatcher { private double posY; private double posZ; - private TileEntityRendererDispatcher() { + private TileEntityRenderer() { this.renderers.put(TileEntitySign.class, new SignRenderer(this)); this.renderers.put(TileEntityDisplay.class, new DisplayRenderer(this)); this.renderers.put(TileEntityChest.class, new ChestRenderer(this)); diff --git a/client/src/main/java/client/renderer/tileentity/TileRenderer.java b/client/src/main/java/client/renderer/tileentity/TileRenderer.java index ffd719a3..1718637f 100755 --- a/client/src/main/java/client/renderer/tileentity/TileRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/TileRenderer.java @@ -10,9 +10,9 @@ public abstract class TileRenderer { "textures/blocks/destroy_stage_8.png", "textures/blocks/destroy_stage_9.png" }; - private final TileEntityRendererDispatcher renderer; + private final TileEntityRenderer renderer; - public TileRenderer(TileEntityRendererDispatcher renderer) { + public TileRenderer(TileEntityRenderer renderer) { this.renderer = renderer; }