Fix more bugs

This commit is contained in:
Vincent Lee committed 2020-01-16 00:32:38 -06:00
1 parent a8d2139d61
commit 6676f370fd
4 files changed
+39 -32

No files matched your search

@@ -78,11 +78,11 @@ public final class RenderHelper {
.writeMaskState(colorMask)
.transparency(lightningTransparency)
.build(false);
STAR = RenderType.of(LibResources.PREFIX_MOD + "star", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, false, true, glState);
STAR = RenderType.of(LibResources.PREFIX_MOD + "star", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, false, true, glState);
glState = RenderType.State.builder().transparency(translucentTransparency).cull(disableCull).build(false);
RECTANGLE = RenderType.of(LibResources.PREFIX_MOD + "rectangle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, false, true, glState);
CIRCLE = RenderType.of(LibResources.PREFIX_MOD + "circle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, false, true, glState);
CIRCLE = RenderType.of(LibResources.PREFIX_MOD + "circle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, false, true, glState);
glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(1))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false);
LINE_1 = RenderType.of(LibResources.PREFIX_MOD + "line_1", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, glState);
@@ -180,15 +180,16 @@ public final class RenderHelper {
}
/**
* With a buffer in GL_TRIANGLES mode, emulates GL_TRIANGLE_FAN on the CPU.
* With a buffer in GL_QUADS mode, emulates GL_TRIANGLE_FAN on the CPU.
* This is because batching of GL_TRIANGLE_FAN makes no sense (the vertices would bleed into one massive fan)
* Primitive restart would also work but it's not easy to use in Minecraft
* Uses GL_QUADS instead of GL_TRIANGLE and repeats the final vertex because Minecraft BufferBuilders assume quads :(
*/
public static void triangleFan(Runnable center, List<Runnable> vertices) {
for (int i = 0; i < vertices.size() - 1; i++) {
center.run();
vertices.get(i).run();
vertices.get(i + 1).run();
vertices.get(i + 1).run();
}
}
@@ -56,8 +56,6 @@ public class ModelBrewery extends Model {
}
public void render(@Nullable TileBrewery brewery, double time, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
float f = 1F / 16F; // todo 1.15
float offset = (float) Math.sin(time / 40) * 0.1F + 0.05F;
boolean hasTile = brewery != null;
int plates = hasTile ? brewery.getSizeInventory() - 1 : 7;
@@ -15,6 +15,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.block.Blocks;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Atlases;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.Vector3f;
@@ -83,7 +84,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntityRenderer<TileCorpor
if (cubeModel != null) {
ms.push();
ms.translate(-0.5F, 0.25F, -0.5F);
IVertexBuilder buffer = buffers.getBuffer(RenderType.getTranslucent());
IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityTranslucent());
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, null, cubeModel, 1, 1, 1, light, overlay);
ms.pop();
}
@@ -104,36 +104,43 @@ public class RenderTileSpreader extends TileEntityRenderer<TileSpreader> {
if(spreader.paddingColor != null) {
BlockState carpet = ColorHelper.CARPET_MAP.get(spreader.paddingColor).getDefaultState();
IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(carpet);
buffer = buffers.getBuffer(RenderTypeLookup.getBlockLayer(carpet));
buffer = buffers.getBuffer(RenderTypeLookup.getEntityBlockLayer(carpet));
ms.translate(-0.5F, -0.5F, 0.5F);
float f = 1 / 16F;
ms.translate(0, -f - 0.001F, 0);
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.translate(0, f + 0.001F, 0);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
ms.translate(-0.001F, 0, 0);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(270));
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.translate(0, 0.001F, 0);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
ms.translate(0, 15 * f + 0.001F, -0.001F);
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.translate(0, -0.001F, 0.001F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
ms.translate(15 * f + 0.001F, f, 0.001F);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(270));
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.translate(-0.001F, 0, -0.001F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
ms.translate(-0.001F, -1 + f + 0.001F, -f + 0.001F);
// back
ms.push();
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90));
ms.translate(-0.5F, 0.5F - f, 0.5F);
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.pop();
// left
ms.push();
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(-90));
ms.translate(0.5F, 0.5F, -0.5F - f);
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.pop();
// right
ms.push();
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(90));
ms.translate(-1.5F, 0.5F , -0.5F - f);
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.pop();
// top
ms.push();
ms.translate(-0.5F, -0.5F, -0.5F - f);
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.pop();
// bottom
ms.push();
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180));
ms.translate(-0.5F, -1.5F - f, -0.5F + f);
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.pop();
}
ms.pop();