diff --git a/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java b/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java index ca5dabd..41c05de 100644 --- a/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java +++ b/Common/src/main/java/tschipp/carryon/client/render/CarryOnRenderType.java @@ -1,108 +1,108 @@ -package tschipp.carryon.client.render; +// package tschipp.carryon.client.render; -import com.mojang.blaze3d.pipeline.BlendFunction; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.platform.DepthTestFunction; -import com.mojang.blaze3d.vertex.MeshData; -import com.mojang.blaze3d.vertex.VertexFormat; -import net.minecraft.client.renderer.RenderType; -import org.jetbrains.annotations.NotNull; +// import com.mojang.blaze3d.pipeline.BlendFunction; +// import com.mojang.blaze3d.pipeline.RenderPipeline; +// import com.mojang.blaze3d.platform.DepthTestFunction; +// import com.mojang.blaze3d.vertex.MeshData; +// import com.mojang.blaze3d.vertex.VertexFormat; +// import net.minecraft.client.renderer.RenderType; +// import org.jetbrains.annotations.NotNull; -import java.util.IdentityHashMap; -import java.util.Map; +// import java.util.IdentityHashMap; +// import java.util.Map; -//Credit: klikli for the idea and code for this wrapper -public class CarryOnRenderType extends RenderType { +// //Credit: klikli for the idea and code for this wrapper +// public class CarryOnRenderType extends RenderType { - private static final Map remappedTypes = new IdentityHashMap<>(); - private final RenderPipeline pipeline; - private final RenderType original; +// private static final Map remappedTypes = new IdentityHashMap<>(); +// private final RenderPipeline pipeline; +// private final RenderType original; - private CarryOnRenderType(RenderType original, RenderPipeline pipeline) { - super(String.format("%s_carryon", original.toString()), original.bufferSize(), original.affectsCrumbling(), true, original::setupRenderState, original::clearRenderState); - this.pipeline = pipeline; - this.original = original; - } +// private CarryOnRenderType(RenderType original, RenderPipeline pipeline) { +// super(String.format("%s_carryon", original.toString()), original.bufferSize(), original.affectsCrumbling(), true, original::setupRenderState, original::clearRenderState); +// this.pipeline = pipeline; +// this.original = original; +// } - public static RenderType remap(RenderType in) { - return remappedTypes.computeIfAbsent(in, (type) -> { +// public static RenderType remap(RenderType in) { +// return remappedTypes.computeIfAbsent(in, (type) -> { - //modify the pipeline - var pipeline = toBuilder(in.pipeline()) - .withBlend(BlendFunction.TRANSLUCENT) - .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST) - .withCull(false); +// //modify the pipeline +// var pipeline = toBuilder(in.pipeline()) +// .withBlend(BlendFunction.TRANSLUCENT) +// .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST) +// .withCull(false); - return new CarryOnRenderType(type, pipeline.build()); - }); - } +// return new CarryOnRenderType(type, pipeline.build()); +// }); +// } - private static RenderPipeline.Builder toBuilder(RenderPipeline pipeline) { - RenderPipeline.Builder builder = RenderPipeline.builder(); - builder.withLocation(pipeline.getLocation()); - builder.withFragmentShader(pipeline.getFragmentShader()); - builder.withVertexShader(pipeline.getVertexShader()); +// private static RenderPipeline.Builder toBuilder(RenderPipeline pipeline) { +// RenderPipeline.Builder builder = RenderPipeline.builder(); +// builder.withLocation(pipeline.getLocation()); +// builder.withFragmentShader(pipeline.getFragmentShader()); +// builder.withVertexShader(pipeline.getVertexShader()); - if (!pipeline.getShaderDefines().isEmpty()) { - for (Map.Entry entry : pipeline.getShaderDefines().values().entrySet()) { - try { - int parsed = Integer.parseInt(entry.getValue()); - builder.withShaderDefine(entry.getKey(), parsed); - } catch (NumberFormatException e) { - float parsed = Float.parseFloat(entry.getValue()); - builder.withShaderDefine(entry.getKey(), parsed); - } - } - for (String flag : pipeline.getShaderDefines().flags()) { - builder.withShaderDefine(flag); - } - } +// if (!pipeline.getShaderDefines().isEmpty()) { +// for (Map.Entry entry : pipeline.getShaderDefines().values().entrySet()) { +// try { +// int parsed = Integer.parseInt(entry.getValue()); +// builder.withShaderDefine(entry.getKey(), parsed); +// } catch (NumberFormatException e) { +// float parsed = Float.parseFloat(entry.getValue()); +// builder.withShaderDefine(entry.getKey(), parsed); +// } +// } +// for (String flag : pipeline.getShaderDefines().flags()) { +// builder.withShaderDefine(flag); +// } +// } - if (!pipeline.getSamplers().isEmpty()) { - pipeline.getSamplers().forEach(builder::withSampler); - } +// if (!pipeline.getSamplers().isEmpty()) { +// pipeline.getSamplers().forEach(builder::withSampler); +// } - if (!pipeline.getUniforms().isEmpty()) { - pipeline.getUniforms().forEach(u -> builder.withUniform(u.name(), u.type())); - } +// if (!pipeline.getUniforms().isEmpty()) { +// pipeline.getUniforms().forEach(u -> builder.withUniform(u.name(), u.type())); +// } - builder.withDepthTestFunction(pipeline.getDepthTestFunction()); - builder.withPolygonMode(pipeline.getPolygonMode()); - builder.withCull(pipeline.isCull()); - builder.withColorWrite(pipeline.isWriteColor(), pipeline.isWriteAlpha()); - builder.withDepthWrite(pipeline.isWriteDepth()); - builder.withColorLogic(pipeline.getColorLogic()); +// builder.withDepthTestFunction(pipeline.getDepthTestFunction()); +// builder.withPolygonMode(pipeline.getPolygonMode()); +// builder.withCull(pipeline.isCull()); +// builder.withColorWrite(pipeline.isWriteColor(), pipeline.isWriteAlpha()); +// builder.withDepthWrite(pipeline.isWriteDepth()); +// builder.withColorLogic(pipeline.getColorLogic()); - if (pipeline.getBlendFunction().isPresent()) - builder.withBlend(pipeline.getBlendFunction().get()); - else - builder.withoutBlend(); - builder.withVertexFormat(pipeline.getVertexFormat(), pipeline.getVertexFormatMode()); - builder.withDepthBias(pipeline.getDepthBiasScaleFactor(), pipeline.getDepthBiasConstant()); +// if (pipeline.getBlendFunction().isPresent()) +// builder.withBlend(pipeline.getBlendFunction().get()); +// else +// builder.withoutBlend(); +// builder.withVertexFormat(pipeline.getVertexFormat(), pipeline.getVertexFormatMode()); +// builder.withDepthBias(pipeline.getDepthBiasScaleFactor(), pipeline.getDepthBiasConstant()); - return builder; - } +// return builder; +// } - @Override - public void draw(@NotNull MeshData meshData) { - this.original.draw(meshData); - } +// @Override +// public void draw(@NotNull MeshData meshData) { +// this.original.draw(meshData); +// } - @Override - public @NotNull VertexFormat format() { - return this.original.format(); - } +// @Override +// public @NotNull VertexFormat format() { +// return this.original.format(); +// } - @Override - public VertexFormat.@NotNull Mode mode() { - return this.original.mode(); - } +// @Override +// public VertexFormat.@NotNull Mode mode() { +// return this.original.mode(); +// } - @Override - public RenderPipeline pipeline() { - return this.pipeline; //get our own modified pipeline - } -} +// @Override +// public RenderPipeline pipeline() { +// return this.pipeline; //get our own modified pipeline +// } +// }