1.13 is dead (followup to 8bc0b0a)

This commit is contained in:
Jonas Herzig
2020-03-30 01:27:57 +02:00
parent 49ea1ae40a
commit 8b7ef8d1e3
105 changed files with 300 additions and 300 deletions

View File

@@ -148,7 +148,7 @@ public class BlendMeshBuilder
}
public static DMesh addBufferToMesh(ByteBuffer buffer, int mode, VertexFormat vertexFormat, DMesh mesh, ReadableVector3f vertOffset) {
//#if MC>=11300
//#if MC>=11400
int vertexCount = buffer.remaining() / vertexFormat.getVertexSize();
//#else
//$$ int vertexCount = buffer.remaining() / vertexFormat.getNextOffset();
@@ -222,7 +222,7 @@ public class BlendMeshBuilder
List<DMesh.Vertex> vertices = new ArrayList<>(vertexCount);
List<Vector2f> uvs = new ArrayList<>(vertexCount);
List<Integer> colors = new ArrayList<>(vertexCount);
//#if MC>=11300
//#if MC>=11400
int step = vertexFormat.getVertexSize();
//#else
//$$ int step = vertexFormat.getNextOffset();

View File

@@ -42,7 +42,7 @@ public class Util {
private static FloatBuffer floatBuffer = GlAllocationUtils.allocateFloatBuffer(16);
public static Matrix4f getGlMatrix(int matrix) {
floatBuffer.clear();
//#if MC>=11300
//#if MC>=11400
GL11.glGetFloatv(matrix, floatBuffer);
//#else
//$$ GL11.glGetFloat(matrix, floatBuffer);
@@ -184,7 +184,7 @@ public class Util {
public static String getTileEntityId(BlockEntity tileEntity) {
CompoundTag nbt = new CompoundTag();
//#if MC>=11300
//#if MC>=11400
tileEntity.toTag(nbt);
//#else
//$$ tileEntity.writeToNBT(nbt);

View File

@@ -55,7 +55,7 @@ public class EntityExporter implements Exporter {
if (entityObject == null) {
entityObject = new DObject(DObject.Type.OB_EMPTY);
entityObject.setParent(renderState.peekObject());
//#if MC>=11300
//#if MC>=11400
entityObject.id.name = entity.getName().getString();
//#else
//$$ entityObject.id.name = entity.getName();

View File

@@ -16,7 +16,7 @@ import net.minecraft.util.math.Vec3i;
//$$ import net.minecraftforge.client.model.pipeline.LightUtil;
//#endif
//#if MC>=11300
//#if MC>=11400
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.BakedModel;
//#else
@@ -69,7 +69,7 @@ public class ItemExporter implements Exporter {
}
if (object == null) {
object = new ItemBasedDObject(renderItem, model, stack);
//#if MC>=11300
//#if MC>=11400
object.id.name = stack.getName().getString();
//#else
//$$ object.id.name = stack.getDisplayName();
@@ -92,7 +92,7 @@ public class ItemExporter implements Exporter {
//$$ builder.setVertexFormat(DefaultVertexFormats.ITEM);
//#endif
//#if MC>=11300
//#if MC>=11400
for (Direction face : Direction.values()) {
renderQuads(renderItem, builder, model.getQuads(null, face, new Random()), stack);
}

View File

@@ -7,7 +7,7 @@ import com.replaymod.render.blend.data.DMesh;
import com.replaymod.render.blend.data.DObject;
import org.lwjgl.opengl.GL11;
//#if MC>=11300
//#if MC>=11400
import net.minecraft.client.model.Box;
import net.minecraft.client.model.Cuboid;
//#else

View File

@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
//#if MC>=11400
@Mixin(targets = "net.minecraft.client.render.WorldRenderer$ChunkInfo")
//#else
//#if MC>=11300
//#if MC>=11400
//$$ @Mixin(targets = "net/minecraft/client/renderer/WorldRenderer$ContainerLocalRenderInformation")
//#else
//$$ @Mixin(targets = "net/minecraft/client/renderer/RenderGlobal$ContainerLocalRenderInformation")

View File

@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//#if MC>=11300
//#if MC>=11400
import net.minecraft.client.render.chunk.ChunkRenderTask;
//#else
//$$ import net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator;
@@ -20,7 +20,7 @@ import net.minecraft.client.render.chunk.ChunkRenderTask;
public abstract class MixinChunkRenderWorker {
@Inject(method = "runTask", at = @At("RETURN"))
//#if MC>=11300
//#if MC>=11400
public void afterChunkUpdate(ChunkRenderTask task, CallbackInfo ci) {
BlendState blendState = BlendState.getState();
if (blendState != null) {

View File

@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//#if MC>=11300
//#if MC>=11400
import net.minecraft.client.model.Cuboid;
//#else
//$$ import net.minecraft.client.model.ModelRenderer;

View File

@@ -16,13 +16,13 @@ import net.minecraft.client.render.Camera;
//$$ import net.minecraft.entity.Entity;
//#endif
//#if MC>=11300
//#if MC>=11400
import net.minecraft.client.render.WorldRenderer;
//#else
//$$ import net.minecraft.client.renderer.RenderGlobal;
//#endif
//#if MC>=11300
//#if MC>=11400
@Mixin(WorldRenderer.class)
//#else
//$$ @Mixin(RenderGlobal.class)
@@ -74,7 +74,7 @@ public abstract class MixinRenderGlobal {
@Inject(method = "renderEntities", at = @At(
value = "INVOKE",
//#if MC>=11300
//#if MC>=11400
target = "Lnet/minecraft/client/render/block/entity/BlockEntityRenderDispatcher;render(Lnet/minecraft/block/entity/BlockEntity;FI)V"
//#else
//$$ target = "Lnet/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher;renderTileEntity(Lnet/minecraft/tileentity/TileEntity;FI)V"
@@ -95,7 +95,7 @@ public abstract class MixinRenderGlobal {
@Inject(method = "renderEntities", at = @At(
value = "INVOKE",
//#if MC>=11300
//#if MC>=11400
target = "Lnet/minecraft/client/render/block/entity/BlockEntityRenderDispatcher;render(Lnet/minecraft/block/entity/BlockEntity;FI)V",
//#else
//$$ target = "Lnet/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher;renderTileEntity(Lnet/minecraft/tileentity/TileEntity;FI)V",

View File

@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//#if MC>=11300
//#if MC>=11400
import net.minecraft.client.render.item.ItemRenderer;
import net.minecraft.client.render.model.BakedModel;
//#else
@@ -22,7 +22,7 @@ import net.minecraft.client.render.model.BakedModel;
//#endif
//#endif
//#if MC>=11300
//#if MC>=11400
@Mixin(ItemRenderer.class)
//#else
//$$ @Mixin(RenderItem.class)
@@ -31,7 +31,7 @@ public abstract class MixinRenderItem {
//#if MC>=11400
@Inject(method = "renderItemModel", at = @At("HEAD"))
//#else
//#if MC>=11300
//#if MC>=11400
//$$ @Inject(method = "renderModel(Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/item/ItemStack;)V",
//$$ at = @At("HEAD"))
//#else

View File

@@ -30,7 +30,7 @@ public abstract class MixinRenderManager {
//#if MC>=11400
method = "render(Lnet/minecraft/entity/Entity;DDDFFZ)V",
//#else
//#if MC>=11300
//#if MC>=11400
//$$ method = "renderEntity",
//#else
//$$ method = "doRenderEntity",
@@ -65,7 +65,7 @@ public abstract class MixinRenderManager {
//#if MC>=11400
method = "render(Lnet/minecraft/entity/Entity;DDDFFZ)V",
//#else
//#if MC>=11300
//#if MC>=11400
//$$ method = "renderEntity",
//#else
//$$ method = "doRenderEntity",

View File

@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(BlockEntityRenderDispatcher.class)
public abstract class MixinTileEntityRendererDispatcher {
//#if MC>=11300
//#if MC>=11400
//#if MC>=11400
@Inject(method = "renderEntity(Lnet/minecraft/block/entity/BlockEntity;DDDFIZ)V",
at = @At("HEAD"))
@@ -42,7 +42,7 @@ public abstract class MixinTileEntityRendererDispatcher {
}
}
//#if MC>=11300
//#if MC>=11400
//#if MC>=11400
@Inject(method = "renderEntity(Lnet/minecraft/block/entity/BlockEntity;DDDFIZ)V",
at = @At("RETURN"))