diff options
| author | Raven Szewczyk <git@eigenraven.me> | 2023-04-10 17:49:16 +0100 |
|---|---|---|
| committer | Raven Szewczyk <git@eigenraven.me> | 2023-04-10 17:49:16 +0100 |
| commit | 8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch) | |
| tree | 0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/common/render | |
| parent | d795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff) | |
| download | GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2 GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip | |
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/common/render')
20 files changed, 711 insertions, 761 deletions
diff --git a/src/main/java/gregtech/common/render/GT_CapeRenderer.java b/src/main/java/gregtech/common/render/GT_CapeRenderer.java index 6254a9df79..ec9ef2880c 100644 --- a/src/main/java/gregtech/common/render/GT_CapeRenderer.java +++ b/src/main/java/gregtech/common/render/GT_CapeRenderer.java @@ -20,14 +20,13 @@ import gregtech.api.util.GT_Utility; public class GT_CapeRenderer extends RenderPlayer { private final ResourceLocation[] mCapes = { new ResourceLocation("gregtech:textures/BrainTechCape.png"), - new ResourceLocation("gregtech:textures/GregTechCape.png"), - new ResourceLocation("gregtech:textures/MrBrainCape.png"), - new ResourceLocation("gregtech:textures/GregoriusCape.png"), - new ResourceLocation("gregtech:textures/DonorCape.png"), - new ResourceLocation("gregtech:textures/DevCape.png"), new ResourceLocation("gregtech:textures/Steam.png"), - new ResourceLocation("gregtech:textures/Titanium.png"), - new ResourceLocation("gregtech:textures/Neutronium.png"), - new ResourceLocation("gregtech:textures/Stargate.png") }; + new ResourceLocation("gregtech:textures/GregTechCape.png"), + new ResourceLocation("gregtech:textures/MrBrainCape.png"), + new ResourceLocation("gregtech:textures/GregoriusCape.png"), + new ResourceLocation("gregtech:textures/DonorCape.png"), new ResourceLocation("gregtech:textures/DevCape.png"), + new ResourceLocation("gregtech:textures/Steam.png"), new ResourceLocation("gregtech:textures/Titanium.png"), + new ResourceLocation("gregtech:textures/Neutronium.png"), + new ResourceLocation("gregtech:textures/Stargate.png") }; private final Collection<String> mCapeList; public GT_CapeRenderer(Collection<String> aCapeList) { @@ -51,50 +50,50 @@ public class GT_CapeRenderer extends RenderPlayer { try { ResourceLocation tResource = aPlayer.getLocationCape(); if (aPlayer.getDisplayName() - .equalsIgnoreCase("Friedi4321")) { + .equalsIgnoreCase("Friedi4321")) { tResource = this.mCapes[0]; } if (this.mCapeList.contains( - aPlayer.getDisplayName() - .toLowerCase())) { + aPlayer.getDisplayName() + .toLowerCase())) { tResource = this.mCapes[1]; } if (aPlayer.getDisplayName() - .equalsIgnoreCase("Mr_Brain")) { + .equalsIgnoreCase("Mr_Brain")) { tResource = this.mCapes[2]; } if (aPlayer.getDisplayName() - .equalsIgnoreCase("GregoriusT")) { + .equalsIgnoreCase("GregoriusT")) { tResource = this.mCapes[3]; } if (this.mCapeList.contains( - aPlayer.getDisplayName() - .toLowerCase() + ":capedonor")) { + aPlayer.getDisplayName() + .toLowerCase() + ":capedonor")) { tResource = this.mCapes[4]; } if (this.mCapeList.contains( - aPlayer.getDisplayName() - .toLowerCase() + ":capedev")) { + aPlayer.getDisplayName() + .toLowerCase() + ":capedev")) { tResource = this.mCapes[5]; } if (this.mCapeList.contains( - aPlayer.getDisplayName() - .toLowerCase() + ":cape_steam")) { + aPlayer.getDisplayName() + .toLowerCase() + ":cape_steam")) { tResource = this.mCapes[6]; } if (this.mCapeList.contains( - aPlayer.getDisplayName() - .toLowerCase() + ":cape_titanium")) { + aPlayer.getDisplayName() + .toLowerCase() + ":cape_titanium")) { tResource = this.mCapes[7]; } if (this.mCapeList.contains( - aPlayer.getDisplayName() - .toLowerCase() + ":cape_neutronium")) { + aPlayer.getDisplayName() + .toLowerCase() + ":cape_neutronium")) { tResource = this.mCapes[8]; } if (this.mCapeList.contains( - aPlayer.getDisplayName() - .toLowerCase() + ":cape_stargate")) { + aPlayer.getDisplayName() + .toLowerCase() + ":cape_stargate")) { tResource = this.mCapes[9]; } @@ -103,13 +102,13 @@ public class GT_CapeRenderer extends RenderPlayer { GL11.glPushMatrix(); GL11.glTranslatef(0.0F, 0.0F, 0.125F); double d0 = aPlayer.field_71091_bM + (aPlayer.field_71094_bP - aPlayer.field_71091_bM) * aPartialTicks - - (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX) * aPartialTicks); + - (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX) * aPartialTicks); double d1 = aPlayer.field_71096_bN + (aPlayer.field_71095_bQ - aPlayer.field_71096_bN) * aPartialTicks - - (aPlayer.prevPosY + (aPlayer.posY - aPlayer.prevPosY) * aPartialTicks); + - (aPlayer.prevPosY + (aPlayer.posY - aPlayer.prevPosY) * aPartialTicks); double d2 = aPlayer.field_71097_bO + (aPlayer.field_71085_bR - aPlayer.field_71097_bO) * aPartialTicks - - (aPlayer.prevPosZ + (aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks); + - (aPlayer.prevPosZ + (aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks); float f6 = aPlayer.prevRenderYawOffset - + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks; + + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks; double d3 = MathHelper.sin(f6 * (float) Math.PI / 180.0F); double d4 = -MathHelper.cos(f6 * (float) Math.PI / 180.0F); float f7 = (float) d1 * 10.0F; @@ -126,11 +125,10 @@ public class GT_CapeRenderer extends RenderPlayer { } float f10 = aPlayer.prevCameraYaw + (aPlayer.cameraYaw - aPlayer.prevCameraYaw) * aPartialTicks; f7 += MathHelper.sin( - (aPlayer.prevDistanceWalkedModified - + (aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified) * aPartialTicks) - * 6.0F) - * 32.0F - * f10; + (aPlayer.prevDistanceWalkedModified + + (aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified) * aPartialTicks) * 6.0F) + * 32.0F + * f10; if (aPlayer.isSneaking()) { f7 += 25.0F; } diff --git a/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java b/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java index fe9f378047..421d2f648b 100644 --- a/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java +++ b/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java @@ -37,7 +37,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I aRenderer.field_152631_f = true; startDrawingQuads(aRenderer, 1.0f, 0.0f, 0.0f); new LightingHelper(aRenderer).setupLightingXPos(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.EAST.ordinal(), 0xffffff); + .setupColor(ForgeDirection.EAST.ordinal(), 0xffffff); aRenderer.renderFaceXPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); aRenderer.field_152631_f = false; @@ -48,7 +48,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I startDrawingQuads(aRenderer, -1.0f, 0.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.WEST.ordinal()); new LightingHelper(aRenderer).setupLightingXNeg(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.WEST.ordinal(), 0xffffff); + .setupColor(ForgeDirection.WEST.ordinal(), 0xffffff); aRenderer.renderFaceXNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -58,7 +58,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I startDrawingQuads(aRenderer, 0.0f, 1.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.UP.ordinal()); new LightingHelper(aRenderer).setupLightingYPos(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.UP.ordinal(), 0xffffff); + .setupColor(ForgeDirection.UP.ordinal(), 0xffffff); aRenderer.renderFaceYPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -68,7 +68,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I startDrawingQuads(aRenderer, 0.0f, -1.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.DOWN.ordinal()); new LightingHelper(aRenderer).setupLightingYNeg(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.DOWN.ordinal(), 0xffffff); + .setupColor(ForgeDirection.DOWN.ordinal(), 0xffffff); aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -78,7 +78,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I startDrawingQuads(aRenderer, 0.0f, 0.0f, 1.0f); final IIcon aIcon = getIcon(ForgeDirection.SOUTH.ordinal()); new LightingHelper(aRenderer).setupLightingZPos(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.SOUTH.ordinal(), 0xffffff); + .setupColor(ForgeDirection.SOUTH.ordinal(), 0xffffff); aRenderer.renderFaceZPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -89,7 +89,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I final IIcon aIcon = getIcon(ForgeDirection.NORTH.ordinal()); aRenderer.field_152631_f = true; new LightingHelper(aRenderer).setupLightingZNeg(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.NORTH.ordinal(), 0xffffff); + .setupColor(ForgeDirection.NORTH.ordinal(), 0xffffff); aRenderer.renderFaceZNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); aRenderer.field_152631_f = false; diff --git a/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java b/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java index 90caaf85cd..e4304af15d 100644 --- a/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java +++ b/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java @@ -43,9 +43,7 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc aRenderer.field_152631_f = true; startDrawingQuads(aRenderer, 1.0f, 0.0f, 0.0f); new LightingHelper(aRenderer).setupLightingXPos(aBlock, aX, aY, aZ) - .setupColor( - ForgeDirection.EAST.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + .setupColor(ForgeDirection.EAST.ordinal(), mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceXPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); aRenderer.field_152631_f = false; @@ -56,9 +54,7 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc startDrawingQuads(aRenderer, -1.0f, 0.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.WEST.ordinal(), aX, aY, aZ, aRenderer); new LightingHelper(aRenderer).setupLightingXNeg(aBlock, aX, aY, aZ) - .setupColor( - ForgeDirection.WEST.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + .setupColor(ForgeDirection.WEST.ordinal(), mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceXNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -68,9 +64,7 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc startDrawingQuads(aRenderer, 0.0f, 1.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.UP.ordinal(), aX, aY, aZ, aRenderer); new LightingHelper(aRenderer).setupLightingYPos(aBlock, aX, aY, aZ) - .setupColor( - ForgeDirection.UP.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + .setupColor(ForgeDirection.UP.ordinal(), mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceYPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -80,9 +74,7 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc startDrawingQuads(aRenderer, 0.0f, -1.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.DOWN.ordinal(), aX, aY, aZ, aRenderer); new LightingHelper(aRenderer).setupLightingYNeg(aBlock, aX, aY, aZ) - .setupColor( - ForgeDirection.DOWN.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + .setupColor(ForgeDirection.DOWN.ordinal(), mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -92,9 +84,7 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc startDrawingQuads(aRenderer, 0.0f, 0.0f, 1.0f); final IIcon aIcon = getIcon(ForgeDirection.SOUTH.ordinal(), aX, aY, aZ, aRenderer); new LightingHelper(aRenderer).setupLightingZPos(aBlock, aX, aY, aZ) - .setupColor( - ForgeDirection.SOUTH.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + .setupColor(ForgeDirection.SOUTH.ordinal(), mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceZPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -105,9 +95,7 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc final IIcon aIcon = getIcon(ForgeDirection.NORTH.ordinal(), aX, aY, aZ, aRenderer); aRenderer.field_152631_f = true; new LightingHelper(aRenderer).setupLightingZNeg(aBlock, aX, aY, aZ) - .setupColor( - ForgeDirection.NORTH.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + .setupColor(ForgeDirection.NORTH.ordinal(), mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceZNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); aRenderer.field_152631_f = false; diff --git a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java b/src/main/java/gregtech/common/render/GT_FlaskRenderer.java index bf29fe0528..52d5d91ee0 100644 --- a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java +++ b/src/main/java/gregtech/common/render/GT_FlaskRenderer.java @@ -57,9 +57,9 @@ public final class GT_FlaskRenderer implements IItemRenderer { if (fs != null) { IIcon iconWindow = cell.iconWindow; IIcon fluidicon = fs.getFluid() - .getIcon(fs); + .getIcon(fs); int fluidColor = fs.getFluid() - .getColor(fs); + .getColor(fs); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); GL11.glBlendFunc(GL11.GL_ZERO, GL11.GL_ONE); if (type.equals(ItemRenderType.INVENTORY)) { @@ -90,14 +90,14 @@ public final class GT_FlaskRenderer implements IItemRenderer { DrawUtil.renderIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - icon.getMaxU(), - icon.getMinV(), - icon.getMinU(), - icon.getMaxV(), - icon.getIconWidth(), - icon.getIconHeight(), - 0.0625F); + Tessellator.instance, + icon.getMaxU(), + icon.getMinV(), + icon.getMinU(), + icon.getMaxV(), + icon.getIconWidth(), + icon.getIconHeight(), + 0.0625F); } GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java b/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java index 9d8d2afe70..9a35f6bc57 100644 --- a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java +++ b/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java @@ -47,9 +47,9 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer { Materials associatedFluidMaterial = Materials.get(item.stackTagCompound.getString("mFluidMaterialName")); if (associatedFluidMaterial.renderer == null - || !associatedFluidMaterial.renderer.renderFluidDisplayItem(type, item, data)) { + || !associatedFluidMaterial.renderer.renderFluidDisplayItem(type, item, data)) { IIcon icon = item.getItem() - .getIconFromDamage(item.getItemDamage()); + .getIconFromDamage(item.getItemDamage()); Tessellator tess = Tessellator.instance; tess.startDrawingQuads(); // draw a simple rectangle for the inventory icon @@ -72,9 +72,9 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer { // Render Fluid amount text long fluidAmount = item.getTagCompound() - .getLong("mFluidDisplayAmount"); + .getLong("mFluidDisplayAmount"); if (fluidAmount > 0L && !item.getTagCompound() - .getBoolean("mHideStackSize")) { + .getBoolean("mHideStackSize")) { String amountString; if (fluidAmount < 10_000) { @@ -89,12 +89,8 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer { GL11.glPushMatrix(); GL11.glScalef(smallTextScale, smallTextScale, 1.0f); - fontRender.drawString( - amountString, - 0, - (int) (16 / smallTextScale) - fontRender.FONT_HEIGHT + 1, - 0xFFFFFF, - true); + fontRender + .drawString(amountString, 0, (int) (16 / smallTextScale) - fontRender.FONT_HEIGHT + 1, 0xFFFFFF, true); GL11.glPopMatrix(); GL11.glDisable(GL11.GL_ALPHA_TEST); } diff --git a/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java b/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java index 12dcec1291..d984bc0dca 100644 --- a/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java +++ b/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java @@ -33,14 +33,14 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { return false; } return (aType == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) - || (aType == IItemRenderer.ItemRenderType.INVENTORY) - || (aType == IItemRenderer.ItemRenderType.EQUIPPED) - || (aType == IItemRenderer.ItemRenderType.ENTITY); + || (aType == IItemRenderer.ItemRenderType.INVENTORY) + || (aType == IItemRenderer.ItemRenderType.EQUIPPED) + || (aType == IItemRenderer.ItemRenderType.ENTITY); } @Override public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType aType, ItemStack aStack, - IItemRenderer.ItemRendererHelper aHelper) { + IItemRenderer.ItemRendererHelper aHelper) { if (GT_Utility.isStackInvalid(aStack)) { return false; } @@ -80,14 +80,14 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(tIcon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - tIcon.getMaxU(), - tIcon.getMinV(), - tIcon.getMinU(), - tIcon.getMaxV(), - tIcon.getIconWidth(), - tIcon.getIconHeight(), - 0.0625F); + Tessellator.instance, + tIcon.getMaxU(), + tIcon.getMinV(), + tIcon.getMinU(), + tIcon.getMaxV(), + tIcon.getIconWidth(), + tIcon.getIconHeight(), + 0.0625F); } GL11.glColor3f(1.0F, 1.0F, 1.0F); } @@ -98,14 +98,14 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(tOverlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - tOverlay.getMaxU(), - tOverlay.getMinV(), - tOverlay.getMinU(), - tOverlay.getMaxV(), - tOverlay.getIconWidth(), - tOverlay.getIconHeight(), - 0.0625F); + Tessellator.instance, + tOverlay.getMaxU(), + tOverlay.getMinV(), + tOverlay.getMinU(), + tOverlay.getMaxV(), + tOverlay.getIconWidth(), + tOverlay.getIconHeight(), + 0.0625F); } } } @@ -122,14 +122,14 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(tIcon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - tIcon.getMaxU(), - tIcon.getMinV(), - tIcon.getMinU(), - tIcon.getMaxV(), - tIcon.getIconWidth(), - tIcon.getIconHeight(), - 0.0625F); + Tessellator.instance, + tIcon.getMaxU(), + tIcon.getMinV(), + tIcon.getMinU(), + tIcon.getMaxV(), + tIcon.getIconWidth(), + tIcon.getIconHeight(), + 0.0625F); } GL11.glColor3f(1.0F, 1.0F, 1.0F); } @@ -140,19 +140,19 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(tOverlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - tOverlay.getMaxU(), - tOverlay.getMinV(), - tOverlay.getMinU(), - tOverlay.getMaxV(), - tOverlay.getIconWidth(), - tOverlay.getIconHeight(), - 0.0625F); + Tessellator.instance, + tOverlay.getMaxU(), + tOverlay.getMinV(), + tOverlay.getMinU(), + tOverlay.getMaxV(), + tOverlay.getIconWidth(), + tOverlay.getIconHeight(), + 0.0625F); } } } if ((aType == IItemRenderer.ItemRenderType.INVENTORY) - && (GT_MetaGenerated_Tool.getPrimaryMaterial(aStack) != Materials._NULL)) { + && (GT_MetaGenerated_Tool.getPrimaryMaterial(aStack) != Materials._NULL)) { long tDamage = GT_MetaGenerated_Tool.getToolDamage(aStack); long tMaxDamage = GT_MetaGenerated_Tool.getToolMaxDamage(aStack); if (tDamage <= 0L) { @@ -160,9 +160,8 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { } else if (tDamage >= tMaxDamage) { aIcon = gregtech.api.enums.Textures.ItemIcons.DURABILITY_BAR[0]; } else { - aIcon = gregtech.api.enums.Textures.ItemIcons.DURABILITY_BAR[((int) java.lang.Math.max( - 0L, - java.lang.Math.min(7L, (tMaxDamage - tDamage) * 8L / tMaxDamage)))]; + aIcon = gregtech.api.enums.Textures.ItemIcons.DURABILITY_BAR[((int) java.lang.Math + .max(0L, java.lang.Math.min(7L, (tMaxDamage - tDamage) * 8L / tMaxDamage)))]; } if (aIcon != null) { IIcon tIcon = aIcon.getIcon(); @@ -174,14 +173,14 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(tIcon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - tIcon.getMaxU(), - tIcon.getMinV(), - tIcon.getMinU(), - tIcon.getMaxV(), - tIcon.getIconWidth(), - tIcon.getIconHeight(), - 0.0625F); + Tessellator.instance, + tIcon.getMaxU(), + tIcon.getMinV(), + tIcon.getMinU(), + tIcon.getMaxV(), + tIcon.getIconWidth(), + tIcon.getIconHeight(), + 0.0625F); } } if (tOverlay != null) { @@ -191,14 +190,14 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(tOverlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - tOverlay.getMaxU(), - tOverlay.getMinV(), - tOverlay.getMinU(), - tOverlay.getMaxV(), - tOverlay.getIconWidth(), - tOverlay.getIconHeight(), - 0.0625F); + Tessellator.instance, + tOverlay.getMaxU(), + tOverlay.getMinV(), + tOverlay.getMinU(), + tOverlay.getMaxV(), + tOverlay.getIconWidth(), + tOverlay.getIconHeight(), + 0.0625F); } } } @@ -210,9 +209,8 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { } else if (tCharge >= tStats[0]) { aIcon = gregtech.api.enums.Textures.ItemIcons.ENERGY_BAR[8]; } else { - aIcon = gregtech.api.enums.Textures.ItemIcons.ENERGY_BAR[(7 - (int) java.lang.Math.max( - 0L, - java.lang.Math.min(6L, (tStats[0] - tCharge) * 7L / tStats[0])))]; + aIcon = gregtech.api.enums.Textures.ItemIcons.ENERGY_BAR[(7 - (int) java.lang.Math + .max(0L, java.lang.Math.min(6L, (tStats[0] - tCharge) * 7L / tStats[0])))]; } } else { aIcon = null; @@ -227,14 +225,14 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(tIcon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - tIcon.getMaxU(), - tIcon.getMinV(), - tIcon.getMinU(), - tIcon.getMaxV(), - tIcon.getIconWidth(), - tIcon.getIconHeight(), - 0.0625F); + Tessellator.instance, + tIcon.getMaxU(), + tIcon.getMinV(), + tIcon.getMinU(), + tIcon.getMaxV(), + tIcon.getIconWidth(), + tIcon.getIconHeight(), + 0.0625F); } } if (tOverlay != null) { @@ -244,14 +242,14 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(tOverlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - tOverlay.getMaxU(), - tOverlay.getMinV(), - tOverlay.getMinU(), - tOverlay.getMaxV(), - tOverlay.getIconWidth(), - tOverlay.getIconHeight(), - 0.0625F); + Tessellator.instance, + tOverlay.getMaxU(), + tOverlay.getMinV(), + tOverlay.getMinU(), + tOverlay.getMaxV(), + tOverlay.getIconWidth(), + tOverlay.getIconHeight(), + 0.0625F); } } } diff --git a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java b/src/main/java/gregtech/common/render/GT_PollutionRenderer.java index e98d90c659..d975ac7952 100644 --- a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java +++ b/src/main/java/gregtech/common/render/GT_PollutionRenderer.java @@ -58,8 +58,8 @@ public class GT_PollutionRenderer { public void preLoad() { net.minecraftforge.common.MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance() - .bus() - .register(this); + .bus() + .register(this); } public void processPacket(ChunkCoordIntPair chunk, int pollution) { @@ -133,8 +133,7 @@ public class GT_PollutionRenderer { if (!GT_Mod.gregtechproxy.mRenderPollutionFog) return; if ((!DEBUG && Minecraft.getMinecraft().thePlayer.capabilities.isCreativeMode) - || (fogIntensityLastTick <= 0 && fogIntensityLastTick >= FOG_START_EXP_RATIO)) - return; + || (fogIntensityLastTick <= 0 && fogIntensityLastTick >= FOG_START_EXP_RATIO)) return; if (event.fogMode == 0) { double v = 1 - fogIntensityLastTick / FOG_START_EXP_RATIO; @@ -153,9 +152,8 @@ public class GT_PollutionRenderer { if (!DEBUG && Minecraft.getMinecraft().thePlayer.capabilities.isCreativeMode) return; if (event.entity.isPotionActive(Potion.blindness) || (fogIntensityLastTick < FOG_START_EXP_RATIO) - || event.block.getMaterial() == Material.water - || event.block.getMaterial() == Material.lava) - return; + || event.block.getMaterial() == Material.water + || event.block.getMaterial() == Material.lava) return; GL11.glFogi(GL11.GL_FOG_MODE, GL11.GL_EXP2); event.density = (float) Math.pow(fogIntensityLastTick - FOG_START_EXP_RATIO, .75F) / 5 + 0.01F; @@ -191,14 +189,14 @@ public class GT_PollutionRenderer { } else if (DEBUG) { drawPollution("Intensity: " + (fogIntensityLastTick * 10000), 0); drawPollution( - "Pollution: " + pollutionMap.getPollution( - Minecraft.getMinecraft().thePlayer.lastTickPosX, - Minecraft.getMinecraft().thePlayer.lastTickPosZ), - 20); + "Pollution: " + pollutionMap.getPollution( + Minecraft.getMinecraft().thePlayer.lastTickPosX, + Minecraft.getMinecraft().thePlayer.lastTickPosZ), + 20); drawPollution( - "Density: " + ((float) (Math.pow(fogIntensityLastTick - FOG_START_EXP_RATIO, .75F) / 5 + 0.01F) - * 10000), - 40); + "Density: " + + ((float) (Math.pow(fogIntensityLastTick - FOG_START_EXP_RATIO, .75F) / 5 + 0.01F) * 10000), + 40); } } @@ -233,10 +231,10 @@ public class GT_PollutionRenderer { if (block.getMaterial() == Material.air) { EntityFX fx = new GT_EntityFXPollution( - w, - (float) i1 + w.rand.nextFloat(), - (float) j1 + w.rand.nextFloat(), - (float) k1 + w.rand.nextFloat()); + w, + (float) i1 + w.rand.nextFloat(), + (float) j1 + w.rand.nextFloat(), + (float) k1 + w.rand.nextFloat()); mc.effectRenderer.addEffect(fx); } } diff --git a/src/main/java/gregtech/common/render/GT_RenderUtil.java b/src/main/java/gregtech/common/render/GT_RenderUtil.java index 1919b7975c..6cba823a66 100644 --- a/src/main/java/gregtech/common/render/GT_RenderUtil.java +++ b/src/main/java/gregtech/common/render/GT_RenderUtil.java @@ -23,7 +23,7 @@ public class GT_RenderUtil { } public static void renderBlockIcon(RenderBlocks aRenderer, Block aBlock, double aX, double aY, double aZ, - IIcon aIcon, byte aSide) { + IIcon aIcon, byte aSide) { switch (aSide) { case 0 -> { aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, aIcon); @@ -57,7 +57,7 @@ public class GT_RenderUtil { } public static void renderItemIcon(IIcon icon, double xStart, double yStart, double xEnd, double yEnd, double z, - float nx, float ny, float nz) { + float nx, float ny, float nz) { if (icon == null) { return; } diff --git a/src/main/java/gregtech/common/render/GT_RenderedTexture.java b/src/main/java/gregtech/common/render/GT_RenderedTexture.java index bc36628324..34b8c879ae 100644 --- a/src/main/java/gregtech/common/render/GT_RenderedTexture.java +++ b/src/main/java/gregtech/common/render/GT_RenderedTexture.java @@ -35,7 +35,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol private final boolean useExtFacing; protected GT_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow, - boolean stdOrient, boolean extFacing) { + boolean stdOrient, boolean extFacing) { if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture"); mIconContainer = aIcon; mRGBa = aRGBa; @@ -64,7 +64,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol if (enableAO) lighting.setBrightnessOverride(MAX_BRIGHTNESS); } lighting.setupLightingXPos(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.EAST.ordinal(), mRGBa); + .setupColor(ForgeDirection.EAST.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceXPos(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -90,7 +90,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setBrightnessOverride(MAX_BRIGHTNESS); } lighting.setupLightingXNeg(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.WEST.ordinal(), mRGBa); + .setupColor(ForgeDirection.WEST.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceXNeg(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -116,7 +116,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setBrightnessOverride(MAX_BRIGHTNESS); } lighting.setupLightingYPos(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.UP.ordinal(), mRGBa); + .setupColor(ForgeDirection.UP.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceYPos(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -142,7 +142,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setBrightnessOverride(MAX_BRIGHTNESS); } lighting.setupLightingYNeg(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.DOWN.ordinal(), mRGBa); + .setupColor(ForgeDirection.DOWN.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceYNeg(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -168,7 +168,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setBrightnessOverride(MAX_BRIGHTNESS); } lighting.setupLightingZPos(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.SOUTH.ordinal(), mRGBa); + .setupColor(ForgeDirection.SOUTH.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceZPos(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -194,7 +194,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setBrightnessOverride(MAX_BRIGHTNESS); } lighting.setupLightingZNeg(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.NORTH.ordinal(), mRGBa); + .setupColor(ForgeDirection.NORTH.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceZNeg(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -219,7 +219,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol * Renders the given texture to the bottom face of the block. Args: block, x, y, z, texture */ protected void renderFaceYNeg(RenderBlocks aRenderer, double x, double y, double z, IIcon icon, - ExtendedFacing extendedFacing) { + ExtendedFacing extendedFacing) { switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { case COUNTER_CLOCKWISE -> aRenderer.uvRotateBottom = 2; @@ -230,16 +230,13 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final Flip aFlip = extendedFacing.getFlip(); aRenderer.renderFaceYNeg( - Blocks.air, - x, - y, - z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped( - icon, - aFlip.isHorizontallyFlipped() ^ !stdOrient, - aFlip.isVerticallyFliped()) - : new GT_IconFlipped(icon, !stdOrient, false)); + Blocks.air, + x, + y, + z, + useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped() ^ !stdOrient, aFlip.isVerticallyFliped()) + : new GT_IconFlipped(icon, !stdOrient, false)); aRenderer.uvRotateBottom = 0; } @@ -247,7 +244,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol * Renders the given texture to the top face of the block. Args: block, x, y, z, texture */ protected void renderFaceYPos(RenderBlocks aRenderer, double x, double y, double z, IIcon icon, - ExtendedFacing extendedFacing) { + ExtendedFacing extendedFacing) { switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { case COUNTER_CLOCKWISE -> aRenderer.uvRotateTop = 2; @@ -258,13 +255,13 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final Flip aFlip = extendedFacing.getFlip(); aRenderer.renderFaceYPos( - Blocks.air, - x, - y, - z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) - : icon); + Blocks.air, + x, + y, + z, + useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) + : icon); aRenderer.uvRotateTop = 0; } @@ -272,7 +269,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol * Renders the given texture to the north (z-negative) face of the block. Args: block, x, y, z, texture */ protected void renderFaceZNeg(RenderBlocks aRenderer, double x, double y, double z, IIcon icon, - ExtendedFacing extendedFacing) { + ExtendedFacing extendedFacing) { aRenderer.field_152631_f = true; // **NOT A BUG**: aRenderer.uvRotateEast REALLY CONTROLS THE ROTATION OF THE NORTH SIDE switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { @@ -284,13 +281,13 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final Flip aFlip = extendedFacing.getFlip(); aRenderer.renderFaceZNeg( - Blocks.air, - x, - y, - z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) - : icon); + Blocks.air, + x, + y, + z, + useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) + : icon); aRenderer.uvRotateEast = 0; aRenderer.field_152631_f = false; } @@ -299,7 +296,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol * Renders the given texture to the south (z-positive) face of the block. Args: block, x, y, z, texture */ protected void renderFaceZPos(RenderBlocks aRenderer, double x, double y, double z, IIcon icon, - ExtendedFacing extendedFacing) { + ExtendedFacing extendedFacing) { // **NOT A BUG**: aRenderer.uvRotateWest REALLY CONTROLS THE ROTATION OF THE SOUTH SIDE switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { case COUNTER_CLOCKWISE -> aRenderer.uvRotateWest = 2; @@ -310,13 +307,13 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final Flip aFlip = extendedFacing.getFlip(); aRenderer.renderFaceZPos( - Blocks.air, - x, - y, - z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) - : icon); + Blocks.air, + x, + y, + z, + useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) + : icon); aRenderer.uvRotateWest = 0; } @@ -324,7 +321,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol * Renders the given texture to the west (x-negative) face of the block. Args: block, x, y, z, texture */ protected void renderFaceXNeg(RenderBlocks aRenderer, double x, double y, double z, IIcon icon, - ExtendedFacing extendedFacing) { + ExtendedFacing extendedFacing) { // **NOT A BUG**: aRenderer.uvRotateNorth REALLY CONTROLS THE ROTATION OF THE WEST SIDE switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { case COUNTER_CLOCKWISE -> aRenderer.uvRotateNorth = 2; @@ -335,13 +332,13 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final Flip aFlip = extendedFacing.getFlip(); aRenderer.renderFaceXNeg( - Blocks.air, - x, - y, - z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) - : icon); + Blocks.air, + x, + y, + z, + useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) + : icon); aRenderer.uvRotateNorth = 0; } @@ -349,7 +346,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol * Renders the given texture to the east (x-positive) face of the block. Args: block, x, y, z, texture */ protected void renderFaceXPos(RenderBlocks aRenderer, double x, double y, double z, IIcon icon, - ExtendedFacing extendedFacing) { + ExtendedFacing extendedFacing) { aRenderer.field_152631_f = true; // **NOT A BUG**: aRenderer.uvRotateSouth REALLY CONTROLS THE ROTATION OF THE EAST SIDE switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { @@ -361,13 +358,13 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final Flip aFlip = extendedFacing.getFlip(); aRenderer.renderFaceXPos( - Blocks.air, - x, - y, - z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) - : icon); + Blocks.air, + x, + y, + z, + useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) + : icon); aRenderer.uvRotateSouth = 0; aRenderer.field_152631_f = false; } @@ -386,9 +383,9 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol alignment = ((IAlignmentProvider) meta).getAlignment(); } else if (meta != null) { return ExtendedFacing.of( - ForgeDirection.getOrientation( - meta.getBaseMetaTileEntity() - .getFrontFacing())); + ForgeDirection.getOrientation( + meta.getBaseMetaTileEntity() + .getFrontFacing())); } } else if (te instanceof IAlignmentProvider) { alignment = ((IAlignmentProvider) te).getAlignment(); diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Block.java b/src/main/java/gregtech/common/render/GT_Renderer_Block.java index ca9997f333..7646ee31fa 100644 --- a/src/main/java/gregtech/common/render/GT_Renderer_Block.java +++ b/src/main/java/gregtech/common/render/GT_Renderer_Block.java @@ -67,43 +67,43 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, - RenderBlocks aRenderer) { + RenderBlocks aRenderer) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof IPipeRenderedTileEntity)) { return renderStandardBlock( - aWorld, - aX, - aY, - aZ, - aBlock, - aRenderer, - new ITexture[][] { ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) DOWN.ordinal()), - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) UP.ordinal()), - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) NORTH.ordinal()), - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) SOUTH.ordinal()), - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) WEST.ordinal()), - ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) EAST.ordinal()) }); + aWorld, + aX, + aY, + aZ, + aBlock, + aRenderer, + new ITexture[][] { ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) DOWN.ordinal()), + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) UP.ordinal()), + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) NORTH.ordinal()), + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) SOUTH.ordinal()), + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) WEST.ordinal()), + ((IPipeRenderedTileEntity) tTileEntity).getTextureCovered((byte) EAST.ordinal()) }); } if ((tTileEntity instanceof ITexturedTileEntity)) { return renderStandardBlock( - aWorld, - aX, - aY, - aZ, - aBlock, - aRenderer, - new ITexture[][] { ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) DOWN.ordinal()), - ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) UP.ordinal()), - ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) NORTH.ordinal()), - ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) SOUTH.ordinal()), - ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) WEST.ordinal()), - ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) EAST.ordinal()) }); + aWorld, + aX, + aY, + aZ, + aBlock, + aRenderer, + new ITexture[][] { ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) DOWN.ordinal()), + ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) UP.ordinal()), + ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) NORTH.ordinal()), + ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) SOUTH.ordinal()), + ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) WEST.ordinal()), + ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, (byte) EAST.ordinal()) }); } return false; } public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, - RenderBlocks aRenderer, ITexture[][] aTextures) { + RenderBlocks aRenderer, ITexture[][] aTextures) { aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -117,7 +117,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } public static boolean renderPipeBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, - IPipeRenderedTileEntity aTileEntity, RenderBlocks aRenderer) { + IPipeRenderedTileEntity aTileEntity, RenderBlocks aRenderer) { final byte aConnections = aTileEntity.getConnections(); if ((aConnections & (HAS_FRESHFOAM | HAS_HARDENEDFOAM)) != 0) { return renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer); @@ -474,7 +474,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { @SideOnly(Side.CLIENT) public static void addHitEffects(EffectRenderer effectRenderer, Block block, World world, int x, int y, int z, - int side) { + int side) { double rX = x + XSTR.XSTR_INSTANCE.nextDouble() * 0.8 + 0.1; double rY = y + XSTR.XSTR_INSTANCE.nextDouble() * 0.8 + 0.1; double rZ = z + XSTR.XSTR_INSTANCE.nextDouble() * 0.8 + 0.1; @@ -492,19 +492,10 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { rX = x + 1.1; } effectRenderer.addEffect( - (new EntityDiggingFX( - world, - rX, - rY, - rZ, - 0.0, - 0.0, - 0.0, - block, - block.getDamageValue(world, x, y, z), - side)).applyColourMultiplier(x, y, z) - .multiplyVelocity(0.2F) - .multipleParticleScaleBy(0.6F)); + (new EntityDiggingFX(world, rX, rY, rZ, 0.0, 0.0, 0.0, block, block.getDamageValue(world, x, y, z), side)) + .applyColourMultiplier(x, y, z) + .multiplyVelocity(0.2F) + .multipleParticleScaleBy(0.6F)); } @SideOnly(Side.CLIENT) @@ -516,16 +507,16 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { final double bY = y + (iY + 0.5) / 4.0; final double bZ = z + (iZ + 0.5) / 4.0; effectRenderer.addEffect( - (new EntityDiggingFX( - world, - bX, - bY, - bZ, - bX - x - 0.5, - bY - y - 0.5, - bZ - z - 0.5, - block, - block.getDamageValue(world, x, y, z))).applyColourMultiplier(x, y, z)); + (new EntityDiggingFX( + world, + bX, + bY, + bZ, + bX - x - 0.5, + bY - y - 0.5, + bZ - z - 0.5, + block, + block.getDamageValue(world, x, y, z))).applyColourMultiplier(x, y, z)); } } } @@ -556,349 +547,349 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } renderNegativeYFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tRenderer.getTexture(aBlock, (byte) DOWN.ordinal(), true, i), - !tNeedsToSetBounds); - renderPositiveYFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tRenderer.getTexture(aBlock, (byte) UP.ordinal(), true, i), - !tNeedsToSetBounds); - renderNegativeZFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tRenderer.getTexture(aBlock, (byte) NORTH.ordinal(), true, i), - !tNeedsToSetBounds); - renderPositiveZFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tRenderer.getTexture(aBlock, (byte) SOUTH.ordinal(), true, i), - !tNeedsToSetBounds); - renderNegativeXFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tRenderer.getTexture(aBlock, (byte) WEST.ordinal(), true, i), - !tNeedsToSetBounds); - renderPositiveXFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tRenderer.getTexture(aBlock, (byte) EAST.ordinal(), true, i), - !tNeedsToSetBounds); - } - } - if (tNeedsToSetBounds) aBlock.setBlockBounds(0, 0, 0, 1, 1, 1); - - } else { - if (aBlock instanceof GT_Block_Ores_Abstract) { - final GT_TileEntity_Ores tTileEntity = new GT_TileEntity_Ores(); - tTileEntity.mMetaData = ((short) aMeta); - - aBlock.setBlockBoundsForItemRender(); - aRenderer.setRenderBoundsFromBlock(aBlock); - renderNegativeYFacing( null, aRenderer, aBlock, 0, 0, 0, - tTileEntity.getTexture(aBlock, (byte) DOWN.ordinal()), - true); - renderPositiveYFacing( + tRenderer.getTexture(aBlock, (byte) DOWN.ordinal(), true, i), + !tNeedsToSetBounds); + renderPositiveYFacing( null, aRenderer, aBlock, 0, 0, 0, - tTileEntity.getTexture(aBlock, (byte) UP.ordinal()), - true); - renderNegativeZFacing( + tRenderer.getTexture(aBlock, (byte) UP.ordinal(), true, i), + !tNeedsToSetBounds); + renderNegativeZFacing( null, aRenderer, aBlock, 0, 0, 0, - tTileEntity.getTexture(aBlock, (byte) NORTH.ordinal()), - true); - renderPositiveZFacing( + tRenderer.getTexture(aBlock, (byte) NORTH.ordinal(), true, i), + !tNeedsToSetBounds); + renderPositiveZFacing( null, aRenderer, aBlock, 0, 0, 0, - tTileEntity.getTexture(aBlock, (byte) SOUTH.ordinal()), - true); - renderNegativeXFacing( + tRenderer.getTexture(aBlock, (byte) SOUTH.ordinal(), true, i), + !tNeedsToSetBounds); + renderNegativeXFacing( null, aRenderer, aBlock, 0, 0, 0, - tTileEntity.getTexture(aBlock, (byte) WEST.ordinal()), - true); - renderPositiveXFacing( + tRenderer.getTexture(aBlock, (byte) WEST.ordinal(), true, i), + !tNeedsToSetBounds); + renderPositiveXFacing( null, aRenderer, aBlock, 0, 0, 0, - tTileEntity.getTexture(aBlock, (byte) EAST.ordinal()), - true); - } else if (aMeta > 0 && (aMeta < GregTech_API.METATILEENTITIES.length) - && aBlock instanceof GT_Block_Machines - && (GregTech_API.METATILEENTITIES[aMeta] != null) - && (!GregTech_API.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer))) { - renderNormalInventoryMetaTileEntity(aBlock, aMeta, aRenderer); - } - aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); - } - - aRenderer.setRenderBoundsFromBlock(aBlock); - - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - aRenderer.useInventoryTint = false; - } - - private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta, RenderBlocks aRenderer) { - if ((aMeta <= 0) || (aMeta >= GregTech_API.METATILEENTITIES.length)) { - return; - } - final IMetaTileEntity tMetaTileEntity = GregTech_API.METATILEENTITIES[aMeta]; - if (tMetaTileEntity == null) { - return; - } - aBlock.setBlockBoundsForItemRender(); - aRenderer.setRenderBoundsFromBlock(aBlock); - - final IGregTechTileEntity iGregTechTileEntity = tMetaTileEntity.getBaseMetaTileEntity(); + tRenderer.getTexture(aBlock, (byte) EAST.ordinal(), true, i), + !tNeedsToSetBounds); + } + } + if (tNeedsToSetBounds) aBlock.setBlockBounds(0, 0, 0, 1, 1, 1); - if ((iGregTechTileEntity instanceof IPipeRenderedTileEntity)) { - final float tThickness = ((IPipeRenderedTileEntity) iGregTechTileEntity).getThickNess(); - final float pipeMin = (blockMax - tThickness) / 2.0F; - final float pipeMax = blockMax - pipeMin; + } else { + if (aBlock instanceof GT_Block_Ores_Abstract) { + final GT_TileEntity_Ores tTileEntity = new GT_TileEntity_Ores(); + tTileEntity.mMetaData = ((short) aMeta); - aBlock.setBlockBounds(blockMin, pipeMin, pipeMin, blockMax, pipeMax, pipeMax); - aRenderer.setRenderBoundsFromBlock(aBlock); - renderNegativeYFacing( + aBlock.setBlockBoundsForItemRender(); + aRenderer.setRenderBoundsFromBlock(aBlock); + renderNegativeYFacing( null, aRenderer, aBlock, 0, 0, 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) DOWN.ordinal(), - (byte) (CONNECTED_WEST | CONNECTED_EAST), - (byte) -1, - false, - false), + tTileEntity.getTexture(aBlock, (byte) DOWN.ordinal()), true); - renderPositiveYFacing( + renderPositiveYFacing( null, aRenderer, aBlock, 0, 0, 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) UP.ordinal(), - (byte) (CONNECTED_WEST | CONNECTED_EAST), - (byte) -1, - false, - false), + tTileEntity.getTexture(aBlock, (byte) UP.ordinal()), true); - renderNegativeZFacing( + renderNegativeZFacing( null, aRenderer, aBlock, 0, 0, 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) NORTH.ordinal(), - (byte) (CONNECTED_WEST | CONNECTED_EAST), - (byte) -1, - false, - false), + tTileEntity.getTexture(aBlock, (byte) NORTH.ordinal()), true); - renderPositiveZFacing( + renderPositiveZFacing( null, aRenderer, aBlock, 0, 0, 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) SOUTH.ordinal(), - (byte) (CONNECTED_WEST | CONNECTED_EAST), - (byte) -1, - false, - false), + tTileEntity.getTexture(aBlock, (byte) SOUTH.ordinal()), true); - renderNegativeXFacing( + renderNegativeXFacing( null, aRenderer, aBlock, 0, 0, 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) WEST.ordinal(), - (byte) (CONNECTED_WEST | CONNECTED_EAST), - (byte) -1, - true, - false), + tTileEntity.getTexture(aBlock, (byte) WEST.ordinal()), true); - renderPositiveXFacing( + renderPositiveXFacing( null, aRenderer, aBlock, 0, 0, 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) EAST.ordinal(), - (byte) (CONNECTED_WEST | CONNECTED_EAST), - (byte) -1, - true, - false), + tTileEntity.getTexture(aBlock, (byte) EAST.ordinal()), true); + } else if (aMeta > 0 && (aMeta < GregTech_API.METATILEENTITIES.length) + && aBlock instanceof GT_Block_Machines + && (GregTech_API.METATILEENTITIES[aMeta] != null) + && (!GregTech_API.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer))) { + renderNormalInventoryMetaTileEntity(aBlock, aMeta, aRenderer); + } + aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); + } + + aRenderer.setRenderBoundsFromBlock(aBlock); + + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + aRenderer.useInventoryTint = false; + } + + private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta, RenderBlocks aRenderer) { + if ((aMeta <= 0) || (aMeta >= GregTech_API.METATILEENTITIES.length)) { + return; + } + final IMetaTileEntity tMetaTileEntity = GregTech_API.METATILEENTITIES[aMeta]; + if (tMetaTileEntity == null) { + return; + } + aBlock.setBlockBoundsForItemRender(); + aRenderer.setRenderBoundsFromBlock(aBlock); + + final IGregTechTileEntity iGregTechTileEntity = tMetaTileEntity.getBaseMetaTileEntity(); + + if ((iGregTechTileEntity instanceof IPipeRenderedTileEntity)) { + final float tThickness = ((IPipeRenderedTileEntity) iGregTechTileEntity).getThickNess(); + final float pipeMin = (blockMax - tThickness) / 2.0F; + final float pipeMax = blockMax - pipeMin; + + aBlock.setBlockBounds(blockMin, pipeMin, pipeMin, blockMax, pipeMax, pipeMax); + aRenderer.setRenderBoundsFromBlock(aBlock); + renderNegativeYFacing( + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) DOWN.ordinal(), + (byte) (CONNECTED_WEST | CONNECTED_EAST), + (byte) -1, + false, + false), + true); + renderPositiveYFacing( + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) UP.ordinal(), + (byte) (CONNECTED_WEST | CONNECTED_EAST), + (byte) -1, + false, + false), + true); + renderNegativeZFacing( + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) NORTH.ordinal(), + (byte) (CONNECTED_WEST | CONNECTED_EAST), + (byte) -1, + false, + false), + true); + renderPositiveZFacing( + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) SOUTH.ordinal(), + (byte) (CONNECTED_WEST | CONNECTED_EAST), + (byte) -1, + false, + false), + true); + renderNegativeXFacing( + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) WEST.ordinal(), + (byte) (CONNECTED_WEST | CONNECTED_EAST), + (byte) -1, + true, + false), + true); + renderPositiveXFacing( + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) EAST.ordinal(), + (byte) (CONNECTED_WEST | CONNECTED_EAST), + (byte) -1, + true, + false), + true); } else { renderNegativeYFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) DOWN.ordinal(), - (byte) WEST.ordinal(), - (byte) -1, - true, - false), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) DOWN.ordinal(), + (byte) WEST.ordinal(), + (byte) -1, + true, + false), + true); renderPositiveYFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) UP.ordinal(), - (byte) WEST.ordinal(), - (byte) -1, - true, - false), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) UP.ordinal(), + (byte) WEST.ordinal(), + (byte) -1, + true, + false), + true); renderNegativeZFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) NORTH.ordinal(), - (byte) WEST.ordinal(), - (byte) -1, - true, - false), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) NORTH.ordinal(), + (byte) WEST.ordinal(), + (byte) -1, + true, + false), + true); renderPositiveZFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) SOUTH.ordinal(), - (byte) WEST.ordinal(), - (byte) -1, - true, - false), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) SOUTH.ordinal(), + (byte) WEST.ordinal(), + (byte) -1, + true, + false), + true); renderNegativeXFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) WEST.ordinal(), - (byte) WEST.ordinal(), - (byte) -1, - true, - false), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) WEST.ordinal(), + (byte) WEST.ordinal(), + (byte) -1, + true, + false), + true); renderPositiveXFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tMetaTileEntity.getTexture( - iGregTechTileEntity, - (byte) EAST.ordinal(), - (byte) WEST.ordinal(), - (byte) -1, - true, - false), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tMetaTileEntity.getTexture( + iGregTechTileEntity, + (byte) EAST.ordinal(), + (byte) WEST.ordinal(), + (byte) -1, + true, + false), + true); } } public static void renderNegativeYFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY - 1, aZ, 0))) return; - Tessellator.instance.setBrightness( - aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -909,11 +900,11 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } public static void renderPositiveYFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY + 1, aZ, 1))) return; - Tessellator.instance.setBrightness( - aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -924,11 +915,11 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } public static void renderNegativeZFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY, aZ - 1, 2))) return; - Tessellator.instance.setBrightness( - aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -939,11 +930,11 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } public static void renderPositiveZFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY, aZ + 1, 3))) return; - Tessellator.instance.setBrightness( - aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -954,11 +945,11 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } public static void renderNegativeXFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX - 1, aY, aZ, 4))) return; - Tessellator.instance.setBrightness( - aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -969,11 +960,11 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } public static void renderPositiveXFacing(IBlockAccess aWorld, RenderBlocks aRenderer, Block aBlock, int aX, int aY, - int aZ, ITexture[] aIcon, boolean aFullBlock) { + int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX + 1, aY, aZ, 5))) return; - Tessellator.instance.setBrightness( - aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ)); + Tessellator.instance + .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -985,7 +976,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, - RenderBlocks aRenderer) { + RenderBlocks aRenderer) { aRenderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion; aRenderer.useInventoryTint = false; if (aBlock instanceof IRenderedBlock) { @@ -999,18 +990,11 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } else { final boolean[] tSides = new boolean[6]; if (tRenderer instanceof IRenderedBlockSideCheck) { - for (byte tSide : ALL_VALID_SIDES) - rReturn |= (tSides[tSide] = ((IRenderedBlockSideCheck) tRenderer).renderFullBlockSide( - aBlock, - aRenderer, - tSide)); + for (byte tSide : ALL_VALID_SIDES) rReturn |= (tSides[tSide] = ((IRenderedBlockSideCheck) tRenderer) + .renderFullBlockSide(aBlock, aRenderer, tSide)); } else { - for (byte tSide : ALL_VALID_SIDES) rReturn |= (tSides[tSide] = aBlock.shouldSideBeRendered( - aWorld, - aX + OFFX[tSide], - aY + OFFY[tSide], - aZ + OFFZ[tSide], - tSide)); + for (byte tSide : ALL_VALID_SIDES) rReturn |= (tSides[tSide] = aBlock + .shouldSideBeRendered(aWorld, aX + OFFX[tSide], aY + OFFY[tSide], aZ + OFFZ[tSide], tSide)); } for (int i = 0, j = tRenderer.getRenderPasses(aBlock); i < j; i++) { if (tRenderer.usesRenderPass(i)) { @@ -1023,59 +1007,59 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { tNeedsToSetBounds = false; } renderNegativeYFacing( - aWorld, - aRenderer, - aBlock, - aX, - aY, - aZ, - tRenderer.getTexture(aBlock, (byte) DOWN.ordinal(), i, tSides), - tSides[DOWN.ordinal()]); + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tRenderer.getTexture(aBlock, (byte) DOWN.ordinal(), i, tSides), + tSides[DOWN.ordinal()]); renderPositiveYFacing( - aWorld, - aRenderer, - aBlock, - aX, - aY, - aZ, - tRenderer.getTexture(aBlock, (byte) UP.ordinal(), i, tSides), - tSides[UP.ordinal()]); + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tRenderer.getTexture(aBlock, (byte) UP.ordinal(), i, tSides), + tSides[UP.ordinal()]); renderNegativeZFacing( - aWorld, - aRenderer, - aBlock, - aX, - aY, - aZ, - tRenderer.getTexture(aBlock, (byte) NORTH.ordinal(), i, tSides), - tSides[NORTH.ordinal()]); + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tRenderer.getTexture(aBlock, (byte) NORTH.ordinal(), i, tSides), + tSides[NORTH.ordinal()]); renderPositiveZFacing( - aWorld, - aRenderer, - aBlock, - aX, - aY, - aZ, - tRenderer.getTexture(aBlock, (byte) SOUTH.ordinal(), i, tSides), - tSides[SOUTH.ordinal()]); + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tRenderer.getTexture(aBlock, (byte) SOUTH.ordinal(), i, tSides), + tSides[SOUTH.ordinal()]); renderNegativeXFacing( - aWorld, - aRenderer, - aBlock, - aX, - aY, - aZ, - tRenderer.getTexture(aBlock, (byte) WEST.ordinal(), i, tSides), - tSides[WEST.ordinal()]); + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tRenderer.getTexture(aBlock, (byte) WEST.ordinal(), i, tSides), + tSides[WEST.ordinal()]); renderPositiveXFacing( - aWorld, - aRenderer, - aBlock, - aX, - aY, - aZ, - tRenderer.getTexture(aBlock, (byte) EAST.ordinal(), i, tSides), - tSides[EAST.ordinal()]); + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tRenderer.getTexture(aBlock, (byte) EAST.ordinal(), i, tSides), + tSides[EAST.ordinal()]); } } if (tNeedsToSetBounds) aBlock.setBlockBounds(0, 0, 0, 1, 1, 1); @@ -1089,13 +1073,13 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { if (tileEntity instanceof IGregTechTileEntity) { final IMetaTileEntity metaTileEntity; if ((metaTileEntity = ((IGregTechTileEntity) tileEntity).getMetaTileEntity()) != null - && metaTileEntity.renderInWorld(aWorld, aX, aY, aZ, aBlock, aRenderer)) { + && metaTileEntity.renderInWorld(aWorld, aX, aY, aZ, aBlock, aRenderer)) { aRenderer.enableAO = false; return true; } } if (tileEntity instanceof IPipeRenderedTileEntity - && renderPipeBlock(aWorld, aX, aY, aZ, aBlock, (IPipeRenderedTileEntity) tileEntity, aRenderer)) { + && renderPipeBlock(aWorld, aX, aY, aZ, aBlock, (IPipeRenderedTileEntity) tileEntity, aRenderer)) { aRenderer.enableAO = false; return true; } diff --git a/src/main/java/gregtech/common/render/GT_SidedTexture.java b/src/main/java/gregtech/common/render/GT_SidedTexture.java index 912e339208..7a851fd1e7 100644 --- a/src/main/java/gregtech/common/render/GT_SidedTexture.java +++ b/src/main/java/gregtech/common/render/GT_SidedTexture.java @@ -19,12 +19,12 @@ public class GT_SidedTexture extends GT_TextureBase implements ITexture, IColorM private final short[] mRGBa; protected GT_SidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, - IIconContainer aIcon3, IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa, boolean aAllowAlpha) { + IIconContainer aIcon3, IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa, boolean aAllowAlpha) { if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture"); mTextures = new ITexture[] { TextureFactory.of(aIcon0, aRGBa, aAllowAlpha), - TextureFactory.of(aIcon1, aRGBa, aAllowAlpha), TextureFactory.of(aIcon2, aRGBa, aAllowAlpha), - TextureFactory.of(aIcon3, aRGBa, aAllowAlpha), TextureFactory.of(aIcon4, aRGBa, aAllowAlpha), - TextureFactory.of(aIcon5, aRGBa, aAllowAlpha) }; + TextureFactory.of(aIcon1, aRGBa, aAllowAlpha), TextureFactory.of(aIcon2, aRGBa, aAllowAlpha), + TextureFactory.of(aIcon3, aRGBa, aAllowAlpha), TextureFactory.of(aIcon4, aRGBa, aAllowAlpha), + TextureFactory.of(aIcon5, aRGBa, aAllowAlpha) }; mRGBa = aRGBa; } diff --git a/src/main/java/gregtech/common/render/GT_TextureBuilder.java b/src/main/java/gregtech/common/render/GT_TextureBuilder.java index 56009c2971..af8a590fc1 100644 --- a/src/main/java/gregtech/common/render/GT_TextureBuilder.java +++ b/src/main/java/gregtech/common/render/GT_TextureBuilder.java @@ -121,23 +121,21 @@ public class GT_TextureBuilder implements ITextureBuilder { return switch (iconContainerList.size()) { case 1 -> new GT_RenderedTexture(iconContainerList.get(0), rgba, allowAlpha, glow, stdOrient, extFacing); case 6 -> new GT_SidedTexture( - iconContainerList.get(ForgeDirection.DOWN.ordinal()), - iconContainerList.get(ForgeDirection.UP.ordinal()), - iconContainerList.get(ForgeDirection.NORTH.ordinal()), - iconContainerList.get(ForgeDirection.SOUTH.ordinal()), - iconContainerList.get(ForgeDirection.WEST.ordinal()), - iconContainerList.get(ForgeDirection.EAST.ordinal()), - rgba, - allowAlpha); + iconContainerList.get(ForgeDirection.DOWN.ordinal()), + iconContainerList.get(ForgeDirection.UP.ordinal()), + iconContainerList.get(ForgeDirection.NORTH.ordinal()), + iconContainerList.get(ForgeDirection.SOUTH.ordinal()), + iconContainerList.get(ForgeDirection.WEST.ordinal()), + iconContainerList.get(ForgeDirection.EAST.ordinal()), + rgba, + allowAlpha); default -> throw new IllegalStateException("Invalid sideIconContainer count"); }; } private boolean isCTMBlock(Block fromBlock, int fromMeta) { - return GT_Mod.gregtechproxy.mCTMBlockCache.computeIfAbsent( - fromBlock, - (byte) fromMeta, - GT_TextureBuilder::apply); + return GT_Mod.gregtechproxy.mCTMBlockCache + .computeIfAbsent(fromBlock, (byte) fromMeta, GT_TextureBuilder::apply); } private static Boolean apply(Block b, Byte m) { diff --git a/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java b/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java index 5577e41d30..717a36b78f 100644 --- a/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java +++ b/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java @@ -94,14 +94,14 @@ public class CosmicNeutroniumRenderer extends GT_GeneratedMaterial_Renderer { } else { GL11.glEnable(GL11.GL_DEPTH_TEST); ItemRenderer.renderItemIn2D( - Tessellator.instance, - icon.getMaxU(), - icon.getMinV(), - icon.getMinU(), - icon.getMaxV(), - icon.getIconWidth(), - icon.getIconHeight(), - 0.0625F); + Tessellator.instance, + icon.getMaxU(), + icon.getMinV(), + icon.getMinU(), + icon.getMaxV(), + icon.getIconWidth(), + icon.getIconHeight(), + 0.0625F); } GL11.glPopMatrix(); } diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java index fbd3798b76..1d3346a675 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java @@ -31,8 +31,8 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { return type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON - || type == ItemRenderType.INVENTORY - || type == ItemRenderType.ENTITY; + || type == ItemRenderType.INVENTORY + || type == ItemRenderType.ENTITY; } @Override @@ -62,7 +62,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { tIcon = aItem.mIconList[(aMetaData - aItem.mOffset)][8]; } else { tIcon = aItem.mIconList[(aMetaData - aItem.mOffset)][(7 - - (int) Math.max(0L, Math.min(5L, (tStats[0] - tCharge) * 6L / tStats[0])))]; + - (int) Math.max(0L, Math.min(5L, (tStats[0] - tCharge) * 6L / tStats[0])))]; } } } else { @@ -87,14 +87,14 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(tIcon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - tIcon.getMaxU(), - tIcon.getMinV(), - tIcon.getMinU(), - tIcon.getMaxV(), - tIcon.getIconWidth(), - tIcon.getIconHeight(), - 0.0625F); + Tessellator.instance, + tIcon.getMaxU(), + tIcon.getMinV(), + tIcon.getMinU(), + tIcon.getMaxV(), + tIcon.getIconWidth(), + tIcon.getIconHeight(), + 0.0625F); } GL11.glDisable(GL11.GL_BLEND); } @@ -134,23 +134,23 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(inner, 16.0D, -0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - inner.getMaxU(), - inner.getMinV(), - inner.getMinU(), - inner.getMaxV(), - inner.getIconWidth(), - inner.getIconHeight(), - 0.0625F); + Tessellator.instance, + inner.getMaxU(), + inner.getMinV(), + inner.getMinU(), + inner.getMaxV(), + inner.getIconWidth(), + inner.getIconHeight(), + 0.0625F); } FluidStack fluidStack = GT_Utility.getFluidForFilledItem(stack, true); if (fluidStack != null && fluidStack.getFluid() != null) { IIcon fluidIcon = fluidStack.getFluid() - .getIcon(fluidStack); + .getIcon(fluidStack); int fluidColor = fluidStack.getFluid() - .getColor(fluidStack); + .getColor(fluidStack); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); markNeedsAnimationUpdate(fluidIcon); @@ -161,14 +161,14 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(fluidIcon, 16.0D, -0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - fluidIcon.getMaxU(), - fluidIcon.getMinV(), - fluidIcon.getMinU(), - fluidIcon.getMaxV(), - fluidIcon.getIconWidth(), - fluidIcon.getIconHeight(), - 0.0625F); + Tessellator.instance, + fluidIcon.getMaxU(), + fluidIcon.getMinV(), + fluidIcon.getMinU(), + fluidIcon.getMaxV(), + fluidIcon.getIconWidth(), + fluidIcon.getIconHeight(), + 0.0625F); } GL11.glColor3ub((byte) -1, (byte) -1, (byte) -1); diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java index ebfb06bcbe..449d4500f6 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java @@ -24,8 +24,8 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { return type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON - || type == ItemRenderType.INVENTORY - || type == ItemRenderType.ENTITY; + || type == ItemRenderType.INVENTORY + || type == ItemRenderType.ENTITY; } @Override @@ -72,7 +72,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { if (tOverlay != null && aFluid != null && aFluid.getFluid() != null) { IIcon fluidIcon = aFluid.getFluid() - .getIcon(aFluid); + .getIcon(aFluid); if (fluidIcon != null) { markNeedsAnimationUpdate(fluidIcon); // Adds colour to a cells fluid. Does not colour full fluid icons as shown in NEI etc. @@ -92,7 +92,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { } protected void renderRegularItem(ItemRenderType type, ItemStack aStack, IIcon icon, boolean shouldModulateColor, - int pass, Object... data) { + int pass, Object... data) { renderRegularItem(type, aStack, icon, shouldModulateColor); } @@ -108,14 +108,14 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - icon.getMaxU(), - icon.getMinV(), - icon.getMinU(), - icon.getMaxV(), - icon.getIconWidth(), - icon.getIconHeight(), - 0.0625F); + Tessellator.instance, + icon.getMaxU(), + icon.getMinV(), + icon.getMinU(), + icon.getMaxV(), + icon.getIconWidth(), + icon.getIconHeight(), + 0.0625F); } } @@ -130,14 +130,14 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(fluidIcon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - fluidIcon.getMaxU(), - fluidIcon.getMinV(), - fluidIcon.getMinU(), - fluidIcon.getMaxV(), - fluidIcon.getIconWidth(), - fluidIcon.getIconHeight(), - 0.0625F); + Tessellator.instance, + fluidIcon.getMaxU(), + fluidIcon.getMinV(), + fluidIcon.getMinU(), + fluidIcon.getMaxV(), + fluidIcon.getIconWidth(), + fluidIcon.getIconHeight(), + 0.0625F); } GL11.glDepthFunc(GL11.GL_LEQUAL); } @@ -147,14 +147,14 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(overlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - overlay.getMaxU(), - overlay.getMinV(), - overlay.getMinU(), - overlay.getMaxV(), - overlay.getIconWidth(), - overlay.getIconHeight(), - 0.0625F); + Tessellator.instance, + overlay.getMaxU(), + overlay.getMinV(), + overlay.getMinU(), + overlay.getMaxV(), + overlay.getIconWidth(), + overlay.getIconHeight(), + 0.0625F); } } diff --git a/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java b/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java index 8dac142cb1..78f8401abb 100644 --- a/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java @@ -28,8 +28,8 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack aStack, ItemRenderType aType) { if ((GT_Utility.isStackInvalid(aStack)) || (aStack.getItemDamage() < 0) - || !(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer) - || !((IGT_ItemWithMaterialRenderer) aStack.getItem()).shouldUseCustomRenderer(aStack.getItemDamage())) { + || !(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer) + || !((IGT_ItemWithMaterialRenderer) aStack.getItem()).shouldUseCustomRenderer(aStack.getItemDamage())) { return false; } return getRendererForItemStack(aStack).handleRenderType(aStack, aType); diff --git a/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java b/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java index 5f226f6c98..97f5096948 100644 --- a/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java +++ b/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java @@ -28,14 +28,14 @@ public class GaiaSpiritRenderer extends GT_GeneratedMaterial_Renderer { GT_RenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - icon.getMaxU(), - icon.getMinV(), - icon.getMinU(), - icon.getMaxV(), - icon.getIconWidth(), - icon.getIconHeight(), - 0.0625F); + Tessellator.instance, + icon.getMaxU(), + icon.getMinV(), + icon.getMinU(), + icon.getMaxV(), + icon.getIconWidth(), + icon.getIconHeight(), + 0.0625F); } } } diff --git a/src/main/java/gregtech/common/render/items/InfinityRenderer.java b/src/main/java/gregtech/common/render/items/InfinityRenderer.java index 3187ab8bcb..9e8b60ad5a 100644 --- a/src/main/java/gregtech/common/render/items/InfinityRenderer.java +++ b/src/main/java/gregtech/common/render/items/InfinityRenderer.java @@ -61,7 +61,7 @@ public class InfinityRenderer extends GT_GeneratedMaterial_Renderer { if (tOverlay != null && aFluid != null && aFluid.getFluid() != null) { IIcon fluidIcon = aFluid.getFluid() - .getIcon(aFluid); + .getIcon(aFluid); if (fluidIcon != null) { markNeedsAnimationUpdate(fluidIcon); // Adds colour to a cells fluid. Does not colour full fluid icons as shown in NEI etc. diff --git a/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java b/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java index 866c426e59..d9149f3ec9 100644 --- a/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java +++ b/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java @@ -21,19 +21,19 @@ public class TranscendentMetalRenderer extends GT_GeneratedMaterial_Renderer { // frameIndex should not have 3 or more frames with same value (unless it's meant to be still) // otherwise the primitive linear interpolation will render the animation in a pretty sluggish way private final int[] frameIndex = new int[] { 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 7, 8, 9, 10, 12, 13, 14, 16, 17, 19, 21, - 22, 24, 25, 27, 29, 30, 32, 33, 35, 36, 38, 39, 40, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, 49, 48, 47, 46, - 45, 44, 43, 42, 40, 39, 38, 36, 35, 33, 32, 30, 29, 27, 25, 24, 22, 21, 19, 17, 16, 14, 13, 12, 10, 9, 8, 7, - 5, 4, 3, 2, 1, 1, 0, 0, 0, 0 }; + 22, 24, 25, 27, 29, 30, 32, 33, 35, 36, 38, 39, 40, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, 49, 48, 47, 46, 45, + 44, 43, 42, 40, 39, 38, 36, 35, 33, 32, 30, 29, 27, 25, 24, 22, 21, 19, 17, 16, 14, 13, 12, 10, 9, 8, 7, 5, 4, + 3, 2, 1, 1, 0, 0, 0, 0 }; private final float[] frameRotation = new float[] { 0, 7, 14, 21, 28, 36, 43, 50, 57, 64, 72, 79, 86, 93, 100, 108, - 115, 122, 129, 136, 144, 151, 158, 165, 172, 180, 187, 194, 201, 208, 216, 223, 230, 237, 244, 252, 259, - 266, 273, 280, 288, 295, 302, 309, 316, 324, 331, 338, 345, 352, 360 }; + 115, 122, 129, 136, 144, 151, 158, 165, 172, 180, 187, 194, 201, 208, 216, 223, 230, 237, 244, 252, 259, 266, + 273, 280, 288, 295, 302, 309, 316, 324, 331, 338, 345, 352, 360 }; private final float[] frameAlpha = new float[] { 100 / 255f, 106 / 255f, 112 / 255f, 118 / 255f, 124 / 255f, - 131 / 255f, 137 / 255f, 143 / 255f, 149 / 255f, 155 / 255f, 162 / 255f, 168 / 255f, 174 / 255f, 180 / 255f, - 186 / 255f, 193 / 255f, 199 / 255f, 205 / 255f, 211 / 255f, 217 / 255f, 224 / 255f, 230 / 255f, 236 / 255f, - 242 / 255f, 248 / 255f, 255 / 255f, 248 / 255f, 242 / 255f, 236 / 255f, 230 / 255f, 224 / 255f, 217 / 255f, - 211 / 255f, 205 / 255f, 199 / 255f, 193 / 255f, 186 / 255f, 180 / 255f, 174 / 255f, 168 / 255f, 162 / 255f, - 155 / 255f, 149 / 255f, 143 / 255f, 137 / 255f, 131 / 255f, 124 / 255f, 118 / 255f, 112 / 255f, 106 / 255f, - 100 / 255f }; + 131 / 255f, 137 / 255f, 143 / 255f, 149 / 255f, 155 / 255f, 162 / 255f, 168 / 255f, 174 / 255f, 180 / 255f, + 186 / 255f, 193 / 255f, 199 / 255f, 205 / 255f, 211 / 255f, 217 / 255f, 224 / 255f, 230 / 255f, 236 / 255f, + 242 / 255f, 248 / 255f, 255 / 255f, 248 / 255f, 242 / 255f, 236 / 255f, 230 / 255f, 224 / 255f, 217 / 255f, + 211 / 255f, 205 / 255f, 199 / 255f, 193 / 255f, 186 / 255f, 180 / 255f, 174 / 255f, 168 / 255f, 162 / 255f, + 155 / 255f, 149 / 255f, 143 / 255f, 137 / 255f, 131 / 255f, 124 / 255f, 118 / 255f, 112 / 255f, 106 / 255f, + 100 / 255f }; private static float linearInterpolation(float[] controlPoints, int frameA, int frameB, float partial) { float a = controlPoints[frameA], b = controlPoints[frameB]; @@ -61,14 +61,14 @@ public class TranscendentMetalRenderer extends GT_GeneratedMaterial_Renderer { GT_RenderUtil.renderItemIcon(fluidIcon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - fluidIcon.getMaxU(), - fluidIcon.getMinV(), - fluidIcon.getMinU(), - fluidIcon.getMaxV(), - fluidIcon.getIconWidth(), - fluidIcon.getIconHeight(), - 0.0625F); + Tessellator.instance, + fluidIcon.getMaxU(), + fluidIcon.getMinV(), + fluidIcon.getMinU(), + fluidIcon.getMaxV(), + fluidIcon.getIconWidth(), + fluidIcon.getIconHeight(), + 0.0625F); } GL11.glDepthFunc(GL11.GL_LEQUAL); GL11.glPopMatrix(); @@ -102,10 +102,10 @@ public class TranscendentMetalRenderer extends GT_GeneratedMaterial_Renderer { if (shouldModulateColor) { GL11.glColor4f( - modulation[0] / 255.0F, - modulation[1] / 255.0F, - modulation[2] / 255.0F, - linearInterpolation(frameAlpha, frameCurrent, frameNext, partialTicks)); + modulation[0] / 255.0F, + modulation[1] / 255.0F, + modulation[2] / 255.0F, + linearInterpolation(frameAlpha, frameCurrent, frameNext, partialTicks)); } else { GL11.glColor4f(1f, 1f, 1f, linearInterpolation(frameAlpha, frameCurrent, frameNext, partialTicks)); } diff --git a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java index 8f75bfb03e..b0d09348db 100644 --- a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java +++ b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java @@ -33,12 +33,12 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { @Override public boolean renderFluidDisplayItem(ItemRenderType type, ItemStack aStack, Object... data) { magicRenderMethod( - type, - ItemList.Emitter_UEV.get(1), // hack to make it render correctly - aStack.getItem() - .getIconFromDamage(aStack.getItemDamage()), - true, - data); + type, + ItemList.Emitter_UEV.get(1), // hack to make it render correctly + aStack.getItem() + .getIconFromDamage(aStack.getItemDamage()), + true, + data); return true; } @@ -79,7 +79,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { } private void magicRenderMethod(ItemRenderType type, ItemStack aStack, IIcon tIcon, boolean fluidDisplay, - Object... data) { + Object... data) { if (!GregTech_API.mEternalSingularity) return; RenderItem r = RenderItem.getInstance(); @@ -111,9 +111,9 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { if (fluidDisplay) { // this somehow makes shader render correctly ResourceLocation resourcelocation = mc.getTextureManager() - .getResourceLocation(aStack.getItemSpriteNumber()); + .getResourceLocation(aStack.getItemSpriteNumber()); mc.getTextureManager() - .bindTexture(resourcelocation); + .bindTexture(resourcelocation); } else { r.renderItemIntoGUI(mc.fontRenderer, mc.getTextureManager(), aStack, 0, 0, true); } @@ -181,15 +181,8 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); // RENDER ITEM IN HAND - ItemRenderer.renderItemIn2D( - Tessellator.instance, - f1, - f2, - f, - f3, - icon.getIconWidth(), - icon.getIconHeight(), - scale); + ItemRenderer + .renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glDepthFunc(GL11.GL_EQUAL); @@ -203,14 +196,14 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { // RENDER COSMIC OVERLAY IN HAND ItemRenderer.renderItemIn2D( - Tessellator.instance, - maxu, - minv, - minu, - maxv, - icon.getIconWidth(), - icon.getIconHeight(), - scale); + Tessellator.instance, + maxu, + minv, + minu, + maxv, + icon.getIconWidth(), + icon.getIconHeight(), + scale); CosmicRenderStuffs.releaseShader(); GL11.glDepthFunc(GL11.GL_LEQUAL); GL11.glEnable(GL11.GL_ALPHA_TEST); @@ -227,20 +220,20 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { EntityItem ent = (EntityItem) (data[1]); if (ent != null) { CosmicRenderStuffs.setLightFromLocation( - ent.worldObj, - MathHelper.floor_double(ent.posX), - MathHelper.floor_double(ent.posY), - MathHelper.floor_double(ent.posZ)); + ent.worldObj, + MathHelper.floor_double(ent.posX), + MathHelper.floor_double(ent.posY), + MathHelper.floor_double(ent.posZ)); } } case EQUIPPED, EQUIPPED_FIRST_PERSON -> { EntityLivingBase ent = (EntityLivingBase) (data[1]); if (ent != null) { CosmicRenderStuffs.setLightFromLocation( - ent.worldObj, - MathHelper.floor_double(ent.posX), - MathHelper.floor_double(ent.posY), - MathHelper.floor_double(ent.posZ)); + ent.worldObj, + MathHelper.floor_double(ent.posX), + MathHelper.floor_double(ent.posY), + MathHelper.floor_double(ent.posZ)); } } case INVENTORY -> { |