From b6715bd812ea5a97cba477d87ee5b71c52932bde Mon Sep 17 00:00:00 2001 From: SquidDev Date: Sun, 2 Jun 2019 18:36:23 +0100 Subject: [PATCH] Fix a couple of build failures --- .../computercraft/client/render/TurtleMultiModel.java | 9 +++++++++ .../resources/data/computercraft/lua/rom/apis/keys.lua | 3 +++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java index 0c8e6e737..c79901802 100644 --- a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java +++ b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java @@ -13,6 +13,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.data.EmptyModelData; +import net.minecraftforge.client.model.data.IModelData; import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; @@ -44,7 +45,15 @@ public TurtleMultiModel( IBakedModel baseModel, IBakedModel overlayModel, Matrix @Nonnull @Override + @Deprecated public List getQuads( IBlockState state, EnumFacing side, @Nonnull Random rand ) + { + return getQuads( state, side, rand, EmptyModelData.INSTANCE ); + } + + @Nonnull + @Override + public List getQuads( IBlockState state, EnumFacing side, @Nonnull Random rand, @Nonnull IModelData data ) { if( side != null ) { diff --git a/src/main/resources/data/computercraft/lua/rom/apis/keys.lua b/src/main/resources/data/computercraft/lua/rom/apis/keys.lua index 8a81c42e0..ffe2ddcf7 100644 --- a/src/main/resources/data/computercraft/lua/rom/apis/keys.lua +++ b/src/main/resources/data/computercraft/lua/rom/apis/keys.lua @@ -7,6 +7,9 @@ -- 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 -- impossible. + +local expect = _G["~expect"] + local tKeys = {} tKeys[32] = 'space' tKeys[39] = 'apostrophe'