From f4868beff6c2121503bcb042484dae266a1c3a30 Mon Sep 17 00:00:00 2001 From: gamax92 Date: Sat, 13 Jun 2015 20:54:47 -0600 Subject: [PATCH 1/2] Add capslock to keyboard.lua --- .../resources/assets/opencomputers/loot/OpenOS/lib/keyboard.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/keyboard.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/lib/keyboard.lua index 3800589de..875e6bd7a 100644 --- a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/keyboard.lua +++ b/src/main/resources/assets/opencomputers/loot/OpenOS/lib/keyboard.lua @@ -42,6 +42,7 @@ keyboard.keys = { at = 0x91, back = 0x0E, -- backspace backslash = 0x2B, + capital = 0x3A, -- capslock colon = 0x92, comma = 0x33, enter = 0x1C, From c3a665748950fbaf7852cdfccc58dc8e8053520d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 14 Jun 2015 11:34:05 +0200 Subject: [PATCH 2/2] Fixed position of hover boots while sneaking. --- .../li/cil/oc/client/renderer/item/HoverBootRenderer.scala | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/scala/li/cil/oc/client/renderer/item/HoverBootRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/item/HoverBootRenderer.scala index 86fc6c72a..ec831a03a 100644 --- a/src/main/scala/li/cil/oc/client/renderer/item/HoverBootRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/item/HoverBootRenderer.scala @@ -5,6 +5,7 @@ import li.cil.oc.util.RenderState import net.minecraft.client.model.ModelBase import net.minecraft.client.model.ModelBiped import net.minecraft.client.model.ModelRenderer +import net.minecraft.entity.Entity import net.minecraft.util.ResourceLocation import org.lwjgl.opengl.GL11 @@ -91,6 +92,12 @@ object HoverBootRenderer extends ModelBiped { bipedEars.isHidden = true bipedCloak.isHidden = true + override def render(entity: Entity, f0: Float, f1: Float, f2: Float, f3: Float, f4: Float, f5: Float): Unit = { + // Because Forge is being a dummy... + isSneak = entity.isSneaking + super.render(entity, f0, f1, f2, f3, f4, f5) + } + class LightModelRenderer(modelBase: ModelBase, name: String) extends ModelRenderer(modelBase, name) { override def render(dt: Float): Unit = { RenderState.disableLighting()