diff --git a/dependencies.gradle b/dependencies.gradle index bc8f0a84d..b77582edf 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ dependencies { implementation('com.github.GTNewHorizons:NotEnoughItems:2.5.21-GTNH:dev') implementation('curse.maven:cofh-core-69162:2388751') - compileOnly('com.github.GTNewHorizons:Angelica:1.0.0-alpha30:dev') + compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha31:api') compileOnly('com.github.GTNewHorizons:ThaumicTinkerer:2.9.2:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.4.8:dev') {transitive = false} diff --git a/settings.gradle b/settings.gradle index b0cc7e7ee..0543e53ae 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.14' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.15' } diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index d010dc37d..2c1299856 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -199,7 +199,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection @Override public boolean canRenderInPass(final int pass) { - BusRenderHelper.INSTANCE.setPass(pass); + BusRenderHelper.instances.get().setPass(pass); if (AEConfig.instance.isFeatureEnabled(AEFeature.AlphaPass)) { return true; diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 21e06f14b..ac8914137 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -250,7 +250,7 @@ public abstract class AEBaseGui extends GuiContainer { */ public void addTexturedRectToTesselator(float x0, float y0, float x1, float y1, float zLevel, float u0, float v0, float u1, float v1) { - Tessellator tessellator = Tessellator.instance; + final Tessellator tessellator = Tessellator.instance; tessellator.addVertexWithUV(x0, y1, this.zLevel, u0, v1); tessellator.addVertexWithUV(x1, y1, this.zLevel, u1, v1); tessellator.addVertexWithUV(x1, y0, this.zLevel, u1, v0); diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java index 9c2312a13..8aa837af3 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java @@ -355,11 +355,12 @@ public class GuiInterfaceTerminal extends AEBaseGui @Override public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { + final Tessellator tessellator = Tessellator.instance; this.bindTexture(BACKGROUND); /* Draws the top part. */ this.drawTexturedModalRect(offsetX, offsetY, 0, 0, xSize, HEADER_HEIGHT); /* Draws the middle part. */ - Tessellator.instance.startDrawingQuads(); + tessellator.startDrawingQuads(); addTexturedRectToTesselator( offsetX, offsetY + HEADER_HEIGHT, @@ -370,7 +371,7 @@ public class GuiInterfaceTerminal extends AEBaseGui (HEADER_HEIGHT + InterfaceSection.TITLE_HEIGHT + 1.0f) / 256.0f, this.xSize / 256.0f, (HEADER_HEIGHT + 106.0f) / 256.0f); - Tessellator.instance.draw(); + tessellator.draw(); /* Draw the bottom part */ this.drawTexturedModalRect(offsetX, offsetY + HEADER_HEIGHT + viewHeight, 0, 158, xSize, INV_HEIGHT); if (online) { @@ -518,7 +519,8 @@ public class GuiInterfaceTerminal extends AEBaseGui */ private int drawEntry(InterfaceTerminalEntry entry, int viewY, int titleBottom, int relMouseX, int relMouseY) { bindTexture(BACKGROUND); - Tessellator.instance.startDrawingQuads(); + final Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); int relY = 0; final int slotLeftMargin = (VIEW_WIDTH - entry.rowSize * 18); @@ -546,7 +548,7 @@ public class GuiInterfaceTerminal extends AEBaseGui (173 + 18) / 256f); } } - Tessellator.instance.draw(); + tessellator.draw(); /* Draw button */ if (viewY + entry.optionsButton.height > 0 && viewY < viewHeight) { entry.optionsButton.yPosition = viewY + 5; diff --git a/src/main/java/appeng/client/render/BlockRenderInfo.java b/src/main/java/appeng/client/render/BlockRenderInfo.java index 0511b329f..f3fa72a1a 100644 --- a/src/main/java/appeng/client/render/BlockRenderInfo.java +++ b/src/main/java/appeng/client/render/BlockRenderInfo.java @@ -21,13 +21,20 @@ import appeng.tile.AEBaseTile; public class BlockRenderInfo { private final BaseBlockRender rendererInstance; - private final TmpFlippableIcon tmpTopIcon = new TmpFlippableIcon(); - private final TmpFlippableIcon tmpBottomIcon = new TmpFlippableIcon(); - private final TmpFlippableIcon tmpSouthIcon = new TmpFlippableIcon(); - private final TmpFlippableIcon tmpNorthIcon = new TmpFlippableIcon(); - private final TmpFlippableIcon tmpEastIcon = new TmpFlippableIcon(); - private final TmpFlippableIcon tmpWestIcon = new TmpFlippableIcon(); - private boolean useTmp = false; + + private static class ThreadState { + + private boolean useTmp = false; + private final TmpFlippableIcon tmpTopIcon = new TmpFlippableIcon(); + private final TmpFlippableIcon tmpBottomIcon = new TmpFlippableIcon(); + private final TmpFlippableIcon tmpSouthIcon = new TmpFlippableIcon(); + private final TmpFlippableIcon tmpNorthIcon = new TmpFlippableIcon(); + private final TmpFlippableIcon tmpEastIcon = new TmpFlippableIcon(); + private final TmpFlippableIcon tmpWestIcon = new TmpFlippableIcon(); + } + + private final ThreadLocal threadState = ThreadLocal.withInitial(ThreadState::new); + private boolean iconsSet = false; private FlippableIcon topIcon = null; private FlippableIcon bottomIcon = null; private FlippableIcon southIcon = null; @@ -50,50 +57,53 @@ public class BlockRenderInfo { } public void setTemporaryRenderIcon(final IIcon icon) { + final ThreadState state = this.threadState.get(); if (icon == null) { - this.useTmp = false; + state.useTmp = false; } else { - this.useTmp = true; - this.tmpTopIcon.setOriginal(icon); - this.tmpBottomIcon.setOriginal(icon); - this.tmpSouthIcon.setOriginal(icon); - this.tmpNorthIcon.setOriginal(icon); - this.tmpEastIcon.setOriginal(icon); - this.tmpWestIcon.setOriginal(icon); + state.useTmp = true; + state.tmpTopIcon.setOriginal(icon); + state.tmpBottomIcon.setOriginal(icon); + state.tmpSouthIcon.setOriginal(icon); + state.tmpNorthIcon.setOriginal(icon); + state.tmpEastIcon.setOriginal(icon); + state.tmpWestIcon.setOriginal(icon); } } public void setTemporaryRenderIcons(final IIcon nTopIcon, final IIcon nBottomIcon, final IIcon nSouthIcon, final IIcon nNorthIcon, final IIcon nEastIcon, final IIcon nWestIcon) { - this.tmpTopIcon.setOriginal(nTopIcon == null ? this.getTexture(ForgeDirection.UP) : nTopIcon); - this.tmpBottomIcon.setOriginal(nBottomIcon == null ? this.getTexture(ForgeDirection.DOWN) : nBottomIcon); - this.tmpSouthIcon.setOriginal(nSouthIcon == null ? this.getTexture(ForgeDirection.SOUTH) : nSouthIcon); - this.tmpNorthIcon.setOriginal(nNorthIcon == null ? this.getTexture(ForgeDirection.NORTH) : nNorthIcon); - this.tmpEastIcon.setOriginal(nEastIcon == null ? this.getTexture(ForgeDirection.EAST) : nEastIcon); - this.tmpWestIcon.setOriginal(nWestIcon == null ? this.getTexture(ForgeDirection.WEST) : nWestIcon); - this.useTmp = true; + final ThreadState state = this.threadState.get(); + state.tmpTopIcon.setOriginal(nTopIcon == null ? this.getTexture(ForgeDirection.UP) : nTopIcon); + state.tmpBottomIcon.setOriginal(nBottomIcon == null ? this.getTexture(ForgeDirection.DOWN) : nBottomIcon); + state.tmpSouthIcon.setOriginal(nSouthIcon == null ? this.getTexture(ForgeDirection.SOUTH) : nSouthIcon); + state.tmpNorthIcon.setOriginal(nNorthIcon == null ? this.getTexture(ForgeDirection.NORTH) : nNorthIcon); + state.tmpEastIcon.setOriginal(nEastIcon == null ? this.getTexture(ForgeDirection.EAST) : nEastIcon); + state.tmpWestIcon.setOriginal(nWestIcon == null ? this.getTexture(ForgeDirection.WEST) : nWestIcon); + state.useTmp = true; } public FlippableIcon getTexture(final ForgeDirection dir) { - if (this.useTmp) { + final ThreadState state = this.threadState.get(); + if (state.useTmp) { switch (dir) { case DOWN -> { - return this.tmpBottomIcon; + return state.tmpBottomIcon; } case UP -> { - return this.tmpTopIcon; + return state.tmpTopIcon; } case NORTH -> { - return this.tmpNorthIcon; + return state.tmpNorthIcon; } case SOUTH -> { - return this.tmpSouthIcon; + return state.tmpSouthIcon; } case EAST -> { - return this.tmpEastIcon; + return state.tmpEastIcon; } case WEST -> { - return this.tmpWestIcon; + return state.tmpWestIcon; } default -> {} } diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index 72a16e6b7..850733f26 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -40,7 +40,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public final class BusRenderHelper implements IPartRenderHelper { - public static final BusRenderHelper INSTANCE = new BusRenderHelper(); + public static final ThreadLocal instances = ThreadLocal.withInitial(BusRenderHelper::new); + private static final int HEX_WHITE = 0xffffff; private final BoundBoxCalculator bbc; @@ -438,8 +439,8 @@ public final class BusRenderHelper implements IPartRenderHelper { final AEBaseBlock block = (AEBaseBlock) multiPart; final BlockRenderInfo info = block.getRendererInstance(); - final ForgeDirection forward = BusRenderHelper.INSTANCE.az; - final ForgeDirection up = BusRenderHelper.INSTANCE.ay; + final ForgeDirection forward = BusRenderHelper.instances.get().az; + final ForgeDirection up = BusRenderHelper.instances.get().ay; renderer.uvRotateBottom = info.getTexture(ForgeDirection.DOWN) .setFlip(BaseBlockRender.getOrientation(ForgeDirection.DOWN, forward, up)); diff --git a/src/main/java/appeng/client/render/BusRenderer.java b/src/main/java/appeng/client/render/BusRenderer.java index 62effd9f1..9bd5d1008 100644 --- a/src/main/java/appeng/client/render/BusRenderer.java +++ b/src/main/java/appeng/client/render/BusRenderer.java @@ -10,8 +10,8 @@ package appeng.client.render; -import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; @@ -39,8 +39,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class BusRenderer implements IItemRenderer { public static final BusRenderer INSTANCE = new BusRenderer(); - private static final Map RENDER_PART = new HashMap<>(); - private final RenderBlocksWorkaround renderer = new RenderBlocksWorkaround(); + private static final Map RENDER_PART = new ConcurrentHashMap<>(); + private final ThreadLocal renderer = ThreadLocal.withInitial(RenderBlocksWorkaround::new); @Override public boolean handleRenderType(final ItemStack item, final ItemRenderType type) { @@ -58,7 +58,9 @@ public class BusRenderer implements IItemRenderer { if (item == null) { return; } - + Tessellator tessellator = Tessellator.instance; + BusRenderHelper busRenderer = BusRenderHelper.instances.get(); + RenderBlocksWorkaround renderer = this.getRenderer(); GL11.glPushMatrix(); GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT); GL11.glEnable(GL11.GL_DEPTH_TEST); @@ -95,20 +97,20 @@ public class BusRenderer implements IItemRenderer { GL11.glScaled(1.2, 1.2, 1.); GL11.glColor4f(1, 1, 1, 1); - Tessellator.instance.setColorOpaque_F(1, 1, 1); - Tessellator.instance.setBrightness(14 << 20 | 14 << 4); + tessellator.setColorOpaque_F(1, 1, 1); + tessellator.setBrightness(14 << 20 | 14 << 4); - BusRenderHelper.INSTANCE.setBounds(0, 0, 0, 1, 1, 1); - BusRenderHelper.INSTANCE.setTexture(null); - BusRenderHelper.INSTANCE.setInvColor(0xffffff); - this.getRenderer().blockAccess = ClientHelper.proxy.getWorld(); + busRenderer.setBounds(0, 0, 0, 1, 1, 1); + busRenderer.setTexture(null); + busRenderer.setInvColor(0xffffff); + renderer.blockAccess = ClientHelper.proxy.getWorld(); - BusRenderHelper.INSTANCE.setOrientation(ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH); + busRenderer.setOrientation(ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH); - this.getRenderer().uvRotateBottom = this.getRenderer().uvRotateEast = this.getRenderer().uvRotateNorth = this - .getRenderer().uvRotateSouth = this.getRenderer().uvRotateTop = this.getRenderer().uvRotateWest = 0; - this.getRenderer().useInventoryTint = false; - this.getRenderer().overrideBlockTexture = null; + renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = this + .getRenderer().uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; + renderer.useInventoryTint = false; + renderer.overrideBlockTexture = null; if (item.getItem() instanceof IFacadeItem fi) { final IFacadePart fp = fi.createPartFromItemStack(item, ForgeDirection.SOUTH); @@ -119,7 +121,7 @@ public class BusRenderer implements IItemRenderer { } if (fp != null) { - fp.renderInventory(BusRenderHelper.INSTANCE, this.getRenderer()); + fp.renderInventory(busRenderer, renderer); } } else { final IPart ip = this.getRenderer(item, (IPartItem) item.getItem()); @@ -130,12 +132,12 @@ public class BusRenderer implements IItemRenderer { GL11.glTranslatef(0.0f, 0.0f, -0.04f * (8 - depth) - 0.06f); } - ip.renderInventory(BusRenderHelper.INSTANCE, this.getRenderer()); + ip.renderInventory(busRenderer, renderer); } } - this.getRenderer().uvRotateBottom = this.getRenderer().uvRotateEast = this.getRenderer().uvRotateNorth = this - .getRenderer().uvRotateSouth = this.getRenderer().uvRotateTop = this.getRenderer().uvRotateWest = 0; + renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = this + .getRenderer().uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; GL11.glPopAttrib(); GL11.glPopMatrix(); @@ -158,6 +160,6 @@ public class BusRenderer implements IItemRenderer { } public RenderBlocksWorkaround getRenderer() { - return this.renderer; + return this.renderer.get(); } } diff --git a/src/main/java/appeng/client/render/CableRenderHelper.java b/src/main/java/appeng/client/render/CableRenderHelper.java index f10406fb6..8fa26a32b 100644 --- a/src/main/java/appeng/client/render/CableRenderHelper.java +++ b/src/main/java/appeng/client/render/CableRenderHelper.java @@ -36,9 +36,9 @@ public class CableRenderHelper { public void renderStatic(final CableBusContainer cableBusContainer, final IFacadeContainer iFacadeContainer) { final TileEntity te = cableBusContainer.getTile(); final RenderBlocksWorkaround renderer = BusRenderer.INSTANCE.getRenderer(); - + final BusRenderHelper busRenderHelper = BusRenderHelper.instances.get(); if (renderer.overrideBlockTexture != null) { - BusRenderHelper.INSTANCE.setPass(0); + busRenderHelper.setPass(0); } if (renderer.blockAccess == null) { @@ -54,7 +54,7 @@ public class CableRenderHelper { renderer.flipTexture = false; renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; - part.renderStatic(te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.INSTANCE, renderer); + part.renderStatic(te.xCoord, te.yCoord, te.zCoord, busRenderHelper, renderer); renderer.setFaces(EnumSet.allOf(ForgeDirection.class)); renderer.setCalculations(true); @@ -72,7 +72,7 @@ public class CableRenderHelper { final IPart part = cableBusContainer.getPart(s); if (part != null) { this.setSide(s); - final BusRenderHelper brh = BusRenderHelper.INSTANCE; + final BusRenderHelper brh = busRenderHelper; final BusCollisionHelper bch = new BusCollisionHelper( boxes, brh.getWorldX(), @@ -133,7 +133,7 @@ public class CableRenderHelper { te.xCoord, te.yCoord, te.zCoord, - BusRenderHelper.INSTANCE, + busRenderHelper, renderer, iFacadeContainer, b, @@ -149,6 +149,7 @@ public class CableRenderHelper { } private void setSide(final ForgeDirection s) { + final BusRenderHelper busRenderHelper = BusRenderHelper.instances.get(); final ForgeDirection ax; final ForgeDirection ay; final ForgeDirection az; @@ -191,11 +192,13 @@ public class CableRenderHelper { } } - BusRenderHelper.INSTANCE.setOrientation(ax, ay, az); + busRenderHelper.setOrientation(ax, ay, az); } public void renderDynamic(final CableBusContainer cableBusContainer, final double x, final double y, final double z) { + final RenderBlocksWorkaround renderer = BusRenderer.INSTANCE.getRenderer(); + final BusRenderHelper busRenderHelper = BusRenderHelper.instances.get(); for (final ForgeDirection s : ForgeDirection.values()) { final IPart part = cableBusContainer.getPart(s); @@ -242,8 +245,8 @@ public class CableRenderHelper { } } - BusRenderHelper.INSTANCE.setOrientation(ax, ay, az); - part.renderDynamic(x, y, z, BusRenderHelper.INSTANCE, BusRenderer.INSTANCE.getRenderer()); + busRenderHelper.setOrientation(ax, ay, az); + part.renderDynamic(x, y, z, busRenderHelper, renderer); } } } diff --git a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java index 419e15bd3..f9098e07f 100644 --- a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java +++ b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java @@ -87,69 +87,35 @@ public class RenderBlocksWorkaround extends RenderBlocks { this.lightState.rZNeg = rZNeg; } + // spotless:off private boolean renderStandardBlockNoCalculations(final Block b, final int x, final int y, final int z) { - Tessellator.instance.setBrightness(this.lightState.bXPos); + final Tessellator tessellator = Tessellator.instance; + tessellator.setBrightness(this.lightState.bXPos); this.restoreAO(this.lightState.aoXPos, this.lightState.foXPos); - this.renderFaceXPos( - b, - x, - y, - z, - this.isUseTextures() ? this.lightState.rXPos - : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.EAST.ordinal())); + this.renderFaceXPos(b, x, y, z, this.isUseTextures() ? this.lightState.rXPos : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.EAST.ordinal())); - Tessellator.instance.setBrightness(this.lightState.bXNeg); + tessellator.setBrightness(this.lightState.bXNeg); this.restoreAO(this.lightState.aoXNeg, this.lightState.foXNeg); - this.renderFaceXNeg( - b, - x, - y, - z, - this.isUseTextures() ? this.lightState.rXNeg - : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.WEST.ordinal())); + this.renderFaceXNeg(b, x, y, z, this.isUseTextures() ? this.lightState.rXNeg : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.WEST.ordinal())); - Tessellator.instance.setBrightness(this.lightState.bYPos); + tessellator.setBrightness(this.lightState.bYPos); this.restoreAO(this.lightState.aoYPos, this.lightState.foYPos); - this.renderFaceYPos( - b, - x, - y, - z, - this.isUseTextures() ? this.lightState.rYPos - : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.UP.ordinal())); + this.renderFaceYPos(b, x, y, z, this.isUseTextures() ? this.lightState.rYPos : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.UP.ordinal())); - Tessellator.instance.setBrightness(this.lightState.bYNeg); + tessellator.setBrightness(this.lightState.bYNeg); this.restoreAO(this.lightState.aoYNeg, this.lightState.foYNeg); - this.renderFaceYNeg( - b, - x, - y, - z, - this.isUseTextures() ? this.lightState.rYNeg - : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.DOWN.ordinal())); + this.renderFaceYNeg(b, x, y, z, this.isUseTextures() ? this.lightState.rYNeg : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.DOWN.ordinal())); - Tessellator.instance.setBrightness(this.lightState.bZPos); - this.restoreAO(this.lightState.aoZPos, this.lightState.foZPos); - this.renderFaceZPos( - b, - x, - y, - z, - this.isUseTextures() ? this.lightState.rZPos - : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.SOUTH.ordinal())); + tessellator.setBrightness(this.lightState.bZPos); + this.restoreAO(this.lightState.aoZPos, this.lightState.foZPos);this.renderFaceZPos(b, x, y, z, this.isUseTextures() ? this.lightState.rZPos : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.SOUTH.ordinal())); - Tessellator.instance.setBrightness(this.lightState.bZNeg); + tessellator.setBrightness(this.lightState.bZNeg); this.restoreAO(this.lightState.aoZNeg, this.lightState.foZNeg); - this.renderFaceZNeg( - b, - x, - y, - z, - this.isUseTextures() ? this.lightState.rZNeg - : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.NORTH.ordinal())); + this.renderFaceZNeg(b, x, y, z, this.isUseTextures() ? this.lightState.rZNeg : this.getBlockIcon(b, this.blockAccess, x, y, z, ForgeDirection.NORTH.ordinal())); return true; } + // spotless:on private void restoreAO(final int[] z, final float[] c) { this.brightnessBottomLeft = z[0]; @@ -501,6 +467,7 @@ public class RenderBlocksWorkaround extends RenderBlocks { } private void partialLightingColoring(final double u, final double v) { + final Tessellator tessellator = Tessellator.instance; final double rA = this.colorRedTopLeft * u + (1.0 - u) * this.colorRedTopRight; final double rB = this.colorRedBottomLeft * u + (1.0 - u) * this.colorRedBottomRight; final float r = (float) (rA * v + rB * (1.0 - v)); @@ -525,8 +492,8 @@ public class RenderBlocksWorkaround extends RenderBlocks { final int out = (high << 16) | low; - Tessellator.instance.setColorRGBA_F(r, g, b, this.getOpacity()); - Tessellator.instance.setBrightness(out); + tessellator.setColorRGBA_F(r, g, b, this.getOpacity()); + tessellator.setBrightness(out); } public boolean similarLighting(final Block blk, final IBlockAccess w, final int x, final int y, final int z, diff --git a/src/main/java/appeng/client/render/WorldRender.java b/src/main/java/appeng/client/render/WorldRender.java index 5ab99a854..ce7ab2971 100644 --- a/src/main/java/appeng/client/render/WorldRender.java +++ b/src/main/java/appeng/client/render/WorldRender.java @@ -10,9 +10,6 @@ package appeng.client.render; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; @@ -29,20 +26,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -@ThreadSafeISBRH(perThread = false) +@ThreadSafeISBRH(perThread = true) public final class WorldRender implements ISimpleBlockRenderingHandler { public static final WorldRender INSTANCE = new WorldRender(); - private final Map blockRenders = new HashMap<>(); private final int renderID = RenderingRegistry.getNextAvailableRenderId(); private final RenderBlocks renderer = new RenderBlocks(); private boolean hasError = false; - private WorldRender() {} - - void setRender(final AEBaseBlock in, final BaseBlockRender r) { - this.blockRenders.put(in, r); - } + public WorldRender() {} @Override public void renderInventoryBlock(final Block block, final int metadata, final int modelID, diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java index bb3db769f..e86ff3ad2 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java @@ -95,7 +95,7 @@ public class RenderBlockAssembler extends BaseBlockRender 0; + return BusRenderHelper.instances.get().getItemsRendered() > 0; } @Override diff --git a/src/main/java/appeng/fmp/CableBusPart.java b/src/main/java/appeng/fmp/CableBusPart.java index eaa5580b0..13901267e 100644 --- a/src/main/java/appeng/fmp/CableBusPart.java +++ b/src/main/java/appeng/fmp/CableBusPart.java @@ -42,6 +42,7 @@ import appeng.api.util.AEColor; import appeng.api.util.DimensionalCoord; import appeng.client.render.BusRenderHelper; import appeng.client.render.BusRenderer; +import appeng.client.render.RenderBlocksWorkaround; import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.features.AEFeature; @@ -163,12 +164,14 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public boolean renderStatic(final Vector3 pos, final int pass) { if (pass == 0 || (pass == 1 && AEConfig.instance.isFeatureEnabled(AEFeature.AlphaPass))) { - BusRenderHelper.INSTANCE.setPass(pass); - BusRenderer.INSTANCE.getRenderer().renderAllFaces = true; - BusRenderer.INSTANCE.getRenderer().blockAccess = this.world(); - BusRenderer.INSTANCE.getRenderer().overrideBlockTexture = null; + final BusRenderHelper helper = BusRenderHelper.instances.get(); + final RenderBlocksWorkaround rb = BusRenderer.INSTANCE.getRenderer(); + helper.setPass(pass); + rb.renderAllFaces = true; + rb.blockAccess = this.world(); + rb.overrideBlockTexture = null; this.getCableBus().renderStatic(pos.x, pos.y, pos.z); - return BusRenderHelper.INSTANCE.getItemsRendered() > 0; + return helper.getItemsRendered() > 0; } return false; } @@ -176,7 +179,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public void renderDynamic(final Vector3 pos, final float frame, final int pass) { if (pass == 0 || (pass == 1 && AEConfig.instance.isFeatureEnabled(AEFeature.AlphaPass))) { - BusRenderHelper.INSTANCE.setPass(pass); + BusRenderHelper.instances.get().setPass(pass); this.getCableBus().renderDynamic(pos.x, pos.y, pos.z); } } diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index be2fe3f5f..0d928e950 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -72,7 +72,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, protected final AENetworkProxy proxy; protected final ItemStack is; - protected ISimplifiedBundle renderCache = null; + protected ThreadLocal renderCache = new ThreadLocal<>(); protected TileEntity tile = null; protected IPartHost host = null; protected ForgeDirection side = null; @@ -505,11 +505,11 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } public ISimplifiedBundle getRenderCache() { - return this.renderCache; + return this.renderCache.get(); } public void setRenderCache(final ISimplifiedBundle renderCache) { - this.renderCache = renderCache; + this.renderCache.set(renderCache); } private static int getSideIndexFromDirection(ForgeDirection direction) { diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/PartDenseCable.java index c851e2b7f..2d1b8377e 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/PartDenseCable.java @@ -162,6 +162,7 @@ public class PartDenseCable extends PartCable { @SideOnly(Side.CLIENT) public void renderStatic(final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer) { + final Tessellator tessellator = Tessellator.instance; this.setRenderCache(rh.useSimplifiedRendering(x, y, z, this, this.getRenderCache())); rh.setTexture(this.getTexture(this.getCableColor())); @@ -215,11 +216,11 @@ public class PartDenseCable extends PartCable { renderer.uvRotateBottom = 0; renderer.uvRotateSouth = 3; renderer.uvRotateEast = 3; - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - Tessellator.instance.setColorOpaque_I(this.getCableColor().blackVariant); + tessellator.setBrightness(15 << 20 | 15 << 4); + tessellator.setColorOpaque_I(this.getCableColor().blackVariant); rh.setTexture(firstIcon, firstIcon, firstOffset, firstOffset, firstOffset, firstOffset); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - Tessellator.instance.setColorOpaque_I(this.getCableColor().whiteVariant); + tessellator.setColorOpaque_I(this.getCableColor().whiteVariant); rh.setTexture(secondIcon, secondIcon, secondOffset, secondOffset, secondOffset, secondOffset); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); } @@ -236,15 +237,15 @@ public class PartDenseCable extends PartCable { ico.setFlip(false, true); renderer.setRenderBounds(0, 3 / 16.0, 3 / 16.0, 16 / 16.0, 13 / 16.0, 13 / 16.0); rh.renderBlockCurrentBounds(x, y, z, renderer); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); + tessellator.setBrightness(15 << 20 | 15 << 4); final FlippableIcon fpA = new FlippableIcon(firstIcon); final FlippableIcon fpB = new FlippableIcon(secondIcon); fpA.setFlip(true, false); fpB.setFlip(true, false); - Tessellator.instance.setColorOpaque_I(this.getCableColor().blackVariant); + tessellator.setColorOpaque_I(this.getCableColor().blackVariant); rh.setTexture(firstOffset, firstOffset, firstOffset, firstOffset, firstIcon, fpA); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - Tessellator.instance.setColorOpaque_I(this.getCableColor().whiteVariant); + tessellator.setColorOpaque_I(this.getCableColor().whiteVariant); rh.setTexture(secondOffset, secondOffset, secondOffset, secondOffset, secondIcon, fpB); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); } @@ -257,11 +258,11 @@ public class PartDenseCable extends PartCable { renderer.uvRotateWest = 1; renderer.setRenderBounds(3 / 16.0, 3 / 16.0, 0, 13 / 16.0, 13 / 16.0, 16 / 16.0); rh.renderBlockCurrentBounds(x, y, z, renderer); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - Tessellator.instance.setColorOpaque_I(this.getCableColor().blackVariant); + tessellator.setBrightness(15 << 20 | 15 << 4); + tessellator.setColorOpaque_I(this.getCableColor().blackVariant); rh.setTexture(firstOffset, firstOffset, firstIcon, firstIcon, firstOffset, firstOffset); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - Tessellator.instance.setColorOpaque_I(this.getCableColor().whiteVariant); + tessellator.setColorOpaque_I(this.getCableColor().whiteVariant); rh.setTexture(secondOffset, secondOffset, secondIcon, secondIcon, secondOffset, secondOffset); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); } @@ -276,32 +277,13 @@ public class PartDenseCable extends PartCable { @SideOnly(Side.CLIENT) private void renderDenseConnection(final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer, final int channels, final ForgeDirection of) { + final Tessellator tessellator = Tessellator.instance; + final TileEntity te = this.getTile().getWorldObj() .getTileEntity(x + of.offsetX, y + of.offsetY, z + of.offsetZ); final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null; final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null; AEColor myColor = this.getCableColor(); - /* - * ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS && - * partHost.getPart( of.getOpposite() ) == null ) { isGlass = true; rh.setTexture( getGlassTexture( myColor = - * partHost.getColor() ) ); } else if ( partHost == null && ghh != null && ghh.getCableConnectionType( of ) != - * AECableType.GLASS ) { rh.setTexture( getSmartTexture( myColor ) ); switch (of) { case DOWN: rh.setBounds( 3, - * 0, 3, 13, 4, 13 ); break; case EAST: rh.setBounds( 12, 3, 3, 16, 13, 13 ); break; case NORTH: rh.setBounds( - * 3, 3, 0, 13, 13, 4 ); break; case SOUTH: rh.setBounds( 3, 3, 12, 13, 13, 16 ); break; case UP: rh.setBounds( - * 3, 12, 3, 13, 16, 13 ); break; case WEST: rh.setBounds( 0, 3, 3, 4, 13, 13 ); break; default: return; } - * rh.renderBlock( x, y, z, renderer ); if ( true ) { setSmartConnectionRotations( of, renderer ); IIcon - * firstIcon = new TaughtIcon( getChannelTex( channels, false ).getIcon(), -0.2f ); IIcon secondIcon = new - * TaughtIcon( getChannelTex( channels, true ).getIcon(), -0.2f ); if ( of == ForgeDirection.EAST || of == - * ForgeDirection.WEST ) { AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); FlippableIcon ico = - * blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip( false, true ); } - * Tessellator.INSTANCE.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.INSTANCE.setColorOpaque_I( - * myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon ); - * renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); Tessellator.INSTANCE.setColorOpaque_I( - * myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon - * ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); renderer.uvRotateBottom = - * renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = - * renderer.uvRotateWest = 0; } rh.setTexture( getTexture( getCableColor() ) ); } - */ rh.setFacesToRender(EnumSet.complementOf(EnumSet.of(of, of.getOpposite()))); if (ghh != null && partHost != null @@ -335,12 +317,12 @@ public class PartDenseCable extends PartCable { final IIcon firstIcon = new TaughtIcon(this.getChannelTex(channels, false).getIcon(), -0.2f); final IIcon secondIcon = new TaughtIcon(this.getChannelTex(channels, true).getIcon(), -0.2f); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - Tessellator.instance.setColorOpaque_I(myColor.blackVariant); + tessellator.setBrightness(15 << 20 | 15 << 4); + tessellator.setColorOpaque_I(myColor.blackVariant); rh.setTexture(firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - Tessellator.instance.setColorOpaque_I(myColor.whiteVariant); + tessellator.setColorOpaque_I(myColor.whiteVariant); rh.setTexture(secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer);