diff --git a/src/main/java/com/jozufozu/flywheel/api/MaterialManager.java b/src/main/java/com/jozufozu/flywheel/api/MaterialManager.java index 64a483736..67e6997e9 100644 --- a/src/main/java/com/jozufozu/flywheel/api/MaterialManager.java +++ b/src/main/java/com/jozufozu/flywheel/api/MaterialManager.java @@ -1,9 +1,7 @@ package com.jozufozu.flywheel.api; import com.jozufozu.flywheel.api.struct.StructType; -import com.jozufozu.flywheel.backend.instancing.instancing.InstancedMaterial; -import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Vec3i; public interface MaterialManager { diff --git a/src/main/java/com/jozufozu/flywheel/backend/Backend.java b/src/main/java/com/jozufozu/flywheel/backend/Backend.java index d3be6f353..fd12889d0 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/Backend.java +++ b/src/main/java/com/jozufozu/flywheel/backend/Backend.java @@ -1,14 +1,13 @@ package com.jozufozu.flywheel.backend; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import com.jozufozu.flywheel.api.FlywheelWorld; import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; import com.jozufozu.flywheel.backend.instancing.ParallelTaskEngine; -import com.jozufozu.flywheel.config.FlwConfig; import com.jozufozu.flywheel.config.BackendType; +import com.jozufozu.flywheel.config.FlwConfig; import com.jozufozu.flywheel.core.shader.ProgramSpec; import com.mojang.logging.LogUtils; diff --git a/src/main/java/com/jozufozu/flywheel/backend/Loader.java b/src/main/java/com/jozufozu/flywheel/backend/Loader.java index 94c3628cf..f87a1982c 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/Loader.java +++ b/src/main/java/com/jozufozu/flywheel/backend/Loader.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java b/src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java index 1e49c7270..06c60498f 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java +++ b/src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java @@ -4,7 +4,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.function.BooleanSupplier; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraft.client.Camera; import net.minecraft.client.renderer.culling.Frustum; diff --git a/src/main/java/com/jozufozu/flywheel/backend/RenderWork.java b/src/main/java/com/jozufozu/flywheel/backend/RenderWork.java index 03369f6c5..c47db732c 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/RenderWork.java +++ b/src/main/java/com/jozufozu/flywheel/backend/RenderWork.java @@ -9,7 +9,7 @@ import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(value = Dist.CLIENT) +@Mod.EventBusSubscriber(Dist.CLIENT) public class RenderWork { private static final Queue runs = new ConcurrentLinkedQueue<>(); diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java b/src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java index aaf69e61d..e5bdd65c8 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java @@ -6,14 +6,9 @@ import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.Nullable; import org.lwjgl.opengl.GL11; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) public enum GlNumericType { FLOAT(4, "float", GL11.GL_FLOAT), UBYTE(1, "ubyte", GL11.GL_UNSIGNED_BYTE), diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java index 465766adb..c02a418c6 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java @@ -7,8 +7,7 @@ import static org.lwjgl.opengl.GL20.glUniformMatrix4fv; import java.nio.FloatBuffer; -import javax.annotation.Nonnull; - +import org.jetbrains.annotations.NotNull; import org.lwjgl.system.MemoryStack; import com.jozufozu.flywheel.backend.Backend; @@ -91,7 +90,7 @@ public abstract class GlProgram extends GlObject { */ public interface Factory

{ - @Nonnull + @NotNull P create(ResourceLocation name, int handle); } } diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstancer.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstancer.java index c018c1bc6..e12af1e4a 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstancer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstancer.java @@ -6,7 +6,6 @@ import java.util.function.Supplier; import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.api.Instancer; -import com.jozufozu.flywheel.core.model.ModelSupplier; public abstract class AbstractInstancer implements Instancer { diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java index 7f741cd8c..8973edb30 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.api.instance.DynamicInstance; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderDispatcher.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderDispatcher.java index 39c7f902c..75a02685c 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderDispatcher.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderDispatcher.java @@ -19,12 +19,10 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@OnlyIn(Dist.CLIENT) @Mod.EventBusSubscriber(Dist.CLIENT) public class InstancedRenderDispatcher { diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderRegistry.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderRegistry.java index 1946dabdb..4b052c4d0 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderRegistry.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderRegistry.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.function.BiFunction; import java.util.function.Predicate; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java index af0fff2cf..c54e03c7d 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java @@ -7,7 +7,6 @@ import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.api.Instancer; import com.jozufozu.flywheel.api.Material; import com.jozufozu.flywheel.api.struct.Batched; -import com.jozufozu.flywheel.core.BasicModelSupplier; import com.jozufozu.flywheel.core.model.ModelSupplier; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java index 5895377c4..c3f5b6e81 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java @@ -7,10 +7,8 @@ import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.api.MaterialGroup; import com.jozufozu.flywheel.api.struct.Batched; import com.jozufozu.flywheel.api.struct.StructType; -import com.jozufozu.flywheel.backend.OptifineHandler; import com.jozufozu.flywheel.backend.instancing.BatchDrawingTracker; import com.jozufozu.flywheel.backend.instancing.TaskEngine; -import com.jozufozu.flywheel.backend.model.DirectVertexConsumer; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java index 967c6c19a..e625a7f9f 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java @@ -5,7 +5,6 @@ import com.jozufozu.flywheel.api.struct.Batched; import com.jozufozu.flywheel.backend.instancing.AbstractInstancer; import com.jozufozu.flywheel.backend.instancing.TaskEngine; import com.jozufozu.flywheel.backend.model.DirectVertexConsumer; -import com.jozufozu.flywheel.core.BasicModelSupplier; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/blockentity/BlockEntityTypeExtension.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/blockentity/BlockEntityTypeExtension.java index 3ac1bbb7e..f07800c08 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/blockentity/BlockEntityTypeExtension.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/blockentity/BlockEntityTypeExtension.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.backend.instancing.blockentity; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityTypeExtension.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityTypeExtension.java index b01918acd..35fb290c5 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityTypeExtension.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityTypeExtension.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.backend.instancing.entity; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java index 865cc4d18..9f2e66236 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.api.struct.Instanced; @@ -55,7 +55,7 @@ public class InstancingEngine

implements Engine { } @SuppressWarnings("unchecked") - @Nonnull + @NotNull @Override public InstancedMaterial material(StructType type) { if (type instanceof Instanced instanced) { diff --git a/src/main/java/com/jozufozu/flywheel/config/BackendType.java b/src/main/java/com/jozufozu/flywheel/config/BackendType.java index b5244b500..f28eb34f6 100644 --- a/src/main/java/com/jozufozu/flywheel/config/BackendType.java +++ b/src/main/java/com/jozufozu/flywheel/config/BackendType.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; public enum BackendType { OFF("Off"), diff --git a/src/main/java/com/jozufozu/flywheel/core/BasicModelSupplier.java b/src/main/java/com/jozufozu/flywheel/core/BasicModelSupplier.java index cd606b35a..0f3f0521a 100644 --- a/src/main/java/com/jozufozu/flywheel/core/BasicModelSupplier.java +++ b/src/main/java/com/jozufozu/flywheel/core/BasicModelSupplier.java @@ -2,7 +2,7 @@ package com.jozufozu.flywheel.core; import java.util.Map; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import com.google.common.collect.ImmutableMap; import com.jozufozu.flywheel.core.model.Mesh; @@ -30,7 +30,7 @@ public class BasicModelSupplier implements ModelSupplier { return setRenderType(RenderType.cutoutMipped()); } - public BasicModelSupplier setRenderType(@Nonnull RenderType renderType) { + public BasicModelSupplier setRenderType(@NotNull RenderType renderType) { this.renderType = renderType; return this; } diff --git a/src/main/java/com/jozufozu/flywheel/core/Contexts.java b/src/main/java/com/jozufozu/flywheel/core/Contexts.java index db5d448f6..921f8a3dd 100644 --- a/src/main/java/com/jozufozu/flywheel/core/Contexts.java +++ b/src/main/java/com/jozufozu/flywheel/core/Contexts.java @@ -11,10 +11,7 @@ import com.jozufozu.flywheel.event.GatherContextEvent; import com.jozufozu.flywheel.util.ResourceUtil; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class Contexts { public static ProgramCompiler WORLD; diff --git a/src/main/java/com/jozufozu/flywheel/core/FullscreenQuad.java b/src/main/java/com/jozufozu/flywheel/core/FullscreenQuad.java index 4a0034507..e319fdf2c 100644 --- a/src/main/java/com/jozufozu/flywheel/core/FullscreenQuad.java +++ b/src/main/java/com/jozufozu/flywheel/core/FullscreenQuad.java @@ -2,7 +2,6 @@ package com.jozufozu.flywheel.core; import static org.lwjgl.opengl.GL11.GL_TRIANGLES; import static org.lwjgl.opengl.GL11.glDrawArrays; -import static org.lwjgl.opengl.GL20.glEnableVertexAttribArray; import static org.lwjgl.opengl.GL20.glVertexAttribPointer; import com.jozufozu.flywheel.Flywheel; diff --git a/src/main/java/com/jozufozu/flywheel/core/Materials.java b/src/main/java/com/jozufozu/flywheel/core/Materials.java index fbf704aaa..ac437afe8 100644 --- a/src/main/java/com/jozufozu/flywheel/core/Materials.java +++ b/src/main/java/com/jozufozu/flywheel/core/Materials.java @@ -8,10 +8,7 @@ import com.jozufozu.flywheel.core.materials.oriented.OrientedData; import com.jozufozu.flywheel.core.materials.oriented.OrientedType; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class Materials { public static final StructType ORIENTED = new OrientedType(); diff --git a/src/main/java/com/jozufozu/flywheel/core/PartialModel.java b/src/main/java/com/jozufozu/flywheel/core/PartialModel.java index 8146152c5..64572104a 100644 --- a/src/main/java/com/jozufozu/flywheel/core/PartialModel.java +++ b/src/main/java/com/jozufozu/flywheel/core/PartialModel.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.resources.ResourceLocation; @@ -51,7 +51,7 @@ public class PartialModel { partial.set(modelRegistry.get(partial.getLocation())); } - @Nonnull + @NotNull public String getName() { return getLocation() .toString(); diff --git a/src/main/java/com/jozufozu/flywheel/core/QuadConverter.java b/src/main/java/com/jozufozu/flywheel/core/QuadConverter.java index d1871224b..100c2e168 100644 --- a/src/main/java/com/jozufozu/flywheel/core/QuadConverter.java +++ b/src/main/java/com/jozufozu/flywheel/core/QuadConverter.java @@ -6,9 +6,8 @@ import java.nio.ByteOrder; import java.util.EnumMap; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryUtil; @@ -34,7 +33,7 @@ public class QuadConverter { private static QuadConverter INSTANCE; - @Nonnull + @NotNull public static QuadConverter getInstance() { if (INSTANCE == null) { INSTANCE = new QuadConverter(STARTING_CAPACITY); diff --git a/src/main/java/com/jozufozu/flywheel/core/RenderTypeRegistry.java b/src/main/java/com/jozufozu/flywheel/core/RenderTypeRegistry.java index 06e706641..6f2cda148 100644 --- a/src/main/java/com/jozufozu/flywheel/core/RenderTypeRegistry.java +++ b/src/main/java/com/jozufozu/flywheel/core/RenderTypeRegistry.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.core; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/jozufozu/flywheel/core/crumbling/AtlasInfo.java b/src/main/java/com/jozufozu/flywheel/core/crumbling/AtlasInfo.java index 1289a3db9..055e27293 100644 --- a/src/main/java/com/jozufozu/flywheel/core/crumbling/AtlasInfo.java +++ b/src/main/java/com/jozufozu/flywheel/core/crumbling/AtlasInfo.java @@ -3,7 +3,7 @@ package com.jozufozu.flywheel.core.crumbling; import java.util.HashMap; import java.util.Map; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.mixin.atlas.SheetDataAccessor; diff --git a/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java b/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java index e01c4b2e3..0b7a125a6 100644 --- a/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java +++ b/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java @@ -37,14 +37,12 @@ import net.minecraft.core.BlockPos; import net.minecraft.server.level.BlockDestructionProgress; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; /** * Responsible for rendering the block breaking overlay for instanced block entities. */ -@OnlyIn(Dist.CLIENT) @Mod.EventBusSubscriber(Dist.CLIENT) public class CrumblingRenderer { diff --git a/src/main/java/com/jozufozu/flywheel/core/hardcoded/ModelPart.java b/src/main/java/com/jozufozu/flywheel/core/hardcoded/ModelPart.java index a70646760..c2ac1bec3 100644 --- a/src/main/java/com/jozufozu/flywheel/core/hardcoded/ModelPart.java +++ b/src/main/java/com/jozufozu/flywheel/core/hardcoded/ModelPart.java @@ -3,7 +3,6 @@ package com.jozufozu.flywheel.core.hardcoded; import java.util.List; import com.jozufozu.flywheel.api.vertex.VertexList; -import com.jozufozu.flywheel.api.vertex.VertexType; import com.jozufozu.flywheel.core.Formats; import com.jozufozu.flywheel.core.model.Mesh; import com.jozufozu.flywheel.core.vertex.PosTexNormalVertex; diff --git a/src/main/java/com/jozufozu/flywheel/core/instancing/ConditionalInstance.java b/src/main/java/com/jozufozu/flywheel/core/instancing/ConditionalInstance.java index 1059f07ca..cfd9d79b0 100644 --- a/src/main/java/com/jozufozu/flywheel/core/instancing/ConditionalInstance.java +++ b/src/main/java/com/jozufozu/flywheel/core/instancing/ConditionalInstance.java @@ -3,7 +3,7 @@ package com.jozufozu.flywheel.core.instancing; import java.util.Optional; import java.util.function.Consumer; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.api.Instancer; diff --git a/src/main/java/com/jozufozu/flywheel/core/instancing/SelectInstance.java b/src/main/java/com/jozufozu/flywheel/core/instancing/SelectInstance.java index e516610df..423434f1e 100644 --- a/src/main/java/com/jozufozu/flywheel/core/instancing/SelectInstance.java +++ b/src/main/java/com/jozufozu/flywheel/core/instancing/SelectInstance.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.api.Instancer; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/FileIndexImpl.java b/src/main/java/com/jozufozu/flywheel/core/source/FileIndexImpl.java index 90a1cc4ba..4529a2d0b 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/FileIndexImpl.java +++ b/src/main/java/com/jozufozu/flywheel/core/source/FileIndexImpl.java @@ -3,7 +3,7 @@ package com.jozufozu.flywheel.core.source; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.backend.Backend; import com.jozufozu.flywheel.core.source.error.ErrorBuilder; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java b/src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java index b7e29c2a4..0366ac78f 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java +++ b/src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.google.common.collect.Lists; import com.jozufozu.flywheel.util.ResourceUtil; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/SourceFinder.java b/src/main/java/com/jozufozu/flywheel/core/source/SourceFinder.java index 50ced811f..5a2a6c94f 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/SourceFinder.java +++ b/src/main/java/com/jozufozu/flywheel/core/source/SourceFinder.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.core.source; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/ErrorBuilder.java b/src/main/java/com/jozufozu/flywheel/core/source/error/ErrorBuilder.java index 9a28a132f..ebd2d22bd 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/ErrorBuilder.java +++ b/src/main/java/com/jozufozu/flywheel/core/source/error/ErrorBuilder.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.core.source.FileIndex; import com.jozufozu.flywheel.core.source.SourceFile; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/parse/Import.java b/src/main/java/com/jozufozu/flywheel/core/source/parse/Import.java index 0a357671b..5fbd5f0c6 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/parse/Import.java +++ b/src/main/java/com/jozufozu/flywheel/core/source/parse/Import.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.core.source.FileResolution; import com.jozufozu.flywheel.core.source.Resolver; diff --git a/src/main/java/com/jozufozu/flywheel/core/virtual/VirtualChunk.java b/src/main/java/com/jozufozu/flywheel/core/virtual/VirtualChunk.java index eaed3e59f..a920bbd90 100644 --- a/src/main/java/com/jozufozu/flywheel/core/virtual/VirtualChunk.java +++ b/src/main/java/com/jozufozu/flywheel/core/virtual/VirtualChunk.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Stream; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.util.Mods; diff --git a/src/main/java/com/jozufozu/flywheel/core/virtual/VirtualRenderWorld.java b/src/main/java/com/jozufozu/flywheel/core/virtual/VirtualRenderWorld.java index 39574d808..68dd97d71 100644 --- a/src/main/java/com/jozufozu/flywheel/core/virtual/VirtualRenderWorld.java +++ b/src/main/java/com/jozufozu/flywheel/core/virtual/VirtualRenderWorld.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Predicate; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.api.FlywheelWorld; diff --git a/src/main/java/com/jozufozu/flywheel/event/ReloadRenderersEvent.java b/src/main/java/com/jozufozu/flywheel/event/ReloadRenderersEvent.java index 27136570c..6187ae578 100644 --- a/src/main/java/com/jozufozu/flywheel/event/ReloadRenderersEvent.java +++ b/src/main/java/com/jozufozu/flywheel/event/ReloadRenderersEvent.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.event; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraftforge.eventbus.api.Event; diff --git a/src/main/java/com/jozufozu/flywheel/mixin/BlockEntityTypeMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/BlockEntityTypeMixin.java index ba5b86e18..41b81e817 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/BlockEntityTypeMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/BlockEntityTypeMixin.java @@ -1,7 +1,6 @@ package com.jozufozu.flywheel.mixin; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/src/main/java/com/jozufozu/flywheel/mixin/BufferBuilderMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/BufferBuilderMixin.java index bc82deaf8..0b697fe50 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/BufferBuilderMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/BufferBuilderMixin.java @@ -2,9 +2,8 @@ package com.jozufozu.flywheel.mixin; import java.nio.ByteBuffer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.lwjgl.system.MemoryUtil; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -59,7 +58,7 @@ public abstract class BufferBuilderMixin implements BufferBuilderExtension { } @Override - public void flywheel$injectForRender(@Nonnull ByteBuffer buffer, @Nonnull VertexFormat format, int vertexCount) { + public void flywheel$injectForRender(@NotNull ByteBuffer buffer, @NotNull VertexFormat format, int vertexCount) { this.building = true; this.mode = VertexFormat.Mode.QUADS; diff --git a/src/main/java/com/jozufozu/flywheel/mixin/BufferUploaderMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/BufferUploaderMixin.java index 7cd63581c..5bee18288 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/BufferUploaderMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/BufferUploaderMixin.java @@ -1,7 +1,6 @@ package com.jozufozu.flywheel.mixin; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/jozufozu/flywheel/mixin/ChunkRebuildHooksMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/ChunkRebuildHooksMixin.java index a4accbe24..a12f4ad07 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/ChunkRebuildHooksMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/ChunkRebuildHooksMixin.java @@ -13,10 +13,7 @@ import com.jozufozu.flywheel.backend.instancing.InstancedRenderRegistry; import net.minecraft.client.renderer.chunk.ChunkRenderDispatcher; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) @Mixin(targets = "net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$RebuildTask") public class ChunkRebuildHooksMixin { diff --git a/src/main/java/com/jozufozu/flywheel/mixin/EntityTypeMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/EntityTypeMixin.java index fdd14c9d2..117a23aff 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/EntityTypeMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/EntityTypeMixin.java @@ -1,7 +1,6 @@ package com.jozufozu.flywheel.mixin; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/src/main/java/com/jozufozu/flywheel/mixin/FixFabulousDepthMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/FixFabulousDepthMixin.java index 9c0978197..1105ba7ab 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/FixFabulousDepthMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/FixFabulousDepthMixin.java @@ -13,10 +13,7 @@ import net.minecraft.client.Camera; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LightTexture; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) @Mixin(LevelRenderer.class) public class FixFabulousDepthMixin { diff --git a/src/main/java/com/jozufozu/flywheel/mixin/InstanceAddMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/InstanceAddMixin.java index b28fbfa84..1a0552aa5 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/InstanceAddMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/InstanceAddMixin.java @@ -13,10 +13,7 @@ import com.jozufozu.flywheel.backend.instancing.InstancedRenderDispatcher; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.chunk.LevelChunk; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) @Mixin(LevelChunk.class) public class InstanceAddMixin { diff --git a/src/main/java/com/jozufozu/flywheel/mixin/InstanceRemoveMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/InstanceRemoveMixin.java index 0ee0fd088..e30ce958b 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/InstanceRemoveMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/InstanceRemoveMixin.java @@ -1,7 +1,6 @@ package com.jozufozu.flywheel.mixin; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java index 2e49ffcfe..53d1bcd7d 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java @@ -29,11 +29,8 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; -@OnlyIn(Dist.CLIENT) @Mixin(value = LevelRenderer.class, priority = 1001) // Higher priority to go after sodium public class LevelRendererMixin { diff --git a/src/main/java/com/jozufozu/flywheel/mixin/RenderTypeMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/RenderTypeMixin.java index c3a3d7b5d..99d208b50 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/RenderTypeMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/RenderTypeMixin.java @@ -1,7 +1,6 @@ package com.jozufozu.flywheel.mixin; -import javax.annotation.Nonnull; - +import org.jetbrains.annotations.NotNull; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @@ -17,7 +16,7 @@ public class RenderTypeMixin implements RenderTypeExtension { private final DrawBuffer flywheel$drawBuffer = new DrawBuffer((RenderType) (Object) this); @Override - @Nonnull + @NotNull public DrawBuffer flywheel$getDrawBuffer() { return flywheel$drawBuffer; } diff --git a/src/main/java/com/jozufozu/flywheel/mixin/light/LightUpdateMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/light/LightUpdateMixin.java index b4b97fe20..8ca63e555 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/light/LightUpdateMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/light/LightUpdateMixin.java @@ -12,10 +12,7 @@ import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.SectionPos; import net.minecraft.world.level.LightLayer; import net.minecraft.world.level.chunk.ChunkSource; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) @Mixin(ClientChunkCache.class) public abstract class LightUpdateMixin extends ChunkSource { diff --git a/src/main/java/com/jozufozu/flywheel/mixin/matrix/Matrix3fMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/matrix/Matrix3fMixin.java index 2967eb43a..a6057dc0c 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/matrix/Matrix3fMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/matrix/Matrix3fMixin.java @@ -8,10 +8,6 @@ import com.jozufozu.flywheel.backend.gl.buffer.VecBuffer; import com.jozufozu.flywheel.util.MatrixWrite; import com.mojang.math.Matrix3f; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) @Mixin(Matrix3f.class) public abstract class Matrix3fMixin implements MatrixWrite { diff --git a/src/main/java/com/jozufozu/flywheel/mixin/matrix/Matrix4fMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/matrix/Matrix4fMixin.java index e512a8899..e97fa3e8d 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/matrix/Matrix4fMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/matrix/Matrix4fMixin.java @@ -8,10 +8,6 @@ import com.jozufozu.flywheel.backend.gl.buffer.VecBuffer; import com.jozufozu.flywheel.util.MatrixWrite; import com.mojang.math.Matrix4f; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) @Mixin(Matrix4f.class) public abstract class Matrix4fMixin implements MatrixWrite { diff --git a/src/main/java/com/jozufozu/flywheel/util/Color.java b/src/main/java/com/jozufozu/flywheel/util/Color.java index 0a21b84bd..e6824ec61 100644 --- a/src/main/java/com/jozufozu/flywheel/util/Color.java +++ b/src/main/java/com/jozufozu/flywheel/util/Color.java @@ -2,7 +2,7 @@ package com.jozufozu.flywheel.util; import java.util.function.UnaryOperator; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import com.google.common.hash.Hashing; import com.mojang.math.Vector3f; @@ -253,7 +253,7 @@ public class Color { // ********* // - public static Color mixColors(@Nonnull Color c1, @Nonnull Color c2, float w) { + public static Color mixColors(@NotNull Color c1, @NotNull Color c2, float w) { return new Color( (int) (c1.getRed() + (c2.getRed() - c1.getRed()) * w), (int) (c1.getGreen() + (c2.getGreen() - c1.getGreen()) * w), diff --git a/src/main/java/com/jozufozu/flywheel/util/Lazy.java b/src/main/java/com/jozufozu/flywheel/util/Lazy.java index 9b35bf323..a1fdd660e 100644 --- a/src/main/java/com/jozufozu/flywheel/util/Lazy.java +++ b/src/main/java/com/jozufozu/flywheel/util/Lazy.java @@ -5,7 +5,7 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; public class Lazy implements Supplier { @@ -17,7 +17,7 @@ public class Lazy implements Supplier { this.supplier = supplier; } - @Nonnull + @NotNull public T get() { if (value == null) { value = supplier.get(); diff --git a/src/main/java/com/jozufozu/flywheel/util/NonNullSupplier.java b/src/main/java/com/jozufozu/flywheel/util/NonNullSupplier.java index 39dd7567d..c53e3d8c4 100644 --- a/src/main/java/com/jozufozu/flywheel/util/NonNullSupplier.java +++ b/src/main/java/com/jozufozu/flywheel/util/NonNullSupplier.java @@ -1,10 +1,10 @@ package com.jozufozu.flywheel.util; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; @FunctionalInterface public interface NonNullSupplier { - @Nonnull + @NotNull T get(); } diff --git a/src/main/java/com/jozufozu/flywheel/util/Textures.java b/src/main/java/com/jozufozu/flywheel/util/Textures.java index f648e7cde..ea111cf87 100644 --- a/src/main/java/com/jozufozu/flywheel/util/Textures.java +++ b/src/main/java/com/jozufozu/flywheel/util/Textures.java @@ -1,7 +1,6 @@ package com.jozufozu.flywheel.util; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.Nullable; import org.lwjgl.opengl.GL32; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/jozufozu/flywheel/util/WorldAttached.java b/src/main/java/com/jozufozu/flywheel/util/WorldAttached.java index 408b54e51..64985d178 100644 --- a/src/main/java/com/jozufozu/flywheel/util/WorldAttached.java +++ b/src/main/java/com/jozufozu/flywheel/util/WorldAttached.java @@ -10,7 +10,7 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import net.minecraft.world.level.LevelAccessor; @@ -42,7 +42,7 @@ public class WorldAttached { } } - @Nonnull + @NotNull public T get(LevelAccessor world) { T t = attached.get(world); if (t != null) return t; @@ -58,7 +58,7 @@ public class WorldAttached { /** * Replaces the entry with a new one from the factory and returns the new entry. */ - @Nonnull + @NotNull public T replace(LevelAccessor world) { attached.remove(world); @@ -68,7 +68,7 @@ public class WorldAttached { /** * Replaces the entry with a new one from the factory and returns the new entry. */ - @Nonnull + @NotNull public T replace(LevelAccessor world, Consumer finalizer) { T remove = attached.remove(world); diff --git a/src/main/java/com/jozufozu/flywheel/vanilla/BellInstance.java b/src/main/java/com/jozufozu/flywheel/vanilla/BellInstance.java index 92430d074..018111754 100644 --- a/src/main/java/com/jozufozu/flywheel/vanilla/BellInstance.java +++ b/src/main/java/com/jozufozu/flywheel/vanilla/BellInstance.java @@ -1,12 +1,12 @@ package com.jozufozu.flywheel.vanilla; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.api.instance.DynamicInstance; import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance; -import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.BasicModelSupplier; +import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.hardcoded.ModelPart; import com.jozufozu.flywheel.core.materials.oriented.OrientedData; import com.jozufozu.flywheel.util.AnimationTickHolder; @@ -68,7 +68,7 @@ public class BellInstance extends BlockEntityInstance implement .createInstance(); } - @Nonnull + @NotNull private static ModelPart createBellModel() { return ModelPart.builder("bell", 32, 32) .sprite(BellRenderer.BELL_RESOURCE_LOCATION.sprite()) diff --git a/src/main/java/com/jozufozu/flywheel/vanilla/ChestInstance.java b/src/main/java/com/jozufozu/flywheel/vanilla/ChestInstance.java index e7678ab6c..abb696838 100644 --- a/src/main/java/com/jozufozu/flywheel/vanilla/ChestInstance.java +++ b/src/main/java/com/jozufozu/flywheel/vanilla/ChestInstance.java @@ -3,13 +3,13 @@ package com.jozufozu.flywheel.vanilla; import java.util.Calendar; import java.util.function.BiFunction; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.api.instance.DynamicInstance; import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance; -import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.BasicModelSupplier; +import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.hardcoded.ModelPart; import com.jozufozu.flywheel.core.materials.model.ModelData; import com.jozufozu.flywheel.core.materials.oriented.OrientedData; @@ -41,7 +41,7 @@ public class ChestInstance extends Block private final Float2FloatFunction lidProgress; private final Material renderMaterial; - @Nonnull + @NotNull private final ChestType chestType; private final Quaternion baseRotation; diff --git a/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java b/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java index 0e7aec4e2..3c2a81b45 100644 --- a/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java +++ b/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java @@ -1,13 +1,13 @@ package com.jozufozu.flywheel.vanilla; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.api.instance.DynamicInstance; import com.jozufozu.flywheel.api.instance.TickableInstance; import com.jozufozu.flywheel.backend.instancing.entity.EntityInstance; -import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.BasicModelSupplier; +import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.Models; import com.jozufozu.flywheel.core.hardcoded.ModelPart; import com.jozufozu.flywheel.core.materials.model.ModelData; @@ -158,7 +158,7 @@ public class MinecartInstance extends EntityInstance .createInstance(); } - @Nonnull + @NotNull private static Mesh getBodyModel() { int y = -3; return ModelPart.builder("minecart", 64, 32) diff --git a/src/main/java/com/jozufozu/flywheel/vanilla/ShulkerBoxInstance.java b/src/main/java/com/jozufozu/flywheel/vanilla/ShulkerBoxInstance.java index 91fe7e959..a1a979e4f 100644 --- a/src/main/java/com/jozufozu/flywheel/vanilla/ShulkerBoxInstance.java +++ b/src/main/java/com/jozufozu/flywheel/vanilla/ShulkerBoxInstance.java @@ -5,8 +5,8 @@ import java.util.function.Function; import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.api.instance.DynamicInstance; import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance; -import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.BasicModelSupplier; +import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.hardcoded.ModelPart; import com.jozufozu.flywheel.core.materials.model.ModelData; import com.jozufozu.flywheel.util.AnimationTickHolder; diff --git a/src/main/resources/flywheel.mixins.json b/src/main/resources/flywheel.mixins.json index c5d033070..d138c4efd 100644 --- a/src/main/resources/flywheel.mixins.json +++ b/src/main/resources/flywheel.mixins.json @@ -1,38 +1,38 @@ { - "required": true, - "minVersion": "0.8", - "package": "com.jozufozu.flywheel.mixin", - "compatibilityLevel": "JAVA_17", - "refmap": "flywheel.refmap.json", - "client": [ - "BlockEntityRenderDispatcherAccessor", - "BlockEntityTypeMixin", - "BufferBuilderMixin", - "BufferUploaderMixin", - "CameraMixin", - "ChunkRebuildHooksMixin", - "ClientLevelMixin", - "EntityTypeMixin", - "FixFabulousDepthMixin", - "FrustumMixin", - "GlStateManagerMixin", - "InstanceAddMixin", - "InstanceRemoveMixin", - "LevelRendererAccessor", - "LevelRendererMixin", - "MultiBufferSourceMixin", - "PausedPartialTickAccessor", - "RenderTexturesMixin", - "RenderTypeMixin", - "atlas.AtlasDataMixin", - "atlas.SheetDataAccessor", - "light.LightUpdateMixin", - "light.NetworkLightUpdateMixin", - "matrix.Matrix3fMixin", - "matrix.Matrix4fMixin", - "matrix.PoseStackMixin" - ], - "injectors": { - "defaultRequire": 1 + "required": true, + "minVersion": "0.8", + "package": "com.jozufozu.flywheel.mixin", + "compatibilityLevel": "JAVA_17", + "refmap": "flywheel.refmap.json", + "client": [ + "BlockEntityRenderDispatcherAccessor", + "BlockEntityTypeMixin", + "BufferBuilderMixin", + "BufferUploaderMixin", + "CameraMixin", + "ChunkRebuildHooksMixin", + "ClientLevelMixin", + "EntityTypeMixin", + "FixFabulousDepthMixin", + "FrustumMixin", + "GlStateManagerMixin", + "InstanceAddMixin", + "InstanceRemoveMixin", + "LevelRendererAccessor", + "LevelRendererMixin", + "MultiBufferSourceMixin", + "PausedPartialTickAccessor", + "RenderTexturesMixin", + "RenderTypeMixin", + "atlas.AtlasDataMixin", + "atlas.SheetDataAccessor", + "light.LightUpdateMixin", + "light.NetworkLightUpdateMixin", + "matrix.Matrix3fMixin", + "matrix.Matrix4fMixin", + "matrix.PoseStackMixin" + ], + "injectors": { + "defaultRequire": 1 } }