diff --git a/common/mekanism/client/model/ModelGasMask.java b/common/mekanism/client/model/ModelGasMask.java index 915a7b551..aeb234864 100644 --- a/common/mekanism/client/model/ModelGasMask.java +++ b/common/mekanism/client/model/ModelGasMask.java @@ -235,7 +235,9 @@ public class ModelGasMask extends ModelBase filterpipeupper.render(size); MekanismRenderer.blendOn(); - GL11.glColor4f(1, 1, 1, 0.4F); + MekanismRenderer.glowOn(); + GL11.glColor4f(1, 1, 1, 0.3F); + GL11.glEnable(GL11.GL_CULL_FACE); glasstop.render(size); glassfront.render(size); @@ -244,7 +246,9 @@ public class ModelGasMask extends ModelBase glassbackR.render(size); glassbackL.render(size); + GL11.glDisable(GL11.GL_CULL_FACE); GL11.glColor4f(1, 1, 1, 1); + MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); pipecornerFL.render(size); diff --git a/common/mekanism/client/render/ModelCustomArmor.java b/common/mekanism/client/render/ModelCustomArmor.java index 32d8a90d2..87df15c71 100644 --- a/common/mekanism/client/render/ModelCustomArmor.java +++ b/common/mekanism/client/render/ModelCustomArmor.java @@ -9,6 +9,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -37,9 +38,14 @@ public class ModelCustomArmor extends ModelBiped public void init(Entity entity, float f, float f1, float f2, float f3, float f4, float size) { reset(); + + if(entity instanceof EntityLivingBase) + { + isSneak = ((EntityLivingBase)entity).isSneaking(); + } if(modelType.armorSlot == 0) - { + { bipedHead.isHidden = false; bipedHead.showModel = true; } diff --git a/common/mekanism/client/render/item/ItemRenderingHandler.java b/common/mekanism/client/render/item/ItemRenderingHandler.java index 248c5d1a3..f7b32502c 100644 --- a/common/mekanism/client/render/item/ItemRenderingHandler.java +++ b/common/mekanism/client/render/item/ItemRenderingHandler.java @@ -330,8 +330,7 @@ public class ItemRenderingHandler implements IItemRenderer { GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.2F, 1F, 0.0F); - GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glTranslatef(0.1F, 0.2F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); gasMask.render(0.0625F); } @@ -339,7 +338,8 @@ public class ItemRenderingHandler implements IItemRenderer { GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.2F, -0.35F, 0.0F); + GL11.glScalef(1.6F, 1.6F, 1.6F); + GL11.glTranslatef(0.2F, -0.5F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); scubaTank.render(0.0625F); } diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 6ebedc2d8..ee4f385fe 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -488,6 +488,12 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Dictionary), new Object[] { "C", "B", Character.valueOf('C'), "circuitBasic", Character.valueOf('B'), Item.book })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GasMask), new Object[] { + " S ", "GCG", "S S", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), Block.glass, Character.valueOf('C'), "circuitBasic" + })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ScubaTank), new Object[] { + " C ", "ATA", "SSS", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('S'), "ingotSteel" + })); for(RecipeType type : RecipeType.values()) {