Move api package

This commit is contained in:
Jozufozu 2021-12-09 15:27:56 -08:00
parent c5b53a0297
commit f2d406a02a
46 changed files with 83 additions and 83 deletions

View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.api;
package com.jozufozu.flywheel.api;
import net.minecraft.world.level.Level;

View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.api;
package com.jozufozu.flywheel.api;
/**
* A marker interface custom worlds can override to indicate

View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.api;
package com.jozufozu.flywheel.api;
public abstract class InstanceData {

View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.api;
package com.jozufozu.flywheel.api;
/**
* An instancer is how you interact with an instanced model.

View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.api;
package com.jozufozu.flywheel.api;
import java.util.function.Supplier;

View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.api;
package com.jozufozu.flywheel.api;
public interface MaterialGroup {
/**

View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.api;
package com.jozufozu.flywheel.api;
import com.jozufozu.flywheel.backend.RenderLayer;

View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.api;
package com.jozufozu.flywheel.api;
import com.jozufozu.flywheel.backend.struct.StructType;

View file

@ -1,7 +1,7 @@
package com.jozufozu.flywheel.backend.api.instance;
package com.jozufozu.flywheel.api.instance;
import com.jozufozu.flywheel.backend.api.Instancer;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.api.Instancer;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance;
/**

View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.api.instance;
package com.jozufozu.flywheel.api.instance;
import net.minecraft.core.BlockPos;

View file

@ -1,7 +1,7 @@
package com.jozufozu.flywheel.backend.api.instance;
package com.jozufozu.flywheel.api.instance;
import com.jozufozu.flywheel.backend.api.Instancer;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.api.Instancer;
import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance;
/**

View file

@ -1,5 +1,5 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.backend.api.instance;
package com.jozufozu.flywheel.api.instance;
import javax.annotation.ParametersAreNonnullByDefault;

View file

@ -1,5 +1,5 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.backend.api;
package com.jozufozu.flywheel.api;
import javax.annotation.ParametersAreNonnullByDefault;

View file

@ -13,10 +13,10 @@ import org.apache.logging.log4j.Logger;
import org.lwjgl.opengl.GL;
import org.lwjgl.opengl.GLCapabilities;
import com.jozufozu.flywheel.backend.api.FlywheelWorld;
import com.jozufozu.flywheel.api.FlywheelWorld;
import com.jozufozu.flywheel.backend.gl.versioned.GlCompat;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.backend.api.MaterialSpec;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.api.MaterialSpec;
import com.jozufozu.flywheel.config.FlwConfig;
import com.jozufozu.flywheel.core.shader.spec.ProgramSpec;

View file

@ -3,11 +3,11 @@ package com.jozufozu.flywheel.backend.instancing;
import java.util.Arrays;
import java.util.stream.Stream;
import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.backend.api.instance.IInstance;
import com.jozufozu.flywheel.backend.api.instance.ITickableInstance;
import com.jozufozu.flywheel.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.api.instance.IInstance;
import com.jozufozu.flywheel.api.instance.ITickableInstance;
import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.core.materials.FlatLit;
import com.jozufozu.flywheel.light.LightListener;
import com.jozufozu.flywheel.light.ImmutableBox;

View file

@ -3,8 +3,8 @@ package com.jozufozu.flywheel.backend.instancing;
import java.util.ArrayList;
import java.util.BitSet;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.backend.api.Instancer;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.api.Instancer;
import com.jozufozu.flywheel.backend.struct.StructType;
import com.jozufozu.flywheel.core.model.Model;

View file

@ -1,6 +1,6 @@
package com.jozufozu.flywheel.backend.instancing;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
public interface Engine extends RenderDispatcher, MaterialManager {
}

View file

@ -9,9 +9,9 @@ import java.util.Set;
import javax.annotation.Nullable;
import com.jozufozu.flywheel.backend.Backend;
import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.backend.api.instance.ITickableInstance;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.api.instance.ITickableInstance;
import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.backend.instancing.instancing.InstancingEngine;
import com.jozufozu.flywheel.light.LightUpdater;
import com.mojang.math.Vector3f;

View file

@ -1,7 +1,7 @@
package com.jozufozu.flywheel.backend.instancing;
import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.backend.api.instance.ITickableInstance;
import com.jozufozu.flywheel.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.api.instance.ITickableInstance;
import com.jozufozu.flywheel.backend.instancing.entity.EntityInstanceManager;
import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager;
import com.jozufozu.flywheel.backend.instancing.batching.BatchingEngine;

View file

@ -5,12 +5,12 @@ import java.util.Map;
import javax.annotation.Nullable;
import com.google.common.collect.Maps;
import com.jozufozu.flywheel.backend.api.FlywheelRendered;
import com.jozufozu.flywheel.api.FlywheelRendered;
import com.jozufozu.flywheel.backend.instancing.entity.EntityInstance;
import com.jozufozu.flywheel.backend.instancing.entity.IEntityInstanceFactory;
import com.jozufozu.flywheel.backend.instancing.tile.ITileInstanceFactory;
import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import it.unimi.dsi.fastutil.objects.Object2BooleanLinkedOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2BooleanMap;

View file

@ -4,10 +4,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.backend.api.Instancer;
import com.jozufozu.flywheel.backend.api.Material;
import com.jozufozu.flywheel.backend.api.MaterialSpec;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.api.Instancer;
import com.jozufozu.flywheel.api.Material;
import com.jozufozu.flywheel.api.MaterialSpec;
import com.jozufozu.flywheel.backend.struct.StructType;
import com.jozufozu.flywheel.core.model.Model;
import com.mojang.blaze3d.vertex.PoseStack;

View file

@ -3,9 +3,9 @@ package com.jozufozu.flywheel.backend.instancing.batching;
import java.util.HashMap;
import java.util.Map;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.backend.api.MaterialGroup;
import com.jozufozu.flywheel.backend.api.MaterialSpec;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.api.MaterialGroup;
import com.jozufozu.flywheel.api.MaterialSpec;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;

View file

@ -5,7 +5,7 @@ import java.util.HashMap;
import java.util.Map;
import com.jozufozu.flywheel.backend.instancing.Engine;
import com.jozufozu.flywheel.backend.api.MaterialGroup;
import com.jozufozu.flywheel.api.MaterialGroup;
import com.jozufozu.flywheel.backend.RenderLayer;
import com.jozufozu.flywheel.event.RenderLayerEvent;

View file

@ -1,7 +1,7 @@
package com.jozufozu.flywheel.backend.instancing.batching;
import com.jozufozu.flywheel.backend.instancing.AbstractInstancer;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.backend.struct.BatchingTransformer;
import com.jozufozu.flywheel.backend.struct.StructType;
import com.jozufozu.flywheel.core.model.Model;

View file

@ -1,10 +1,10 @@
package com.jozufozu.flywheel.backend.instancing.entity;
import com.jozufozu.flywheel.backend.instancing.AbstractInstance;
import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.backend.api.instance.ITickableInstance;
import com.jozufozu.flywheel.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.api.instance.ITickableInstance;
import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.light.GridAlignedBB;
import com.jozufozu.flywheel.light.LightListener;
import com.jozufozu.flywheel.light.MovingListener;

View file

@ -4,7 +4,7 @@ import com.jozufozu.flywheel.backend.Backend;
import com.jozufozu.flywheel.backend.instancing.AbstractInstance;
import com.jozufozu.flywheel.backend.instancing.InstanceManager;
import com.jozufozu.flywheel.backend.instancing.InstancedRenderRegistry;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.Entity;

View file

@ -1,6 +1,6 @@
package com.jozufozu.flywheel.backend.instancing.entity;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import net.minecraft.world.entity.Entity;

View file

@ -10,7 +10,7 @@ import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType;
import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer;
import com.jozufozu.flywheel.backend.gl.error.GlError;
import com.jozufozu.flywheel.backend.instancing.AbstractInstancer;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.backend.model.IBufferedModel;
import com.jozufozu.flywheel.backend.model.ModelAllocator;
import com.jozufozu.flywheel.backend.struct.StructType;

View file

@ -6,10 +6,10 @@ import java.util.function.Supplier;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.jozufozu.flywheel.backend.RenderWork;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.backend.api.Instancer;
import com.jozufozu.flywheel.backend.api.Material;
import com.jozufozu.flywheel.backend.api.MaterialSpec;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.api.Instancer;
import com.jozufozu.flywheel.api.Material;
import com.jozufozu.flywheel.api.MaterialSpec;
import com.jozufozu.flywheel.backend.model.ModelPool;
import com.jozufozu.flywheel.backend.struct.StructType;
import com.jozufozu.flywheel.core.Formats;

View file

@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.backend.api.MaterialGroup;
import com.jozufozu.flywheel.backend.api.MaterialSpec;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.api.MaterialGroup;
import com.jozufozu.flywheel.api.MaterialSpec;
import com.jozufozu.flywheel.core.shader.WorldProgram;
import com.jozufozu.flywheel.util.TextureBinder;
import com.mojang.math.Matrix4f;

View file

@ -11,7 +11,7 @@ import javax.annotation.Nullable;
import com.jozufozu.flywheel.backend.gl.GlVertexArray;
import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType;
import com.jozufozu.flywheel.backend.instancing.Engine;
import com.jozufozu.flywheel.backend.api.MaterialGroup;
import com.jozufozu.flywheel.api.MaterialGroup;
import com.jozufozu.flywheel.backend.RenderLayer;
import com.jozufozu.flywheel.core.WorldContext;
import com.jozufozu.flywheel.core.shader.WorldProgram;

View file

@ -1,6 +1,6 @@
package com.jozufozu.flywheel.backend.instancing.tile;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import net.minecraft.world.level.block.entity.BlockEntity;

View file

@ -1,10 +1,10 @@
package com.jozufozu.flywheel.backend.instancing.tile;
import com.jozufozu.flywheel.backend.instancing.AbstractInstance;
import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.backend.api.instance.ITickableInstance;
import com.jozufozu.flywheel.backend.api.Material;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.api.instance.ITickableInstance;
import com.jozufozu.flywheel.api.Material;
import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.core.Materials;
import com.jozufozu.flywheel.core.materials.model.ModelData;
import com.jozufozu.flywheel.core.materials.oriented.OrientedData;

View file

@ -4,7 +4,7 @@ import com.jozufozu.flywheel.backend.Backend;
import com.jozufozu.flywheel.backend.instancing.AbstractInstance;
import com.jozufozu.flywheel.backend.instancing.InstanceManager;
import com.jozufozu.flywheel.backend.instancing.InstancedRenderRegistry;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;

View file

@ -1,6 +1,6 @@
package com.jozufozu.flywheel.core;
import com.jozufozu.flywheel.backend.api.MaterialSpec;
import com.jozufozu.flywheel.api.MaterialSpec;
import com.jozufozu.flywheel.backend.struct.StructType;
import com.jozufozu.flywheel.core.materials.model.ModelData;
import com.jozufozu.flywheel.core.materials.model.ModelType;

View file

@ -7,7 +7,7 @@ import java.util.stream.Stream;
import com.jozufozu.flywheel.backend.Backend;
import com.jozufozu.flywheel.backend.ShaderContext;
import com.jozufozu.flywheel.backend.api.MaterialSpec;
import com.jozufozu.flywheel.api.MaterialSpec;
import com.jozufozu.flywheel.backend.pipeline.ShaderPipeline;
import com.jozufozu.flywheel.core.shader.ContextAwareProgram;
import com.jozufozu.flywheel.core.shader.WorldProgram;

View file

@ -1,7 +1,7 @@
package com.jozufozu.flywheel.core.crumbling;
import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import net.minecraft.core.BlockPos;

View file

@ -5,8 +5,8 @@ import java.util.function.Consumer;
import javax.annotation.Nullable;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.backend.api.Instancer;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.api.Instancer;
public class ConditionalInstance<D extends InstanceData> {

View file

@ -5,8 +5,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.backend.api.Instancer;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.api.Instancer;
public class GroupInstance<D extends InstanceData> extends AbstractCollection<D> {

View file

@ -6,8 +6,8 @@ import java.util.Optional;
import javax.annotation.Nullable;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.backend.api.Instancer;
import com.jozufozu.flywheel.api.InstanceData;
import com.jozufozu.flywheel.api.Instancer;
public class SelectInstance<D extends InstanceData> {

View file

@ -1,6 +1,6 @@
package com.jozufozu.flywheel.core.materials;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.api.InstanceData;
public abstract class BasicData extends InstanceData implements FlatLit<BasicData> {

View file

@ -1,6 +1,6 @@
package com.jozufozu.flywheel.core.materials;
import com.jozufozu.flywheel.backend.api.InstanceData;
import com.jozufozu.flywheel.api.InstanceData;
/**
* An interface that implementors of {@link InstanceData} should also implement

View file

@ -1,8 +1,8 @@
package com.jozufozu.flywheel.vanilla;
import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.core.Materials;
import com.jozufozu.flywheel.core.materials.oriented.OrientedData;
import com.jozufozu.flywheel.core.model.ModelPart;

View file

@ -4,9 +4,9 @@ import java.util.Calendar;
import javax.annotation.Nonnull;
import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.core.Materials;
import com.jozufozu.flywheel.core.materials.model.ModelData;
import com.jozufozu.flywheel.core.materials.oriented.OrientedData;

View file

@ -1,9 +1,9 @@
package com.jozufozu.flywheel.vanilla;
import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.backend.api.instance.ITickableInstance;
import com.jozufozu.flywheel.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.api.instance.ITickableInstance;
import com.jozufozu.flywheel.backend.instancing.entity.EntityInstance;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.core.Materials;
import com.jozufozu.flywheel.core.materials.model.ModelData;
import com.jozufozu.flywheel.core.model.Model;

View file

@ -1,8 +1,8 @@
package com.jozufozu.flywheel.vanilla;
import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.api.instance.IDynamicInstance;
import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance;
import com.jozufozu.flywheel.backend.api.MaterialManager;
import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.core.Materials;
import com.jozufozu.flywheel.core.materials.model.ModelData;
import com.jozufozu.flywheel.core.model.ModelPart;