Skip to content

Commit

Permalink
1.0.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jtrent238 committed Jul 27, 2016
1 parent 847f282 commit 8fec04f
Show file tree
Hide file tree
Showing 53 changed files with 4,133 additions and 7,991 deletions.
9 changes: 9 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
Epic Proportions Mod ChangeLog

1.0.6.4
- Added Kitty
- Removed Random Creative Tabs
- Fixed Version Info
- Fixed Bomby (*Model Is Still Broke*)
- Lowered Spawnrate of jtrent238
- Added More Drops for jtrent238

1.0.6.3
- Added More Achevements
- Added Love Flower
- Tweaked The Startup Event
- Tweaked The Loot Chests

1.0.6.2
- Added Troll TNT
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/jtrent238/epicproportions/BlockLoader.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.jtrent238.epicproportions;

import com.jtrent238.epicproportions.blocks.blockBirthdayPresent;
import com.jtrent238.epicproportions.blocks.blockBombySpawner;
import com.jtrent238.epicproportions.blocks.blockFartBomb;
import com.jtrent238.epicproportions.blocks.blockJenChest;
import com.jtrent238.epicproportions.blocks.blockJenIngot;
Expand Down Expand Up @@ -36,6 +37,7 @@ public class BlockLoader {
public static Block blockFlowerPinkHeart;
public static Block blockFlowerRainbow;
public static Block blockFlowerLove;
public static Block blockBombySpawner;
//public static final BlockFlower jen_flower = (BlockFlower)Block.blockRegistry.getObject("jen_flower");
//public static final BlockFlower jen_flower2 = (BlockFlower)Block.blockRegistry.getObject("jen_flower2");

Expand All @@ -59,7 +61,8 @@ public static void loadBlocks() {
blockFlowerPinkHeart = new blockModFlower(2).setBlockName("blockFlowerPinkHeart").setBlockTextureName("epicproportionsmod:" + blockModFlower.field_149860_M);
blockFlowerRainbow = new blockModFlower(3).setBlockName("blockFlowerRainbow").setBlockTextureName("epicproportionsmod:" + blockModFlower.field_149860_M);
blockFlowerLove = new blockModFlower(4).setBlockName("blockFlowerLove").setBlockTextureName("epicproportionsmod:" + blockModFlower.field_149860_M);

blockBombySpawner = new blockBombySpawner().setBlockName("blockBombySpawner").setBlockTextureName("epicproportionsmod:blockBombySpawner").setHardness(3F)/*/.setCreativeTab(EpicProportionsMod.EpicProportionsMod)/*/;



registerBlocks();
Expand All @@ -85,6 +88,7 @@ private static void registerBlocks(){
GameRegistry.registerBlock(blockFlowerPinkHeart, "blockFlowerPinkHeart");
GameRegistry.registerBlock(blockFlowerRainbow, "blockFlowerRainbow");
GameRegistry.registerBlock(blockFlowerLove, "blockFlowerLove");
GameRegistry.registerBlock(blockBombySpawner, "blockBombySpawner");

}
}
17 changes: 15 additions & 2 deletions src/main/java/com/jtrent238/epicproportions/EntityLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.jtrent238.epicproportions.entity.EntityClown;
import com.jtrent238.epicproportions.entity.EntityFred2_0;
import com.jtrent238.epicproportions.entity.EntityJen;
import com.jtrent238.epicproportions.entity.EntityKitty;
import com.jtrent238.epicproportions.entity.EntityNinjaMaster;
import com.jtrent238.epicproportions.entity.EntityPat;
import com.jtrent238.epicproportions.entity.EntitySparky;
Expand All @@ -20,27 +21,35 @@
import cpw.mods.fml.common.registry.EntityRegistry;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.model.ModelCreeper;
import net.minecraft.client.model.ModelOcelot;
import net.minecraft.client.model.ModelPig;
import net.minecraft.client.model.ModelVillager;
import net.minecraft.client.model.ModelWolf;
import net.minecraft.client.model.ModelZombie;
import net.minecraft.client.renderer.entity.RenderCreeper;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EnumCreatureType;
import net.minecraft.entity.passive.EntitySheep;

import com.jtrent238.epicproportions.model.ModelBomby;
import com.jtrent238.epicproportions.model.ModelCandyPopper;
import com.jtrent238.epicproportions.model.ModelFred2_0;
import com.jtrent238.epicproportions.model.ModelKitty;
import com.jtrent238.epicproportions.render.RenderBomby;

import net.minecraft.util.ResourceLocation;
import net.minecraft.world.biome.BiomeGenBase;

public class EntityLoader {




public static void LoadEntitys() {
//Bomby Registry
EntityRegistry.registerGlobalEntityID(EntityBomby.class, "EntityBomby",EntityRegistry.findGlobalUniqueEntityId());
RenderingRegistry.registerEntityRenderingHandler(EntityBomby.class, new RenderLiving(new ModelCreeper(), 0){protected ResourceLocation getEntityTexture(Entity par1Entity){return new ResourceLocation("epicproportionsmod:EntityBomby.png");}});//Sets Bomby Texture
RenderingRegistry.registerEntityRenderingHandler(EntityBomby.class, new RenderBomby(){protected ResourceLocation getEntityTexture(Entity par1Entity){return new ResourceLocation("epicproportionsmod:EntityBomby.png");}});//Sets Bomby Texture

//Captian Cookie Registry
EntityRegistry.registerGlobalEntityID(EntityCaptianCookie.class, "EntityCaptianCookie",EntityRegistry.findGlobalUniqueEntityId());
Expand Down Expand Up @@ -78,7 +87,7 @@ public static void LoadEntitys() {
//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
EntityRegistry.addSpawn(Entilyjtrent238.class, 1, 4, 6, EnumCreatureType.creature, BiomeGenBase.forest, BiomeGenBase.forestHills, BiomeGenBase.jungle, BiomeGenBase.forest, BiomeGenBase.plains, BiomeGenBase.beach, BiomeGenBase.mesa, BiomeGenBase.savanna);
EntityRegistry.addSpawn(Entilyjtrent238.class, 1, 1, 1, EnumCreatureType.creature, BiomeGenBase.forest, BiomeGenBase.forestHills, BiomeGenBase.jungle, BiomeGenBase.forest, BiomeGenBase.plains, BiomeGenBase.beach, BiomeGenBase.mesa, BiomeGenBase.savanna);

// EntityRegistry.addSpawn(EntityPat.class, 25, 4, 6, EnumCreatureType.creature, BiomeGenBase.forest, BiomeGenBase.forestHills, BiomeGenBase.jungle, BiomeGenBase.icePlains);
/*
Expand All @@ -102,6 +111,10 @@ public static void LoadEntitys() {
//Sparky Registry
EntityRegistry.registerGlobalEntityID(EntitySparky.class, "EntitySparky",EntityRegistry.findGlobalUniqueEntityId());
RenderingRegistry.registerEntityRenderingHandler(EntitySparky.class, new RenderLiving(new ModelWolf(), 0){protected ResourceLocation getEntityTexture(Entity par1Entity){return new ResourceLocation("epicproportionsmod:EntitySparky.png");}});//Sparky Texture

//Kitty Registry
EntityRegistry.registerGlobalEntityID(EntityKitty.class, "EntityKitty",EntityRegistry.findGlobalUniqueEntityId());
RenderingRegistry.registerEntityRenderingHandler(EntityKitty.class, new RenderLiving(new ModelKitty(), 0){protected ResourceLocation getEntityTexture(Entity par1Entity){return new ResourceLocation("epicproportionsmod:EntityKitty.png");}});//Kitty Texture

}
//
Expand Down
Loading

0 comments on commit 8fec04f

Please sign in to comment.