mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-22 09:27:39 +00:00
Code Issues Releases Wiki Activity

Started work on upgrading to 1.16.1. Not in a compilable state yet

Browse Source
This commit is contained in:
Alex Evelyn
2020-07-07 13:27:13 -04:00
parent cb66ef7e30
commit 605e1f6b9b
513 changed files with 48117 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java
View File

@@ -9,7 +9,6 @@ package dan200.computercraft.client.render;
import com.mojang.blaze3d.platform.GlStateManager;
import dan200.computercraft.shared.mixed.MixedFirstPersonRenderer;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.FirstPersonRenderer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Arm;
@@ -65,7 +64,7 @@ public abstract class ItemMapLikeRenderer
{
GlStateManager.pushMatrix();
GlStateManager.rotatef( offset * 10f, 0f, 0f, 1f );
((MixedFirstPersonRenderer) minecraft.getFirstPersonRenderer()).renderArmFirstPerson_CC( equipProgress, swingProgress, side );
((MixedFirstPersonRenderer) minecraft.getHeldItemRenderer()).renderArmFirstPerson_CC( equipProgress, swingProgress, side );
GlStateManager.popMatrix();
}
@@ -98,7 +97,7 @@ public abstract class ItemMapLikeRenderer
*/
private void renderItemFirstPersonCenter( float pitch, float equipProgress, float swingProgress, ItemStack stack )
{
MixedFirstPersonRenderer renderer = (MixedFirstPersonRenderer) MinecraftClient.getInstance().getFirstPersonRenderer();
MixedFirstPersonRenderer renderer = (MixedFirstPersonRenderer) MinecraftClient.getInstance().getHeldItemRenderer();
// Setup the appropriate transformations. This is just copied from the
// corresponding method in ItemRenderer.

12
src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java
View File

@@ -100,10 +100,10 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
else
{
// Otherwise render a plain background
MinecraftClient.getInstance().getTextureManager().bindTexture( BACKGROUND );
MinecraftClient.getInstance().getTextureManager().bindTextureInner( BACKGROUND );
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder buffer = tessellator.getBufferBuilder();
BufferBuilder buffer = tessellator.getBuffer();
Colour black = Colour.Black;
buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION );
@@ -119,7 +119,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
private static void renderFrame( ComputerFamily family, int colour, int width, int height )
{
MinecraftClient.getInstance().getTextureManager().bindTexture( colour != -1
MinecraftClient.getInstance().getTextureManager().bindTextureInner( colour != -1
? BACKGROUND_COLOUR
: family == ComputerFamily.Normal ? BACKGROUND_NORMAL : BACKGROUND_ADVANCED
);
@@ -129,8 +129,8 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
float b = (colour & 0xFF) / 255.0f;
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder buffer = tessellator.getBufferBuilder();
buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_UV_COLOR );
BufferBuilder buffer = tessellator.getBuffer();
buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_TEXTURE_COLOR );
// Top left, middle, right
renderTexture( buffer, -FRAME, -FRAME, 12, 28, FRAME, FRAME, r, g, b );
@@ -168,7 +168,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
float b = (colour & 0xFF) / 255.0f;
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder buffer = tessellator.getBufferBuilder();
BufferBuilder buffer = tessellator.getBuffer();
buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_COLOR );
buffer.vertex( width - LIGHT_HEIGHT * 2, height + LIGHT_HEIGHT + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).next();
buffer.vertex( width, height + LIGHT_HEIGHT + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).next();

2
src/main/java/dan200/computercraft/client/render/ModelTransformer.java
View File

@@ -35,7 +35,7 @@ public final class ModelTransformer
public static void transformQuadsTo( List<BakedQuad> output, List<BakedQuad> input, Matrix4f transform )
{
transformQuadsTo( VertexFormats.POSITION_COLOR_UV_NORMAL, output, input, transform );
transformQuadsTo( VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, output, input, transform );
}
public static void transformQuadsTo( VertexFormat format, List<BakedQuad> output, List<BakedQuad> input, Matrix4f transform )

2
src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java
View File

@@ -64,7 +64,7 @@ public final class MonitorHighlightRenderer
GlStateManager.translated( pos.getX() - camera.getPos().getX(), pos.getY() - camera.getPos().getY(), pos.getZ() - camera.getPos().getZ() );
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder buffer = tessellator.getBufferBuilder();
BufferBuilder buffer = tessellator.getBuffer();
buffer.begin( GL11.GL_LINES, VertexFormats.POSITION_COLOR );
// I wish I could think of a better way to do this

6
src/main/java/dan200/computercraft/client/render/PrintoutRenderer.java
View File

@@ -94,11 +94,11 @@ public final class PrintoutRenderer
GlStateManager.enableTexture();
GlStateManager.blendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
MinecraftClient.getInstance().getTextureManager().bindTexture( BG );
MinecraftClient.getInstance().getTextureManager().bindTextureInner( BG );
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder buffer = tessellator.getBufferBuilder();
buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_UV );
BufferBuilder buffer = tessellator.getBuffer();
buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_TEXTURE );
int leftPages = page;
int rightPages = pages - page - 1;

4
src/main/java/dan200/computercraft/client/render/TileEntityCableRenderer.java
View File

@@ -48,7 +48,7 @@ public class TileEntityCableRenderer extends BlockEntityRenderer<TileCable>
MinecraftClient mc = MinecraftClient.getInstance();
HitResult hit = mc.hitResult;
HitResult hit = mc.crosshairTarget;
if( !(hit instanceof BlockHitResult) || !((BlockHitResult) hit).getBlockPos().equals( pos ) ) return;
World world = te.getWorld();
@@ -64,7 +64,7 @@ public class TileEntityCableRenderer extends BlockEntityRenderer<TileCable>
preRenderDamagedBlocks();
BufferBuilder buffer = Tessellator.getInstance().getBufferBuilder();
BufferBuilder buffer = Tessellator.getInstance().getBuffer();
buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_COLOR_UV_LMAP );
buffer.setOffset( x - pos.getX(), y - pos.getY(), z - pos.getZ() );
buffer.disableColor();

10
src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
View File

@@ -87,7 +87,7 @@ public class TileEntityMonitorRenderer extends BlockEntityRenderer<TileMonitor>
// Get renderers
MinecraftClient mc = MinecraftClient.getInstance();
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder renderer = tessellator.getBufferBuilder();
BufferBuilder renderer = tessellator.getBuffer();
// Get terminal
boolean redraw = originTerminal.pollTerminalChanged();
@@ -127,7 +127,7 @@ public class TileEntityMonitorRenderer extends BlockEntityRenderer<TileMonitor>
GlStateManager.scaled( xScale, -yScale, 1.0 );
// Draw background
mc.getTextureManager().bindTexture( FixedWidthFontRenderer.BACKGROUND );
mc.getTextureManager().bindTextureInner( FixedWidthFontRenderer.BACKGROUND );
if( redraw )
{
// Build background display list
@@ -244,14 +244,14 @@ public class TileEntityMonitorRenderer extends BlockEntityRenderer<TileMonitor>
else
{
// Draw a big black quad
mc.getTextureManager().bindTexture( FixedWidthFontRenderer.BACKGROUND );
mc.getTextureManager().bindTextureInner( FixedWidthFontRenderer.BACKGROUND );
final Colour colour = Colour.Black;
final float r = colour.getR();
final float g = colour.getG();
final float b = colour.getB();
renderer.begin( GL11.GL_TRIANGLE_STRIP, VertexFormats.POSITION_UV_COLOR );
renderer.begin( GL11.GL_TRIANGLE_STRIP, VertexFormats.POSITION_TEXTURE_COLOR );
renderer.vertex( -TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0D ).texture( 0.0, 0.0 ).color( r, g, b, 1.0f ).next();
renderer.vertex( -TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).texture( 0.0, 1.0 ).color( r, g, b, 1.0f ).next();
renderer.vertex( xSize + TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0D ).texture( 1.0, 0.0 ).color( r, g, b, 1.0f ).next();
@@ -270,7 +270,7 @@ public class TileEntityMonitorRenderer extends BlockEntityRenderer<TileMonitor>
GlStateManager.colorMask( false, false, false, false );
try
{
mc.getTextureManager().bindTexture( FixedWidthFontRenderer.BACKGROUND );
mc.getTextureManager().bindTextureInner( FixedWidthFontRenderer.BACKGROUND );
renderer.begin( GL11.GL_TRIANGLE_STRIP, VertexFormats.POSITION );
renderer.vertex( -TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0 ).next();
renderer.vertex( -TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).next();

10
src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java
View File

@@ -85,13 +85,13 @@ public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
{
// Render the label
String label = turtle.createProxy().getLabel();
if( label != null && renderManager.hitResult != null && renderManager.hitResult instanceof BlockHitResult && turtle.getPos().equals( ((BlockHitResult) renderManager.hitResult).getBlockPos() ) )
if( label != null && renderManager.crosshairTarget != null && renderManager.crosshairTarget instanceof BlockHitResult && turtle.getPos().equals( ((BlockHitResult) renderManager.crosshairTarget).getBlockPos() ) )
{
disableLightmap( true );
GameRenderer.renderFloatingText(
getFontRenderer(), label,
(float) posX + 0.5F, (float) posY + 1.2F, (float) posZ + 0.5F, 0,
renderManager.cameraEntity.getYaw(), renderManager.cameraEntity.getPitch(), false
renderManager.camera.getYaw(), renderManager.camera.getPitch(), false
);
disableLightmap( false );
}
@@ -206,7 +206,7 @@ public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
{
Random random = new Random( 0 );
Tessellator tessellator = Tessellator.getInstance();
renderManager.textureManager.bindTexture( SpriteAtlasTexture.BLOCK_ATLAS_TEX );
renderManager.textureManager.bindTextureInner( SpriteAtlasTexture.BLOCK_ATLAS_TEX );
renderQuads( tessellator, model.getQuads( state, null, random ), tints );
for( Direction facing : DirectionUtil.FACINGS )
{
@@ -216,8 +216,8 @@ public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
private static void renderQuads( Tessellator tessellator, List<BakedQuad> quads, int[] tints )
{
BufferBuilder buffer = tessellator.getBufferBuilder();
VertexFormat format = VertexFormats.POSITION_COLOR_UV_NORMAL;
BufferBuilder buffer = tessellator.getBuffer();
VertexFormat format = VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL;
buffer.begin( GL11.GL_QUADS, format );
for( BakedQuad quad : quads )
{

10
src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
View File

@@ -9,7 +9,7 @@ package dan200.computercraft.client.render;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.json.ModelItemPropertyOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.math.Direction;
@@ -97,9 +97,9 @@ public class TurtleMultiModel implements BakedModel
}
@Override
public boolean hasDepthInGui()
public boolean hasDepth()
{
return m_baseModel.hasDepthInGui();
return m_baseModel.hasDepth();
}
@Override
@@ -121,8 +121,8 @@ public class TurtleMultiModel implements BakedModel
}
@Override
public ModelItemPropertyOverrideList getItemPropertyOverrides()
public ModelOverrideList getOverrides()
{
return ModelItemPropertyOverrideList.EMPTY;
return ModelOverrideList.EMPTY;
}
}

12
src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
View File

@@ -18,7 +18,7 @@ import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.BakedModelManager;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.render.model.json.ModelItemPropertyOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.util.ModelIdentifier;
@@ -105,7 +105,7 @@ public class TurtleSmartItemModel implements BakedModel
private final BakedModel colourModel;
private HashMap<TurtleModelCombination, BakedModel> m_cachedModels;
private ModelItemPropertyOverrideList m_overrides;
private ModelOverrideList m_overrides;
public TurtleSmartItemModel( ModelLoader loader, BakedModel familyModel, BakedModel colourModel )
{
@@ -113,7 +113,7 @@ public class TurtleSmartItemModel implements BakedModel
this.colourModel = colourModel;
m_cachedModels = new HashMap<>();
m_overrides = new ModelItemPropertyOverrideList( loader, null, null, Collections.emptyList() )
m_overrides = new ModelOverrideList( loader, null, null, Collections.emptyList() )
{
@Nonnull
@Override
@@ -138,7 +138,7 @@ public class TurtleSmartItemModel implements BakedModel
@Nonnull
@Override
public ModelItemPropertyOverrideList getItemPropertyOverrides()
public ModelOverrideList getOverrides()
{
return m_overrides;
}
@@ -187,9 +187,9 @@ public class TurtleSmartItemModel implements BakedModel
}
@Override
public boolean hasDepthInGui()
public boolean hasDepth()
{
return familyModel.hasDepthInGui();
return familyModel.hasDepth();
}
@Override