diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/Camera.java b/src/main/java/com/gtnewhorizons/angelica/compat/Camera.java similarity index 93% rename from src/main/java/com/gtnewhorizons/angelica/compat/mojang/Camera.java rename to src/main/java/com/gtnewhorizons/angelica/compat/Camera.java index 49fb42d7d..88969231f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/Camera.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/Camera.java @@ -1,5 +1,6 @@ -package com.gtnewhorizons.angelica.compat.mojang; +package com.gtnewhorizons.angelica.compat; +import com.gtnewhorizons.angelica.compat.mojang.BlockPos; import lombok.Getter; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkPos.java b/src/main/java/com/gtnewhorizons/angelica/compat/ChunkPos.java similarity index 58% rename from src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkPos.java rename to src/main/java/com/gtnewhorizons/angelica/compat/ChunkPos.java index 1ea2651c1..afa801ae5 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkPos.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/ChunkPos.java @@ -1,6 +1,8 @@ -package com.gtnewhorizons.angelica.compat.mojang; +package com.gtnewhorizons.angelica.compat; -// ChunkCoordIntPair +import com.gtnewhorizons.angelica.compat.mojang.BlockPos; + +// See if we can merge/mixin/extend ChunkCoordIntPair? public class ChunkPos { public static long INT_MASK = (1L << Integer.SIZE) - 1; @@ -37,4 +39,21 @@ public long toLong() { public static long toLong(int x, int z) { return (long)x & 4294967295L | ((long)z & 4294967295L) << 32; } + + public int hashCode() + { + int i = 1664525 * this.x + 1013904223; + int j = 1664525 * (this.z ^ -559038737) + 1013904223; + return i ^ j; + } + + public boolean equals(Object object) { + if (this == object) { + return true; + } + if (object instanceof ChunkPos lv) { + return this.x == lv.x && this.z == lv.z; + } + return false; + } } diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkSectionPos.java b/src/main/java/com/gtnewhorizons/angelica/compat/ChunkSectionPos.java similarity index 92% rename from src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkSectionPos.java rename to src/main/java/com/gtnewhorizons/angelica/compat/ChunkSectionPos.java index 0feb82473..c20a2927a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkSectionPos.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/ChunkSectionPos.java @@ -1,8 +1,9 @@ -package com.gtnewhorizons.angelica.compat.mojang; +package com.gtnewhorizons.angelica.compat; +import com.gtnewhorizons.angelica.compat.mojang.BlockPos; import org.joml.Vector3i; -// ChunkPosition maybe? +// See if we can merge/mixin/extend ChunkPosition maybe? public class ChunkSectionPos extends Vector3i { public static int getSectionCoord(int coord) { diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/CompatMathHelper.java b/src/main/java/com/gtnewhorizons/angelica/compat/CompatMathHelper.java similarity index 92% rename from src/main/java/com/gtnewhorizons/angelica/compat/mojang/CompatMathHelper.java rename to src/main/java/com/gtnewhorizons/angelica/compat/CompatMathHelper.java index 1808502a3..a20ed75e3 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/CompatMathHelper.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/CompatMathHelper.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.compat.mojang; +package com.gtnewhorizons.angelica.compat; public class CompatMathHelper { public static int smallestEncompassingPowerOfTwo(int value) { diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/Constants.java b/src/main/java/com/gtnewhorizons/angelica/compat/Constants.java similarity index 67% rename from src/main/java/com/gtnewhorizons/angelica/compat/mojang/Constants.java rename to src/main/java/com/gtnewhorizons/angelica/compat/Constants.java index 2f1bd5ec6..04aa000ee 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/Constants.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/Constants.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.compat.mojang; +package com.gtnewhorizons.angelica.compat; public class Constants { diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/NativeImage.java b/src/main/java/com/gtnewhorizons/angelica/compat/NativeImage.java similarity index 96% rename from src/main/java/com/gtnewhorizons/angelica/compat/mojang/NativeImage.java rename to src/main/java/com/gtnewhorizons/angelica/compat/NativeImage.java index 237d84993..3e4413216 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/NativeImage.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/NativeImage.java @@ -1,5 +1,6 @@ -package com.gtnewhorizons.angelica.compat.mojang; +package com.gtnewhorizons.angelica.compat; +import com.gtnewhorizons.angelica.compat.mojang.ByteBufferBackedInputStream; import lombok.Getter; import net.coderbot.iris.Iris; import org.lwjgl.BufferUtils; @@ -14,6 +15,7 @@ import java.nio.ByteBuffer; import java.nio.IntBuffer; +// TBD public class NativeImage extends BufferedImage { @Getter private final Format format; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/AutoClosableAbstractTexture.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/AutoClosableAbstractTexture.java index 90f543a1a..dd3c9679e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/AutoClosableAbstractTexture.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/AutoClosableAbstractTexture.java @@ -7,6 +7,7 @@ import java.io.IOException; +@Deprecated public abstract class AutoClosableAbstractTexture extends AbstractTexture implements AutoCloseable { public abstract void load(IResourceManager manager) throws IOException; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/Axis.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/Axis.java index 1074e0a88..9d1dca10d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/Axis.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/Axis.java @@ -2,6 +2,7 @@ import net.minecraftforge.common.util.ForgeDirection; +@Deprecated public enum Axis { X, Y, diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BakedModel.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BakedModel.java index 1565feb3c..be0ef0d5f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BakedModel.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BakedModel.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Random; +@Deprecated public interface BakedModel extends IForgeBakedModel { List getQuads(BlockState state, ForgeDirection face, Random random); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BakedQuad.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BakedQuad.java index 3eee1d139..87966cd1c 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BakedQuad.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BakedQuad.java @@ -3,6 +3,7 @@ import com.gtnewhorizons.angelica.compat.forge.VertexLighterFlat; import net.minecraftforge.common.util.ForgeDirection; +@Deprecated public class BakedQuad { public void pipe(VertexLighterFlat lighter) {} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockBreakingInfo.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockBreakingInfo.java index a0f96c7d4..5c007e8c7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockBreakingInfo.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockBreakingInfo.java @@ -2,6 +2,7 @@ import org.jetbrains.annotations.NotNull; +@Deprecated public class BlockBreakingInfo implements Comparable { @Override diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockModels.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockModels.java index be8f69f79..4a432e064 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockModels.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockModels.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.compat.mojang; +@Deprecated public class BlockModels { public BakedModel getModel(BlockState blockState) { return null; } diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockPos.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockPos.java index 83586a52d..0536347e6 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockPos.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockPos.java @@ -9,6 +9,7 @@ import static com.google.common.math.IntMath.log2; +// Should we keep this? public class BlockPos extends Vector3i { private static final int SIZE_BITS_X = 1 + log2(MathHelper.roundUpToPowerOfTwo(30000000), RoundingMode.UNNECESSARY); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockRenderType.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockRenderType.java index aced71efd..186821165 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockRenderType.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockRenderType.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.compat.mojang; +@Deprecated public enum BlockRenderType { INVISIBLE, ENTITYBLOCK_ANIMATED, diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockRenderView.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockRenderView.java index 7a7f32840..deb8e93f1 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockRenderView.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockRenderView.java @@ -4,6 +4,7 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraftforge.common.util.ForgeDirection; +@Deprecated public interface BlockRenderView extends BlockView { float getBrightness(ForgeDirection face, boolean shade); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockState.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockState.java index 46238b871..874b26571 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockState.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockState.java @@ -3,13 +3,11 @@ import com.gtnewhorizons.angelica.compat.forge.IForgeBlockState; import me.jellysquid.mods.sodium.common.util.WorldUtil; import net.minecraft.block.Block; -import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.BlockFluidBase; -import net.minecraftforge.fluids.FluidRegistry; import org.joml.Vector3d; +@Deprecated public class BlockState implements IForgeBlockState { private final static Vector3d ZERO = new Vector3d(0, 0, 0); private final Block block; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockView.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockView.java index 363712fbe..09109d8cd 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockView.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BlockView.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.compat.mojang; +@Deprecated public interface BlockView { BlockState getBlockState(BlockPos adjPos); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferBuilder.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferBuilder.java index cbf8fe9d4..3675b8058 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferBuilder.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferBuilder.java @@ -9,6 +9,7 @@ import java.util.List; // This is the Tessellator - TODO: Merge/Overwrite +@Deprecated public class BufferBuilder implements VertexConsumer, BufferBuilderExt { private ByteBuffer buffer; private List vertexCounts; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferBuilderStorage.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferBuilderStorage.java index 22c02ebbc..056cbae17 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferBuilderStorage.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferBuilderStorage.java @@ -2,6 +2,7 @@ import java.util.SortedMap; +@Deprecated public class BufferBuilderStorage { private final SortedMap entityBuilders = null; private final VertexConsumerProvider.Immediate entityVertexConsumers; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferSource.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferSource.java index 9322f68f2..eed8ab20d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferSource.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/BufferSource.java @@ -2,6 +2,7 @@ import java.util.Map; +@Deprecated public class BufferSource implements MultiBufferSource { public BufferSource(BufferBuilder bufferBuilder, Map kvMap) {} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ByteBufferBackedInputStream.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ByteBufferBackedInputStream.java index 11269c996..8ac3f6b80 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ByteBufferBackedInputStream.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ByteBufferBackedInputStream.java @@ -4,6 +4,7 @@ import java.io.InputStream; import java.nio.ByteBuffer; +@Deprecated public class ByteBufferBackedInputStream extends InputStream { ByteBuffer buf; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkCuller.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkCuller.java deleted file mode 100644 index 0a1e84b6d..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkCuller.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.gtnewhorizons.angelica.compat.mojang; - -public interface ChunkCuller { - -} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkOcclusionData.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkOcclusionData.java index 34478aa08..e0d5b0c65 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkOcclusionData.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkOcclusionData.java @@ -3,9 +3,9 @@ import net.minecraftforge.common.util.ForgeDirection; import java.util.BitSet; -import java.util.EnumSet; import java.util.Set; +@Deprecated public class ChunkOcclusionData { private static final int DIRECTION_COUNT = ForgeDirection.values().length; private final BitSet visibility; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkOcclusionDataBuilder.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkOcclusionDataBuilder.java index f338b42cf..05a04b19e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkOcclusionDataBuilder.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ChunkOcclusionDataBuilder.java @@ -3,7 +3,6 @@ import it.unimi.dsi.fastutil.ints.IntArrayFIFOQueue; import it.unimi.dsi.fastutil.ints.IntPriorityQueue; import me.jellysquid.mods.sodium.common.util.DirectionUtil; -import net.minecraft.util.Util; import net.minecraftforge.common.util.ForgeDirection; import java.util.BitSet; @@ -13,6 +12,8 @@ /** * WARNING: Minecraft 1.16 code rip!! */ + +@Deprecated public class ChunkOcclusionDataBuilder { private static final int STEP_X = (int)Math.pow(16.0, 0.0); private static final int STEP_Z = (int)Math.pow(16.0, 1.0); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ColorResolver.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ColorResolver.java deleted file mode 100644 index a0a2cba28..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ColorResolver.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.gtnewhorizons.angelica.compat.mojang; - -import net.minecraft.world.biome.BiomeGenBase; - -public interface ColorResolver { - - int getColor(BiomeGenBase biome, int x, int z); -} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/DefaultVertexFormat.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/DefaultVertexFormat.java index c6e126c4c..8faa3da21 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/DefaultVertexFormat.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/DefaultVertexFormat.java @@ -4,6 +4,7 @@ import com.gtnewhorizons.angelica.compat.mojang.VertexFormatElement.Type; import com.gtnewhorizons.angelica.compat.mojang.VertexFormatElement.Usage; +@Deprecated public class DefaultVertexFormat { public static final VertexFormatElement POSITION_ELEMENT = new VertexFormatElement(0, Type.FLOAT, Usage.POSITION, 3); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/DrawState.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/DrawState.java index 0be23ade7..0aa8acbb9 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/DrawState.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/DrawState.java @@ -2,6 +2,7 @@ import lombok.Getter; +@Deprecated public class DrawState { @Getter private final VertexFormat format; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/FluidState.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/FluidState.java index 2de6149ab..45d0e047f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/FluidState.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/FluidState.java @@ -4,6 +4,7 @@ import net.minecraftforge.fluids.Fluid; import org.joml.Vector3d; +@Deprecated public class FluidState { private final Fluid fluid; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/GLHelper.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/GLHelper.java deleted file mode 100644 index 9a90b5c60..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/GLHelper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gtnewhorizons.angelica.compat.mojang; - -import net.minecraft.client.renderer.OpenGlHelper; - -public class GLHelper { - - public static void glDeleteFramebuffers(int framebuffer) { - OpenGlHelper.func_153174_h(framebuffer); - } - - public static int glCheckFramebufferStatus(int target) { - return OpenGlHelper.func_153167_i(target); - } - - public static int glGenFramebuffers() { - return OpenGlHelper.func_153165_e/*glGenFramebuffers*/(); - } -} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/GameRenderer.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/GameRenderer.java index 26523a9fa..098de5c2f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/GameRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/GameRenderer.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.compat.mojang; +@Deprecated public class GameRenderer { public void invokeBobHurt(MatrixStack poseStack, float tickDelta) {} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/IdList.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/IdList.java index 1e9b81115..57738b125 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/IdList.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/IdList.java @@ -9,6 +9,7 @@ import java.util.Iterator; import java.util.List; +@Deprecated public class IdList implements IndexedIterable { protected int nextId; protected final IdentityHashMap idMap; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/IndexedIterable.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/IndexedIterable.java index 75ea6d14a..1fecd5226 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/IndexedIterable.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/IndexedIterable.java @@ -2,6 +2,7 @@ import javax.annotation.Nullable; +@Deprecated public interface IndexedIterable extends Iterable { int getRawId(T entry); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/InteractionHand.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/InteractionHand.java index 75af559a5..1361415b7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/InteractionHand.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/InteractionHand.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.compat.mojang; +@Deprecated public enum InteractionHand { MAIN_HAND, OFF_HAND; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ItemColorProvider.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ItemColorProvider.java deleted file mode 100644 index 1779aca63..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ItemColorProvider.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.gtnewhorizons.angelica.compat.mojang; - -import net.minecraft.item.ItemStack; - -public interface ItemColorProvider { - int getColor(ItemStack stack, int tintIndex); -} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/LevelRenderer.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/LevelRenderer.java deleted file mode 100644 index af3781168..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/LevelRenderer.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.gtnewhorizons.angelica.compat.mojang; - -public class LevelRenderer { - - public void invokeRenderChunkLayer(RenderLayer solid, MatrixStack modelView, double cameraX, double cameraY, double cameraZ) {} -} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/LightingProvider.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/LightingProvider.java deleted file mode 100644 index 41ce17115..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/LightingProvider.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.gtnewhorizons.angelica.compat.mojang; - -// LightingEngine from archaicfix/phosphor? -public class LightingProvider implements LightingView { - - @Override - public void setSectionStatus(ChunkSectionPos pos, boolean notReady) { - - } -} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/LightingView.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/LightingView.java deleted file mode 100644 index 4e4778cfb..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/LightingView.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.gtnewhorizons.angelica.compat.mojang; - -public interface LightingView { - default void setSectionStatus(BlockPos pos, boolean notReady) { - this.setSectionStatus(ChunkSectionPos.from(pos), notReady); - } - - void setSectionStatus(ChunkSectionPos pos, boolean notReady); -} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/MatrixStack.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/MatrixStack.java index fa695b453..0a52a40e4 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/MatrixStack.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/MatrixStack.java @@ -6,6 +6,7 @@ import java.util.Deque; +@Deprecated public class MatrixStack { private final Deque matrixStack; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ModelLoader.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ModelLoader.java deleted file mode 100644 index 5a8fbcae1..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/ModelLoader.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.gtnewhorizons.angelica.compat.mojang; - -import java.util.Collections; -import java.util.List; - -public class ModelLoader { - public static final List BLOCK_DESTRUCTION_RENDER_LAYERS = Collections.emptyList(); - -} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/MultiBufferSource.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/MultiBufferSource.java index 6377c95a5..745f1c9b8 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/MultiBufferSource.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/MultiBufferSource.java @@ -2,6 +2,7 @@ import java.util.Map; +@Deprecated public interface MultiBufferSource { static BufferSource immediateWithBuffers(Map map, BufferBuilder arg) { return new BufferSource(arg, map); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/OverlayTexture.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/OverlayTexture.java index fd219461f..dce839dbd 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/OverlayTexture.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/OverlayTexture.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.compat.mojang; +@Deprecated public class OverlayTexture { // This is definitely wrong diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/OverlayVertexConsumer.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/OverlayVertexConsumer.java index 8b30554f3..6f185d545 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/OverlayVertexConsumer.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/OverlayVertexConsumer.java @@ -4,6 +4,7 @@ import org.joml.Matrix3f; import org.joml.Matrix4f; +@Deprecated public class OverlayVertexConsumer implements VertexConsumer { public OverlayVertexConsumer(VertexConsumer buffer, Matrix4f model, Matrix3f normal) {} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/PackedIntegerArray.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/PackedIntegerArray.java index 56115c5d4..254123d7f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/PackedIntegerArray.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/PackedIntegerArray.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.compat.mojang; +@Deprecated public class PackedIntegerArray { public PackedIntegerArray(int paletteSize, int size, long[] storage) {} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderLayer.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderLayer.java index aadac15ff..5594123bf 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderLayer.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderLayer.java @@ -12,6 +12,7 @@ import java.util.Optional; import java.util.OptionalDouble; +@Deprecated public abstract class RenderLayer extends RenderPhase { // Aka: RenderType (Iris) private static final RenderLayer SOLID = of("solid", DefaultVertexFormat.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, 7, 2097152, true, false, RenderLayer.MultiPhaseParameters.builder().shadeModel(SMOOTH_SHADE_MODEL).lightmap(ENABLE_LIGHTMAP).texture(MIPMAP_BLOCK_ATLAS_TEXTURE).build(true)); private static final RenderLayer CUTOUT_MIPPED = of("cutout_mipped", DefaultVertexFormat.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, 7, 131072, true, false, RenderLayer.MultiPhaseParameters.builder().shadeModel(SMOOTH_SHADE_MODEL).lightmap(ENABLE_LIGHTMAP).texture(MIPMAP_BLOCK_ATLAS_TEXTURE).alpha(HALF_ALPHA).build(true)); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderLayers.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderLayers.java index 13734edee..99590a273 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderLayers.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderLayers.java @@ -1,11 +1,9 @@ package com.gtnewhorizons.angelica.compat.mojang; -import com.gtnewhorizons.angelica.mixins.early.sodium.MixinMaterial; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialLiquid; -import net.minecraftforge.fluids.Fluid; +@Deprecated public class RenderLayers { public static boolean canRenderInLayer(BlockState state, RenderLayer layer) { diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderPhase.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderPhase.java index 48490fa58..54874ef74 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderPhase.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/RenderPhase.java @@ -14,6 +14,7 @@ import java.util.OptionalDouble; +@Deprecated public abstract class RenderPhase { protected final String name; protected Runnable beginAction; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/SideShapeType.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/SideShapeType.java index 92d526124..53dc98ecd 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/SideShapeType.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/SideShapeType.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.compat.mojang; +@Deprecated public enum SideShapeType { FULL, CENTER, diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/TextureAtlas.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/TextureAtlas.java index 4615a3140..21547fe3d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/TextureAtlas.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/TextureAtlas.java @@ -5,6 +5,7 @@ import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; +@Deprecated public abstract class TextureAtlas extends AbstractTexture implements ITickable, IResourceManagerReloadListener { @Override diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexBuffer.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexBuffer.java index 8a7d0661b..797897074 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexBuffer.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexBuffer.java @@ -6,6 +6,7 @@ import java.nio.ByteBuffer; import java.nio.FloatBuffer; +@Deprecated public class VertexBuffer implements AutoCloseable { private int id; private int vertexCount; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumer.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumer.java index 7ec104359..cc93669be 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumer.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumer.java @@ -4,6 +4,7 @@ import javax.annotation.Nonnull; +@Deprecated public interface VertexConsumer extends IForgeVertexBuilder { VertexConsumer vertex(double d, double e, double f); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumerProvider.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumerProvider.java index 138c5bebf..cb5124361 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumerProvider.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumerProvider.java @@ -9,6 +9,7 @@ import java.util.Optional; import java.util.Set; +@Deprecated public interface VertexConsumerProvider { static Immediate immediate(BufferBuilder buffer) { return immediate(ImmutableMap.of(), buffer); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumers.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumers.java index 5d6f638b5..78d0b8a3e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumers.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexConsumers.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.compat.mojang; +@Deprecated public class VertexConsumers { public static VertexConsumer union(VertexConsumer first, VertexConsumer second) { return new Dual(first, second); diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexFormat.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexFormat.java index a48e0042c..a28c2957a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexFormat.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexFormat.java @@ -5,6 +5,7 @@ import it.unimi.dsi.fastutil.ints.IntList; import lombok.Getter; +@Deprecated public class VertexFormat { protected final ImmutableList elements; protected final IntList offsets = new IntArrayList(); @@ -21,8 +22,10 @@ public VertexFormat(ImmutableList elements) { vertexSize = i; } + @Deprecated public void setupBufferState(long l) {} + @Deprecated public void clearBufferState() {} } diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexFormatElement.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexFormatElement.java index a7561e989..e1d1ce286 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexFormatElement.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VertexFormatElement.java @@ -7,6 +7,7 @@ import java.util.function.IntConsumer; +@Deprecated public class VertexFormatElement { @Getter protected final Type type; diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VoxelShape.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VoxelShape.java index 13fbb5c1a..3433c2ba6 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VoxelShape.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VoxelShape.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.compat.mojang; +@Deprecated public enum VoxelShape { FULL_CUBE(false), diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VoxelShapes.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VoxelShapes.java index 4bcb26479..2ec1e4b5a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VoxelShapes.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/VoxelShapes.java @@ -2,6 +2,7 @@ import net.minecraftforge.common.util.ForgeDirection; +@Deprecated public final class VoxelShapes { public static VoxelShape fullCube() { diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/WorldRendererExt.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/WorldRendererExt.java deleted file mode 100644 index 36e679bfb..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/WorldRendererExt.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.gtnewhorizons.angelica.compat.mojang; - -public interface WorldRendererExt { - -} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityRenderer.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityRenderer.java index a9fc6d3aa..7472b7920 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityRenderer.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.mixins.early.shaders; -import com.gtnewhorizons.angelica.compat.mojang.Camera; +import com.gtnewhorizons.angelica.compat.Camera; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Share; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderGlobal.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderGlobal.java index 579b62ce1..7675c04de 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderGlobal.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderGlobal.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.mixins.early.sodium; -import com.gtnewhorizons.angelica.compat.mojang.Camera; +import com.gtnewhorizons.angelica.compat.Camera; import com.gtnewhorizons.angelica.compat.mojang.MatrixStack; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalExt; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/model/light/cache/ArrayLightDataCache.java b/src/main/java/me/jellysquid/mods/sodium/client/model/light/cache/ArrayLightDataCache.java index c7a445128..e15e960dd 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/model/light/cache/ArrayLightDataCache.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/model/light/cache/ArrayLightDataCache.java @@ -1,6 +1,6 @@ package me.jellysquid.mods.sodium.client.model.light.cache; -import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; +import com.gtnewhorizons.angelica.compat.ChunkSectionPos; import me.jellysquid.mods.sodium.client.model.light.data.LightDataAccess; import me.jellysquid.mods.sodium.client.world.WorldSlice; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java b/src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java index 3c9f30ce5..c2f0201ed 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java @@ -1,7 +1,7 @@ package me.jellysquid.mods.sodium.client.render; -import com.gtnewhorizons.angelica.compat.mojang.Camera; -import com.gtnewhorizons.angelica.compat.mojang.ChunkPos; +import com.gtnewhorizons.angelica.compat.Camera; +import com.gtnewhorizons.angelica.compat.ChunkPos; import com.gtnewhorizons.angelica.compat.mojang.MatrixStack; import com.gtnewhorizons.angelica.compat.mojang.RenderLayer; import com.gtnewhorizons.angelica.config.AngelicaConfig; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderContainer.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderContainer.java index 3c9e1684e..fabb1298c 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderContainer.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderContainer.java @@ -1,7 +1,7 @@ package me.jellysquid.mods.sodium.client.render.chunk; import com.gtnewhorizons.angelica.compat.mojang.BlockPos; -import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; +import com.gtnewhorizons.angelica.compat.ChunkSectionPos; import lombok.Getter; import me.jellysquid.mods.sodium.client.gl.device.RenderDevice; import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java index 21e201600..2ff703613 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java @@ -1,7 +1,7 @@ package me.jellysquid.mods.sodium.client.render.chunk; -import com.gtnewhorizons.angelica.compat.mojang.Camera; -import com.gtnewhorizons.angelica.compat.mojang.ChunkPos; +import com.gtnewhorizons.angelica.compat.Camera; +import com.gtnewhorizons.angelica.compat.ChunkPos; import com.gtnewhorizons.angelica.compat.mojang.MatrixStack; import com.gtnewhorizons.angelica.config.AngelicaConfig; import it.unimi.dsi.fastutil.ints.IntIterator; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/backends/multidraw/ChunkDrawCallBatcher.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/backends/multidraw/ChunkDrawCallBatcher.java index aeb88fbcf..a5fcbae6d 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/backends/multidraw/ChunkDrawCallBatcher.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/backends/multidraw/ChunkDrawCallBatcher.java @@ -1,7 +1,7 @@ package me.jellysquid.mods.sodium.client.render.chunk.backends.multidraw; import com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil; -import com.gtnewhorizons.angelica.compat.mojang.CompatMathHelper; +import com.gtnewhorizons.angelica.compat.CompatMathHelper; import me.jellysquid.mods.sodium.client.SodiumClientMod; import org.lwjgl.MemoryUtil; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/cull/ChunkCuller.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/cull/ChunkCuller.java index c718516f4..317adad30 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/cull/ChunkCuller.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/cull/ChunkCuller.java @@ -1,6 +1,6 @@ package me.jellysquid.mods.sodium.client.render.chunk.cull; -import com.gtnewhorizons.angelica.compat.mojang.Camera; +import com.gtnewhorizons.angelica.compat.Camera; import com.gtnewhorizons.angelica.compat.mojang.ChunkOcclusionData; import it.unimi.dsi.fastutil.ints.IntArrayList; import me.jellysquid.mods.sodium.client.util.math.FrustumExtended; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/cull/graph/ChunkGraphCuller.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/cull/graph/ChunkGraphCuller.java index 876c34402..a24fa354f 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/cull/graph/ChunkGraphCuller.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/cull/graph/ChunkGraphCuller.java @@ -1,10 +1,9 @@ package me.jellysquid.mods.sodium.client.render.chunk.cull.graph; import com.gtnewhorizons.angelica.compat.mojang.BlockPos; -import com.gtnewhorizons.angelica.compat.mojang.BlockRenderView; -import com.gtnewhorizons.angelica.compat.mojang.Camera; +import com.gtnewhorizons.angelica.compat.Camera; import com.gtnewhorizons.angelica.compat.mojang.ChunkOcclusionData; -import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; +import com.gtnewhorizons.angelica.compat.ChunkSectionPos; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; @@ -12,8 +11,6 @@ import me.jellysquid.mods.sodium.client.util.math.FrustumExtended; import me.jellysquid.mods.sodium.common.util.DirectionUtil; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraft.util.MathHelper; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/data/ChunkRenderBounds.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/data/ChunkRenderBounds.java index 4a06495ab..54430fd90 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/data/ChunkRenderBounds.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/data/ChunkRenderBounds.java @@ -1,6 +1,6 @@ package me.jellysquid.mods.sodium.client.render.chunk.data; -import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; +import com.gtnewhorizons.angelica.compat.ChunkSectionPos; public class ChunkRenderBounds { public static final ChunkRenderBounds ALWAYS_FALSE = new ChunkRenderBounds(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY, diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/region/ChunkRegionManager.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/region/ChunkRegionManager.java index 0b8845916..9dff791f8 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/region/ChunkRegionManager.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/region/ChunkRegionManager.java @@ -1,6 +1,6 @@ package me.jellysquid.mods.sodium.client.render.chunk.region; -import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; +import com.gtnewhorizons.angelica.compat.ChunkSectionPos; import it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectIterator; import me.jellysquid.mods.sodium.client.gl.device.RenderDevice; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java b/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java index 4fb82730b..89d880b1f 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java @@ -2,12 +2,8 @@ import java.util.Arrays; -import com.gtnewhorizons.angelica.compat.mojang.BlockPos; -import com.gtnewhorizons.angelica.compat.mojang.BlockRenderView; -import com.gtnewhorizons.angelica.compat.mojang.BlockState; -import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; -import com.gtnewhorizons.angelica.compat.mojang.CompatMathHelper; -import com.gtnewhorizons.angelica.compat.mojang.FluidState; +import com.gtnewhorizons.angelica.compat.ChunkSectionPos; +import com.gtnewhorizons.angelica.compat.CompatMathHelper; import lombok.Getter; import me.jellysquid.mods.sodium.client.world.cloned.ChunkRenderContext; import me.jellysquid.mods.sodium.client.world.cloned.ClonedChunkSection; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ChunkRenderContext.java b/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ChunkRenderContext.java index 19dfd8d01..031188510 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ChunkRenderContext.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ChunkRenderContext.java @@ -1,6 +1,6 @@ package me.jellysquid.mods.sodium.client.world.cloned; -import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; +import com.gtnewhorizons.angelica.compat.ChunkSectionPos; import net.minecraft.world.gen.structure.StructureBoundingBox; public class ChunkRenderContext { diff --git a/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSection.java b/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSection.java index 5819e3af5..4b591f40d 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSection.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSection.java @@ -2,12 +2,11 @@ import com.gtnewhorizons.angelica.compat.ExtendedBlockStorageExt; import com.gtnewhorizons.angelica.compat.mojang.BlockPos; -import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; +import com.gtnewhorizons.angelica.compat.ChunkSectionPos; import it.unimi.dsi.fastutil.shorts.Short2ObjectMap; import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap; import lombok.Getter; import net.minecraft.block.Block; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSectionCache.java b/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSectionCache.java index 3d2866520..48f358e1c 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSectionCache.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSectionCache.java @@ -1,6 +1,6 @@ package me.jellysquid.mods.sodium.client.world.cloned; -import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos; +import com.gtnewhorizons.angelica.compat.ChunkSectionPos; import it.unimi.dsi.fastutil.longs.Long2ReferenceLinkedOpenHashMap; import net.minecraft.world.World; diff --git a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java index d19e1d7c3..6245de3c8 100644 --- a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java +++ b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java @@ -3,7 +3,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Ints; -import com.gtnewhorizons.angelica.compat.mojang.Camera; +import com.gtnewhorizons.angelica.compat.Camera; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.rendering.RenderingState; import net.coderbot.iris.Iris; diff --git a/src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java index efb429135..85968f8fe 100644 --- a/src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java +++ b/src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java @@ -1,6 +1,6 @@ package net.coderbot.iris.pipeline; -import com.gtnewhorizons.angelica.compat.mojang.Camera; +import com.gtnewhorizons.angelica.compat.Camera; import net.coderbot.iris.block_rendering.BlockRenderingSettings; import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability; import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition; diff --git a/src/main/java/net/coderbot/iris/pipeline/HandRenderer.java b/src/main/java/net/coderbot/iris/pipeline/HandRenderer.java index 320d4f0af..f642aaf73 100644 --- a/src/main/java/net/coderbot/iris/pipeline/HandRenderer.java +++ b/src/main/java/net/coderbot/iris/pipeline/HandRenderer.java @@ -1,7 +1,7 @@ package net.coderbot.iris.pipeline; import net.coderbot.batchedentityrendering.impl.FullyBufferedMultiBufferSource; -import com.gtnewhorizons.angelica.compat.mojang.Camera; +import com.gtnewhorizons.angelica.compat.Camera; import com.gtnewhorizons.angelica.compat.mojang.GameRenderer; import com.gtnewhorizons.angelica.compat.mojang.InteractionHand; import com.gtnewhorizons.angelica.compat.mojang.MatrixStack; diff --git a/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java b/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java index 77cc0ed05..283ce4847 100644 --- a/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java +++ b/src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java @@ -2,7 +2,7 @@ import com.google.common.collect.ImmutableList; import com.gtnewhorizons.angelica.compat.mojang.BufferSource; -import com.gtnewhorizons.angelica.compat.mojang.Camera; +import com.gtnewhorizons.angelica.compat.Camera; import com.gtnewhorizons.angelica.compat.mojang.MatrixStack; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.rendering.RenderingState; diff --git a/src/main/java/net/coderbot/iris/pipeline/WorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/WorldRenderingPipeline.java index 4dc2904f0..3167265fd 100644 --- a/src/main/java/net/coderbot/iris/pipeline/WorldRenderingPipeline.java +++ b/src/main/java/net/coderbot/iris/pipeline/WorldRenderingPipeline.java @@ -1,6 +1,6 @@ package net.coderbot.iris.pipeline; -import com.gtnewhorizons.angelica.compat.mojang.Camera; +import com.gtnewhorizons.angelica.compat.Camera; import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability; import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition; import net.coderbot.iris.gbuffer_overrides.state.RenderTargetStateListener; diff --git a/src/main/java/net/coderbot/iris/postprocess/CompositeRenderer.java b/src/main/java/net/coderbot/iris/postprocess/CompositeRenderer.java index bdeba1eb7..09d5a8204 100644 --- a/src/main/java/net/coderbot/iris/postprocess/CompositeRenderer.java +++ b/src/main/java/net/coderbot/iris/postprocess/CompositeRenderer.java @@ -30,6 +30,7 @@ import net.coderbot.iris.uniforms.FrameUpdateNotifier; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.shader.Framebuffer; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL20; @@ -62,8 +63,7 @@ public CompositeRenderer(PackDirectives packDirectives, ProgramSource[] sources, this.customTextureIds = customTextureIds; final PackRenderTargetDirectives renderTargetDirectives = packDirectives.getRenderTargetDirectives(); - final Map renderTargetSettings = - renderTargetDirectives.getRenderTargetSettings(); + final Map renderTargetSettings = renderTargetDirectives.getRenderTargetSettings(); final ImmutableList.Builder passes = ImmutableList.builder(); final ImmutableSet.Builder flippedAtLeastOnce = new ImmutableSet.Builder<>(); @@ -205,21 +205,18 @@ protected void destroy() { } public void renderAll() { - GL11.glDisable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_ALPHA_TEST); + GLStateManager.disableBlend(); + GLStateManager.disableAlphaTest(); FullScreenQuadRenderer.INSTANCE.begin(); - final Minecraft mc = Minecraft.getMinecraft(); + for (Pass renderPass : passes) { boolean ranCompute = false; for (ComputeProgram computeProgram : renderPass.computes) { if (computeProgram != null) { ranCompute = true; - - // TODO: Iris -// com.mojang.blaze3d.pipeline.RenderTarget main = Minecraft.getMinecraft().getMainRenderTarget(); -// computeProgram.dispatch(main.width, main.height); - computeProgram.dispatch(mc.displayWidth, mc.displayHeight); + final Framebuffer main = Minecraft.getMinecraft().getFramebuffer(); + computeProgram.dispatch(main.framebufferWidth, main.framebufferHeight); } } diff --git a/src/main/java/net/coderbot/iris/postprocess/FinalPassRenderer.java b/src/main/java/net/coderbot/iris/postprocess/FinalPassRenderer.java index 4b431bc8b..e68a7d472 100644 --- a/src/main/java/net/coderbot/iris/postprocess/FinalPassRenderer.java +++ b/src/main/java/net/coderbot/iris/postprocess/FinalPassRenderer.java @@ -170,7 +170,7 @@ public void renderFinalPass() { // // This is not a concern for depthtex1 / depthtex2 since the copy call extracts the depth values, and the // shader pack only ever uses them to read the depth values. - if (((IRenderTargetExt)main).iris$getColorBufferVersion() != lastColorTextureVersion) { + if (((IRenderTargetExt)main).iris$getColorBufferVersion() != lastColorTextureVersion || main.framebufferTexture != lastColorTextureId) { lastColorTextureVersion = ((IRenderTargetExt)main).iris$getColorBufferVersion(); this.lastColorTextureId = main.framebufferTexture; colorHolder.addColorAttachment(0, lastColorTextureId); diff --git a/src/main/java/net/coderbot/iris/postprocess/FullScreenQuadRenderer.java b/src/main/java/net/coderbot/iris/postprocess/FullScreenQuadRenderer.java index f183630a6..b1fad6ba0 100644 --- a/src/main/java/net/coderbot/iris/postprocess/FullScreenQuadRenderer.java +++ b/src/main/java/net/coderbot/iris/postprocess/FullScreenQuadRenderer.java @@ -31,7 +31,7 @@ public void render() { @SuppressWarnings("deprecation") public void begin() { - GL11.glDisable(GL11.GL_DEPTH_TEST); + GLStateManager.disableDepthTest(); GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glPushMatrix(); @@ -59,7 +59,7 @@ public static void end() { DefaultVertexFormat.POSITION_TEXTURE.clearBufferState(); GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GLStateManager.enableDepthTest(); GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glPopMatrix(); diff --git a/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedCustomTexture.java b/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedCustomTexture.java index 22d6e7f6d..9a92801ab 100644 --- a/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedCustomTexture.java +++ b/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedCustomTexture.java @@ -1,6 +1,6 @@ package net.coderbot.iris.rendertarget; -import com.gtnewhorizons.angelica.compat.mojang.NativeImage; +import com.gtnewhorizons.angelica.compat.NativeImage; import net.coderbot.iris.gl.IrisRenderSystem; import net.coderbot.iris.shaderpack.texture.CustomTextureData; import net.minecraft.client.renderer.texture.DynamicTexture; diff --git a/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedNoiseTexture.java b/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedNoiseTexture.java index fbb7c232c..31cd216c8 100644 --- a/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedNoiseTexture.java +++ b/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedNoiseTexture.java @@ -1,6 +1,6 @@ package net.coderbot.iris.rendertarget; -import com.gtnewhorizons.angelica.compat.mojang.NativeImage; +import com.gtnewhorizons.angelica.compat.NativeImage; import net.minecraft.client.renderer.texture.DynamicTexture; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedSingleColorTexture.java b/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedSingleColorTexture.java index 2671804d8..34d6ea970 100644 --- a/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedSingleColorTexture.java +++ b/src/main/java/net/coderbot/iris/rendertarget/NativeImageBackedSingleColorTexture.java @@ -1,6 +1,6 @@ package net.coderbot.iris.rendertarget; -import com.gtnewhorizons.angelica.compat.mojang.NativeImage; +import com.gtnewhorizons.angelica.compat.NativeImage; import net.minecraft.client.renderer.texture.DynamicTexture; public class NativeImageBackedSingleColorTexture extends DynamicTexture { diff --git a/src/main/java/net/coderbot/iris/shadow/ShadowMatrices.java b/src/main/java/net/coderbot/iris/shadow/ShadowMatrices.java index 63d7d557c..75f821149 100644 --- a/src/main/java/net/coderbot/iris/shadow/ShadowMatrices.java +++ b/src/main/java/net/coderbot/iris/shadow/ShadowMatrices.java @@ -5,7 +5,7 @@ import java.nio.FloatBuffer; -import static com.gtnewhorizons.angelica.compat.mojang.Constants.DEGREES_TO_RADIANS; +import static com.gtnewhorizons.angelica.compat.Constants.DEGREES_TO_RADIANS; public class ShadowMatrices { private static final float NEAR = 0.05f; diff --git a/src/main/java/net/coderbot/iris/texture/mipmap/AbstractMipmapGenerator.java b/src/main/java/net/coderbot/iris/texture/mipmap/AbstractMipmapGenerator.java index 81d1e4ba8..e41cdfee8 100644 --- a/src/main/java/net/coderbot/iris/texture/mipmap/AbstractMipmapGenerator.java +++ b/src/main/java/net/coderbot/iris/texture/mipmap/AbstractMipmapGenerator.java @@ -1,6 +1,6 @@ package net.coderbot.iris.texture.mipmap; -import com.gtnewhorizons.angelica.compat.mojang.NativeImage; +import com.gtnewhorizons.angelica.compat.NativeImage; public abstract class AbstractMipmapGenerator implements CustomMipmapGenerator { @Override diff --git a/src/main/java/net/coderbot/iris/texture/mipmap/ChannelMipmapGenerator.java b/src/main/java/net/coderbot/iris/texture/mipmap/ChannelMipmapGenerator.java index dd92ad317..5e7f45699 100644 --- a/src/main/java/net/coderbot/iris/texture/mipmap/ChannelMipmapGenerator.java +++ b/src/main/java/net/coderbot/iris/texture/mipmap/ChannelMipmapGenerator.java @@ -1,5 +1,5 @@ package net.coderbot.iris.texture.mipmap; -import com.gtnewhorizons.angelica.compat.mojang.NativeImage; +import com.gtnewhorizons.angelica.compat.NativeImage; public class ChannelMipmapGenerator extends AbstractMipmapGenerator { protected final BlendFunction redFunc; diff --git a/src/main/java/net/coderbot/iris/texture/mipmap/CustomMipmapGenerator.java b/src/main/java/net/coderbot/iris/texture/mipmap/CustomMipmapGenerator.java index ace0d2aa2..918502422 100644 --- a/src/main/java/net/coderbot/iris/texture/mipmap/CustomMipmapGenerator.java +++ b/src/main/java/net/coderbot/iris/texture/mipmap/CustomMipmapGenerator.java @@ -1,6 +1,6 @@ package net.coderbot.iris.texture.mipmap; -import com.gtnewhorizons.angelica.compat.mojang.NativeImage; +import com.gtnewhorizons.angelica.compat.NativeImage; public interface CustomMipmapGenerator { NativeImage[] generateMipLevels(NativeImage image, int mipLevel); diff --git a/src/main/java/net/coderbot/iris/texture/util/ImageManipulationUtil.java b/src/main/java/net/coderbot/iris/texture/util/ImageManipulationUtil.java index 365c56355..e4a7a0db0 100644 --- a/src/main/java/net/coderbot/iris/texture/util/ImageManipulationUtil.java +++ b/src/main/java/net/coderbot/iris/texture/util/ImageManipulationUtil.java @@ -1,6 +1,6 @@ package net.coderbot.iris.texture.util; -import com.gtnewhorizons.angelica.compat.mojang.NativeImage; +import com.gtnewhorizons.angelica.compat.NativeImage; public class ImageManipulationUtil { public static NativeImage scaleNearestNeighbor(NativeImage image, int newWidth, int newHeight) { diff --git a/src/main/java/net/coderbot/iris/texture/util/TextureExporter.java b/src/main/java/net/coderbot/iris/texture/util/TextureExporter.java index 4a89d9583..e7bbdca1d 100644 --- a/src/main/java/net/coderbot/iris/texture/util/TextureExporter.java +++ b/src/main/java/net/coderbot/iris/texture/util/TextureExporter.java @@ -1,7 +1,7 @@ package net.coderbot.iris.texture.util; import com.gtnewhorizons.angelica.glsm.GLStateManager; -import com.gtnewhorizons.angelica.compat.mojang.NativeImage; +import com.gtnewhorizons.angelica.compat.NativeImage; import net.minecraft.client.Minecraft; import org.apache.commons.io.FilenameUtils; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/net/coderbot/iris/uniforms/CelestialUniforms.java b/src/main/java/net/coderbot/iris/uniforms/CelestialUniforms.java index 68db63e00..d669bb2c2 100644 --- a/src/main/java/net/coderbot/iris/uniforms/CelestialUniforms.java +++ b/src/main/java/net/coderbot/iris/uniforms/CelestialUniforms.java @@ -1,6 +1,6 @@ package net.coderbot.iris.uniforms; -import com.gtnewhorizons.angelica.compat.mojang.Constants; +import com.gtnewhorizons.angelica.compat.Constants; import com.gtnewhorizons.angelica.rendering.RenderingState; import net.coderbot.iris.gl.uniform.UniformHolder; import net.minecraft.client.Minecraft;