AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 02:12:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source
This commit is contained in:
Florian Nücke 2015-06-14 11:54:45 +02:00
commit d357ce2b0e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/assets/opencomputers/loot/OpenOS/lib/keyboard.lua
View File

@ -42,6 +42,7 @@ keyboard.keys = {
at = 0x91, at = 0x91,
back = 0x0E, -- backspace back = 0x0E, -- backspace
backslash = 0x2B, backslash = 0x2B,
capital = 0x3A, -- capslock
colon = 0x92, colon = 0x92,
comma = 0x33, comma = 0x33,
enter = 0x1C, enter = 0x1C,

7
src/main/scala/li/cil/oc/client/renderer/item/HoverBootRenderer.scala
View File

@ -5,6 +5,7 @@ import li.cil.oc.util.RenderState
import net.minecraft.client.model.ModelBase import net.minecraft.client.model.ModelBase
import net.minecraft.client.model.ModelBiped import net.minecraft.client.model.ModelBiped
import net.minecraft.client.model.ModelRenderer import net.minecraft.client.model.ModelRenderer
import net.minecraft.entity.Entity
import net.minecraft.util.ResourceLocation import net.minecraft.util.ResourceLocation
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
@ -89,6 +90,12 @@ object HoverBootRenderer extends ModelBiped {
bipedRightArm.isHidden = true bipedRightArm.isHidden = true
bipedLeftArm.isHidden = true bipedLeftArm.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) { class LightModelRenderer(modelBase: ModelBase, name: String) extends ModelRenderer(modelBase, name) {
override def render(dt: Float): Unit = { override def render(dt: Float): Unit = {
RenderState.disableLighting() RenderState.disableLighting()