mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-06-27 23:53:21 +00:00
Code Issues Releases Wiki Activity

Fix a couple of build failures

Browse Source
This commit is contained in:
SquidDev 2019-06-02 18:36:23 +01:00
parent 18aee02221
commit b6715bd812
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IModelData;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.vecmath.Matrix4f; import javax.vecmath.Matrix4f;
@ -44,7 +45,15 @@ public TurtleMultiModel( IBakedModel baseModel, IBakedModel overlayModel, Matrix
@Nonnull @Nonnull
@Override @Override
@Deprecated
public List<BakedQuad> getQuads( IBlockState state, EnumFacing side, @Nonnull Random rand ) public List<BakedQuad> getQuads( IBlockState state, EnumFacing side, @Nonnull Random rand )
{
return getQuads( state, side, rand, EmptyModelData.INSTANCE );
}
@Nonnull
@Override
public List<BakedQuad> getQuads( IBlockState state, EnumFacing side, @Nonnull Random rand, @Nonnull IModelData data )
{ {
if( side != null ) if( side != null )
{ {

3
src/main/resources/data/computercraft/lua/rom/apis/keys.lua
View File

@ -7,6 +7,9 @@
-- they relied on Minecraft's character mappings. However, if CC emulators have -- they relied on Minecraft's character mappings. However, if CC emulators have
-- taught me anything, it's that emulating LWJGL's weird key handling is nigh-on -- taught me anything, it's that emulating LWJGL's weird key handling is nigh-on
-- impossible. -- impossible.
local expect = _G["~expect"]
local tKeys = {} local tKeys = {}
tKeys[32] = 'space' tKeys[32] = 'space'
tKeys[39] = 'apostrophe' tKeys[39] = 'apostrophe'