Skip to content

Commit a9e077f

Browse files
committed
Unified tess get
1 parent 8313627 commit a9e077f

12 files changed

+32
-20
lines changed

src/main/java/com/carpentersblocks/renderer/BlockHandlerBase.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
import com.carpentersblocks.block.BlockCoverable;
44
import com.carpentersblocks.data.Slope;
5-
import com.carpentersblocks.renderer.helper.LightingHelper;
6-
import com.carpentersblocks.renderer.helper.RenderHelper;
7-
import com.carpentersblocks.renderer.helper.RoutableFluidsHelper;
8-
import com.carpentersblocks.renderer.helper.VertexHelper;
5+
import com.carpentersblocks.renderer.helper.*;
96
import com.carpentersblocks.tileentity.TEBase;
107
import com.carpentersblocks.util.BlockProperties;
118
import com.carpentersblocks.util.handler.DesignHandler;
@@ -72,7 +69,7 @@ public abstract class BlockHandlerBase implements ISimpleBlockRenderingHandler,
7269

7370
@Override
7471
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderBlocks) {
75-
Tessellator tessellator = Tessellator.instance;
72+
Tessellator tessellator = TessProvider.getTess();
7673
GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
7774
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
7875
tessellator.startDrawingQuads();

src/main/java/com/carpentersblocks/renderer/BlockHandlerCarpentersFlowerPot.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.carpentersblocks.renderer;
22

33
import com.carpentersblocks.block.BlockCoverable;
4+
import com.carpentersblocks.renderer.helper.TessProvider;
45
import com.carpentersblocks.util.BlockProperties;
56
import com.carpentersblocks.util.flowerpot.FlowerPotHandler;
67
import com.carpentersblocks.util.flowerpot.FlowerPotProperties;
@@ -148,7 +149,7 @@ public boolean renderPlant(ItemStack itemStack, int x, int y, int z) {
148149
itemStack.setItemDamage(7);
149150
}
150151

151-
Tessellator tessellator = Tessellator.instance;
152+
Tessellator tessellator = TessProvider.getTess();
152153
tessellator.addTranslation(0.0F, 0.25F, 0.0F);
153154

154155
renderHelper.setPlantColor(this, itemStack, x, y, z);

src/main/java/com/carpentersblocks/renderer/BlockHandlerCarpentersLever.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.carpentersblocks.renderer;
22

3+
import com.carpentersblocks.renderer.helper.TessProvider;
34
import net.minecraft.block.Block;
45
import net.minecraft.client.renderer.Tessellator;
56
import net.minecraft.init.Blocks;
@@ -80,7 +81,7 @@ private void renderLever(ItemStack itemStack, int x, int y, int z) {
8081
* Renders the lever handle.
8182
*/
8283
private void renderLeverHandle(int x, int y, int z) {
83-
Tessellator tessellator = Tessellator.instance;
84+
Tessellator tessellator = TessProvider.getTess();
8485
tessellator.setBrightness(Blocks.dirt.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y, z));
8586
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
8687

src/main/java/com/carpentersblocks/renderer/BlockHandlerCarpentersPressurePlate.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.carpentersblocks.renderer;
22

3+
import com.carpentersblocks.renderer.helper.TessProvider;
34
import net.minecraft.block.Block;
45
import net.minecraft.client.renderer.RenderBlocks;
56
import net.minecraft.client.renderer.Tessellator;
@@ -22,8 +23,8 @@ public ThreadSafeISBRHFactory newInstance() {
2223
@Override
2324
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderBlocks) {
2425
renderBlocks.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F);
25-
Tessellator.instance.addTranslation(0.0F, 0.4365F, 0.0F);
26+
TessProvider.getTess().addTranslation(0.0F, 0.4365F, 0.0F);
2627
super.renderInventoryBlock(block, metadata, modelID, renderBlocks);
27-
Tessellator.instance.addTranslation(0.0F, -0.4365F, 0.0F);
28+
TessProvider.getTess().addTranslation(0.0F, -0.4365F, 0.0F);
2829
}
2930
}

src/main/java/com/carpentersblocks/renderer/BlockHandlerCarpentersSlope.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.util.ArrayList;
1313
import java.util.List;
1414

15+
import com.carpentersblocks.renderer.helper.TessProvider;
1516
import net.minecraft.block.Block;
1617
import net.minecraft.block.BlockDirectional;
1718
import net.minecraft.block.material.Material;
@@ -121,7 +122,7 @@ public ThreadSafeISBRHFactory newInstance() {
121122

122123
@Override
123124
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderBlocks) {
124-
Tessellator tessellator = Tessellator.instance;
125+
Tessellator tessellator = TessProvider.getTess();
125126
GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
126127
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
127128

src/main/java/com/carpentersblocks/renderer/BlockHandlerCarpentersTorch.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.carpentersblocks.renderer;
22

3+
import com.carpentersblocks.renderer.helper.TessProvider;
34
import net.minecraft.block.Block;
45
import net.minecraft.client.renderer.Tessellator;
56
import net.minecraft.init.Blocks;
@@ -78,7 +79,7 @@ private void renderTypeVanilla(ItemStack itemStack, int x, int y, int z) {
7879

7980
/* Render torch head. */
8081

81-
Tessellator tessellator = Tessellator.instance;
82+
Tessellator tessellator = TessProvider.getTess();
8283
tessellator.setBrightness(
8384
srcBlock.getMixedBrightnessForBlock(renderBlocks.blockAccess, TE.xCoord, TE.yCoord, TE.zCoord));
8485
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);

src/main/java/com/carpentersblocks/renderer/entity/RenderCarpentersTile.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.carpentersblocks.renderer.entity;
22

3+
import com.carpentersblocks.renderer.helper.TessProvider;
34
import net.minecraft.client.renderer.RenderBlocks;
45
import net.minecraft.client.renderer.Tessellator;
56
import net.minecraft.client.renderer.entity.Render;
@@ -37,7 +38,7 @@ public void doRender(Entity entity, double x, double y, double z, float par8, fl
3738
private void render(EntityCarpentersTile entity, int x, int y, int z)
3839
{
3940
RenderBlocks renderBlocks = RenderBlocks.getInstance();
40-
Tessellator tessellator = Tessellator.instance;
41+
Tessellator tessellator = TessProvider.getTess();
4142
tessellator.startDrawingQuads();
4243

4344
double bounds[] = entity.getBounds();

src/main/java/com/carpentersblocks/renderer/helper/LightingHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public static float[] getRGB(int hexColor)
167167
*/
168168
public void setupColor(int x, int y, int z, int side, int hexColor, IIcon icon)
169169
{
170-
Tessellator tessellator = Tessellator.instance;
170+
Tessellator tessellator = TessProvider.getTess();
171171
float lightness = hasLightnessOverride ? lightnessOverride : LIGHTNESS[side];
172172

173173
if (ShadersHandler.enableShadersModCoreIntegration && !ShadersHandler.oldLighting) {

src/main/java/com/carpentersblocks/renderer/helper/RenderHelper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,7 +1827,7 @@ public void collapsibleRenderFaceXPos(RenderBlocks renderBlocks, double x, doubl
18271827
*/
18281828
public void setPlantColor(BlockHandlerBase blockHandler, ItemStack itemStack, int x, int y, int z) {
18291829
Block block = FlowerPotProperties.toBlock(itemStack);
1830-
Tessellator tessellator = Tessellator.instance;
1830+
Tessellator tessellator = TessProvider.getTess();
18311831

18321832
float[] rgb = LightingHelper
18331833
.getRGB(blockHandler.getBlockColor(block, itemStack.getItemDamage(), x, y, z, 1, null));
@@ -1849,7 +1849,7 @@ public boolean renderBlockDoublePlant(TEBase TE, RenderBlocks renderBlocks, Item
18491849
int z, boolean thin) {
18501850
BlockDoublePlant block = (BlockDoublePlant) FlowerPotProperties.toBlock(itemStack);
18511851

1852-
Tessellator tessellator = Tessellator.instance;
1852+
Tessellator tessellator = TessProvider.getTess();
18531853
tessellator.setBrightness(block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y, z));
18541854

18551855
boolean thinPlant = itemStack.getUnlocalizedName().equals("tile.doublePlant.grass");
@@ -1928,7 +1928,7 @@ public boolean renderBlockDoublePlant(TEBase TE, RenderBlocks renderBlocks, Item
19281928
*/
19291929
public boolean renderPlantCrossedSquares(RenderBlocks renderBlocks, Block block, IIcon icon, int x, int y, int z,
19301930
float scale, boolean flip_vertical) {
1931-
Tessellator tessellator = Tessellator.instance;
1931+
Tessellator tessellator = TessProvider.getTess();
19321932
tessellator.setBrightness(block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y, z));
19331933

19341934
double uMin = icon.getMinU();
@@ -1972,7 +1972,7 @@ public boolean renderPlantCrossedSquares(RenderBlocks renderBlocks, Block block,
19721972
*/
19731973
public void renderPlantThinCrossedSquares(RenderBlocks renderBlocks, Block block, IIcon icon, int x, int y, int z,
19741974
boolean flip_vertical) {
1975-
Tessellator tessellator = Tessellator.instance;
1975+
Tessellator tessellator = TessProvider.getTess();
19761976
tessellator.setBrightness(block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y, z));
19771977

19781978
double uMin = icon.getInterpolatedU(0.0D);

src/main/java/com/carpentersblocks/renderer/helper/RoutableFluidsHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public static ItemStack getFluidBlock(IBlockAccess blockAccess, int x, int y, in
185185
*/
186186
public static void renderLiquidSurface(TEBase TE, RenderBlocks renderBlocks, ItemStack itemStack, int x, int y, int z)
187187
{
188-
Tessellator tessellator = Tessellator.instance;
188+
Tessellator tessellator = TessProvider.getTess();
189189
Block block = BlockProperties.toBlock(itemStack);
190190
Material material = block.getMaterial();
191191
double offset = 0.0010000000474974513D;

0 commit comments

Comments
 (0)