Merge pull request #1719 from MatthiasMann/forestry_armor_upgrades

#1703 added Forestry upgrades to the Dark Steel Armor
This commit is contained in:
tterrag1098 committed 2015-01-21 16:15:45 -05:00
commit 5540204afe
27 files changed
+362 -129

No files matched your search

@@ -54,7 +54,7 @@ import crazypants.enderio.item.ConduitProbeOverlayRenderer;
import crazypants.enderio.item.KeyTracker;
import crazypants.enderio.item.ToolTickHandler;
import crazypants.enderio.item.YetaWrenchOverlayRenderer;
import crazypants.enderio.item.darksteel.PoweredItemRenderer;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.darksteel.SoundDetector;
import crazypants.enderio.item.darksteel.SoundEntity;
import crazypants.enderio.item.darksteel.SoundRenderer;
@@ -154,9 +154,9 @@ public class ClientProxy extends CommonProxy {
MEConduit.initIcons();
}
private List<ConduitRenderer> conduitRenderers = new ArrayList<ConduitRenderer>();
private final List<ConduitRenderer> conduitRenderers = new ArrayList<ConduitRenderer>();
private DefaultConduitRenderer dcr = new DefaultConduitRenderer();
private final DefaultConduitRenderer dcr = new DefaultConduitRenderer();
private ConduitBundleRenderer cbr;
@@ -385,14 +385,8 @@ public class ClientProxy extends CommonProxy {
MinecraftForge.EVENT_BUS.register(TravelController.instance);
FMLCommonHandler.instance().bus().register(TravelController.instance);
PoweredItemRenderer dsr = new PoweredItemRenderer();
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelBoots, dsr);
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelLeggings, dsr);
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelChestplate, dsr);
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelHelmet, dsr);
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelSword, dsr);
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelPickaxe, dsr);
MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelAxe, dsr);
DarkSteelItems.registerItemRenderer();
//Ensure it is loaded and registered
KeyTracker.instance.isGlideActive();
+3 -35
View File
@@ -72,11 +72,7 @@ import crazypants.enderio.item.ItemMagnet;
import crazypants.enderio.item.ItemRecipes;
import crazypants.enderio.item.ItemSoulVessel;
import crazypants.enderio.item.ItemYetaWrench;
import crazypants.enderio.item.darksteel.ItemDarkSteelArmor;
import crazypants.enderio.item.darksteel.ItemDarkSteelAxe;
import crazypants.enderio.item.darksteel.ItemDarkSteelPickaxe;
import crazypants.enderio.item.darksteel.ItemDarkSteelSword;
import crazypants.enderio.item.darksteel.ItemGliderWing;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.darksteel.SoundEntity;
import crazypants.enderio.item.skull.BlockEndermanSkull;
import crazypants.enderio.machine.MachineRecipes;
@@ -293,15 +289,7 @@ public class EnderIO {
public static ItemSoulVessel itemSoulVessel;
public static ItemFrankenSkull itemFrankenSkull;
public static ItemDarkSteelArmor itemDarkSteelHelmet;
public static ItemDarkSteelArmor itemDarkSteelChestplate;
public static ItemDarkSteelArmor itemDarkSteelLeggings;
public static ItemDarkSteelArmor itemDarkSteelBoots;
public static ItemDarkSteelSword itemDarkSteelSword;
public static ItemDarkSteelPickaxe itemDarkSteelPickaxe;
public static ItemDarkSteelAxe itemDarkSteelAxe;
public static BlockVacuumChest blockVacuumChest;
public static ItemGliderWing itemGliderWing;
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
@@ -416,16 +404,7 @@ public class EnderIO {
blockDarkIronBars = BlockDarkIronBars.create();
itemGliderWing = ItemGliderWing.create();
itemDarkSteelHelmet = ItemDarkSteelArmor.create(0);
itemDarkSteelChestplate = ItemDarkSteelArmor.create(1);
itemDarkSteelLeggings = ItemDarkSteelArmor.create(2);
itemDarkSteelBoots = ItemDarkSteelArmor.create(3);
itemDarkSteelSword = ItemDarkSteelSword.create();
itemDarkSteelPickaxe = ItemDarkSteelPickaxe.create();
itemDarkSteelAxe = ItemDarkSteelAxe.create();
DarkSteelItems.createDarkSteelArmorItems();
int entityID = EntityRegistry.findGlobalUniqueEntityId();
EntityRegistry.registerGlobalEntityID(SoundEntity.class, "soundEntity", entityID);
@@ -549,19 +528,8 @@ public class EnderIO {
ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(staff, 1, 1, 3));
}
if(Config.lootTheEnder) {
ItemStack sword = new ItemStack(EnderIO.itemDarkSteelSword, 1, 0);
ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 5));
ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(sword, 1, 1, 5));
ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 4));
ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 4));
}
DarkSteelItems.addLoot();
if(Config.lootDarkSteelBoots) {
ItemStack boots = new ItemStack(EnderIO.itemDarkSteelBoots, 1, 0);
ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(boots, 1, 1, 5));
ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(boots, 1, 1, 5));
}
if(Loader.isModLoaded("ComputerCraft")) {
ConduitBundledRedstoneProvider.register();
}
@@ -211,6 +211,8 @@ public final class Config {
public static int darkSteelGogglesOfRevealingCost = 10;
public static int darkSteelApiaristArmorCost = 10;
public static int darkSteelSwimCost = 10;
public static int darkSteelNightVisionCost = 10;
@@ -788,6 +790,9 @@ public final class Config {
darkSteelGogglesOfRevealingCost= config.get(sectionDarkSteel.name, "darkSteelGogglesOfRevealingCost", darkSteelGogglesOfRevealingCost,
"Number of levels required for the Goggles of Revealing upgrade.").getInt(darkSteelGogglesOfRevealingCost);
darkSteelApiaristArmorCost= config.get(sectionDarkSteel.name, "darkSteelApiaristArmorCost", darkSteelApiaristArmorCost,
"Number of levels required for the Apiarist Armor upgrade.").getInt(darkSteelApiaristArmorCost);
darkSteelTravelCost = config.get(sectionDarkSteel.name, "darkSteelTravelCost", darkSteelTravelCost,
"Number of levels required for the 'Travel' upgrade.").getInt(darkSteelTravelCost);
@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.EnderIO;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.material.Alloy;
import crazypants.enderio.material.MachinePart;
import crazypants.enderio.material.Material;
@@ -32,14 +33,14 @@ public class ItemRecipes {
GameRegistry.addShapedRecipe(magnet, "scc", " v", "scc", 's', electricalSteel, 'c', conductiveIron, 'v', vibCry);
//Dark Steel
GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelHelmet.createItemStack(), "sss", "s s", 's', darkSteel);
GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelChestplate.createItemStack(), "s s", "sss", "sss", 's', darkSteel);
GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelLeggings.createItemStack(), "sss", "s s", "s s", 's', darkSteel);
GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelBoots.createItemStack(), "s s", "s s", 's', darkSteel);
GameRegistry.addShapedRecipe(DarkSteelItems.itemDarkSteelHelmet.createItemStack(), "sss", "s s", 's', darkSteel);
GameRegistry.addShapedRecipe(DarkSteelItems.itemDarkSteelChestplate.createItemStack(), "s s", "sss", "sss", 's', darkSteel);
GameRegistry.addShapedRecipe(DarkSteelItems.itemDarkSteelLeggings.createItemStack(), "sss", "s s", "s s", 's', darkSteel);
GameRegistry.addShapedRecipe(DarkSteelItems.itemDarkSteelBoots.createItemStack(), "s s", "s s", 's', darkSteel);
ItemStack wing = new ItemStack(EnderIO.itemGliderWing,1,0);
ItemStack wing = new ItemStack(DarkSteelItems.itemGliderWing,1,0);
GameRegistry.addShapedRecipe(wing, " s", " sl", "sll", 's', darkSteel, 'l', Items.leather);
GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemGliderWing,1,1), " s ", "wsw", " ", 's', darkSteel, 'w', wing);
GameRegistry.addShapedRecipe(new ItemStack(DarkSteelItems.itemGliderWing,1,1), " s ", "wsw", " ", 's', darkSteel, 'w', wing);
ItemStack dspp = new ItemStack(EnderIO.blockDarkSteelPressurePlate);
@@ -58,11 +59,11 @@ public class ItemRecipes {
public static void addOreDictionaryRecipes() {
ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal());
GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "stickWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "woodStick"));
GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "stickWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "woodStick"));
GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "woodStick"));
GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "stickWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "stickWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "woodStick"));
GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "stickWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "woodStick"));
GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "woodStick"));
GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "stickWood"));
}
}
@@ -14,6 +14,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
import crazypants.enderio.EnderIO;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.conduit.ConduitDisplayMode;
import crazypants.enderio.item.darksteel.DarkSteelController;
import crazypants.enderio.item.darksteel.GogglesOfRevealingUpgrade;
@@ -27,7 +28,7 @@ import crazypants.util.Lang;
public class KeyTracker {
public static KeyTracker instance = new KeyTracker();
public static final KeyTracker instance = new KeyTracker();
static {
FMLCommonHandler.instance().bus().register(instance);
@@ -128,7 +129,7 @@ public class KeyTracker {
return;
}
if(gogglesKey.getIsKeyPressed()) {
EnderIO.itemDarkSteelHelmet.setGogglesUgradeActive(!EnderIO.itemDarkSteelHelmet.isGogglesUgradeActive());
DarkSteelItems.itemDarkSteelHelmet.setGogglesUgradeActive(!DarkSteelItems.itemDarkSteelHelmet.isGogglesUgradeActive());
}
}
@@ -0,0 +1,92 @@
package crazypants.enderio.item.darksteel;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.config.Config;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public class ApiaristArmorUpgrade extends AbstractUpgrade {
private static String UPGRADE_NAME = "apiaristArmor";
private static final String forestryItemNames[] = {
"apiaristHelmet", "apiaristChest", "apiaristLegs", "apiaristBoots"};
public static final ApiaristArmorUpgrade HELMET = new ApiaristArmorUpgrade(0);
public static final ApiaristArmorUpgrade CHEST = new ApiaristArmorUpgrade(1);
public static final ApiaristArmorUpgrade LEGS = new ApiaristArmorUpgrade(2);
public static final ApiaristArmorUpgrade BOOTS = new ApiaristArmorUpgrade(3);
public static ItemStack getApiaristArmor(int slot) {
Item i = GameRegistry.findItem("Forestry", forestryItemNames[slot]);
if(i != null) {
return new ItemStack(i);
}
return null;
}
public static ApiaristArmorUpgrade loadFromItem(ItemStack stack) {
if(stack == null) {
return null;
}
if(stack.stackTagCompound == null) {
return null;
}
if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) {
return null;
}
return new ApiaristArmorUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME));
}
private final int slot;
public ApiaristArmorUpgrade(NBTTagCompound tag) {
super(UPGRADE_NAME, tag);
this.slot = tag.getInteger("slot");
}
public ApiaristArmorUpgrade(int slot) {
super(UPGRADE_NAME,
"enderio.darksteel.upgrade.apiaristArmor.".concat(ItemDarkSteelArmor.NAMES[slot]),
getApiaristArmor(slot), Config.darkSteelApiaristArmorCost);
this.slot = slot;
}
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != ItemDarkSteelArmor.forArmorType(slot) || getUpgradeItem() == null) {
return false;
}
ApiaristArmorUpgrade up = loadFromItem(stack);
return up == null;
}
@Override
public boolean hasUpgrade(ItemStack stack) {
return super.hasUpgrade(stack) && stack.getItem() == ItemDarkSteelArmor.forArmorType(slot);
}
@Override
public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {
upgradeRoot.setByte("slot", (byte)slot);
}
@Override
public ItemStack getUpgradeItem() {
if(upgradeItem != null) {
return upgradeItem;
}
upgradeItem = getApiaristArmor(slot);
return upgradeItem;
}
@Override
public String getUpgradeItemName() {
if(getUpgradeItem() == null) {
return "Apiarist Armor";
}
return super.getUpgradeItemName();
}
}
@@ -34,28 +34,28 @@ public class DarkSteelController {
public static final DarkSteelController instance = new DarkSteelController();
private AttributeModifier[] walkModifiers = new AttributeModifier[] {
private final AttributeModifier[] walkModifiers = new AttributeModifier[] {
new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[0], 1),
new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[1], 1),
new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[2], 1),
};
private AttributeModifier[] sprintModifiers = new AttributeModifier[] {
private final AttributeModifier[] sprintModifiers = new AttributeModifier[] {
new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[0], 1),
new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[1], 1),
new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[2], 1),
};
private AttributeModifier swordDamageModifierPowered = new AttributeModifier(new UUID(63242325, 320981923), "Weapon modifier",
private final AttributeModifier swordDamageModifierPowered = new AttributeModifier(new UUID(63242325, 320981923), "Weapon modifier",
2, 0);
private boolean wasJumping;
private int jumpCount;
private int ticksSinceLastJump;
private Map<String, Boolean> glideActiveMap = new HashMap<String, Boolean>();
private Map<String, Boolean> speedActiveMap = new HashMap<String, Boolean>();
private Map<String, Boolean> stepAssistActiveMap = new HashMap<String, Boolean>();
private final Map<String, Boolean> glideActiveMap = new HashMap<String, Boolean>();
private final Map<String, Boolean> speedActiveMap = new HashMap<String, Boolean>();
private final Map<String, Boolean> stepAssistActiveMap = new HashMap<String, Boolean>();
private boolean nightVisionActive = false;
private boolean removeNightvision = false;
@@ -239,7 +239,7 @@ public class DarkSteelController {
attackInst.removeModifier(swordDamageModifierPowered);
ItemStack sword = player.getCurrentEquippedItem();
if(Config.darkSteelSwordPowerUsePerHit <= 0 || EnderIO.itemDarkSteelSword.getEnergyStored(sword) >= Config.darkSteelSwordPowerUsePerHit) {
if(Config.darkSteelSwordPowerUsePerHit <= 0 || EnergyUpgrade.getEnergyStored(sword) >= Config.darkSteelSwordPowerUsePerHit) {
attackInst.applyModifier(swordDamageModifierPowered);
}
}
@@ -259,16 +259,16 @@ public class DarkSteelController {
ItemStack leggings = player.getEquipmentInSlot(2);
SpeedUpgrade speedUpgrade = SpeedUpgrade.loadFromItem(leggings);
if(leggings != null && leggings.getItem() == EnderIO.itemDarkSteelLeggings && speedUpgrade != null && isSpeedActive(player)) {
if(leggings != null && leggings.getItem() == DarkSteelItems.itemDarkSteelLeggings && speedUpgrade != null && isSpeedActive(player)) {
double horzMovement = Math.abs(player.distanceWalkedModified - player.prevDistanceWalkedModified);
double costModifier = player.isSprinting() ? Config.darkSteelSprintPowerCost : Config.darkSteelWalkPowerCost;
costModifier = costModifier + (costModifier * speedUpgrade.walkMultiplier);
int cost = (int) (horzMovement * costModifier);
int totalEnergy = getPlayerEnergy(player, EnderIO.itemDarkSteelLeggings);
int totalEnergy = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelLeggings);
if(totalEnergy > 0) {
usePlayerEnergy(player, EnderIO.itemDarkSteelLeggings, cost);
usePlayerEnergy(player, DarkSteelItems.itemDarkSteelLeggings, cost);
if(player.isSprinting()) {
moveInst.applyModifier(sprintModifiers[speedUpgrade.level - 1]);
} else {
@@ -281,20 +281,20 @@ public class DarkSteelController {
private void updateStepHeightAndFallDistance(EntityPlayer player) {
ItemStack boots = player.getEquipmentInSlot(1);
if(boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots) {
if(boots != null && boots.getItem() == DarkSteelItems.itemDarkSteelBoots) {
int costedDistance = (int) player.fallDistance;
if(costedDistance > 0) {
int energyCost = costedDistance * Config.darkSteelFallDistanceCost;
int totalEnergy = getPlayerEnergy(player, EnderIO.itemDarkSteelBoots);
int totalEnergy = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots);
if(totalEnergy > 0 && totalEnergy >= energyCost) {
usePlayerEnergy(player, EnderIO.itemDarkSteelBoots, energyCost);
usePlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots, energyCost);
player.fallDistance -= costedDistance;
}
}
}
JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots);
if(jumpUpgrade != null && boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots && isStepAssistActive(player)) {
if(jumpUpgrade != null && boots != null && boots.getItem() == DarkSteelItems.itemDarkSteelBoots && isStepAssistActive(player)) {
player.stepHeight = 1.0023F;
} else if(player.stepHeight == 1.0023F) {
player.stepHeight = 0.5001F;
@@ -380,19 +380,19 @@ public class DarkSteelController {
ItemStack boots = player.getEquipmentInSlot(1);
JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots);
if(jumpUpgrade == null || boots == null || boots.getItem() != EnderIO.itemDarkSteelBoots) {
if(jumpUpgrade == null || boots == null || boots.getItem() != DarkSteelItems.itemDarkSteelBoots) {
return;
}
int requiredPower = Config.darkSteelBootsJumpPowerCost * (int) Math.pow(jumpCount + 1, 2.5);
int availablePower = getPlayerEnergy(player, EnderIO.itemDarkSteelBoots);
int availablePower = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots);
if(availablePower > 0 && requiredPower <= availablePower && jumpCount < jumpUpgrade.level) {
jumpCount++;
player.motionY += 0.15 * Config.darkSteelBootsJumpModifier * jumpCount;
ticksSinceLastJump = 0;
usePlayerEnergy(player, EnderIO.itemDarkSteelBoots, requiredPower);
usePlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots, requiredPower);
player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.MODID + ":ds.jump", 1.0f, player.worldObj.rand.nextFloat() * 0.5f + 0.75f, false);
PacketHandler.INSTANCE.sendToServer(new PacketDarkSteelPowerPacket(requiredPower, EnderIO.itemDarkSteelBoots.armorType));
PacketHandler.INSTANCE.sendToServer(new PacketDarkSteelPowerPacket(requiredPower, DarkSteelItems.itemDarkSteelBoots.armorType));
}
}
@@ -0,0 +1,67 @@
package crazypants.enderio.item.darksteel;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.item.ItemStack;
import net.minecraft.util.WeightedRandomChestContent;
import net.minecraftforge.common.ChestGenHooks;
import crazypants.enderio.config.Config;
import net.minecraftforge.client.MinecraftForgeClient;
public class DarkSteelItems {
public static ItemGliderWing itemGliderWing;
public static ItemDarkSteelArmor itemDarkSteelHelmet;
public static ItemDarkSteelArmor itemDarkSteelChestplate;
public static ItemDarkSteelArmor itemDarkSteelLeggings;
public static ItemDarkSteelArmor itemDarkSteelBoots;
public static ItemDarkSteelSword itemDarkSteelSword;
public static ItemDarkSteelPickaxe itemDarkSteelPickaxe;
public static ItemDarkSteelAxe itemDarkSteelAxe;
private DarkSteelItems() {
}
public static void createDarkSteelArmorItems() {
itemGliderWing = ItemGliderWing.create();
itemDarkSteelHelmet = ItemDarkSteelArmor.create(0);
itemDarkSteelChestplate = ItemDarkSteelArmor.create(1);
itemDarkSteelLeggings = ItemDarkSteelArmor.create(2);
itemDarkSteelBoots = ItemDarkSteelArmor.create(3);
itemDarkSteelSword = ItemDarkSteelSword.create();
itemDarkSteelPickaxe = ItemDarkSteelPickaxe.create();
itemDarkSteelAxe = ItemDarkSteelAxe.create();
}
public static void addLoot() {
if(Config.lootTheEnder) {
ItemStack sword = new ItemStack(itemDarkSteelSword, 1, 0);
ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 5));
ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(sword, 1, 1, 5));
ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 4));
ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 4));
}
if(Config.lootDarkSteelBoots) {
ItemStack boots = new ItemStack(itemDarkSteelBoots, 1, 0);
ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(boots, 1, 1, 5));
ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(boots, 1, 1, 5));
}
}
@SideOnly(Side.CLIENT)
public static void registerItemRenderer() {
PoweredItemRenderer dsr = new PoweredItemRenderer();
MinecraftForgeClient.registerItemRenderer(itemDarkSteelBoots, dsr);
MinecraftForgeClient.registerItemRenderer(itemDarkSteelLeggings, dsr);
MinecraftForgeClient.registerItemRenderer(itemDarkSteelChestplate, dsr);
MinecraftForgeClient.registerItemRenderer(itemDarkSteelHelmet, dsr);
MinecraftForgeClient.registerItemRenderer(itemDarkSteelSword, dsr);
MinecraftForgeClient.registerItemRenderer(itemDarkSteelPickaxe, dsr);
MinecraftForgeClient.registerItemRenderer(itemDarkSteelAxe, dsr);
}
}
@@ -49,6 +49,13 @@ public class DarkSteelRecipeManager {
if(Loader.isModLoaded("Thaumcraft")) {
upgrades.add(GogglesOfRevealingUpgrade.INSTANCE);
}
if(Loader.isModLoaded("Forestry")) {
upgrades.add(NaturalistEyeUpgrade.INSTANCE);
upgrades.add(ApiaristArmorUpgrade.HELMET);
upgrades.add(ApiaristArmorUpgrade.CHEST);
upgrades.add(ApiaristArmorUpgrade.LEGS);
upgrades.add(ApiaristArmorUpgrade.BOOTS);
}
}
@SubscribeEvent
@@ -30,12 +30,12 @@ public class GliderUpgrade extends AbstractUpgrade {
}
public GliderUpgrade() {
super(UPGRADE_NAME, "enderio.darksteel.upgrade.glider", new ItemStack(EnderIO.itemGliderWing,1,1), Config.darkSteelGliderCost);
super(UPGRADE_NAME, "enderio.darksteel.upgrade.glider", new ItemStack(DarkSteelItems.itemGliderWing,1,1), Config.darkSteelGliderCost);
}
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != EnderIO.itemDarkSteelChestplate) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelChestplate) {
return false;
}
GliderUpgrade up = loadFromItem(stack);
@@ -5,7 +5,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
public class GogglesOfRevealingUpgrade extends AbstractUpgrade {
@@ -50,7 +49,7 @@ public class GogglesOfRevealingUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet || getGoggles() == null) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet || getGoggles() == null) {
return false;
}
GogglesOfRevealingUpgrade up = loadFromItem(stack);
@@ -27,20 +27,23 @@ import cpw.mods.fml.common.Optional.Method;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.config.Config;
import crazypants.enderio.gui.IAdvancedTooltipProvider;
import crazypants.util.ItemUtil;
import crazypants.util.Lang;
import forestry.api.apiculture.IArmorApiarist;
import forestry.api.core.IArmorNaturalist;
@InterfaceList({
@Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"),
@Interface(iface = "thaumcraft.api.IVisDiscountGear", modid = "Thaumcraft"),
@Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft")
@Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"),
@Interface(iface = "forestry.api.apiculture.IArmorApiarist", modid = "Forestry"),
@Interface(iface = "forestry.api.core.IArmorNaturalist", modid = "Forestry")
})
public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerItem, ISpecialArmor, IAdvancedTooltipProvider, IDarkSteelItem, IGoggles,
IRevealer, IVisDiscountGear {
IRevealer, IVisDiscountGear, IArmorApiarist, IArmorNaturalist {
public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("darkSteel", 35, new int[] { 2, 6, 5, 2 }, 15);
@@ -63,13 +66,13 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte
public static ItemDarkSteelArmor forArmorType(int armorType) {
switch (armorType) {
case 0:
return EnderIO.itemDarkSteelHelmet;
return DarkSteelItems.itemDarkSteelHelmet;
case 1:
return EnderIO.itemDarkSteelChestplate;
return DarkSteelItems.itemDarkSteelChestplate;
case 2:
return EnderIO.itemDarkSteelLeggings;
return DarkSteelItems.itemDarkSteelLeggings;
case 3:
return EnderIO.itemDarkSteelBoots;
return DarkSteelItems.itemDarkSteelBoots;
}
return null;
}
@@ -93,7 +96,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte
return res;
}
private int powerPerDamagePoint;
private final int powerPerDamagePoint;
protected ItemDarkSteelArmor(int armorType) {
super(MATERIAL, 0, armorType);
@@ -169,7 +172,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte
if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) {
list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_armor.tooltip.line1"));
list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_armor.tooltip.line2"));
if(itemstack.getItem() == EnderIO.itemDarkSteelBoots) {
if(itemstack.getItem() == DarkSteelItems.itemDarkSteelBoots) {
list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_boots.tooltip.line1"));
list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_boots.tooltip.line2"));
}
@@ -280,7 +283,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte
@Override
@Method(modid = "Thaumcraft")
public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) {
if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) {
return 0;
}
return GogglesOfRevealingUpgrade.isUpgradeEquipped(player) ? 5 : 0;
@@ -294,4 +297,20 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte
this.gogglesUgradeActive = gogglesUgradeActive;
}
// Forestry
@Override
@Method(modid = "Forestry")
public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect) {
return ApiaristArmorUpgrade.loadFromItem(armor) != null;
}
@Override
@Method(modid = "Forestry")
public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) {
if(armor == null || armor.getItem() != DarkSteelItems.itemDarkSteelHelmet) {
return false;
}
return NaturalistEyeUpgrade.isUpgradeEquipped(player);
}
}
@@ -1,16 +1,11 @@
package crazypants.enderio.item.darksteel;
import java.awt.Point;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import net.minecraft.block.Block;
import net.minecraft.block.BlockNewLeaf;
import net.minecraft.block.BlockOldLeaf;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
@@ -20,12 +15,10 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.oredict.OreDictionary;
@@ -34,26 +27,17 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.config.Config;
import crazypants.enderio.gui.IAdvancedTooltipProvider;
import crazypants.enderio.machine.farm.farmers.HarvestResult;
import crazypants.enderio.machine.farm.farmers.TreeHarvestUtil;
import crazypants.render.BoundingBox;
import crazypants.util.BlockCoord;
import crazypants.util.ItemUtil;
import crazypants.util.Lang;
public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem {
private static Point[] DIAGINALS = new Point[] {
new Point(1,1),
new Point(1,-1),
new Point(-1,1),
new Point(-1,-1)
};
public static boolean isEquipped(EntityPlayer player) {
if(player == null) {
return false;
@@ -62,7 +46,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I
if(equipped == null) {
return false;
}
return equipped.getItem() == EnderIO.itemDarkSteelAxe;
return equipped.getItem() == DarkSteelItems.itemDarkSteelAxe;
}
public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) {
@@ -73,7 +57,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I
if(!isEquipped(player)) {
return 0;
}
return EnderIO.itemDarkSteelAxe.getEnergyStored(player.getCurrentEquippedItem());
return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem());
}
public static ItemDarkSteelAxe create() {
@@ -84,7 +68,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I
}
private int logOreId = -1;
private MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
protected ItemDarkSteelAxe() {
super(ItemDarkSteelSword.MATERIAL);
@@ -48,14 +48,14 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine
if(equipped == null) {
return false;
}
return equipped.getItem() == EnderIO.itemDarkSteelPickaxe;
return equipped.getItem() == DarkSteelItems.itemDarkSteelPickaxe;
}
public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) {
if(!isEquipped(player)) {
return false;
}
return EnderIO.itemDarkSteelPickaxe.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower;
return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower;
}
public static ItemDarkSteelPickaxe create() {
@@ -54,14 +54,14 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
if(equipped == null) {
return false;
}
return equipped.getItem() == EnderIO.itemDarkSteelSword;
return equipped.getItem() == DarkSteelItems.itemDarkSteelSword;
}
public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) {
if(!isEquipped(player)) {
return false;
}
return EnderIO.itemDarkSteelSword.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower;
return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower;
}
public static ItemDarkSteelSword create() {
@@ -71,7 +71,7 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
return res;
}
private int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses();
private final int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses();
private long lastBlickTick = -1;
public ItemDarkSteelSword() {
@@ -198,7 +198,7 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
return true;
}
float fromWeapon = 0;
float fromWeapon;
if(isCleaver) {
fromWeapon = Config.ticCleaverSkullDropChance;
} else {
@@ -223,8 +223,8 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
return 0.01;
}
}
float fromWeapon = 0;
float fromLooting = 0;
float fromWeapon;
float fromLooting;
if(isEquippedAndPowered(player, Config.darkSteelSwordPowerUsePerHit)) {
fromWeapon = Config.darkSteelSwordSkullChance;
fromLooting = Config.darkSteelSwordSkullLootingModifier * evt.lootingLevel;
@@ -50,7 +50,7 @@ public class JumpUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != EnderIO.itemDarkSteelBoots || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelBoots || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
return false;
}
JumpUpgrade up = loadFromItem(stack);
@@ -0,0 +1,80 @@
package crazypants.enderio.item.darksteel;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.config.Config;
import static crazypants.enderio.item.darksteel.AbstractUpgrade.KEY_UPGRADE_PREFIX;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public class NaturalistEyeUpgrade extends AbstractUpgrade {
private static String UPGRADE_NAME = "naturalistEye";
public static final NaturalistEyeUpgrade INSTANCE = new NaturalistEyeUpgrade();
public static ItemStack getNaturalistEye() {
Item i = GameRegistry.findItem("Forestry", "naturalistHelmet");
if(i != null) {
return new ItemStack(i);
}
return null;
}
public static NaturalistEyeUpgrade loadFromItem(ItemStack stack) {
if(stack == null) {
return null;
}
if(stack.stackTagCompound == null) {
return null;
}
if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) {
return null;
}
return new NaturalistEyeUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME));
}
public static boolean isUpgradeEquipped(EntityPlayer player) {
ItemStack helmet = player.getEquipmentInSlot(4);
return NaturalistEyeUpgrade.loadFromItem(helmet) != null;
}
public NaturalistEyeUpgrade(NBTTagCompound tag) {
super(UPGRADE_NAME, tag);
}
public NaturalistEyeUpgrade() {
super(UPGRADE_NAME, "enderio.darksteel.upgrade.naturalistEye",getNaturalistEye(), Config.darkSteelApiaristArmorCost);
}
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet || getUpgradeItem() == null) {
return false;
}
NaturalistEyeUpgrade up = loadFromItem(stack);
return up == null;
}
@Override
public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {
}
@Override
public ItemStack getUpgradeItem() {
if(upgradeItem != null) {
return upgradeItem;
}
upgradeItem = getNaturalistEye();
return upgradeItem;
}
@Override
public String getUpgradeItemName() {
if(getUpgradeItem() == null) {
return "Naturalist Helmet";
}
return super.getUpgradeItemName();
}
}
@@ -46,7 +46,7 @@ public class NightVisionUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) {
return false;
}
NightVisionUpgrade up = loadFromItem(stack);
@@ -51,7 +51,7 @@ public class SolarUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
return false;
}
SolarUpgrade up = loadFromItem(stack);
@@ -36,7 +36,7 @@ public class SoundDetectorUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) {
return false;
}
SoundDetectorUpgrade up = loadFromItem(stack);
@@ -77,7 +77,7 @@ public class SpeedUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != EnderIO.itemDarkSteelLeggings || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelLeggings || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
return false;
}
SpeedUpgrade up = loadFromItem(stack);
@@ -37,7 +37,7 @@ public class SpoonUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != EnderIO.itemDarkSteelPickaxe || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
return false;
}
SpoonUpgrade up = loadFromItem(stack);
@@ -36,7 +36,7 @@ public class SwimUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != EnderIO.itemDarkSteelBoots) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelBoots) {
return false;
}
SwimUpgrade up = loadFromItem(stack);
@@ -1,9 +1,7 @@
package crazypants.enderio.item.darksteel;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionHelper;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
import crazypants.enderio.material.Material;
@@ -38,7 +36,7 @@ public class TravelUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != EnderIO.itemDarkSteelSword && stack.getItem() != EnderIO.itemDarkSteelPickaxe) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelSword && stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
return false;
}
TravelUpgrade up = loadFromItem(stack);