mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-20 12:29:40 +00:00
Various Mixin-related Fixes (#890)
* Update deps * Remove dead code * Add missing `@Override` annotations * Fix generics * Add `serialVersionUID`s * Address deprecation warnings * Use `@WrapWithCondition` v2 * Misc cleanup * Use AccessTransformers if possible * Fix mixin conflicts * Add `@Mutable` annotations * Fix injection targets * Update deps
This commit is contained in:
1 parent
611bbf02c8
commit
bb5526598e
158 files changed
+252
-619
No files matched your search
@@ -23,7 +23,6 @@ import net.coderbot.iris.samplers.IrisImages;
|
||||
import net.coderbot.iris.samplers.IrisSamplers;
|
||||
import net.coderbot.iris.shaderpack.ComputeSource;
|
||||
import net.coderbot.iris.shaderpack.PackDirectives;
|
||||
import net.coderbot.iris.shaderpack.PackRenderTargetDirectives;
|
||||
import net.coderbot.iris.shaderpack.ProgramDirectives;
|
||||
import net.coderbot.iris.shaderpack.ProgramSource;
|
||||
import net.coderbot.iris.shadows.ShadowRenderTargets;
|
||||
@@ -64,9 +63,6 @@ public class CompositeRenderer {
|
||||
this.renderTargets = renderTargets;
|
||||
this.customTextureIds = customTextureIds;
|
||||
|
||||
final PackRenderTargetDirectives renderTargetDirectives = packDirectives.getRenderTargetDirectives();
|
||||
final Map<Integer, PackRenderTargetDirectives.RenderTargetSettings> renderTargetSettings = renderTargetDirectives.getRenderTargetSettings();
|
||||
|
||||
final ImmutableList.Builder<Pass> passes = ImmutableList.builder();
|
||||
final ImmutableSet.Builder<Integer> flippedAtLeastOnce = new ImmutableSet.Builder<>();
|
||||
|
||||
@@ -136,7 +132,6 @@ public class CompositeRenderer {
|
||||
pass.framebuffer = framebuffer;
|
||||
pass.viewportScale = directives.getViewportScale();
|
||||
pass.mipmappedBuffers = directives.getMipmappedBuffers();
|
||||
pass.flippedAtLeastOnce = flippedAtLeastOnceSnapshot;
|
||||
|
||||
passes.add(pass);
|
||||
}
|
||||
@@ -175,7 +170,6 @@ public class CompositeRenderer {
|
||||
Program program;
|
||||
ComputeProgram[] computes;
|
||||
GlFramebuffer framebuffer;
|
||||
ImmutableSet<Integer> flippedAtLeastOnce;
|
||||
ImmutableSet<Integer> stageReadsFromAlt;
|
||||
ImmutableSet<Integer> mipmappedBuffers;
|
||||
float viewportScale;
|
||||
|
||||
@@ -22,7 +22,6 @@ import net.coderbot.iris.rendertarget.RenderTargets;
|
||||
import net.coderbot.iris.samplers.IrisImages;
|
||||
import net.coderbot.iris.samplers.IrisSamplers;
|
||||
import net.coderbot.iris.shaderpack.ComputeSource;
|
||||
import net.coderbot.iris.shaderpack.PackRenderTargetDirectives;
|
||||
import net.coderbot.iris.shaderpack.ProgramDirectives;
|
||||
import net.coderbot.iris.shaderpack.ProgramSet;
|
||||
import net.coderbot.iris.shaderpack.ProgramSource;
|
||||
@@ -69,9 +68,6 @@ public class FinalPassRenderer {
|
||||
this.centerDepthSampler = centerDepthSampler;
|
||||
this.customTextureIds = customTextureIds;
|
||||
|
||||
final PackRenderTargetDirectives renderTargetDirectives = pack.getPackDirectives().getRenderTargetDirectives();
|
||||
final Map<Integer, PackRenderTargetDirectives.RenderTargetSettings> renderTargetSettings = renderTargetDirectives.getRenderTargetSettings();
|
||||
|
||||
this.noiseTexture = noiseTexture;
|
||||
this.renderTargets = renderTargets;
|
||||
this.finalPass = pack.getCompositeFinal().map(source -> {
|
||||
|
||||
@@ -30,7 +30,6 @@ public class FullScreenQuadRenderer {
|
||||
end();
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public void begin() {
|
||||
GLStateManager.disableDepthTest();
|
||||
|
||||
@@ -55,7 +54,6 @@ public class FullScreenQuadRenderer {
|
||||
GLStateManager.glDrawArrays(GL11.GL_TRIANGLE_STRIP, 0, 4);
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public static void end() {
|
||||
DefaultVertexFormat.POSITION_TEXTURE.clearBufferState();
|
||||
GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
|
||||
|
||||
Reference in new issue
Block a user