mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-28 08:12:18 +00:00
Code Issues Releases Wiki Activity

Correctly set VertexBuffer.format

Browse Source 
Fixes #1137. Maybe.
This commit is contained in:
Jonathan Coates 2022-07-21 09:50:33 +01:00
parent 4a273ae8e5
commit 25a44bea6e
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -7,5 +7,5 @@ mod_version=1.100.8
# Minecraft properties (update mods.toml when changing) # Minecraft properties (update mods.toml when changing)
mc_version=1.19 mc_version=1.19
mapping_version=1.18.2-2022.07.03 mapping_version=1.18.2-2022.07.03
forge_version=41.0.98 forge_version=41.0.105
# NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING # NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING

2
src/main/java/dan200/computercraft/client/ClientRegistry.java
View File

@ -115,7 +115,7 @@ public final class ClientRegistry
}, Registry.ModItems.POCKET_COMPUTER_NORMAL.get(), Registry.ModItems.POCKET_COMPUTER_ADVANCED.get() ); }, Registry.ModItems.POCKET_COMPUTER_NORMAL.get(), Registry.ModItems.POCKET_COMPUTER_ADVANCED.get() );
// Setup turtle colours // Setup turtle colours
event.getItemColors().register( event.register(
( stack, tintIndex ) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour( stack ) : 0xFFFFFF, ( stack, tintIndex ) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour( stack ) : 0xFFFFFF,
Registry.ModBlocks.TURTLE_NORMAL.get(), Registry.ModBlocks.TURTLE_ADVANCED.get() Registry.ModBlocks.TURTLE_NORMAL.get(), Registry.ModBlocks.TURTLE_ADVANCED.get()
); );

1
src/main/java/dan200/computercraft/client/util/DirectVertexBuffer.java
View File

@ -50,6 +50,7 @@ public class DirectVertexBuffer extends VertexBuffer
if( format != this.format ) if( format != this.format )
{ {
if( this.format != null ) this.format.clearBufferState(); if( this.format != null ) this.format.clearBufferState();
this.format = format;
GL15C.glBindBuffer( GL15C.GL_ARRAY_BUFFER, vertexBufferId ); GL15C.glBindBuffer( GL15C.GL_ARRAY_BUFFER, vertexBufferId );
format.setupBufferState(); format.setupBufferState();

2
src/main/resources/META-INF/mods.toml
View File

@ -21,6 +21,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a
[[dependencies.computercraft]] [[dependencies.computercraft]]
modId="forge" modId="forge"
mandatory=true mandatory=true
versionRange="[41.0.98,42)" versionRange="[41.0.105,42)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"