jtrent238
/
popularmmos-epicproportions-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1092021351

master
unknown 2021-10-09 03:51:16 -04:00
parent 823347c165
commit 3bd56c921f
59 changed files with 143 additions and 527 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -1,5 +1,8 @@
Epic Proportions Mod ChangeLog
indev-1.5.9.15
- Cleaned up some code [Halloween Addon]
1.5.9.15
- Added more drops to Evil Birthday Present
- Fixed Enchantments for Super SuperGirlyGamer Armor and Tools

8
src/main/java/com/jtrent238/coremod/items/tools/ItemMultiTool.java
View File

@ -1,24 +1,20 @@
package com.jtrent238.coremod.items.tools;
import java.util.Set;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import cpw.mods.fml.common.eventhandler.Event.Result;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityLargeFireball;
import net.minecraft.init.Blocks;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.UseHoeEvent;
import java.util.Set;
/**
* @author jtrent238
* jtrent238 Coremod Version: 1.0.0.4

2
src/main/java/com/jtrent238/epicproportions/EpicProportionsMod.java
View File

@ -131,7 +131,7 @@ public class EpicProportionsMod implements ITweaker
@Instance(MODID)
public static EpicProportionsMod instance;
public static final String MODVERSION = "1.5.9.15";
public static final String MODVERSION = "indev-1.5.9.15";
public static final String APIVERSION = "1.0.0.0";
public static final String MODNAME = "PopularMMOS EpicProportions Mod";

6
src/main/java/com/jtrent238/epicproportions/addons/halloween/EntityLoader.java
View File

@ -1,7 +1,6 @@
package com.jtrent238.epicproportions.addons.halloween;
import com.jtrent238.epicproportions.addons.halloween.entity.EntityGhost;
import com.jtrent238.epicproportions.addons.halloween.entity.EntityPumpkinHead;
import com.jtrent238.epicproportions.addons.halloween.entity.EntityScareCrow;
import com.jtrent238.epicproportions.addons.halloween.entity.EntitySpookyCaptianCookie;
import com.jtrent238.epicproportions.addons.halloween.entity.EntitySpookyJen;
@ -41,9 +40,4 @@ public class EntityLoader {
//EntityRegistry.addSpawn(EntityGhost.class, 8, 4, 6, EnumCreatureType.creature, BiomeGenBase.forest, BiomeGenBase.forestHills, BiomeGenBase.jungle, BiomeGenBase.forest, BiomeGenBase.plains, BiomeGenBase.beach, BiomeGenBase.mesa, BiomeGenBase.savanna, BiomeGenBase.desert, BiomeGenBase.desertHills);
}
{
}
//
}

87
src/main/java/com/jtrent238/epicproportions/addons/halloween/ItemLoader.java
View File

@ -1,47 +1,18 @@
package com.jtrent238.epicproportions.addons.halloween;
import com.jtrent238.epicproportions.EpicProportionsMod;
import com.jtrent238.epicproportions.addons.halloween.items.itemHalloweenEssence;
import com.jtrent238.epicproportions.addons.halloween.items.itemHalloweenIngot;
import com.jtrent238.epicproportions.addons.halloween.items.itemSpookyEssence;
import com.jtrent238.epicproportions.addons.halloween.items.itemSpookyIngot;
import com.jtrent238.epicproportions.addons.halloween.items.blockplacers.itemWitchesCauldron;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_0;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_1;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_10;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_11;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_12;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_13;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_14;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_15;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_16;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_17;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_18;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_19;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_2;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_20;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_21;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_22;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_3;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_4;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_5;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_6;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_7;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_8;
import com.jtrent238.epicproportions.addons.halloween.items.candy.itemCandy_9;
import com.jtrent238.epicproportions.addons.halloween.items.pails.itemHalloweenPail;
import com.jtrent238.epicproportions.addons.halloween.items.pails.itemHalloweenPail_Cow;
import com.jtrent238.epicproportions.addons.halloween.items.pails.itemHalloweenPail_Creeper;
import com.jtrent238.epicproportions.addons.halloween.items.pails.itemHalloweenPail_Jen;
import com.jtrent238.epicproportions.addons.halloween.items.pails.itemHalloweenPail_Pat;
import com.jtrent238.epicproportions.addons.halloween.items.itemCandy;
import com.jtrent238.epicproportions.addons.halloween.items.itemHalloweenPail;
import com.jtrent238.epicproportions.addons.halloween.items.spawners.itemSpawnGhost;
import com.jtrent238.epicproportions.addons.halloween.items.spawners.itemSpawnScareCrow;
import com.jtrent238.epicproportions.addons.halloween.items.spawners.itemSpawnSpookyCaptainCookie;
import com.jtrent238.epicproportions.addons.halloween.items.spawners.itemSpawnSpookyJen;
import com.jtrent238.epicproportions.addons.halloween.items.spawners.itemSpawnSpookyPat;
import com.jtrent238.epicproportions.addons.halloween.items.structureplacers.itemAlterPlacer;
import com.jtrent238.epicproportions.items.structureplacers.itemTNTSwordPlacer;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.Item;
@ -100,33 +71,33 @@ public static void LoadItems() {
itemHalloweenEssence = new itemHalloweenEssence().setUnlocalizedName("itemHalloweenEssence").setTextureName("epicproportionsmod_halloween:itemHalloweenEssence").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemHalloweenIngot = new itemHalloweenIngot().setUnlocalizedName("itemHalloweenIngot").setTextureName("epicproportionsmod_halloween:itemHalloweenIngot").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemHalloweenPail = new itemHalloweenPail(0).setUnlocalizedName("itemHalloweenPail").setTextureName("epicproportionsmod_halloween:itemHalloweenPail").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemHalloweenPail_Pat = new itemHalloweenPail_Pat(1).setUnlocalizedName("itemHalloweenPail_Pat").setTextureName("epicproportionsmod_halloween:itemHalloweenPail_Pat").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemHalloweenPail_Jen = new itemHalloweenPail_Jen(2).setUnlocalizedName("itemHalloweenPail_Jen").setTextureName("epicproportionsmod_halloween:itemHalloweenPail_Jen").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemHalloweenPail_Creeper = new itemHalloweenPail_Creeper(3).setUnlocalizedName("itemHalloweenPail_Creeper").setTextureName("epicproportionsmod_halloween:itemHalloweenPail_Creeper").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemHalloweenPail_Cow = new itemHalloweenPail_Cow(4).setUnlocalizedName("itemHalloweenPail_Cow").setTextureName("epicproportionsmod_halloween:itemHalloweenPail_Cow").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_0 = new itemCandy_0(22, 22, false).setUnlocalizedName("itemCandy_0").setTextureName("epicproportionsmod_halloween:itemCandy_0").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_1 = new itemCandy_1(22, 22, false).setUnlocalizedName("itemCandy_1").setTextureName("epicproportionsmod_halloween:itemCandy_1").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_2 = new itemCandy_2(22, 22, false).setUnlocalizedName("itemCandy_2").setTextureName("epicproportionsmod_halloween:itemCandy_2").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_3 = new itemCandy_3(22, 22, false).setUnlocalizedName("itemCandy_3").setTextureName("epicproportionsmod_halloween:itemCandy_3").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_4 = new itemCandy_4(22, 22, false).setUnlocalizedName("itemCandy_4").setTextureName("epicproportionsmod_halloween:itemCandy_4").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_5 = new itemCandy_5(22, 22, false).setUnlocalizedName("itemCandy_5").setTextureName("epicproportionsmod_halloween:itemCandy_5").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_6 = new itemCandy_6(22, 22, false).setUnlocalizedName("itemCandy_6").setTextureName("epicproportionsmod_halloween:itemCandy_6").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_7 = new itemCandy_7(22, 22, false).setUnlocalizedName("itemCandy_7").setTextureName("epicproportionsmod_halloween:itemCandy_7").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_8 = new itemCandy_8(22, 22, false).setUnlocalizedName("itemCandy_8").setTextureName("epicproportionsmod_halloween:itemCandy_8").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_9 = new itemCandy_9(22, 22, false).setUnlocalizedName("itemCandy_9").setTextureName("epicproportionsmod_halloween:itemCandy_9").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_10 = new itemCandy_10(22, 22, false).setUnlocalizedName("itemCandy_10").setTextureName("epicproportionsmod_halloween:itemCandy_10").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_11 = new itemCandy_11(22, 22, false).setUnlocalizedName("itemCandy_11").setTextureName("epicproportionsmod_halloween:itemCandy_11").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_12 = new itemCandy_12(22, 22, false).setUnlocalizedName("itemCandy_12").setTextureName("epicproportionsmod_halloween:itemCandy_12").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_13 = new itemCandy_13(22, 22, false).setUnlocalizedName("itemCandy_13").setTextureName("epicproportionsmod_halloween:itemCandy_13").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_14 = new itemCandy_14(22, 22, false).setUnlocalizedName("itemCandy_14").setTextureName("epicproportionsmod_halloween:itemCandy_14").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_15 = new itemCandy_15(22, 22, false).setUnlocalizedName("itemCandy_15").setTextureName("epicproportionsmod_halloween:itemCandy_15").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_16 = new itemCandy_16(22, 22, false).setUnlocalizedName("itemCandy_16").setTextureName("epicproportionsmod_halloween:itemCandy_16").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_17 = new itemCandy_17(22, 22, false).setUnlocalizedName("itemCandy_17").setTextureName("epicproportionsmod_halloween:itemCandy_17").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_18 = new itemCandy_18(22, 22, false).setUnlocalizedName("itemCandy_18").setTextureName("epicproportionsmod_halloween:itemCandy_18").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_19 = new itemCandy_19(22, 22, false).setUnlocalizedName("itemCandy_19").setTextureName("epicproportionsmod_halloween:itemCandy_19").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_20 = new itemCandy_20(22, 22, false).setUnlocalizedName("itemCandy_20").setTextureName("epicproportionsmod_halloween:itemCandy_20").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_21 = new itemCandy_21(22, 22, false).setUnlocalizedName("itemCandy_21").setTextureName("epicproportionsmod_halloween:itemCandy_21").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_22 = new itemCandy_22(22, 22, false).setUnlocalizedName("itemCandy_22").setTextureName("epicproportionsmod_halloween:itemCandy_22").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemHalloweenPail_Pat = new itemHalloweenPail(1).setUnlocalizedName("itemHalloweenPail_Pat").setTextureName("epicproportionsmod_halloween:itemHalloweenPail_Pat").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemHalloweenPail_Jen = new itemHalloweenPail(2).setUnlocalizedName("itemHalloweenPail_Jen").setTextureName("epicproportionsmod_halloween:itemHalloweenPail_Jen").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemHalloweenPail_Creeper = new itemHalloweenPail(3).setUnlocalizedName("itemHalloweenPail_Creeper").setTextureName("epicproportionsmod_halloween:itemHalloweenPail_Creeper").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemHalloweenPail_Cow = new itemHalloweenPail(4).setUnlocalizedName("itemHalloweenPail_Cow").setTextureName("epicproportionsmod_halloween:itemHalloweenPail_Cow").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_0 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_0").setTextureName("epicproportionsmod_halloween:itemCandy_0").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_1 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_1").setTextureName("epicproportionsmod_halloween:itemCandy_1").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_2 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_2").setTextureName("epicproportionsmod_halloween:itemCandy_2").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_3 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_3").setTextureName("epicproportionsmod_halloween:itemCandy_3").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_4 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_4").setTextureName("epicproportionsmod_halloween:itemCandy_4").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_5 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_5").setTextureName("epicproportionsmod_halloween:itemCandy_5").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_6 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_6").setTextureName("epicproportionsmod_halloween:itemCandy_6").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_7 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_7").setTextureName("epicproportionsmod_halloween:itemCandy_7").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_8 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_8").setTextureName("epicproportionsmod_halloween:itemCandy_8").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_9 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_9").setTextureName("epicproportionsmod_halloween:itemCandy_9").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_10 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_10").setTextureName("epicproportionsmod_halloween:itemCandy_10").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_11 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_11").setTextureName("epicproportionsmod_halloween:itemCandy_11").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_12 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_12").setTextureName("epicproportionsmod_halloween:itemCandy_12").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_13 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_13").setTextureName("epicproportionsmod_halloween:itemCandy_13").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_14 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_14").setTextureName("epicproportionsmod_halloween:itemCandy_14").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_15 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_15").setTextureName("epicproportionsmod_halloween:itemCandy_15").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_16 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_16").setTextureName("epicproportionsmod_halloween:itemCandy_16").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_17 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_17").setTextureName("epicproportionsmod_halloween:itemCandy_17").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_18 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_18").setTextureName("epicproportionsmod_halloween:itemCandy_18").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_19 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_19").setTextureName("epicproportionsmod_halloween:itemCandy_19").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_20 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_20").setTextureName("epicproportionsmod_halloween:itemCandy_20").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_21 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_21").setTextureName("epicproportionsmod_halloween:itemCandy_21").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemCandy_22 = new itemCandy(22, 22, false).setUnlocalizedName("itemCandy_22").setTextureName("epicproportionsmod_halloween:itemCandy_22").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemAlterPlacer = new itemAlterPlacer(0).setUnlocalizedName("itemAlterPlacer").setTextureName("epicproportionsmod_halloween:itemAlterPlacer").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);
itemWitchesCauldron = new itemWitchesCauldron().setUnlocalizedName("itemWitchesCauldron").setTextureName("epicproportionsmod_halloween:itemWitchesCauldron").setCreativeTab(epicproportionsmod_halloween.EpicProportionsMod_Halloween);

5
src/main/java/com/jtrent238/epicproportions/addons/halloween/ItemStore.java
View File

@ -1,5 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween;
public class ItemStore {
}

3
src/main/java/com/jtrent238/epicproportions/addons/halloween/blocks/blockHalloweenIngot.java
View File

@ -1,11 +1,8 @@
package com.jtrent238.epicproportions.addons.halloween.blocks;
import com.jtrent238.epicproportions.addons.halloween.BlockLoader;
import net.minecraft.block.Block;
import net.minecraft.block.BlockCompressed;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.world.IBlockAccess;
public class blockHalloweenIngot extends BlockCompressed{

7
src/main/java/com/jtrent238/epicproportions/addons/halloween/blocks/blockSpookyEssenceOre.java
View File

@ -1,19 +1,16 @@
package com.jtrent238.epicproportions.addons.halloween.blocks;
import java.util.Random;
import com.jtrent238.epicproportions.addons.halloween.BlockLoader;
import com.jtrent238.epicproportions.addons.halloween.ItemLoader;
import net.minecraft.block.Block;
import net.minecraft.block.BlockOre;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import java.util.Random;
public class blockSpookyEssenceOre extends BlockOre{
public blockSpookyEssenceOre(Material ground) {

15
src/main/java/com/jtrent238/epicproportions/addons/halloween/blocks/blockWitchesCauldron.java
View File

@ -1,11 +1,7 @@
package com.jtrent238.epicproportions.addons.halloween.blocks;
import java.util.List;
import java.util.Random;
import com.jtrent238.epicproportions.addons.halloween.BlockLoader;
import com.jtrent238.epicproportions.addons.halloween.ItemLoader;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@ -15,7 +11,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
@ -23,8 +18,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class blockWitchesCauldron extends Block
{
@SideOnly(Side.CLIENT)
@ -84,6 +83,10 @@ public class blockWitchesCauldron extends Block
return (IIcon) (p_150026_0_.equals("inner") ? BlockLoader.blockWitchesCauldron : (p_150026_0_.equals("bottom") ? BlockLoader.blockWitchesCauldron : null));
}
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
{
return new ItemStack(ItemLoader.itemWitchesCauldron);
}
/**
* Sets the block's bounds for rendering it as an item
*/
@ -98,7 +101,7 @@ public class blockWitchesCauldron extends Block
*/
public boolean isOpaqueCube()
{
return false;
return true;
}
/**

2
src/main/java/com/jtrent238/epicproportions/addons/halloween/client/ClientProxy.java
View File

@ -10,8 +10,6 @@ import com.jtrent238.epicproportions.addons.halloween.entity.EntitySpookyPat;
import com.jtrent238.epicproportions.addons.halloween.model.ModelGhost;
import com.jtrent238.epicproportions.addons.halloween.model.ModelPumpkinHead;
import com.jtrent238.epicproportions.addons.halloween.model.ModelScareCrow;
import com.jtrent238.epicproportions.entity.EntityJen;
import com.jtrent238.epicproportions.entity.EntityPat;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.event.FMLInitializationEvent;

2
src/main/java/com/jtrent238/epicproportions/addons/halloween/container/ContainerPail.java
View File

@ -2,7 +2,7 @@ package com.jtrent238.epicproportions.addons.halloween.container;
import com.jtrent238.epicproportions.addons.halloween.inventory.InventoryPail;
import com.jtrent238.epicproportions.addons.halloween.items.pails.itemHalloweenPail;
import com.jtrent238.epicproportions.addons.halloween.items.itemHalloweenPail;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;

30
src/main/java/com/jtrent238/epicproportions/addons/halloween/entity/EntityGhost.java
View File

@ -1,30 +1,10 @@
package com.jtrent238.epicproportions.addons.halloween.entity;
import java.util.Calendar;
import java.util.List;
import java.util.UUID;
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.command.IEntitySelector;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.EnumCreatureAttribute;
import net.minecraft.entity.IEntityLivingData;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIBreakDoor;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIMoveThroughVillage;
import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction;
import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.*;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.ai.attributes.IAttribute;
import net.minecraft.entity.ai.attributes.IAttributeInstance;
@ -41,13 +21,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeModContainer;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.event.entity.living.ZombieEvent.SummonAidEvent;
import java.util.UUID;
public class EntityGhost extends EntityMob
{
@ -60,7 +39,6 @@ public class EntityGhost extends EntityMob
private boolean field_146076_bu = false;
private float field_146074_bv = -1.0F;
private float field_146073_bw;
private static final String __OBFID = "CL_00001702";
public EntityGhost(World p_i1745_1_)
{

6
src/main/java/com/jtrent238/epicproportions/addons/halloween/entity/EntityPumpkinHead.java
View File

@ -1,14 +1,12 @@
package com.jtrent238.epicproportions.addons.halloween.entity;
import java.util.Random;
import net.minecraft.entity.monster.EntityGolem;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import java.util.Random;
public class EntityPumpkinHead extends EntityGolem{
public EntityPumpkinHead(World p_i1686_1_) {

7
src/main/java/com/jtrent238/epicproportions/addons/halloween/entity/EntityScareCrow.java
View File

@ -1,15 +1,12 @@
package com.jtrent238.epicproportions.addons.halloween.entity;
import java.util.Random;
import net.minecraft.entity.monster.EntityGolem;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import java.util.Random;
public class EntityScareCrow extends EntityGolem{
public EntityScareCrow(World p_i1686_1_) {

6
src/main/java/com/jtrent238/epicproportions/addons/halloween/entity/EntitySpookyCaptianCookie.java
View File

@ -1,14 +1,12 @@
package com.jtrent238.epicproportions.addons.halloween.entity;
import java.util.concurrent.ThreadLocalRandom;
import com.jtrent238.epicproportions.addons.halloween.ItemLoader;
import com.jtrent238.epicproportions.entity.EntityCaptianCookie;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import java.util.concurrent.ThreadLocalRandom;
public class EntitySpookyCaptianCookie extends EntityCaptianCookie{
public EntitySpookyCaptianCookie(World var1) {

12
src/main/java/com/jtrent238/epicproportions/addons/halloween/entity/EntitySpookyJen.java
View File

@ -2,25 +2,15 @@ package com.jtrent238.epicproportions.addons.halloween.entity;
import com.jtrent238.epicproportions.addons.halloween.ItemLoader;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIMoveThroughVillage;
import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction;
import net.minecraft.entity.ai.EntityAIMoveTowardsTarget;
import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.boss.IBossDisplayData;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.monster.EntityGolem;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;

16
src/main/java/com/jtrent238/epicproportions/addons/halloween/entity/EntitySpookyPat.java
View File

@ -1,34 +1,22 @@
package com.jtrent238.epicproportions.addons.halloween.entity;
import com.jtrent238.epicproportions.addons.halloween.ItemLoader;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIMoveThroughVillage;
import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction;
import net.minecraft.entity.ai.EntityAIMoveTowardsTarget;
import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.boss.IBossDisplayData;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.monster.EntityGolem;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.common.DungeonHooks;
import com.jtrent238.epicproportions.addons.halloween.ItemLoader;
import net.minecraft.client.model.ModelBiped;
public class EntitySpookyPat extends EntityGolem implements IBossDisplayData
{
World world = null;

8
src/main/java/com/jtrent238/epicproportions/addons/halloween/epicproportionsmod_halloween.java
View File

@ -5,7 +5,6 @@ import com.jtrent238.epicproportions.ForgeSubscribe;
import com.jtrent238.epicproportions.addons.halloween.common.CommonProxy;
import com.jtrent238.epicproportions.addons.halloween.worldgen.ModWorldGen;
import com.jtrent238.epicproportions.api.API;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
@ -17,15 +16,10 @@ import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.crash.CrashReportCategory;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.common.ChestGenHooks;
import net.minecraftforge.common.MinecraftForge;
@Mod(modid="epicproportionsmod_halloween", name="jtrent238's EpicProportions Mod - Halloween Addon", version=(epicproportionsmod_halloween.MODVERSION), dependencies="required-after:epicproportionsmod")
@API(owner = "jtrent238", provides = "EpicproportionsModAPI", apiVersion = com.jtrent238.epicproportions.EpicProportionsMod.APIVERSION, addonName = epicproportionsmod_halloween.ADDONNAME, addonID = epicproportionsmod_halloween.ADDONID)
@ -49,7 +43,7 @@ public class epicproportionsmod_halloween
/** This is used to keep track of GUIs that we make*/
private static int modGuiIndex = 0;
public static final String MODVERSION = "1.0.1.2";
public static final String MODVERSION = "indev-1.0.1.2";
public static final String MODNAME = "PopularMMOS EpicProportions Mod - Halloween Addon";
public static final String ADDONNAME = "Halloween Addon";
public static final String MODAUTHOR = "jtrent238";

1
src/main/java/com/jtrent238/epicproportions/addons/halloween/gui/GuiPailInventory.java
View File

@ -68,7 +68,6 @@ public class GuiPailInventory extends GuiContainer
int k = (this.width - this.xSize) / 2;
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int i1;
drawPlayerModel(k + 51, l + 75, 30, (float)(k + 51) - this.xSize_lo, (float)(l + 75 - 50) - this.ySize_lo, this.mc.thePlayer);
}

13
src/main/java/com/jtrent238/epicproportions/addons/halloween/inventory/InventoryPail.java
View File

@ -1,24 +1,20 @@
package com.jtrent238.epicproportions.addons.halloween.inventory;
import java.util.UUID;
import com.jtrent238.epicproportions.addons.halloween.items.pails.itemHalloweenPail;
import com.jtrent238.epicproportions.addons.halloween.items.itemHalloweenPail;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.common.util.Constants.NBT;
import net.minecraftforge.event.entity.item.ItemEvent;
@SuppressWarnings("null")
public class InventoryPail implements IInventory
{
private String name = "Inventory Pail";
private final String name = "Inventory Pail";
/** Provides NBT Tag Compound to reference */
private final ItemStack invItem;
@ -27,7 +23,7 @@ public class InventoryPail implements IInventory
public static final int INV_SIZE = 8;
/** Inventory's size must be same as number of slots you add to the Container class */
private ItemStack[] inventory = new ItemStack[INV_SIZE];
private final ItemStack[] inventory = new ItemStack[INV_SIZE];
/**
* @param itemstack - the ItemStack to which this inventory belongs
@ -219,8 +215,7 @@ public class InventoryPail implements IInventory
// Add the TagList to the ItemStack's Tag Compound with the name "ItemInventory"
tagcompound.setTag("PailInventory", items);
}
{
}
/*
If you want to be able to place your inventory-holding Item within another
instance of itself, you'll need to have a way to distinguish between each

64
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/blockplacers/itemWitchesCauldron.java
View File

@ -1,7 +1,67 @@
package com.jtrent238.epicproportions.addons.halloween.items.blockplacers;
import com.jtrent238.epicproportions.addons.halloween.BlockLoader;
import com.jtrent238.epicproportions.addons.halloween.blocks.blockWitchesCauldron;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
public class itemWitchesCauldron extends Item{
public class itemWitchesCauldron extends Item
{
}
/**
* Callback for item usage. If the item does something special on right clicking, he will have one of those. Return
* True if something happen and false if it don't. This is for ITEMS, not BLOCKS
*/
public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_)
{
if (p_77648_3_.isRemote)
{
return true;
}
else if (p_77648_7_ != 1)
{
return false;
}
else
{
++p_77648_5_;
blockWitchesCauldron present = (blockWitchesCauldron) BlockLoader.blockWitchesCauldron;
int i1 = MathHelper.floor_double((double)(p_77648_2_.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
byte b0 = 0;
byte b1 = 0;
/*
if (i1 == 0)
{
b1 = 1;
}
if (i1 == 1)
{
b0 = -1;
}
if (i1 == 2)
{
b1 = -1;
}
if (i1 == 3)
{
b0 = 1;
}
*/
p_77648_3_.setBlock(p_77648_4_ + b0, p_77648_5_, p_77648_6_ + b1, present, i1 + 8, 3);
--p_77648_1_.stackSize;
return true;
}
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_0.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_0 extends itemCandy{
public itemCandy_0(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_1.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_1 extends itemCandy{
public itemCandy_1(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_10.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_10 extends itemCandy{
public itemCandy_10(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_11.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_11 extends itemCandy{
public itemCandy_11(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_12.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_12 extends itemCandy{
public itemCandy_12(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_13.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_13 extends itemCandy{
public itemCandy_13(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_14.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_14 extends itemCandy{
public itemCandy_14(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_15.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_15 extends itemCandy{
public itemCandy_15(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_16.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_16 extends itemCandy{
public itemCandy_16(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_17.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_17 extends itemCandy{
public itemCandy_17(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_18.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_18 extends itemCandy{
public itemCandy_18(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_19.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_19 extends itemCandy{
public itemCandy_19(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_2.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_2 extends itemCandy{
public itemCandy_2(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_20.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_20 extends itemCandy{
public itemCandy_20(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_21.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_21 extends itemCandy{
public itemCandy_21(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_22.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_22 extends itemCandy{
public itemCandy_22(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_3.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_3 extends itemCandy{
public itemCandy_3(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_4.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_4 extends itemCandy{
public itemCandy_4(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_5.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_5 extends itemCandy{
public itemCandy_5(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_6.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_6 extends itemCandy{
public itemCandy_6(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_7.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_7 extends itemCandy{
public itemCandy_7(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_8.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_8 extends itemCandy{
public itemCandy_8(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy_9.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
public class itemCandy_9 extends itemCandy{
public itemCandy_9(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
}
}

2
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/candy/itemCandy.java → src/main/java/com/jtrent238/epicproportions/addons/halloween/items/itemCandy.java
View File

@ -1,4 +1,4 @@
package com.jtrent238.epicproportions.addons.halloween.items.candy;
package com.jtrent238.epicproportions.addons.halloween.items;
import net.minecraft.item.ItemFood;
import net.minecraft.potion.Potion;

11
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/pails/itemHalloweenPail.java → src/main/java/com/jtrent238/epicproportions/addons/halloween/items/itemHalloweenPail.java
View File

@ -1,21 +1,12 @@
package com.jtrent238.epicproportions.addons.halloween.items.pails;
import java.util.UUID;
package com.jtrent238.epicproportions.addons.halloween.items;
import com.jtrent238.epicproportions.addons.halloween.epicproportionsmod_halloween;
import com.jtrent238.epicproportions.addons.halloween.inventory.InventoryPail;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
public class itemHalloweenPail extends Item
{

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/pails/itemHalloweenPail_Cow.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.pails;
public class itemHalloweenPail_Cow extends itemHalloweenPail{
public itemHalloweenPail_Cow(int par1) {
super(par1);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/pails/itemHalloweenPail_Creeper.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.pails;
public class itemHalloweenPail_Creeper extends itemHalloweenPail{
public itemHalloweenPail_Creeper(int par1) {
super(par1);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/pails/itemHalloweenPail_Jen.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.pails;
public class itemHalloweenPail_Jen extends itemHalloweenPail{
public itemHalloweenPail_Jen(int par1) {
super(par1);
}
}

9
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/pails/itemHalloweenPail_Pat.java
View File

@ -1,9 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.items.pails;
public class itemHalloweenPail_Pat extends itemHalloweenPail{
public itemHalloweenPail_Pat(int par1) {
super(par1);
}
}

13
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/spawners/itemSpawnGhost.java
View File

@ -1,26 +1,15 @@
package com.jtrent238.epicproportions.addons.halloween.items.spawners;
import com.jtrent238.epicproportions.addons.halloween.entity.EntityGhost;
import com.jtrent238.epicproportions.addons.halloween.entity.EntitySpookyCaptianCookie;
import com.jtrent238.epicproportions.addons.halloween.entity.EntitySpookyJen;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class itemSpawnGhost extends Item
{
@SideOnly(Side.CLIENT)
private IIcon theIcon;
private static final String __OBFID = "CL_00000070";
//This allows Right Click to spawn entity
//This allows Right Click to spawn entity
public ItemStack onItemRightClick(ItemStack itemstack, World world,EntityPlayer entityplayer)
{
if(!world.isRemote)

12
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/spawners/itemSpawnScareCrow.java
View File

@ -1,24 +1,16 @@
package com.jtrent238.epicproportions.addons.halloween.items.spawners;
import com.jtrent238.epicproportions.addons.halloween.entity.EntityGhost;
import com.jtrent238.epicproportions.addons.halloween.entity.EntityScareCrow;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class itemSpawnScareCrow extends Item
{
@SideOnly(Side.CLIENT)
private IIcon theIcon;
private static final String __OBFID = "CL_00000070";
//This allows Right Click to spawn entity
//This allows Right Click to spawn entity
public ItemStack onItemRightClick(ItemStack itemstack, World world,EntityPlayer entityplayer)
{
if(!world.isRemote)

13
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/spawners/itemSpawnSpookyCaptainCookie.java
View File

@ -1,25 +1,16 @@
package com.jtrent238.epicproportions.addons.halloween.items.spawners;
import com.jtrent238.epicproportions.addons.halloween.entity.EntitySpookyCaptianCookie;
import com.jtrent238.epicproportions.addons.halloween.entity.EntitySpookyJen;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class itemSpawnSpookyCaptainCookie extends Item
{
@SideOnly(Side.CLIENT)
private IIcon theIcon;
private static final String __OBFID = "CL_00000070";
//This allows Right Click to spawn entity
//This allows Right Click to spawn entity
public ItemStack onItemRightClick(ItemStack itemstack, World world,EntityPlayer entityplayer)
{
if(!world.isRemote)

12
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/spawners/itemSpawnSpookyJen.java
View File

@ -1,24 +1,16 @@
package com.jtrent238.epicproportions.addons.halloween.items.spawners;
import com.jtrent238.epicproportions.addons.halloween.entity.EntitySpookyJen;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class itemSpawnSpookyJen extends Item
{
@SideOnly(Side.CLIENT)
private IIcon theIcon;
private static final String __OBFID = "CL_00000070";
//This allows Right Click to spawn entity
//This allows Right Click to spawn entity
public ItemStack onItemRightClick(ItemStack itemstack, World world,EntityPlayer entityplayer)
{
if(!world.isRemote)

11
src/main/java/com/jtrent238/epicproportions/addons/halloween/items/spawners/itemSpawnSpookyPat.java
View File

@ -1,23 +1,16 @@
package com.jtrent238.epicproportions.addons.halloween.items.spawners;
import com.jtrent238.epicproportions.addons.halloween.entity.EntitySpookyPat;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class itemSpawnSpookyPat extends Item
{
@SideOnly(Side.CLIENT)
private IIcon theIcon;
private static final String __OBFID = "CL_00000070";
//This allows Right Click to spawn entity
//This allows Right Click to spawn entity
public ItemStack onItemRightClick(ItemStack itemstack, World world,EntityPlayer entityplayer)
{
if(!world.isRemote)

4
src/main/java/com/jtrent238/epicproportions/addons/halloween/model/ModelPumpkinHead.java
View File

@ -1,6 +1,5 @@
package com.jtrent238.epicproportions.addons.halloween.model;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
@ -22,7 +21,6 @@ public class ModelPumpkinHead extends ModelBase {
private final ModelRenderer layer11;
private final ModelRenderer sides;
private final ModelRenderer facelayer0;
private final ModelRenderer facelayer2;
private final ModelRenderer facelayer3;
private final ModelRenderer facelayer4;
private final ModelRenderer facelayer5;
@ -154,7 +152,7 @@ public class ModelPumpkinHead extends ModelBase {
facelayer0.cubeList.add(new ModelBox(facelayer0, 0, 0, 8.0F, -10.0F, -10.0F, 1, 1, 1, 0.0F));
facelayer0.cubeList.add(new ModelBox(facelayer0, 0, 0, 9.0F, -10.0F, -10.0F, 1, 1, 1, 0.0F));
facelayer2 = new ModelRenderer(this);
ModelRenderer facelayer2 = new ModelRenderer(this);
facelayer2.setRotationPoint(0.0F, 0.0F, 0.0F);
sides.addChild(facelayer2);
facelayer2.cubeList.add(new ModelBox(facelayer2, 0, 0, -10.0F, -9.0F, -10.0F, 1, 1, 1, 0.0F));

1
src/main/java/com/jtrent238/epicproportions/addons/halloween/model/ModelScareCrow.java
View File

@ -1,6 +1,5 @@
package com.jtrent238.epicproportions.addons.halloween.model;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;

27
src/main/java/com/jtrent238/epicproportions/addons/halloween/render/RenderGhost.java
View File

@ -1,27 +0,0 @@
package com.jtrent238.epicproportions.addons.halloween.render;
import org.lwjgl.opengl.GL11;
import com.jtrent238.epicproportions.addons.halloween.entity.EntityGhost;
import com.jtrent238.epicproportions.addons.halloween.model.ModelGhost;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.util.ResourceLocation;
public class RenderGhost extends RenderLiving
{
public RenderGhost(ModelBase p_i1262_1_, float p_i1262_2_) {
super(p_i1262_1_, p_i1262_2_);
}
@Override
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
// TODO Auto-generated method stub
return null;
}
}

18
src/main/java/com/jtrent238/epicproportions/addons/halloween/worldgen/ModWorldGen.java
View File

@ -1,24 +1,14 @@
package com.jtrent238.epicproportions.addons.halloween.worldgen;
import java.util.Random;
import java.util.logging.Level;
import com.jtrent238.epicproportions.addons.halloween.BlockLoader;
import cpw.mods.fml.common.IWorldGenerator;
import cpw.mods.fml.common.Loader;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.feature.WorldGenBigMushroom;
import net.minecraft.world.gen.feature.WorldGenCactus;
import net.minecraft.world.gen.feature.WorldGenFlowers;
import net.minecraft.world.gen.feature.WorldGenMinable;
import net.minecraft.world.gen.feature.WorldGenReed;
import net.minecraft.world.gen.feature.WorldGenSand;
import net.minecraft.world.gen.feature.WorldGenWaterlily;
import net.minecraft.world.gen.feature.WorldGenerator;
import java.util.Random;
public class ModWorldGen implements IWorldGenerator {
@Override
@ -39,8 +29,8 @@ public class ModWorldGen implements IWorldGenerator {
}
}
private WorldGenerator gen_HalloweenEssence_ore;
private WorldGenerator gen_SpookyEssence_ore;
private final WorldGenerator gen_HalloweenEssence_ore;
private final WorldGenerator gen_SpookyEssence_ore;