new novac model, crucible fixes

src/main/java/com/hbm/blocks/BlockDummyable.java

@@ -8,7 +8,6 @@ import com.hbm.handler.MultiblockHandlerXR;
 import com.hbm.handler.ThreeInts;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.IPersistentNBT;
-import com.hbm.tileentity.machine.TileEntityCrucible;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -37,6 +36,7 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 
 	public BlockDummyable(Material mat) {
 		super(mat);
+		this.maxY = 0.999D; //item bounce prevention
 		this.setTickRandomly(true);
 	}
 

src/main/java/com/hbm/blocks/machine/MachineCrucible.java

@@ -8,6 +8,7 @@ import com.hbm.blocks.ICustomBlockHighlight;
 import com.hbm.inventory.material.Mats.MaterialStack;
 import com.hbm.items.machine.ItemScraps;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityCrucible;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
@@ -39,10 +40,8 @@ public class MachineCrucible extends BlockDummyable {
 	@Override
 	public TileEntity createNewTileEntity(World world, int meta) {
 		
-		if(meta >= 12)
-			return new TileEntityCrucible();
-		
-		return null;
+		if(meta >= 12) return new TileEntityCrucible();
+		return new TileEntityProxyCombo().inventory();
 	}
 	
 	@Override

src/main/java/com/hbm/entity/effect/EntityNukeTorex.java

@@ -73,8 +73,8 @@ public class EntityNukeTorex extends Entity {
 			for(Cloudlet cloud : cloudlets) {
 				cloud.update();
 			}
-			coreHeight += 0.15 * s;
-			torusWidth += 0.05 * s;
+			coreHeight += 0.15/* * s*/;
+			torusWidth += 0.05/* * s*/;
 			rollerSize = torusWidth * 0.35;
 			convectionHeight = coreHeight + rollerSize;
 			

src/main/java/com/hbm/inventory/material/MaterialShapes.java

@@ -25,6 +25,9 @@ public class MaterialShapes {
 	public static void registerCompatShapes() {
 
 		if(Compat.isModLoaded(Compat.MOD_GT6)) {
+			new MaterialShapes(BLOCK.q(1), "blockDust");
+			new MaterialShapes(BLOCK.q(1), "blockGem");
+			new MaterialShapes(BLOCK.q(1), "blockIngot");
 			new MaterialShapes(INGOT.q(9, 8), "crushed");
 			new MaterialShapes(INGOT.q(9, 72), "crushedTiny");
 			new MaterialShapes(INGOT.q(10, 8), "crushedPurified");

src/main/java/com/hbm/main/ClientProxy.java

@@ -82,7 +82,6 @@ import com.hbm.render.util.RenderInfoSystem;
 import com.hbm.render.util.RenderInfoSystem.InfoEntry;
 import com.hbm.render.util.RenderOverhead;
 import com.hbm.render.util.RenderOverhead.Marker;
-import com.hbm.saveddata.TomSaveData;
 import com.hbm.sound.AudioWrapper;
 import com.hbm.sound.AudioWrapperClient;
 import com.hbm.sound.AudioWrapperClientStartStop;
@@ -451,7 +450,7 @@ public class ClientProxy extends ServerProxy {
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_dash, new ItemRenderOverkill());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_twigun, new ItemRenderOverkill());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_pip, new ItemRenderOverkill());
-		MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nopip, new ItemRenderOverkill());
+		//MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nopip, new ItemRenderOverkill());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_blackjack, new ItemRenderOverkill());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_silver, new ItemRenderOverkill());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_red, new ItemRenderOverkill());
@@ -496,6 +495,7 @@ public class ClientProxy extends ServerProxy {
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_spas12, new ItemRenderWeaponSpas12());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_glass_cannon, new ItemRenderWeaponGlass());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_chemthrower, new ItemRenderWeaponChemthrower());
+		MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nopip, new ItemRenderWeaponNovac());
 		//multitool
 		MinecraftForgeClient.registerItemRenderer(ModItems.multitool_dig, new ItemRenderMultitool());
 		MinecraftForgeClient.registerItemRenderer(ModItems.multitool_silk, new ItemRenderMultitool());

src/main/java/com/hbm/main/ResourceManager.java

@@ -706,6 +706,7 @@ public class ResourceManager {
 	public static final IModelCustom glass_cannon = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/glass_cannon.obj"));
 	public static final IModelCustom bio_revolver = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/bio_revolver.obj"));
 	public static final IModelCustom chemthrower = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/chemthrower.obj")).asDisplayList();
+	public static final IModelCustom novac = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/novac.obj"));
 	
 	public static final IModelCustom lance = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/lance.obj"));
 
@@ -785,6 +786,7 @@ public class ResourceManager {
 	public static final ResourceLocation glass_cannon_panel_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/glass_cannon_panel.png");
 	public static final ResourceLocation bio_revolver_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/bio_revolver.png");
 	public static final ResourceLocation chemthrower_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/chemthrower.png");
+	public static final ResourceLocation novac_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/novac.png");
 	
 	public static final ResourceLocation lance_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/lance.png");
 

src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponNovac.java

@@ -0,0 +1,95 @@
+package com.hbm.render.item.weapon;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.main.ResourceManager;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.IItemRenderer;
+
+public class ItemRenderWeaponNovac implements IItemRenderer {
+	
+	public ItemRenderWeaponNovac() { }
+
+	@Override
+	public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+		switch(type) {
+		case EQUIPPED:
+		case EQUIPPED_FIRST_PERSON:
+		case ENTITY:
+		case INVENTORY:
+			return true;
+		default: return false;
+		}
+	}
+
+	@Override
+	public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
+		
+		return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING);
+	}
+
+	@Override
+	public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
+		
+		GL11.glPushMatrix();
+		
+		GL11.glEnable(GL11.GL_CULL_FACE);
+		Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.novac_tex);
+		
+		switch(type) {
+		
+		case EQUIPPED_FIRST_PERSON:
+			
+			double s0 = 0.4D;
+			GL11.glRotated(25, 0, 0, 1);
+			GL11.glRotated(80, 0, 1, 0);
+			GL11.glRotatef(180, 0.0F, 1.0F, 0.0F);
+			GL11.glTranslatef(-0.25F, 0.0F, -1.25F);
+			GL11.glScaled(s0, s0, s0);
+			
+			break;
+			
+		case EQUIPPED:
+
+			double scale = 0.35D;
+			GL11.glScaled(scale, scale, scale);
+			GL11.glRotatef(20F, 0.0F, 0.0F, 1.0F);
+			GL11.glRotatef(-5, 0.0F, 0.0F, 1.0F);
+			GL11.glRotatef(10, 0.0F, 1.0F, 0.0F);
+			GL11.glRotatef(15F, 1.0F, 0.0F, 0.0F);
+			GL11.glRotatef(180, 0.0F, 1.0F, 0.0F);
+			GL11.glTranslatef(-1.25F, 0.25F, -1F);
+			
+			break;
+			
+		case ENTITY:
+
+			double s1 = 0.3D;
+			GL11.glScaled(s1, s1, s1);
+			
+			break;
+			
+		case INVENTORY:
+
+			GL11.glEnable(GL11.GL_LIGHTING);
+			
+			double s = 3D;
+			GL11.glTranslated(7, 8, 0);
+			GL11.glRotated(90, 0, 1, 0);
+			GL11.glRotated(135, 1, 0, 0);
+			GL11.glScaled(s, s, -s);
+			
+			break;
+			
+		default: break;
+		}
+		
+		GL11.glShadeModel(GL11.GL_SMOOTH);
+		ResourceManager.novac.renderAll();
+		GL11.glShadeModel(GL11.GL_FLAT);
+		
+		GL11.glPopMatrix();
+	}
+}

src/main/java/com/hbm/tileentity/machine/TileEntityCrucible.java

@@ -462,6 +462,11 @@ public class TileEntityCrucible extends TileEntityMachineBase implements IGUIPro
 		return sum;
 	}
 
+	@Override
+	public int[] getAccessibleSlotsFromSide(int meta) {
+		return new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+	}
+
 	@Override
 	public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) {
 		return new ContainerCrucible(player.inventory, this);