Remove deprecations

This commit is contained in:
tterrag committed 2019-12-17 04:50:13 -05:00
1 parent 5b67354e24
commit 1558362583
17 files changed
+15 -287

No files matched your search

@@ -463,22 +463,6 @@ public class ForgeHooksClient
return model;
}
private static final FloatBuffer matrixBuf = BufferUtils.createFloatBuffer(16);
@Deprecated
public static void multiplyCurrentGlMatrix(Matrix4f matrix)
{
matrixBuf.clear();
float[] t = new float[4];
for(int i = 0; i < 4; i++)
{
matrix.getColumn(i, t);
matrixBuf.put(t);
}
matrixBuf.flip();
glMultMatrixf(matrixBuf);
}
// moved and expanded from WorldVertexBufferUploader.draw
public static void preDraw(Usage attrType, VertexFormat format, int element, int stride, ByteBuffer buffer)
@@ -72,9 +72,6 @@ public final class ModelDynBucket implements IModelGeometry<ModelDynBucket>
private static final float NORTH_Z_FLUID = 7.498f / 16f;
private static final float SOUTH_Z_FLUID = 8.502f / 16f;
@Deprecated
public static final ModelDynBucket MODEL = new ModelDynBucket();
@Nonnull
private final Fluid fluid;
@@ -82,12 +79,6 @@ public final class ModelDynBucket implements IModelGeometry<ModelDynBucket>
private final boolean tint;
private final boolean coverIsMask;
@Deprecated
public ModelDynBucket()
{
this(Fluids.EMPTY, false, true, false);
}
public ModelDynBucket(Fluid fluid, boolean flipGas, boolean tint, boolean coverIsMask)
{
this.fluid = fluid;
@@ -97,24 +88,12 @@ public final class ModelDynBucket implements IModelGeometry<ModelDynBucket>
}
/**
* Sets the fluid in the model.
* "fluid" - Name of the fluid in the fluid registry.
* "flipGas" - If "true" the model will be flipped upside down if the fluid is lighter than air. If "false" it won't.
* "applyTint" - If "true" the model will tint the fluid quads according to the fluid's base color.
* <p/>
* If the fluid can't be found, water is used.
* Returns a new ModelDynBucket representing the given fluid, but with the same
* other properties (flipGas, tint, coverIsMask).
*/
@Deprecated
public ModelDynBucket withFluid(String newFluid)
public ModelDynBucket withFluid(Fluid newFluid)
{
ResourceLocation fluidName = new ResourceLocation(newFluid);
Fluid fluid = ForgeRegistries.FLUIDS.getValue(fluidName);
if (fluid == null)
fluid = this.fluid;
// create new model with correct liquid
return new ModelDynBucket(fluid, flipGas, tint, coverIsMask);
return new ModelDynBucket(newFluid, flipGas, tint, coverIsMask);
}
@Nullable
@@ -438,7 +417,7 @@ public final class ModelDynBucket implements IModelGeometry<ModelDynBucket>
if (!model.cache.containsKey(name))
{
ModelDynBucket parent = model.parent.withFluid(name);
ModelDynBucket parent = model.parent.withFluid(fluid);
IBakedModel bakedModel = parent.bake(model.owner, bakery, ModelLoader.defaultTextureGetter(), new SimpleModelTransform(model.transforms), model.getOverrides(), new ResourceLocation("forge:bucket_override"));
model.cache.put(name, bakedModel);
return bakedModel;
@@ -69,11 +69,6 @@ public abstract class ModelFile {
public static class ExistingModelFile extends ModelFile {
private final ExistingFileHelper existingHelper;
@Deprecated
public ExistingModelFile(String location, ExistingFileHelper existingHelper) {
this(new ResourceLocation(location), existingHelper);
}
public ExistingModelFile(ResourceLocation location, ExistingFileHelper existingHelper) {
super(location);
this.existingHelper = existingHelper;
@@ -254,30 +254,6 @@ public class LightUtil
}
}
private static IVertexConsumer tessellator = null;
@Deprecated // TODO: remove
public static IVertexConsumer getTessellator()
{
if(tessellator == null)
{
Tessellator tes = Tessellator.getInstance();
BufferBuilder wr = tes.getBuffer();
tessellator = new VertexBufferConsumer(wr);
}
return tessellator;
}
private static ItemConsumer itemConsumer = null;
@Deprecated // TODO: remove
public static ItemConsumer getItemConsumer()
{
if(itemConsumer == null)
{
itemConsumer = new ItemConsumer(getTessellator());
}
return itemConsumer;
}
private static final class ItemPipeline
{
final VertexBufferConsumer bufferConsumer;