Merge branch 'mc-1.13.x' into mc-1.14-fabric

cc-tweaked · Jun 2, 2019 · 45e84e1 · 45e84e1
2 parents 725dfa7 + b6715bd
commit 45e84e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
@@ -44,7 +44,7 @@ public TurtleMultiModel( BakedModel baseModel, BakedModel overlayModel, Matrix4f
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads( BlockState state, Direction side, Random rand )
+    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand )
     {
         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
@@ -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'