mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-18 11:29:30 +00:00
Added dark steel pickaxe.
This commit is contained in:
1 parent
9bd71bb4ee
commit
4ac3cd092b
7 files changed
+189
-4
No files matched your search
@@ -124,6 +124,7 @@ item.darkSteel_chestplate.name=Dark Plate
|
||||
item.darkSteel_leggings.name=Dark Leggings
|
||||
item.darkSteel_boots.name=Dark Boots
|
||||
item.darkSteel_sword.name=The Ender
|
||||
item.darkSteel_pickaxe.name=Dark Pick
|
||||
|
||||
|
||||
//------GUI
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 260 B |
@@ -187,6 +187,7 @@ public class ClientProxy extends CommonProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelChestplate, dsr);
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelHelmet, dsr);
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelSword, dsr);
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelPickaxe, dsr);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -81,11 +81,12 @@ public final class Config {
|
||||
public static int enderIoRange = 8;
|
||||
public static boolean enderIoMeAccessEnabled = true;
|
||||
|
||||
public static int darkSteelPowerStorage = 100000;
|
||||
|
||||
public static double darkSteelLeggingWalkModifier = 0.3;
|
||||
public static double darkSteelLeggingSprintModifier = 0.5;
|
||||
public static double darkSteelBootsJumpModifier = 1.5;
|
||||
|
||||
public static int darkSteelPowerStorage = 100000;
|
||||
public static int darkSteelWalkPowerCost = darkSteelPowerStorage / 3000;
|
||||
public static int darkSteelSprintPowerCost = darkSteelWalkPowerCost * 4;
|
||||
public static boolean darkSteelDrainPowerFromInventory = true;
|
||||
@@ -97,6 +98,12 @@ public final class Config {
|
||||
public static float darkSteelSwordSkullLootingModifier = 0.15f;
|
||||
public static float vanillaSwordSkullLootingModifier = 0.1f;
|
||||
public static int darkSteelSwordPowerUsePerHit = 250;
|
||||
public static double darkSteelSwordEnderPearlDropChance = 1;
|
||||
public static double darkSteelSwordEnderPearlDropChancePerLooting = 0.2;
|
||||
|
||||
public static int darkSteelPickPowerUseObsidian = 2500;
|
||||
public static int darkSteelPickEffeciencyObsidian = 50;
|
||||
public static int darkSteelPickPowerUsePerDamagePoint = 250;
|
||||
|
||||
public static void load(FMLPreInitializationEvent event) {
|
||||
configDirectory = new File(event.getModConfigurationDirectory(), "enderio");
|
||||
@@ -280,6 +287,21 @@ public final class Config {
|
||||
vanillaSwordSkullLootingModifier);
|
||||
darkSteelSwordPowerUsePerHit = config.get("Settings", "darkSteelSwordPowerUsePerHit", darkSteelSwordPowerUsePerHit,
|
||||
"The amount of power (RF) used per hit.").getInt(darkSteelSwordPowerUsePerHit);
|
||||
darkSteelSwordEnderPearlDropChance = config.get("Settings", "darkSteelSwordEnderPearlDropChance", darkSteelSwordEnderPearlDropChance,
|
||||
"The chance that an ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance)").getDouble(
|
||||
darkSteelSwordEnderPearlDropChance);
|
||||
darkSteelSwordEnderPearlDropChancePerLooting = config.get("Settings", "darkSteelSwordEnderPearlDropChancePerLooting",
|
||||
darkSteelSwordEnderPearlDropChancePerLooting,
|
||||
"The chance for each looting level that an additional ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance)")
|
||||
.getDouble(
|
||||
darkSteelSwordEnderPearlDropChancePerLooting);
|
||||
|
||||
darkSteelPickPowerUseObsidian = config.get("Settings", "darkSteelPickPowerUseObsidian", darkSteelPickPowerUseObsidian,
|
||||
"The amount of power (RF) used to break an obsidian block.").getInt(darkSteelPickPowerUseObsidian);
|
||||
darkSteelPickEffeciencyObsidian = config.get("Settings", "darkSteelPickEffeciencyObsidian", darkSteelPickEffeciencyObsidian,
|
||||
"The efeciency when breaking obsidian with a powered Dark Pickaxe.").getInt(darkSteelPickEffeciencyObsidian);
|
||||
darkSteelPickPowerUsePerDamagePoint = config.get("Settings", "darkSteelPickPowerUsePerDamagePoint", darkSteelPickPowerUsePerDamagePoint,
|
||||
"Power use (RF) per damage/durability point avoided.").getInt(darkSteelPickPowerUsePerDamagePoint);
|
||||
|
||||
//TODO: Debug
|
||||
renderCapBankGauge = config.get("Debug", "renderCapBankGauge", renderCapBankGauge, "If not true capacitor banks will not render the level gauge at all.")
|
||||
|
||||
@@ -28,6 +28,7 @@ import crazypants.enderio.enderface.BlockEnderIO;
|
||||
import crazypants.enderio.enderface.EnderfaceRecipes;
|
||||
import crazypants.enderio.enderface.ItemEnderface;
|
||||
import crazypants.enderio.item.ItemDarkSteelArmor;
|
||||
import crazypants.enderio.item.ItemDarkSteelPickaxe;
|
||||
import crazypants.enderio.item.ItemDarkSteelSword;
|
||||
import crazypants.enderio.item.ItemRecipes;
|
||||
import crazypants.enderio.item.ItemYetaWrench;
|
||||
@@ -138,6 +139,7 @@ public class EnderIO {
|
||||
public static ItemDarkSteelArmor itemDarkSteelLeggings;
|
||||
public static ItemDarkSteelArmor itemDarkSteelBoots;
|
||||
public static ItemDarkSteelSword itemDarkSteelSword;
|
||||
public static ItemDarkSteelPickaxe itemDarkSteelPickaxe;
|
||||
|
||||
// public static ITrigger triggerNoEnergy;
|
||||
// public static ITrigger triggerHasEnergy;
|
||||
@@ -208,6 +210,7 @@ public class EnderIO {
|
||||
itemDarkSteelBoots = ItemDarkSteelArmor.create(3);
|
||||
|
||||
itemDarkSteelSword = ItemDarkSteelSword.create();
|
||||
itemDarkSteelPickaxe = ItemDarkSteelPickaxe.create();
|
||||
|
||||
MaterialRecipes.registerOresInDictionary();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
package crazypants.enderio.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import crazypants.enderio.Config;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
import crazypants.enderio.machine.power.PowerDisplayUtil;
|
||||
import crazypants.enderio.material.Alloy;
|
||||
|
||||
public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem {
|
||||
|
||||
public static boolean isEquipped(EntityPlayer player) {
|
||||
if(player == null) {
|
||||
return false;
|
||||
}
|
||||
ItemStack equipped = player.getCurrentEquippedItem();
|
||||
if(equipped == null) {
|
||||
return false;
|
||||
}
|
||||
return equipped.getItem() == EnderIO.itemDarkSteelPickaxe;
|
||||
}
|
||||
|
||||
public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) {
|
||||
if(!isEquipped(player)) {
|
||||
return false;
|
||||
}
|
||||
return EnderIO.itemDarkSteelPickaxe.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower;
|
||||
}
|
||||
|
||||
public static ItemDarkSteelPickaxe create() {
|
||||
ItemDarkSteelPickaxe res = new ItemDarkSteelPickaxe();
|
||||
res.init();
|
||||
MinecraftForge.EVENT_BUS.register(res);
|
||||
return res;
|
||||
}
|
||||
|
||||
private EnergyContainer energyCont = new EnergyContainer(Config.darkSteelPowerStorage, Config.darkSteelPowerStorage / 10, Config.darkSteelPowerStorage / 10);
|
||||
|
||||
public ItemDarkSteelPickaxe() {
|
||||
super(ItemDarkSteelSword.MATERIAL);
|
||||
setCreativeTab(EnderIOTab.tabEnderIO);
|
||||
String str = "darkSteel_pickaxe";
|
||||
setUnlocalizedName(str);
|
||||
setTextureName("enderIO:" + str);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDamaged(ItemStack stack) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) {
|
||||
applyDamage(par3EntityLivingBase, par1ItemStack, 2);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(ItemStack item, World world, Block block, int x, int y, int z, EntityLivingBase entLiving) {
|
||||
if(block.getBlockHardness(world, x, y, z) != 0.0D) {
|
||||
if(block == Blocks.obsidian) {
|
||||
extractEnergy(item, Config.darkSteelPickPowerUseObsidian, false);
|
||||
}
|
||||
applyDamage(entLiving, item, 1);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private void applyDamage(EntityLivingBase entity, ItemStack item, int damage) {
|
||||
boolean absorbWithPower = energyCont.isAbsorbDamageWithPower(item);
|
||||
if(getEnergyStored(item) > 0 && absorbWithPower) {
|
||||
extractEnergy(item, Config.darkSteelPickPowerUsePerDamagePoint * damage, false);
|
||||
} else {
|
||||
item.damageItem(damage, entity);
|
||||
}
|
||||
energyCont.setAbsorbDamageWithPower(item, !absorbWithPower);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public float func_150893_a(ItemStack item, Block block) {
|
||||
if(block == Blocks.obsidian && EnergyContainer.getEnergyStored(item) > 0) {
|
||||
return Config.darkSteelPickEffeciencyObsidian;
|
||||
}
|
||||
return super.func_150893_a(item, block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getDigSpeed(ItemStack stack, Block block, int meta) {
|
||||
if(ForgeHooks.isToolEffective(stack, block, meta)) {
|
||||
if(Config.darkSteelPickPowerUsePerDamagePoint > 0 && energyCont.getEnergyStored(stack) > 0) {
|
||||
return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial() + 3;
|
||||
}
|
||||
return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial();
|
||||
}
|
||||
return super.getDigSpeed(stack, block, meta);
|
||||
}
|
||||
|
||||
protected void init() {
|
||||
GameRegistry.registerItem(this, getUnlocalizedName());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
|
||||
return energyCont.receiveEnergy(container, maxReceive, simulate);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
|
||||
return energyCont.extractEnergy(container, maxExtract, simulate);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getEnergyStored(ItemStack container) {
|
||||
return energyCont.getEnergyStored(container);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxEnergyStored(ItemStack container) {
|
||||
return energyCont.getMaxEnergyStored(container);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack i1, ItemStack i2) {
|
||||
return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
|
||||
//TODO: Localize
|
||||
list.add("Durability: " + (itemstack.getMaxDamage() - itemstack.getItemDamage()) + "/" + itemstack.getMaxDamage());
|
||||
String str = "Power: " + PowerDisplayUtil.formatPower(getEnergyStored(itemstack) / 10) + "/"
|
||||
+ PowerDisplayUtil.formatPower(getMaxEnergyStored(itemstack) / 10) + " " + PowerDisplayUtil.abrevation();
|
||||
list.add(str);
|
||||
list.add("");
|
||||
list.add(EnumChatFormatting.BLUE + "+3 Effeciency when Powered");
|
||||
list.add(EnumChatFormatting.BLUE + "" + Config.darkSteelPickEffeciencyObsidian + " Effeciency when Powered");
|
||||
list.add(EnumChatFormatting.BLUE + "and breaking obsidian (cost " + PowerDisplayUtil.formatPower(Config.darkSteelPickPowerUseObsidian / 10) + " "
|
||||
+ PowerDisplayUtil.abrevation() + ")");
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -79,7 +79,6 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
|
||||
@SubscribeEvent
|
||||
public void onEnderTeleport(EnderTeleportEvent evt) {
|
||||
if(evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) {
|
||||
System.out.println("ItemDarkSteelSword.onEnderTeleport: cancelled teleport");
|
||||
evt.setCanceled(true);
|
||||
}
|
||||
}
|
||||
@@ -100,9 +99,12 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
|
||||
}
|
||||
if(isEquipped(player)) {
|
||||
if(evt.entityLiving instanceof EntityEnderman) {
|
||||
int numPearls = 1;
|
||||
int numPearls = 0;
|
||||
if(Math.random() >= Config.darkSteelSwordEnderPearlDropChance) {
|
||||
numPearls++;
|
||||
}
|
||||
for (int i = 0; i < evt.lootingLevel; i++) {
|
||||
if(Math.random() > 0.2) { //TODO: Config
|
||||
if(Math.random() >= Config.darkSteelSwordEnderPearlDropChancePerLooting) {
|
||||
numPearls++;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user