Large diffs are not rendered by default.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -74,7 +74,6 @@ public boolean executeHoldAction(World world, int i, double yaw, double pitch, i
}

private void rayShot(World world, Vec3 vec, double posX, double posY, double posZ, int range, float damage, int hitPercent) {
List<Entity> entities = world.getLoadedEntityList();

for(float i = 0; i < range; i += 0.25F) {
double pX = posX + vec.xCoord * i;
@@ -969,6 +969,7 @@ public static void mainRegistry()

public static Item schrabidium_hammer;
public static Item shimmer_sledge;
public static Item shimmer_axe;
public static Item bottle_opener;

public static Item crowbar;
@@ -2186,6 +2187,7 @@ public static void initializeItem()

schrabidium_hammer = new WeaponSpecial(MainRegistry.enumToolMaterialHammer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer");
shimmer_sledge = new WeaponSpecial(MainRegistry.enumToolMaterialSledge).setUnlocalizedName("shimmer_sledge").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":shimmer_sledge_original");
shimmer_axe = new WeaponSpecial(MainRegistry.enumToolMaterialSledge).setUnlocalizedName("shimmer_axe").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":shimmer_axe");
bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener");
euphemium_stopper = new ItemSyringe().setUnlocalizedName("euphemium_stopper").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":euphemium_stopper");
matchstick = new ItemMatch().setUnlocalizedName("matchstick").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":matchstick");
@@ -3193,6 +3195,7 @@ private static void registerItem() {
GameRegistry.registerItem(schrabidium_sword, schrabidium_sword.getUnlocalizedName());
GameRegistry.registerItem(schrabidium_hammer, schrabidium_hammer.getUnlocalizedName());
GameRegistry.registerItem(shimmer_sledge, shimmer_sledge.getUnlocalizedName());
GameRegistry.registerItem(shimmer_axe, shimmer_axe.getUnlocalizedName());
GameRegistry.registerItem(schrabidium_pickaxe, schrabidium_pickaxe.getUnlocalizedName());
GameRegistry.registerItem(schrabidium_axe, schrabidium_axe.getUnlocalizedName());
GameRegistry.registerItem(schrabidium_shovel, schrabidium_shovel.getUnlocalizedName());
@@ -199,6 +199,7 @@ public void registerRenderInfo()
MinecraftForgeClient.registerItemRenderer(ModItems.multitool_decon, new ItemRenderMultitool());

MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_sledge, new ItemRenderShim());
MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_axe, new ItemRenderShim());

RenderingRegistry.registerEntityRenderingHandler(EntityBullet.class, new RenderRocket());
RenderingRegistry.registerEntityRenderingHandler(EntityMiniNuke.class, new RenderMiniNuke());
@@ -111,11 +111,13 @@ public class ResourceManager {

//Shimmer Sledge
public static final IModelCustom shimmer_sledge = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_sledge.obj"));
public static final IModelCustom shimmer_axe = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_axe.obj"));

////Texture Items

//Shimmer Sledge
public static final ResourceLocation shimmer_sledge_tex = new ResourceLocation(RefStrings.MODID, "textures/models/shimmer_sledge.png");
public static final ResourceLocation shimmer_axe_tex = new ResourceLocation(RefStrings.MODID, "textures/models/shimmer_axe.png");



@@ -2,6 +2,7 @@

import org.lwjgl.opengl.GL11;

import com.hbm.items.ModItems;
import com.hbm.lib.RefStrings;
import com.hbm.main.MainRegistry;
import com.hbm.main.ResourceManager;
@@ -42,12 +43,18 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
case EQUIPPED_FIRST_PERSON:
case ENTITY:
GL11.glPushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.shimmer_sledge_tex);
if(item.getItem() == ModItems.shimmer_sledge)
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.shimmer_sledge_tex);
if(item.getItem() == ModItems.shimmer_axe)
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.shimmer_axe_tex);
GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glScalef(1.5F, 1.5F, 1.5F);
GL11.glTranslatef(0.45F, -0.3F, 0.0F);
ResourceManager.shimmer_sledge.renderAll();
if(item.getItem() == ModItems.shimmer_sledge)
ResourceManager.shimmer_sledge.renderAll();
if(item.getItem() == ModItems.shimmer_axe)
ResourceManager.shimmer_axe.renderAll();
GL11.glPopMatrix();
default: break;
}