Getting closer to pre1!
This commit is contained in:
parent
4c35f7810c
commit
3e9c60a39c
|
@ -1,8 +1,10 @@
|
|||
package ee3.common.core.handlers;
|
||||
|
||||
import ee3.common.core.helper.ItemDropHelper;
|
||||
import ee3.common.core.helper.RedWaterHelper;
|
||||
import ee3.common.lib.Reference;
|
||||
import net.minecraft.src.EntityLiving;
|
||||
import net.minecraft.src.EntityPlayer;
|
||||
import net.minecraft.src.Potion;
|
||||
import net.minecraft.src.PotionEffect;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
|
@ -28,7 +30,9 @@ public class EntityLivingHandler {
|
|||
|
||||
@ForgeSubscribe
|
||||
public void onEntityLivingDeath(LivingDeathEvent event) {
|
||||
|
||||
if (event.source.getDamageType().equals("player")) {
|
||||
ItemDropHelper.dropMiniumShard((EntityPlayer)event.source.getSourceOfDamage(), event.entityLiving);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
22
ee3_common/ee3/common/core/helper/ItemDropHelper.java
Normal file
22
ee3_common/ee3/common/core/helper/ItemDropHelper.java
Normal file
|
@ -0,0 +1,22 @@
|
|||
package ee3.common.core.helper;
|
||||
|
||||
import ee3.common.item.ModItems;
|
||||
import net.minecraft.src.EntityAgeable;
|
||||
import net.minecraft.src.EntityLiving;
|
||||
import net.minecraft.src.EntityPlayer;
|
||||
|
||||
public class ItemDropHelper {
|
||||
|
||||
private static double rand;
|
||||
|
||||
public static void dropMiniumShard(EntityPlayer player, EntityLiving entity) {
|
||||
if (!(entity instanceof EntityAgeable) && !(entity instanceof EntityPlayer)) {
|
||||
rand = Math.random();
|
||||
|
||||
if (rand < 0.15d) {
|
||||
entity.dropItem(ModItems.miniumShard.shiftedIndex, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -1,19 +0,0 @@
|
|||
package ee3.common.item;
|
||||
|
||||
/**
|
||||
* ItemEEStackable
|
||||
*
|
||||
* Stackable version of mod items
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class ItemEEStackable extends ItemEE {
|
||||
|
||||
public ItemEEStackable(int id) {
|
||||
super(id);
|
||||
maxStackSize = 64;
|
||||
}
|
||||
|
||||
}
|
9
ee3_common/ee3/common/item/ItemInertStone.java
Normal file
9
ee3_common/ee3/common/item/ItemInertStone.java
Normal file
|
@ -0,0 +1,9 @@
|
|||
package ee3.common.item;
|
||||
|
||||
public class ItemInertStone extends ItemEE {
|
||||
|
||||
public ItemInertStone(int id) {
|
||||
super(id);
|
||||
}
|
||||
|
||||
}
|
|
@ -13,6 +13,7 @@ public class ItemMiniumShard extends ItemEE {
|
|||
|
||||
public ItemMiniumShard(int id) {
|
||||
super(id);
|
||||
maxStackSize = 64;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
package ee3.common.item;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.lib.ItemIds;
|
||||
import net.minecraft.src.Block;
|
||||
import net.minecraft.src.CreativeTabs;
|
||||
import net.minecraft.src.Item;
|
||||
import net.minecraft.src.ItemStack;
|
||||
|
||||
/**
|
||||
* ModItems
|
||||
|
@ -17,11 +20,13 @@ import net.minecraft.src.Item;
|
|||
public class ModItems {
|
||||
|
||||
/* Item name constants */
|
||||
public static final String INERT_STONE_NAME = "inertStone";
|
||||
public static final String MINIUM_SHARD_NAME = "miniumShard";
|
||||
public static final String MINIUM_STONE_NAME = "miniumStone";
|
||||
public static final String PHILOSOPHER_STONE_NAME = "philStone";
|
||||
|
||||
/* Mod item instances */
|
||||
public static Item inertStone;
|
||||
public static Item miniumShard;
|
||||
public static Item miniumStone;
|
||||
public static Item philStone;
|
||||
|
@ -29,11 +34,18 @@ public class ModItems {
|
|||
public static void init() {
|
||||
/* Initialize each mod item individually */
|
||||
miniumShard = new ItemMiniumShard(ItemIds.MINIUM_SHARD).setIconCoord(0, 0).setItemName(MINIUM_SHARD_NAME).setCreativeTab(CreativeTabs.tabMisc);
|
||||
inertStone = new ItemInertStone(ItemIds.INERT_STONE).setIconCoord(1, 0).setItemName(INERT_STONE_NAME).setCreativeTab(CreativeTabs.tabMisc);
|
||||
miniumStone = new ItemMiniumStone(ItemIds.MINIUM_STONE).setIconCoord(1, 0).setItemName(MINIUM_STONE_NAME).setCreativeTab(CreativeTabs.tabMisc);
|
||||
philStone = new ItemPhilosopherStone(ItemIds.PHILOSOPHER_STONE).setIconCoord(2, 0).setItemName(PHILOSOPHER_STONE_NAME).setCreativeTab(CreativeTabs.tabMisc);
|
||||
|
||||
miniumStone.setContainerItem(miniumStone);
|
||||
philStone.setContainerItem(philStone);
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(miniumStone),
|
||||
new Object[] {"sss","sds","sss",
|
||||
Character.valueOf('s'), miniumShard,
|
||||
Character.valueOf('d'), Item.diamond
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,13 +11,15 @@ package ee3.common.lib;
|
|||
*/
|
||||
public class ItemIds {
|
||||
|
||||
/* Default item ids */
|
||||
/* Default item ids */
|
||||
public static int MINIUM_SHARD_DEFAULT = 27000;
|
||||
public static int MINIUM_STONE_DEFAULT = 27001;
|
||||
public static int PHILOSOPHER_STONE_DEFAULT = 27002;
|
||||
public static int INERT_STONE_DEFAULT = 27001;
|
||||
public static int MINIUM_STONE_DEFAULT = 27002;
|
||||
public static int PHILOSOPHER_STONE_DEFAULT = 27003;
|
||||
|
||||
/* Current item ids */
|
||||
public static int MINIUM_SHARD;
|
||||
public static int INERT_STONE;
|
||||
public static int MINIUM_STONE;
|
||||
public static int PHILOSOPHER_STONE;
|
||||
|
||||
|
|
Loading…
Reference in a new issue