Skip to content

Commit

Permalink
1.0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jtrent238 committed Jul 13, 2016
1 parent a05d188 commit d6b5320
Show file tree
Hide file tree
Showing 22 changed files with 529 additions and 12 deletions.
7 changes: 7 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
Epic Proportions Mod ChangeLog

1.0.1.1
- Added jtrent238
- Added Pat Pick
- Added Jen Pick
- Removed Extra Spawn Eggs


1.0.1.0
- Added Captian Cookie Litte
- Added Bob 2.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.jtrent238.epicproportions;

import com.jtrent238.epicproportions.entity.Entilyjtrent238;
import com.jtrent238.epicproportions.entity.EntityBomby;
import com.jtrent238.epicproportions.entity.EntityCandyMan;
import com.jtrent238.epicproportions.entity.EntityCaptianCookie;
Expand Down Expand Up @@ -46,5 +47,8 @@ public static void LoadEntitys() {
//Captian Cookie Little Registry
EntityRegistry.registerGlobalEntityID(EntityCaptianCookieLittle.class, "EntityCaptianCookieLittle",EntityRegistry.findGlobalUniqueEntityId());
RenderingRegistry.registerEntityRenderingHandler(EntityCaptianCookieLittle.class, new RenderLiving(new ModelVillager(0), 0){protected ResourceLocation getEntityTexture(Entity par1Entity){return new ResourceLocation("epicproportionsmod:EntityCaptianCookieLittle.png");}});//The Captian Cookie Little Texture
}
//jtrent238 Registry
EntityRegistry.registerGlobalEntityID(Entilyjtrent238.class, "Entilyjtrent238",EntityRegistry.findGlobalUniqueEntityId());
RenderingRegistry.registerEntityRenderingHandler(Entilyjtrent238.class, new RenderLiving(new ModelBiped(), 0){protected ResourceLocation getEntityTexture(Entity par1Entity){return new ResourceLocation("epicproportionsmod:Entilyjtrent238.png");}});//jtrent238 Texture
}
}
11 changes: 11 additions & 0 deletions src/main/java/com/jtrent238/epicproportions/EnumHelper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.jtrent238.epicproportions;

import net.minecraft.item.ItemArmor.ArmorMaterial;

public class EnumHelper {

public static ArmorMaterial addArmorMaterial(String string, int i, int[] js, int j) {
return null;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class EpicProportionsMod

@Instance(MODID)
public static EpicProportionsMod instance;
public static final String MODVERSION = "1.0.1.0";
public static final String MODVERSION = "1.0.1.1";

@ForgeSubscribe(priority = EventPriority.NORMAL)
public void eventHandler(RenderGameOverlayEvent event) {
Expand Down
61 changes: 55 additions & 6 deletions src/main/java/com/jtrent238/epicproportions/ItemLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import com.jtrent238.epicproportions.items.itemPatIngot;
import com.jtrent238.epicproportions.items.itemSpawnEgg;
import com.jtrent238.epicproportions.items.itemgemofepicproportions;
import com.jtrent238.epicproportions.items.armor.ItemJenArmor;
import com.jtrent238.epicproportions.items.armor.ItemPatArmor;
import com.jtrent238.epicproportions.items.spawners.itemSpawnBomby;
import com.jtrent238.epicproportions.items.spawners.itemSpawnCandyMan;
import com.jtrent238.epicproportions.items.spawners.itemSpawnCaptianCookie;
Expand All @@ -14,6 +16,9 @@
import com.jtrent238.epicproportions.items.spawners.itemSpawnJen;
import com.jtrent238.epicproportions.items.spawners.itemSpawnNinjaMaster;
import com.jtrent238.epicproportions.items.spawners.itemSpawnPat;
import com.jtrent238.epicproportions.items.spawners.itemSpawnjtrent238;
import com.jtrent238.epicproportions.items.tools.itemJenPick;
import com.jtrent238.epicproportions.items.tools.itemPatPick;
import com.jtrent238.epicproportions.items.tools.weapons.itemJenSword;
import com.jtrent238.epicproportions.items.tools.weapons.itemPatSword;
/*
Expand Down Expand Up @@ -56,11 +61,13 @@
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemRecord;

public class ItemLoader {


public static Item itemgemofepicproportions;
public static Item itemPatIngot;
public static Item itemJenIngot;
Expand All @@ -72,9 +79,11 @@ public class ItemLoader {
//Weapons & Tools
public static Item itemPatSword;
public static Item itemJenSword;
public static Item itemPatPick;
public static Item itemJenPick;

//SpawnEggs//
public static Item itemSpawnEgg;
//public static Item itemSpawnEgg;
public static Item itemSpawnBomby;
public static Item itemSpawnCaptianCookie;
public static Item itemSpawnPat;
Expand All @@ -83,9 +92,21 @@ public class ItemLoader {
public static Item itemSpawnNinjaMaster;
public static Item itemSpawnCandyMan;
public static Item itemSpawnCookieLittle;
public static Item itemSpawnjtrent238;

//Armor
public static Item itemPatHelmet;
public static Item itemPatChestplate;
public static Item itemPatLeggings;
public static Item itemPatBoots;

//CrossMod FoodMod
public static Item itembuttercandy;
public static Item itemJenHelmet;
public static Item itemJenChestplate;
public static Item itemJenLeggings;
public static Item itemJenBoots;

public static ArmorMaterial PAT_ARMOR = EnumHelper.addArmorMaterial("PAT_ARMOR", 16, new int[] {3, 8, 6, 3}, 30);
public static ArmorMaterial JEN_ARMOR = EnumHelper.addArmorMaterial("JEN_ARMOR", 16, new int[] {3, 8, 6, 3}, 30);


/**
Expand All @@ -103,9 +124,12 @@ public static void LoadItems() {
//Weapons & Tools
itemPatSword = new itemPatSword(ToolMaterial.EMERALD).setUnlocalizedName("itemPatSword").setTextureName("epicproportionsmod:itemPatSword").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
itemJenSword = new itemJenSword(ToolMaterial.EMERALD).setUnlocalizedName("itemJenSword").setTextureName("epicproportionsmod:itemJenSword").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
itemPatPick = new itemPatPick(0, ToolMaterial.EMERALD, null).setUnlocalizedName("itemPatPick").setTextureName("epicproportionsmod:itemPatPick").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
itemJenPick = new itemJenPick(0, ToolMaterial.EMERALD, null).setUnlocalizedName("itemJenPick").setTextureName("epicproportionsmod:itemJenPick").setCreativeTab(EpicProportionsMod.EpicProportionsMod);


//SpawnEggs//
itemSpawnEgg = new itemSpawnEgg().setUnlocalizedName("itemSpawnEgg").setTextureName("epicproportionsmod:itemSpawnEgg").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
//itemSpawnEgg = new itemSpawnEgg().setUnlocalizedName("itemSpawnEgg").setTextureName("epicproportionsmod:itemSpawnEgg").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
itemSpawnBomby = new itemSpawnBomby().setUnlocalizedName("itemSpawnBomby").setTextureName("epicproportionsmod:itemSpawnBomby").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
itemSpawnCaptianCookie = new itemSpawnCaptianCookie().setUnlocalizedName("itemSpawnCaptianCookie").setTextureName("epicproportionsmod:itemSpawnCaptianCookie").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
itemSpawnPat = new itemSpawnPat().setUnlocalizedName("itemSpawnPat").setTextureName("epicproportionsmod:itemSpawnPat").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
Expand All @@ -114,8 +138,20 @@ public static void LoadItems() {
itemSpawnNinjaMaster = new itemSpawnNinjaMaster().setUnlocalizedName("itemSpawnNinjaMaster").setTextureName("epicproportionsmod:itemSpawnNinjaMaster").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
itemSpawnCandyMan = new itemSpawnCandyMan().setUnlocalizedName("itemSpawnCandyMan").setTextureName("epicproportionsmod:itemSpawnCandyMan").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
itemSpawnCookieLittle = new itemSpawnCookieLittle().setUnlocalizedName("itemSpawnCookieLittle").setTextureName("epicproportionsmod:itemSpawnCookieLittle").setCreativeTab(EpicProportionsMod.EpicProportionsMod);
itemSpawnjtrent238 = new itemSpawnjtrent238().setUnlocalizedName("itemSpawnjtrent238").setTextureName("epicproportionsmod:itemSpawnjtrent238").setCreativeTab(EpicProportionsMod.EpicProportionsMod);

registerItems();
//Armor
itemPatHelmet = new ItemPatArmor("pat_helmet", PAT_ARMOR, "pat", 0); //0 for helmet
itemPatChestplate = new ItemPatArmor("pat_chestplate", PAT_ARMOR, "pat", 1); // 1 for chestplate
itemPatLeggings = new ItemPatArmor("pat_leggings", PAT_ARMOR, "pat", 2); // 2 for leggings
itemPatBoots = new ItemPatArmor("pat_boots", PAT_ARMOR, "pat", 3); // 3 for boots

itemJenHelmet = new ItemJenArmor("jen_helmet", JEN_ARMOR, "jen", 0); //0 for helmet
itemJenChestplate = new ItemJenArmor("jen_chestplate", JEN_ARMOR, "jen", 1); // 1 for chestplate
itemJenLeggings = new ItemJenArmor("jen_leggings", JEN_ARMOR, "jen", 2); // 2 for leggings
itemJenBoots = new ItemJenArmor("jen_boots", JEN_ARMOR, "jen", 3); // 3 for boots

registerItems();
}

/**
Expand All @@ -133,9 +169,11 @@ private static void registerItems(){
//Weapons & Tools
GameRegistry.registerItem(itemPatSword, itemPatSword.getUnlocalizedName().substring(5));
GameRegistry.registerItem(itemJenSword, itemJenSword.getUnlocalizedName().substring(5));
GameRegistry.registerItem(itemPatPick, itemPatPick.getUnlocalizedName().substring(5));
GameRegistry.registerItem(itemJenPick, itemJenPick.getUnlocalizedName().substring(5));

//SpawnEggs//
GameRegistry.registerItem(itemSpawnEgg, itemSpawnEgg.getUnlocalizedName().substring(5));
//GameRegistry.registerItem(itemSpawnEgg, itemSpawnEgg.getUnlocalizedName().substring(5));
GameRegistry.registerItem(itemSpawnBomby, itemSpawnBomby.getUnlocalizedName().substring(5));
GameRegistry.registerItem(itemSpawnCaptianCookie, itemSpawnCaptianCookie.getUnlocalizedName().substring(5));
GameRegistry.registerItem(itemSpawnPat, itemSpawnPat.getUnlocalizedName().substring(5));
Expand All @@ -144,6 +182,17 @@ private static void registerItems(){
GameRegistry.registerItem(itemSpawnNinjaMaster, itemSpawnNinjaMaster.getUnlocalizedName().substring(5));
GameRegistry.registerItem(itemSpawnCandyMan, itemSpawnCandyMan.getUnlocalizedName().substring(5));
GameRegistry.registerItem(itemSpawnCookieLittle, itemSpawnCookieLittle.getUnlocalizedName().substring(5));
GameRegistry.registerItem(itemSpawnjtrent238, itemSpawnjtrent238.getUnlocalizedName().substring(5));

//GameRegistry.registerItem(itemPatHelmet, itemPatHelmet.getUnlocalizedName().substring(5));
//GameRegistry.registerItem(itemPatChestplate, itemPatChestplate.getUnlocalizedName().substring(5));
//GameRegistry.registerItem(itemPatLeggings, itemPatLeggings.getUnlocalizedName().substring(5));
//GameRegistry.registerItem(itemPatBoots, itemPatBoots.getUnlocalizedName().substring(5));

//GameRegistry.registerItem(itemJenHelmet, itemJenHelmet.getUnlocalizedName().substring(5));
//GameRegistry.registerItem(itemJenChestplate, itemJenChestplate.getUnlocalizedName().substring(5));
//GameRegistry.registerItem(itemJenLeggings, itemJenLeggings.getUnlocalizedName().substring(5));
//GameRegistry.registerItem(itemJenBoots, itemJenBoots.getUnlocalizedName().substring(5));

}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/jtrent238/epicproportions/Recipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ private static void addShapedRecpies(){
GameRegistry.addShapedRecipe(new ItemStack(BlockLoader.blockJenIngot), "XXX", "XXX","XXX", 'X', ItemLoader.itemJenIngot);
GameRegistry.addShapedRecipe(new ItemStack(ItemLoader.itemPatIngot, 9), "X", 'X', BlockLoader.blockPatIngot);
GameRegistry.addShapedRecipe(new ItemStack(ItemLoader.itemJenIngot, 9), "X", 'X', BlockLoader.blockJenIngot);
GameRegistry.addShapedRecipe(new ItemStack(ItemLoader.itemJenPick), "XXX", "S", "S", 'X', ItemLoader.itemJenIngot, 'S' , Items.stick);
GameRegistry.addShapedRecipe(new ItemStack(ItemLoader.itemPatPick), "XXX", "S", "S", 'X', ItemLoader.itemJenIngot, 'S' , Items.stick);

}

Expand Down
Loading

0 comments on commit d6b5320

Please sign in to comment.