Skip to content

Commit

Permalink
Fix a couple of build failures
Browse files Browse the repository at this point in the history
SquidDev committed Jun 2, 2019
1 parent 18aee02 commit b6715bd
Showing 2 changed files with 12 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -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<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 )
{
3 changes: 3 additions & 0 deletions src/main/resources/data/computercraft/lua/rom/apis/keys.lua
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit b6715bd

Please sign in to comment.