diff --git a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java index 9ee51e70d..6801e85dc 100644 --- a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java +++ b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java @@ -244,6 +244,7 @@ public class ModelArmoredJetpack extends ModelBase GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); + GlStateManager.enableCull(); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glColor4f(1, 1, 1, 0.2F); @@ -251,7 +252,7 @@ public class ModelArmoredJetpack extends ModelBase WingbladeR.render(size); MekanismRenderer.resetColor(); - GL11.glDisable(GL11.GL_CULL_FACE); + GlStateManager.disableCull(); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); GlStateManager.popMatrix(); diff --git a/src/main/java/mekanism/client/model/ModelGasMask.java b/src/main/java/mekanism/client/model/ModelGasMask.java index 1069eb530..6205bd3df 100644 --- a/src/main/java/mekanism/client/model/ModelGasMask.java +++ b/src/main/java/mekanism/client/model/ModelGasMask.java @@ -3,6 +3,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -240,7 +241,7 @@ public class ModelGasMask extends ModelBase MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); GL11.glColor4f(1, 1, 1, 0.3F); - GL11.glEnable(GL11.GL_CULL_FACE); + GlStateManager.enableCull(); glasstop.render(size); glassfront.render(size); @@ -249,7 +250,7 @@ public class ModelGasMask extends ModelBase glassbackR.render(size); glassbackL.render(size); - GL11.glDisable(GL11.GL_CULL_FACE); + GlStateManager.disableCull(); MekanismRenderer.resetColor(); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); diff --git a/src/main/java/mekanism/client/model/ModelJetpack.java b/src/main/java/mekanism/client/model/ModelJetpack.java index 7a379b478..000924d77 100644 --- a/src/main/java/mekanism/client/model/ModelJetpack.java +++ b/src/main/java/mekanism/client/model/ModelJetpack.java @@ -190,14 +190,14 @@ public class ModelJetpack extends ModelBase GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); - GL11.glEnable(GL11.GL_CULL_FACE); + GlStateManager.enableCull(); GL11.glColor4f(1, 1, 1, 0.2F); WingbladeL.render(size); WingbladeR.render(size); MekanismRenderer.resetColor(); - GL11.glDisable(GL11.GL_CULL_FACE); + GlStateManager.disableCull(); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); GlStateManager.popMatrix(); diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index d2b65e57e..3b75afde6 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -156,12 +156,7 @@ public class RenderTickHandler continue; } - Pos3D playerPos = new Pos3D(p); - - if(p != mc.thePlayer) - { - playerPos = playerPos.translate(0, 1.7, 0); - } + Pos3D playerPos = new Pos3D(p).translate(0, 1.7, 0); float xRand = (rand.nextFloat() - 0.5F) * 0.08F; float yRand = (rand.nextFloat() - 0.5F) * 0.05F; @@ -243,7 +238,7 @@ public class RenderTickHandler { fx = new EntityJetpackSmokeFX(world, x, y, z, velX, velY, velZ); } - else if(s.equals("bubble")) + else if(s.equals(EnumParticleTypes.WATER_BUBBLE)) { fx = new EntityScubaBubbleFX(world, x, y, z, velX, velY, velZ); } diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 8fc18a7b0..674083c74 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -52,6 +52,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.GlStateManager.CullFace; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -111,6 +112,11 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel { BasicBlockType basicType = BasicBlockType.get(stack); + if(type == TransformType.GUI) + { + GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); + } + if(basicType != null) { if(basicType == BasicBlockType.BIN) @@ -251,9 +257,7 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel if(type == TransformType.GUI) { - GlStateManager.scale(0.625, 0.625, 0.625); - GlStateManager.rotate(30.0F, 1.0F, 0.0F, 0.0F); - GlStateManager.rotate(-45.0F, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); } if(stack.getItem() == MekanismItems.Jetpack) @@ -314,8 +318,13 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.scale(1.4F, 1.4F, 1.4F); GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); - if(type == TransformType.THIRD_PERSON_RIGHT_HAND) + if(type == TransformType.THIRD_PERSON_RIGHT_HAND || type == TransformType.THIRD_PERSON_LEFT_HAND) { + if(type == TransformType.THIRD_PERSON_LEFT_HAND) + { + GlStateManager.rotate(-90, 0.0F, 1.0F, 0.0F); + } + GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(50, 1.0F, 0.0F, 0.0F); GlStateManager.scale(2.0F, 2.0F, 2.0F); @@ -329,6 +338,11 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.translate(0.0F, -0.2F, 0.0F); } else { + if(type == TransformType.FIRST_PERSON_LEFT_HAND) + { + GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); + } + GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); GlStateManager.translate(0.0F, -0.7F, 0.0F); } @@ -347,16 +361,28 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.rotate(135, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-20, 0.0F, 0.0F, 1.0F); - if(type == TransformType.FIRST_PERSON_RIGHT_HAND || type == TransformType.THIRD_PERSON_RIGHT_HAND) + if(type == TransformType.FIRST_PERSON_RIGHT_HAND || type == TransformType.THIRD_PERSON_RIGHT_HAND + || type == TransformType.FIRST_PERSON_LEFT_HAND || type == TransformType.THIRD_PERSON_LEFT_HAND) { if(type == TransformType.FIRST_PERSON_RIGHT_HAND) { GlStateManager.rotate(55, 0.0F, 1.0F, 0.0F); } - else { + else if(type == TransformType.FIRST_PERSON_LEFT_HAND) + { + GlStateManager.rotate(-160, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(30F, 1.0F, 0.0F, 0.0F); + } + else if(type == TransformType.THIRD_PERSON_RIGHT_HAND) + { GlStateManager.translate(0.0F, 0.7F, 0.0F); GlStateManager.rotate(75, 0.0F, 1.0F, 0.0F); } + else if(type == TransformType.THIRD_PERSON_LEFT_HAND) + { + GlStateManager.translate(0.0F, 0.7F, 0.0F); + GlStateManager.rotate(-75, 0.0F, 1.0F, 0.0F); + } GlStateManager.scale(2.5F, 2.5F, 2.5F); GlStateManager.translate(0.0F, -1.0F, -0.5F); @@ -407,7 +433,8 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.enableLight(0); GlStateManager.enableLight(1); GlStateManager.enableColorMaterial(); - GlStateManager.colorMaterial(1032, 5634); + GlStateManager.colorMaterial(1032, 5634); + GlStateManager.enableCull(); Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.popMatrix(); diff --git a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java index 52923df69..c9e02a137 100644 --- a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -25,6 +25,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJModel; @@ -167,23 +168,29 @@ public class GlowPanelModel extends OBJBakedModelBase private Pair thirdPersonTransform; @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) + public Pair handlePerspective(ItemCameraTransforms.TransformType transformType) { - if(cameraTransformType == TransformType.GUI) + if(transformType == TransformType.GUI) { - GlStateManager.translate(0.3F, 0.25F, 0.0F); + ForgeHooksClient.multiplyCurrentGlMatrix(CTMModelFactory.transforms.get(transformType).getMatrix()); + GlStateManager.translate(0.65F, -0.55F, 0.0F); GlStateManager.rotate(90, 1, 0, 0); GlStateManager.scale(1.6F, 1.6F, 1.6F); + + return Pair.of(this, null); } - else if(cameraTransformType == TransformType.FIRST_PERSON_RIGHT_HAND) + else if(transformType == TransformType.FIRST_PERSON_RIGHT_HAND || transformType == TransformType.FIRST_PERSON_LEFT_HAND) { - GlStateManager.translate(0.0F, 0.3F, 0.0F); + GlStateManager.translate(0.0F, 0.2F, 0.0F); } - else if(cameraTransformType == TransformType.THIRD_PERSON_RIGHT_HAND) + else if(transformType == TransformType.THIRD_PERSON_RIGHT_HAND || transformType == TransformType.THIRD_PERSON_LEFT_HAND) { - GlStateManager.translate(0.0F, -0.1F, 0.0F); + ForgeHooksClient.multiplyCurrentGlMatrix(CTMModelFactory.transforms.get(transformType).getMatrix()); + GlStateManager.translate(0.0F, 0.3F, 0.2F); + + return Pair.of(this, null); } - return Pair.of(this, CTMModelFactory.transforms.get(cameraTransformType).getMatrix()); + return Pair.of(this, CTMModelFactory.transforms.get(transformType).getMatrix()); } } diff --git a/src/main/java/mekanism/client/render/obj/TransmitterModel.java b/src/main/java/mekanism/client/render/obj/TransmitterModel.java index cfcff2b0d..cb084ddb3 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterModel.java @@ -8,7 +8,10 @@ import java.util.Objects; import javax.vecmath.Matrix4f; +import org.apache.commons.lang3.tuple.Pair; + import mekanism.api.MekanismConfig.client; +import mekanism.client.render.ctm.CTMModelFactory; import mekanism.common.multipart.ColorProperty; import mekanism.common.multipart.ConnectionProperty; import mekanism.common.multipart.PartSidedPipe; @@ -16,6 +19,7 @@ import mekanism.common.multipart.PartSidedPipe.ConnectionType; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -29,6 +33,7 @@ import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.obj.OBJModel.Face; import net.minecraftforge.client.model.obj.OBJModel.Group; @@ -247,6 +252,12 @@ public class TransmitterModel extends OBJBakedModelBase return (byte)0; } + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) + { + return Pair.of(this, CTMModelFactory.transforms.get(cameraTransformType).getMatrix()); + } + public static void registerIcons(TextureMap map) { transporter_center = map.registerSprite(new ResourceLocation("mekanism:blocks/models/multipart/LogisticalTransporterGlass")); diff --git a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java index e52b65170..074b66055 100644 --- a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java @@ -18,7 +18,7 @@ public class EntityScubaBubbleFX extends ParticleBubble { super(world, posX, posY, posZ, velX, velY, velZ); - particleScale = (rand.nextFloat()*0.2F)+0.5F; + particleScale = (rand.nextFloat()*0.2F)+0.3F; particleMaxAge *= 2; } diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index d04d805b7..0390575c8 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -82,7 +82,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem { if(!world.isRemote) { - Pos3D pos = new Pos3D(-0.4, 0, 0.3).rotateYaw(entityplayer.renderYawOffset).translate(new Pos3D(entityplayer)); + Pos3D pos = new Pos3D(hand == EnumHand.MAIN_HAND ? -0.4 : 0.4, 0, 0.3).rotateYaw(entityplayer.renderYawOffset).translate(new Pos3D(entityplayer)); world.spawnEntityInWorld(new EntityBalloon(world, pos.xCoord-0.5, pos.yCoord-0.25, pos.zCoord-0.5, getColor(itemstack))); } diff --git a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java index d1df9f7c3..77cb78444 100644 --- a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java +++ b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java @@ -66,8 +66,6 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo if(generatorType != null) { - GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); - if(generatorType == GeneratorType.BIO_GENERATOR) { GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/resources/assets/mekanism/models/block/chargepad.json b/src/main/resources/assets/mekanism/models/block/chargepad.json index cd721527c..3a1fda99a 100644 --- a/src/main/resources/assets/mekanism/models/block/chargepad.json +++ b/src/main/resources/assets/mekanism/models/block/chargepad.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "pillar2", diff --git a/src/main/resources/assets/mekanism/models/block/chemical_infuser.json b/src/main/resources/assets/mekanism/models/block/chemical_infuser.json index ed05a9820..7e200c0ba 100644 --- a/src/main/resources/assets/mekanism/models/block/chemical_infuser.json +++ b/src/main/resources/assets/mekanism/models/block/chemical_infuser.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "portRight", diff --git a/src/main/resources/assets/mekanism/models/block/chemical_oxidizer.json b/src/main/resources/assets/mekanism/models/block/chemical_oxidizer.json index 895350843..ce683be5c 100644 --- a/src/main/resources/assets/mekanism/models/block/chemical_oxidizer.json +++ b/src/main/resources/assets/mekanism/models/block/chemical_oxidizer.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "stand", diff --git a/src/main/resources/assets/mekanism/models/block/chemical_washer.json b/src/main/resources/assets/mekanism/models/block/chemical_washer.json index 2faa853f5..e5e248a2b 100644 --- a/src/main/resources/assets/mekanism/models/block/chemical_washer.json +++ b/src/main/resources/assets/mekanism/models/block/chemical_washer.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "connectorRight", diff --git a/src/main/resources/assets/mekanism/models/block/cube_colour.json b/src/main/resources/assets/mekanism/models/block/cube_colour.json index 5a162a39f..e8419cc22 100644 --- a/src/main/resources/assets/mekanism/models/block/cube_colour.json +++ b/src/main/resources/assets/mekanism/models/block/cube_colour.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "from": [ 0, 0, 0 ], "to": [ 16, 16, 16 ], diff --git a/src/main/resources/assets/mekanism/models/block/electric_pump.json b/src/main/resources/assets/mekanism/models/block/electric_pump.json index 450962db7..592e84fe5 100644 --- a/src/main/resources/assets/mekanism/models/block/electric_pump.json +++ b/src/main/resources/assets/mekanism/models/block/electric_pump.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "pumpCasing", diff --git a/src/main/resources/assets/mekanism/models/block/electrolytic_separator.json b/src/main/resources/assets/mekanism/models/block/electrolytic_separator.json index 4ab7a2272..309c6f81c 100644 --- a/src/main/resources/assets/mekanism/models/block/electrolytic_separator.json +++ b/src/main/resources/assets/mekanism/models/block/electrolytic_separator.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "tube4", diff --git a/src/main/resources/assets/mekanism/models/block/fence_inventory.json b/src/main/resources/assets/mekanism/models/block/fence_inventory.json index 2ea89d19b..d85f6a3e1 100755 --- a/src/main/resources/assets/mekanism/models/block/fence_inventory.json +++ b/src/main/resources/assets/mekanism/models/block/fence_inventory.json @@ -1,4 +1,5 @@ -{ +{ + "parent": "block/cube_all", "ambientocclusion": false, "textures": { "particle": "#texture" diff --git a/src/main/resources/assets/mekanism/models/block/fence_post.json b/src/main/resources/assets/mekanism/models/block/fence_post.json index 0f2038137..94df6335e 100755 --- a/src/main/resources/assets/mekanism/models/block/fence_post.json +++ b/src/main/resources/assets/mekanism/models/block/fence_post.json @@ -1,4 +1,5 @@ -{ +{ + "parent": "block/cube_all", "textures": { "particle": "#texture" }, diff --git a/src/main/resources/assets/mekanism/models/block/fluidic_plenisher.json b/src/main/resources/assets/mekanism/models/block/fluidic_plenisher.json index 5dfd53402..8f888a8b6 100644 --- a/src/main/resources/assets/mekanism/models/block/fluidic_plenisher.json +++ b/src/main/resources/assets/mekanism/models/block/fluidic_plenisher.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "ringTop", diff --git a/src/main/resources/assets/mekanism/models/block/gas_tank.json b/src/main/resources/assets/mekanism/models/block/gas_tank.json index 7d0a41396..38c90005a 100644 --- a/src/main/resources/assets/mekanism/models/block/gas_tank.json +++ b/src/main/resources/assets/mekanism/models/block/gas_tank.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "rim3", diff --git a/src/main/resources/assets/mekanism/models/block/laser.json b/src/main/resources/assets/mekanism/models/block/laser.json index 996d0bd10..aa6043fe9 100644 --- a/src/main/resources/assets/mekanism/models/block/laser.json +++ b/src/main/resources/assets/mekanism/models/block/laser.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "rod1", diff --git a/src/main/resources/assets/mekanism/models/block/laser_amplifier.json b/src/main/resources/assets/mekanism/models/block/laser_amplifier.json index ccf312fca..137b6efc2 100644 --- a/src/main/resources/assets/mekanism/models/block/laser_amplifier.json +++ b/src/main/resources/assets/mekanism/models/block/laser_amplifier.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "S1", diff --git a/src/main/resources/assets/mekanism/models/block/logistical_sorter.json b/src/main/resources/assets/mekanism/models/block/logistical_sorter.json index 9851aee02..d99130576 100644 --- a/src/main/resources/assets/mekanism/models/block/logistical_sorter.json +++ b/src/main/resources/assets/mekanism/models/block/logistical_sorter.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "portBackLarge", diff --git a/src/main/resources/assets/mekanism/models/block/machine.json b/src/main/resources/assets/mekanism/models/block/machine.json index e66f2ac7d..a95d6e02e 100644 --- a/src/main/resources/assets/mekanism/models/block/machine.json +++ b/src/main/resources/assets/mekanism/models/block/machine.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "from": [ 0, 0, 0 ], "to": [ 16, 16, 16 ], diff --git a/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json b/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json index 52fed7225..075f2dddd 100644 --- a/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json +++ b/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "plate2", diff --git a/src/main/resources/assets/mekanism/models/block/obsidian_tnt.json b/src/main/resources/assets/mekanism/models/block/obsidian_tnt.json index 3a2e025c1..004500bff 100644 --- a/src/main/resources/assets/mekanism/models/block/obsidian_tnt.json +++ b/src/main/resources/assets/mekanism/models/block/obsidian_tnt.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "Wick6", diff --git a/src/main/resources/assets/mekanism/models/block/pressurized_reaction_chamber.json b/src/main/resources/assets/mekanism/models/block/pressurized_reaction_chamber.json index 1f3bce236..f8d635b60 100644 --- a/src/main/resources/assets/mekanism/models/block/pressurized_reaction_chamber.json +++ b/src/main/resources/assets/mekanism/models/block/pressurized_reaction_chamber.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "frontDivider1", diff --git a/src/main/resources/assets/mekanism/models/block/rotary_condensentrator.json b/src/main/resources/assets/mekanism/models/block/rotary_condensentrator.json index 56c8d1ad3..d35458df6 100644 --- a/src/main/resources/assets/mekanism/models/block/rotary_condensentrator.json +++ b/src/main/resources/assets/mekanism/models/block/rotary_condensentrator.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "tube5", diff --git a/src/main/resources/assets/mekanism/models/entity/balloon.json b/src/main/resources/assets/mekanism/models/entity/balloon.json index 972f1d419..901f418aa 100755 --- a/src/main/resources/assets/mekanism/models/entity/balloon.json +++ b/src/main/resources/assets/mekanism/models/entity/balloon.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "String", diff --git a/src/main/resources/assets/mekanism/models/entity/robit.json b/src/main/resources/assets/mekanism/models/entity/robit.json index 0fd1db389..47c150b71 100644 --- a/src/main/resources/assets/mekanism/models/entity/robit.json +++ b/src/main/resources/assets/mekanism/models/entity/robit.json @@ -1,4 +1,5 @@ { + "parent": "block/cube_all", "elements": [ { "__comment": "eyeRight", diff --git a/src/main/resources/assets/mekanism/models/item/Balloon.json b/src/main/resources/assets/mekanism/models/item/Balloon.json index 32060665c..517838eab 100644 --- a/src/main/resources/assets/mekanism/models/item/Balloon.json +++ b/src/main/resources/assets/mekanism/models/item/Balloon.json @@ -2,17 +2,23 @@ "parent": "mekanism:entity/balloon", "display": { "thirdperson_righthand": { - "rotation": [ -150, 0, 10 ], - "translation": [ 0, 1.5, -0.4 ], + "rotation": [ 50, 0, -10 ], + "translation": [ 0, -1, 2 ], + "scale": [ 1.8, 1.8, 1.8 ] + }, + "thirdperson_lefthand": { + "rotation": [ 50, 0, -10 ], + "translation": [ 0, -1, 2 ], "scale": [ 1.8, 1.8, 1.8 ] }, "firstperson_righthand": { - "translation": [ 0, -2, 0 ], + "translation": [ 0, -6, 0 ], "scale": [ 1.8, 1.8, 1.8 ] }, "gui": { - "translation": [ 0, -7.4, 0 ], - "scale": [ 1.5, 1.5, 1.5 ] + "translation": [ 0, -8, 0 ], + "scale": [ 0.9375, 0.9375, 0.9375 ], + "rotation": [ 30, -45, 0 ] } } }