Fabric port in progress

This commit is contained in:
Sebastian Hartte
2020-06-28 00:45:33 +02:00
parent b79cd732b2
commit 37ce6b262e
102 changed files with 650 additions and 591 deletions
@@ -20,7 +20,7 @@ package appeng.thirdparty.codechicken.lib.model;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.util.math.Box;
@@ -45,7 +45,7 @@ public class Quad implements IVertexProducer, ISmartVertexConsumer {
public int tintIndex = -1;
public Direction orientation;
public boolean diffuseLighting = true;
public TextureAtlasSprite sprite;
public Sprite sprite;
public Vertex[] vertices = new Vertex[4];
public boolean full;
@@ -94,7 +94,7 @@ public class Quad implements IVertexProducer, ISmartVertexConsumer {
}
@Override
public void setTexture(TextureAtlasSprite texture) {
public void setTexture(Sprite texture) {
this.sprite = texture;
}
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.pipeline.IVertexConsumer;
@@ -216,7 +216,7 @@ public class BakedPipeline implements ISmartVertexConsumer {
}
@Override
public void setTexture(TextureAtlasSprite texture) {
public void setTexture(Sprite texture) {
this.check();
this.unpacker.setTexture(texture);
}
@@ -20,7 +20,7 @@ package appeng.thirdparty.codechicken.lib.model.pipeline;
import javax.annotation.OverridingMethodsMustInvokeSuper;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.pipeline.IVertexConsumer;
@@ -104,7 +104,7 @@ public abstract class QuadTransformer implements IVertexConsumer, ISmartVertexCo
}
@Override
public void setTexture(TextureAtlasSprite texture) {
public void setTexture(Sprite texture) {
this.quad.setTexture(texture);
}
// @formatter:on