Compare commits

...
5 Commits
Author SHA1 Message Date
Dream-Master 030a91397a bump version 2020-03-12 22:05:37 +01:00
Dream-Master be2a33caf6 bump version 2020-03-12 22:04:10 +01:00
Dream-Master 2286835f18 update gitignore 2020-03-12 22:02:06 +01:00
Martin Robertz 819c765b27 Merge pull request #8 from Zoko061602/master
Fixed Upgrades
2020-03-12 21:59:25 +01:00
Zoko061602 ab0de22156 Fixed Upgrades 2020-03-12 21:51:15 +01:00
35 changed files with 225 additions and 187 deletions

No files matched your search

+8
View File
@@ -27,6 +27,14 @@
## gedit
*~
## minecraft files
/asm
/config
/saves
/logs
/crash-reports
## translation reports
resources/assets/enderio/lang/*.lang.txt
*.bat
libs/
+1 -1
View File
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
forge_version=10.13.4.1614-1.7.10
forgeDep_version=10.13.4.1614
mod_version=2.3.0.434_beta
mod_version=2.3.1.0_beta
#Comment out this line to get rid of the appendix
#mod_appendix=beta
@@ -48,6 +48,7 @@ import crazypants.enderio.conduit.item.ItemExtractSpeedUpgrade;
import crazypants.enderio.conduit.item.ItemFunctionUpgrade;
import crazypants.enderio.conduit.item.ItemItemConduit;
import crazypants.enderio.conduit.item.filter.ItemBasicItemFilter;
import crazypants.enderio.conduit.item.filter.ItemBigItemFilter;
import crazypants.enderio.conduit.item.filter.ItemExistingItemFilter;
import crazypants.enderio.conduit.item.filter.ItemModItemFilter;
import crazypants.enderio.conduit.item.filter.ItemPowerItemFilter;
@@ -239,6 +240,7 @@ public class EnderIO {
public static ItemMEConduit itemMEConduit;
public static ItemOCConduit itemOCConduit;
public static ItemBasicItemFilter itemBasicFilterUpgrade;
public static ItemBigItemFilter itemBigFilterUpgrade;
public static ItemExistingItemFilter itemExistingItemFilter;
public static ItemModItemFilter itemModItemFilter;
public static ItemPowerItemFilter itemPowerItemFilter;
@@ -442,6 +444,7 @@ public class EnderIO {
itemOCConduit = ItemOCConduit.create();
itemBasicFilterUpgrade = ItemBasicItemFilter.create();
// itemBigFilterUpgrade = ItemBigItemFilter.create();
itemExistingItemFilter = ItemExistingItemFilter.create();
itemModItemFilter = ItemModItemFilter.create();
itemPowerItemFilter = ItemPowerItemFilter.create();
@@ -13,8 +13,9 @@ public enum ModObject {
itemItemConduit,
itemGasConduit,
itemMEConduit,
itemOCConduit,
itemOCConduit,
itemBasicFilterUpgrade,
itemBigFilterUpgrade,
itemExistingItemFilter,
itemModItemFilter,
itemPowerItemFilter,
@@ -0,0 +1,64 @@
package crazypants.enderio.conduit.item.filter;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
public class ItemBigItemFilter extends ItemBasicItemFilter {
public static ItemBigItemFilter create() {
ItemBigItemFilter result = new ItemBigItemFilter();
result.init();
return result;
}
private final IIcon[] icons;
protected ItemBigItemFilter() {
setCreativeTab(EnderIOTab.tabEnderIO);
setUnlocalizedName(ModObject.itemBigFilterUpgrade.unlocalisedName);
setHasSubtypes(true);
setMaxDamage(0);
setMaxStackSize(64);
icons = new IIcon[2];
}
protected void init() {
GameRegistry.registerItem(this, ModObject.itemBigFilterUpgrade.unlocalisedName);
}
@Override
public IItemFilter createFilterFromStack(ItemStack stack) {
int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, 1);
ItemFilter filter;
if(damage == 0) {
filter = new ItemFilter(30,false);
} else {
filter = new ItemFilter(30,true);
}
if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
}
return filter;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister IIconRegister) {
icons[0] = IIconRegister.registerIcon("enderio:filterUpgradeBig");
icons[1] = IIconRegister.registerIcon("enderio:filterUpgradeBigAdvanced");
}
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 1);
return i == 0 ? "enderio.filterUpgradeBig" : "enderio.filterUpgradeBigAdvanced";
}
}
@@ -49,7 +49,7 @@ public class ItemFilter implements IInventory, IItemFilter {
final List<int[]> oreIds;
private boolean isAdvanced;
private boolean isAdvanced;
public void copyFrom(ItemFilter o) {
isBlacklist = o.isBlacklist;
@@ -67,12 +67,12 @@ public class ItemFilter implements IInventory, IItemFilter {
public ItemFilter() {
this(5, false);
}
public ItemFilter(boolean advanced) {
this(advanced ? 10 : 5, advanced);
}
private ItemFilter(int numItems, boolean isAdvanced) {
public ItemFilter(int numItems, boolean isAdvanced) {
this.isAdvanced = isAdvanced;
items = new ItemStack[numItems];
oreIds = new ArrayList<int[]>(numItems);
@@ -119,7 +119,7 @@ public class ItemFilter implements IInventory, IItemFilter {
matched = false;
} else if(matchNBT && !isNBTMatch(item, it)) {
matched = false;
}
}
}
if(!matched && useOreDict && isOreDicMatch(i, item)) {
matched = true;
@@ -147,10 +147,10 @@ public class ItemFilter implements IInventory, IItemFilter {
return true;
}
}
}
}
return false;
}
private boolean isNBTMatch(ItemStack filter, ItemStack item)
{
if (filter.stackTagCompound == null && item.stackTagCompound == null) return true;
@@ -163,7 +163,7 @@ public class ItemFilter implements IInventory, IItemFilter {
return filterTag.equals(itemTag);
}
private int[] getCachedIds(int filterItemIndex) {
private int[] getCachedIds(int filterItemIndex) {
int[] res = oreIds.get(filterItemIndex);
if(res == null) {
ItemStack item = items[filterItemIndex];
@@ -280,13 +280,13 @@ public class ItemFilter implements IInventory, IItemFilter {
isAdvanced = nbtRoot.getBoolean("isAdvanced");
fuzzyMode = FuzzyMode.values()[nbtRoot.getByte("fuzzyMode") & 255];
int numItems = isAdvanced ? 10 : 5;
int numItems = items.length;
items = new ItemStack[numItems];
oreIds.clear();
for(int i=0;i<numItems;i++) {
oreIds.add(null);
}
for (int i = 0; i < numItems; i++) {
for (int i = 0; i < numItems; i++) {
NBTBase tag = nbtRoot.getTag("item" + i);
if(tag instanceof NBTTagCompound) {
items[i] = ItemStack.loadItemStackFromNBT((NBTTagCompound) tag);
@@ -366,7 +366,7 @@ public class ItemFilter implements IInventory, IItemFilter {
}
@Override
public void markDirty() {
public void markDirty() {
}
@Override
@@ -391,8 +391,8 @@ public class ItemFilter implements IInventory, IItemFilter {
public void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb) {
int topY = yOffset;
int leftX = xOffset;
int index = 0;
int numRows = isAdvanced ? 2 : 1;
int index = 0;
int numRows = (int) Math.ceil(items.length/5);
for (int row = 0; row < numRows; ++row) {
for (int col = 0; col < 5; ++col) {
int x = leftX + col * 18;
@@ -404,14 +404,14 @@ public class ItemFilter implements IInventory, IItemFilter {
}
@Override
public int getSlotCount() {
public int getSlotCount() {
return getSizeInventory();
}
public boolean isAdvanced() {
public boolean isAdvanced() {
return isAdvanced;
}
public boolean isDefault() {
return !isAdvanced && !isValid() && isBlacklist == DEFAULT_BLACKLIST &&
matchMeta == DEFAULT_META &&
@@ -7,7 +7,6 @@ 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.item.endsteel.EndSteelItems;
import crazypants.enderio.material.FrankenSkull;
import crazypants.enderio.material.MachinePart;
@@ -45,10 +44,10 @@ public class ItemRecipes {
addShaped(DarkSteelItems.itemDarkSteelBoots.createItemStack(), "s s", "s s", 's', darkSteel);
//End Steel
addShaped(EndSteelItems.itemEndSteelHelmet.createItemStack(), "sss", "sds", 's', endSteel, 'd', diode);
addShaped(EndSteelItems.itemEndSteelChestplate.createItemStack(), "sds", "sss", "sss", 's', endSteel, 'd', diode);
addShaped(EndSteelItems.itemEndSteelLeggings.createItemStack(), "sss", "sds", "s s", 's', endSteel, 'd', diode);
addShaped(EndSteelItems.itemEndSteelBoots.createItemStack(), "s s", "sds", 's', endSteel, 'd', diode);
addShaped(DarkSteelItems.itemEndSteelHelmet.createItemStack(), "sss", "sds", 's', endSteel, 'd', diode);
addShaped(DarkSteelItems.itemEndSteelChestplate.createItemStack(), "sds", "sss", "sss", 's', endSteel, 'd', diode);
addShaped(DarkSteelItems.itemEndSteelLeggings.createItemStack(), "sss", "sds", "s s", 's', endSteel, 'd', diode);
addShaped(DarkSteelItems.itemEndSteelBoots.createItemStack(), "s s", "sds", 's', endSteel, 'd', diode);
ItemStack wing = new ItemStack(DarkSteelItems.itemGliderWing, 1, 0);
addShaped(wing, " s", " sl", "sll", 's', darkSteel, 'l', Items.leather);
@@ -79,12 +78,12 @@ public class ItemRecipes {
addShaped(DarkSteelItems.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "stickWood");
// ES Tools
addShaped(EndSteelItems.itemEndSteelSword.createItemStack(), " s ", " s ", " w ", 's', endSteel, 'w', "stickDarkSteel");
addShaped(EndSteelItems.itemEndSteelSword.createItemStack(), " s ", " s ", " w ", 's', endSteel, 'w', "itemDarkSteelRod");
addShaped(EndSteelItems.itemEndSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', endSteel, 'w', "stickDarkSteel");
addShaped(EndSteelItems.itemEndSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', endSteel, 'w', "itemDarkSteelRod");
addShaped(EndSteelItems.itemEndSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', endSteel, 'w', "stickDarkSteel");
addShaped(EndSteelItems.itemEndSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', endSteel, 'w', "itemDarkSteelRod");
addShaped(DarkSteelItems.itemEndSteelSword.createItemStack(), " s ", " s ", " w ", 's', endSteel, 'w', "stickDarkSteel");
addShaped(DarkSteelItems.itemEndSteelSword.createItemStack(), " s ", " s ", " w ", 's', endSteel, 'w', "itemDarkSteelRod");
addShaped(DarkSteelItems.itemEndSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', endSteel, 'w', "stickDarkSteel");
addShaped(DarkSteelItems.itemEndSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', endSteel, 'w', "itemDarkSteelRod");
addShaped(DarkSteelItems.itemEndSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', endSteel, 'w', "stickDarkSteel");
addShaped(DarkSteelItems.itemEndSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', endSteel, 'w', "itemDarkSteelRod");
}
}
@@ -68,7 +68,7 @@ public class DarkSteelController {
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),
new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[2], 1),
};
private final AttributeModifier swordDamageModifierPowered = new AttributeModifier(new UUID(63242325, 320981923), "Weapon modifier",
@@ -121,19 +121,19 @@ public class DarkSteelController {
public boolean isGlideActive(EntityPlayer player) {
return isActive(player, Type.GLIDE);
}
public boolean isSpeedActive(EntityPlayer player) {
return isActive(player, Type.SPEED);
}
public boolean isStepAssistActive(EntityPlayer player) {
return isActive(player, Type.STEP_ASSIST);
}
public boolean isJumpActive(EntityPlayer player) {
return isActive(player, Type.JUMP);
}
@SubscribeEvent
public void onPlayerTick(TickEvent.PlayerTickEvent event) {
EntityPlayer player = event.player;
@@ -151,9 +151,9 @@ public class DarkSteelController {
updateGlide(player);
updateSwim(player);
updateSolar(player);
}
}
@@ -163,18 +163,18 @@ public class DarkSteelController {
if (player.worldObj.isRemote) {
return;
}
ItemStack helm = player.getEquipmentInSlot(4);
SolarUpgrade upgrade = SolarUpgrade.loadFromItem(helm);
if(upgrade == null) {
return;
}
int RFperSecond = Math.round((float) upgrade.getRFPerSec() * TileEntitySolarPanel.calculateLightRatio(player.worldObj, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY + 1), MathHelper.floor_double(player.posZ)));
int leftover = RFperSecond % 20;
boolean addExtraRF = player.worldObj.getTotalWorldTime() % 20 < leftover;
int toAdd = (RFperSecond / 20) + (addExtraRF ? 1 : 0);
if(toAdd != 0) {
@@ -188,7 +188,7 @@ public class DarkSteelController {
}
nextIndex = (nextIndex + 1) % 4;
}
player.getEntityData().setInteger("dsarmor:solar", nextIndex);
}
}
@@ -286,7 +286,7 @@ public class DarkSteelController {
ItemStack leggings = player.getEquipmentInSlot(2);
SpeedUpgrade speedUpgrade = SpeedUpgrade.loadFromItem(leggings);
if(leggings != null && leggings.getItem() == DarkSteelItems.itemDarkSteelLeggings && speedUpgrade != null && isSpeedActive(player)) {
if(leggings != null && DarkSteelItems.isArmorPart(leggings.getItem(),2) && speedUpgrade != null && isSpeedActive(player)) {
double horzMovement = Math.abs(player.distanceWalkedModified - player.prevDistanceWalkedModified);
double costModifier = player.isSprinting() ? Config.darkSteelSprintPowerCost : Config.darkSteelWalkPowerCost;
@@ -308,7 +308,7 @@ public class DarkSteelController {
private void updateStepHeightAndFallDistance(EntityPlayer player) {
ItemStack boots = player.getEquipmentInSlot(1);
if(boots != null && boots.getItem() == DarkSteelItems.itemDarkSteelBoots && !player.capabilities.allowFlying) {
if(boots != null && !DarkSteelItems.isArmorPart(boots.getItem(), 3) && !player.capabilities.allowFlying) {
int costedDistance = (int) player.fallDistance;
if(costedDistance > 0) {
int energyCost = costedDistance * Config.darkSteelFallDistanceCost;
@@ -339,7 +339,7 @@ public class DarkSteelController {
IEnergyContainerItem cont = (IEnergyContainerItem) stack.getItem();
int used = cont.extractEnergy(stack, remaining, false);
remaining -= used;
if(remaining <= 0) {
if(remaining <= 0) {
return;
}
}
@@ -370,7 +370,7 @@ public class DarkSteelController {
}
return res;
}
@SubscribeEvent
public void onStartTracking(PlayerEvent.StartTracking event) {
if (event.target instanceof EntityPlayerMP) {
@@ -462,11 +462,11 @@ public class DarkSteelController {
if (!isJumpActive(player)) {
return;
}
ItemStack boots = player.getEquipmentInSlot(1);
JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots);
if(jumpUpgrade == null || boots == null || boots.getItem() != DarkSteelItems.itemDarkSteelBoots) {
if(jumpUpgrade == null || boots == null || !DarkSteelItems.isArmorPart(boots.getItem(), 3)) {
return;
}
@@ -490,12 +490,12 @@ public class DarkSteelController {
}
}
private void updateNightvision(EntityPlayer player) {
if(isNightVisionUpgradeOrEnchEquipped(player) && nightVisionActive) {
player.addPotionEffect(new PotionEffect(Potion.nightVision.getId(), 210, 0, true));
}
}
if(!isNightVisionUpgradeOrEnchEquipped(player) && nightVisionActive) {
nightVisionActive = false;
removeNightvision = true;
@@ -541,14 +541,14 @@ public class DarkSteelController {
public boolean isNightVisionUpgradeOrEnchEquipped(EntityPlayer player) {
ItemStack helmet = player.getEquipmentInSlot(4);
return (NightVisionUpgrade.loadFromItem(helmet) != null || isNightVisionEnch(helmet));
return (NightVisionUpgrade.loadFromItem(helmet) != null || isNightVisionEnch(helmet));
}
public void setNightVisionActive(boolean isNightVisionActive) {
if(nightVisionActive && !isNightVisionActive) {
removeNightvision = true;
}
this.nightVisionActive = isNightVisionActive;
this.nightVisionActive = isNightVisionActive;
}
public boolean isNightVisionActive() {
@@ -1,5 +1,6 @@
package crazypants.enderio.item.darksteel;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.WeightedRandomChestContent;
import net.minecraftforge.client.MinecraftForgeClient;
@@ -8,7 +9,6 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.ItemMagnet;
import crazypants.enderio.item.endsteel.EndSteelItems;
public class DarkSteelItems {
@@ -23,6 +23,14 @@ public class DarkSteelItems {
public static ItemDarkSteelAxe itemDarkSteelAxe;
public static ItemDarkSteelShears itemDarkSteelShears;
public static ItemEndSteelArmor itemEndSteelHelmet;
public static ItemEndSteelArmor itemEndSteelChestplate;
public static ItemEndSteelArmor itemEndSteelLeggings;
public static ItemEndSteelArmor itemEndSteelBoots;
public static ItemEndSteelSword itemEndSteelSword;
public static ItemEndSteelPickaxe itemEndSteelPickaxe;
public static ItemEndSteelAxe itemEndSteelAxe;
public static ItemMagnet itemMagnet;
private DarkSteelItems() {
@@ -41,9 +49,27 @@ public class DarkSteelItems {
itemDarkSteelAxe = ItemDarkSteelAxe.create();
itemDarkSteelShears = ItemDarkSteelShears.create();
itemEndSteelHelmet = ItemEndSteelArmor.create(0);
itemEndSteelChestplate = ItemEndSteelArmor.create(1);
itemEndSteelLeggings = ItemEndSteelArmor.create(2);
itemEndSteelBoots = ItemEndSteelArmor.create(3);
itemEndSteelSword = ItemEndSteelSword.create();
itemEndSteelPickaxe = ItemEndSteelPickaxe.create();
itemEndSteelAxe = ItemEndSteelAxe.create();
itemMagnet = ItemMagnet.create();
EndSteelItems.createEndSteelArmorItems();
}
public static boolean isArmorPart(Item item, int type){
switch(type){
case 0:return item == itemDarkSteelHelmet||item == itemEndSteelHelmet;
case 1:return item == itemDarkSteelChestplate||item == itemEndSteelChestplate;
case 2:return item == itemDarkSteelLeggings||item == itemEndSteelLeggings;
case 3:return item == itemDarkSteelBoots||item == itemEndSteelBoots;
default: return false;
}
}
public static void addLoot() {
@@ -74,6 +100,12 @@ public class DarkSteelItems {
MinecraftForgeClient.registerItemRenderer(itemDarkSteelAxe, dsr);
MinecraftForgeClient.registerItemRenderer(itemDarkSteelShears, dsr);
EndSteelItems.registerItemRenderer();
MinecraftForgeClient.registerItemRenderer(itemEndSteelBoots, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelLeggings, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelChestplate, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelHelmet, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelSword, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelPickaxe, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelAxe, dsr);
}
}
@@ -20,6 +20,7 @@ import com.google.common.collect.ImmutableList;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import crazypants.enderio.EnderIO;
import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem;
import crazypants.enderio.item.darksteel.upgrade.ApiaristArmorUpgrade;
import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
import crazypants.enderio.item.darksteel.upgrade.GliderUpgrade;
@@ -33,7 +34,6 @@ import crazypants.enderio.item.darksteel.upgrade.SpeedUpgrade;
import crazypants.enderio.item.darksteel.upgrade.SpoonUpgrade;
import crazypants.enderio.item.darksteel.upgrade.SwimUpgrade;
import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade;
import crazypants.enderio.item.endsteel.IEndSteelItem;
import crazypants.enderio.material.Alloy;
import crazypants.enderio.thaumcraft.ThaumcraftCompat;
@@ -3,5 +3,9 @@ package crazypants.enderio.item.darksteel;
public interface IDarkSteelItem {
int getIngotsRequiredForFullRepair();
public interface IEndSteelItem extends IDarkSteelItem{
}
}
@@ -38,7 +38,6 @@ import crazypants.enderio.item.darksteel.upgrade.ApiaristArmorUpgrade;
import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade;
import crazypants.enderio.item.darksteel.upgrade.NaturalistEyeUpgrade;
import crazypants.enderio.item.endsteel.ItemEndSteelArmor;
import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade;
import forestry.api.apiculture.IArmorApiarist;
import forestry.api.core.IArmorNaturalist;
@@ -50,7 +50,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I
if(equipped == null) {
return false;
}
return equipped.getItem() == DarkSteelItems.itemDarkSteelAxe;
return equipped.getItem() instanceof ItemDarkSteelAxe;
}
public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) {
@@ -47,7 +47,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine
if(equipped == null) {
return false;
}
return equipped.getItem() == DarkSteelItems.itemDarkSteelPickaxe;
return equipped.getItem() instanceof ItemDarkSteelPickaxe;
}
public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) {
@@ -45,7 +45,7 @@ public class ItemDarkSteelShears extends ItemShears implements IEnergyContainerI
if(equipped == null) {
return false;
}
return equipped.getItem() == DarkSteelItems.itemDarkSteelShears;
return equipped.getItem() instanceof ItemDarkSteelShears;
}
public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) {
@@ -57,7 +57,7 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
if(equipped == null) {
return false;
}
return equipped.getItem() == DarkSteelItems.itemDarkSteelSword;
return equipped.getItem() instanceof ItemDarkSteelSword;
}
public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) {
@@ -1,21 +1,16 @@
package crazypants.enderio.item.endsteel;
package crazypants.enderio.item.darksteel;
import java.util.Iterator;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.darksteel.DarkSteelRecipeManager;
import crazypants.enderio.item.darksteel.ItemDarkSteelArmor;
import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem;
import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraftforge.common.util.EnumHelper;
public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelItem {
@@ -35,10 +30,10 @@ public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelIt
public static ItemEndSteelArmor forArmorType(int armorType) {
switch (armorType) {
case 0: return EndSteelItems.itemEndSteelHelmet;
case 1: return EndSteelItems.itemEndSteelChestplate;
case 2: return EndSteelItems.itemEndSteelLeggings;
case 3: return EndSteelItems.itemEndSteelBoots;
case 0: return DarkSteelItems.itemEndSteelHelmet;
case 1: return DarkSteelItems.itemEndSteelChestplate;
case 2: return DarkSteelItems.itemEndSteelLeggings;
case 3: return DarkSteelItems.itemEndSteelBoots;
}
return null;
}
@@ -1,12 +1,12 @@
package crazypants.enderio.item.endsteel;
package crazypants.enderio.item.darksteel;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.item.darksteel.ItemDarkSteelAxe;
import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade;
import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -23,7 +23,7 @@ public class ItemEndSteelAxe extends ItemDarkSteelAxe implements IEndSteelItem {
if(equipped == null) {
return false;
}
return equipped.getItem() == EndSteelItems.itemEndSteelAxe;
return equipped.getItem() == DarkSteelItems.itemEndSteelAxe;
}
public static ItemEndSteelAxe create() {
@@ -1,12 +1,12 @@
package crazypants.enderio.item.endsteel;
package crazypants.enderio.item.darksteel;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.item.darksteel.ItemDarkSteelPickaxe;
import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade;
import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -23,7 +23,7 @@ public class ItemEndSteelPickaxe extends ItemDarkSteelPickaxe implements IEndSte
if(equipped == null) {
return false;
}
return equipped.getItem() == EndSteelItems.itemEndSteelPickaxe;
return equipped.getItem() == DarkSteelItems.itemEndSteelPickaxe;
}
public static ItemEndSteelPickaxe create() {
@@ -1,13 +1,13 @@
package crazypants.enderio.item.endsteel;
package crazypants.enderio.item.darksteel;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.ItemDarkSteelSword;
import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade;
import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade;
import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -27,7 +27,7 @@ public class ItemEndSteelSword extends ItemDarkSteelSword implements IEndSteelIt
if(equipped == null) {
return false;
}
return equipped.getItem() == EndSteelItems.itemEndSteelSword;
return equipped.getItem() == DarkSteelItems.itemEndSteelSword;
}
@@ -2,8 +2,9 @@ package crazypants.enderio.item.darksteel.upgrade;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.darksteel.ItemDarkSteelArmor;
import crazypants.enderio.item.endsteel.ItemEndSteelArmor;
import crazypants.enderio.item.darksteel.ItemEndSteelArmor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -57,7 +58,7 @@ public class ApiaristArmorUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != ItemDarkSteelArmor.forArmorType(slot) && stack.getItem() != ItemEndSteelArmor.forArmorType(slot)) || getUpgradeItem() == null) {
if(stack == null || ! DarkSteelItems.isArmorPart(stack.getItem(), slot) || getUpgradeItem() == null) {
return false;
}
ApiaristArmorUpgrade up = loadFromItem(stack);
@@ -66,7 +67,7 @@ public class ApiaristArmorUpgrade extends AbstractUpgrade {
@Override
public boolean hasUpgrade(ItemStack stack) {
return super.hasUpgrade(stack) && stack.getItem() == ItemDarkSteelArmor.forArmorType(slot);
return super.hasUpgrade(stack) && stack.getItem() instanceof ItemDarkSteelArmor;
}
@Override
@@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.IDarkSteelItem;
import crazypants.enderio.item.endsteel.IEndSteelItem;
import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem;
import crazypants.enderio.machine.power.PowerDisplayUtil;
import crazypants.enderio.material.Material;
@@ -16,7 +16,6 @@ import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelController;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.endsteel.EndSteelItems;
import static org.lwjgl.opengl.GL11.glDepthMask;
@@ -53,7 +52,7 @@ public class GliderUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelChestplate && stack.getItem() != EndSteelItems.itemEndSteelChestplate)) {
if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 1)) {
return false;
}
GliderUpgrade up = loadFromItem(stack);
@@ -6,7 +6,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.endsteel.EndSteelItems;
public class JumpUpgrade extends AbstractUpgrade {
@@ -50,7 +49,7 @@ public class JumpUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelBoots && stack.getItem() != EndSteelItems.itemEndSteelBoots) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 3) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
return false;
}
JumpUpgrade up = loadFromItem(stack);
@@ -1,13 +1,12 @@
package crazypants.enderio.item.darksteel.upgrade;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import net.minecraft.entity.player.EntityPlayer;
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.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.endsteel.EndSteelItems;
public class NaturalistEyeUpgrade extends AbstractUpgrade {
@@ -51,7 +50,7 @@ public class NaturalistEyeUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelHelmet && stack.getItem() != EndSteelItems.itemEndSteelHelmet)|| getUpgradeItem() == null) {
if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0) || getUpgradeItem() == null) {
return false;
}
NaturalistEyeUpgrade up = loadFromItem(stack);
@@ -1,12 +1,11 @@
package crazypants.enderio.item.darksteel.upgrade;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionHelper;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.endsteel.EndSteelItems;
public class NightVisionUpgrade extends AbstractUpgrade {
@@ -45,7 +44,7 @@ public class NightVisionUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelHelmet && stack.getItem() != EndSteelItems.itemEndSteelHelmet)) {
if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) {
return false;
}
NightVisionUpgrade up = loadFromItem(stack);
@@ -1,13 +1,6 @@
package crazypants.enderio.item.darksteel.upgrade;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionHelper;
import net.minecraftforge.client.event.RenderPlayerEvent;
import static org.lwjgl.opengl.GL11.glDepthMask;
import org.lwjgl.opengl.GL11;
@@ -18,9 +11,12 @@ import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.endsteel.EndSteelItems;
import static org.lwjgl.opengl.GL11.glDepthMask;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.client.event.RenderPlayerEvent;
public class SolarUpgrade extends AbstractUpgrade {
@@ -65,7 +61,7 @@ public class SolarUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelHelmet && stack.getItem() != EndSteelItems.itemEndSteelHelmet)|| !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)|| !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
return false;
}
SolarUpgrade up = loadFromItem(stack);
@@ -1,11 +1,10 @@
package crazypants.enderio.item.darksteel.upgrade;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.endsteel.EndSteelItems;
public class SoundDetectorUpgrade extends AbstractUpgrade {
@@ -37,7 +36,7 @@ public class SoundDetectorUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != EndSteelItems.itemEndSteelHelmet && stack.getItem() != DarkSteelItems.itemDarkSteelHelmet)) {
if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) {
return false;
}
SoundDetectorUpgrade up = loadFromItem(stack);
@@ -7,7 +7,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionHelper;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.endsteel.EndSteelItems;
public class SpeedUpgrade extends AbstractUpgrade {
@@ -75,7 +74,7 @@ public class SpeedUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelLeggings && stack.getItem() != EndSteelItems.itemEndSteelLeggings) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 2) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
return false;
}
SpeedUpgrade up = loadFromItem(stack);
@@ -1,11 +1,10 @@
package crazypants.enderio.item.darksteel.upgrade;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.endsteel.EndSteelItems;
public class SpoonUpgrade extends AbstractUpgrade {
@@ -37,7 +36,7 @@ public class SpoonUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe && stack.getItem() != EndSteelItems.itemEndSteelPickaxe) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe && stack.getItem() != DarkSteelItems.itemEndSteelPickaxe) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
return false;
}
SpoonUpgrade up = loadFromItem(stack);
@@ -1,11 +1,10 @@
package crazypants.enderio.item.darksteel.upgrade;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.endsteel.EndSteelItems;
public class SwimUpgrade extends AbstractUpgrade {
@@ -37,7 +36,7 @@ public class SwimUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelBoots && stack.getItem() != EndSteelItems.itemEndSteelBoots)) {
if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 3)) {
return false;
}
SwimUpgrade up = loadFromItem(stack);
@@ -1,12 +1,11 @@
package crazypants.enderio.item.darksteel.upgrade;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.darksteel.DarkSteelItems;
import crazypants.enderio.item.endsteel.EndSteelItems;
import crazypants.enderio.material.Material;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public class TravelUpgrade extends AbstractUpgrade {
@@ -38,7 +37,7 @@ public class TravelUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelSword && stack.getItem() != EndSteelItems.itemEndSteelPickaxe && stack.getItem() != EndSteelItems.itemEndSteelSword && stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe)|| !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelSword && stack.getItem() != DarkSteelItems.itemEndSteelPickaxe && stack.getItem() != DarkSteelItems.itemEndSteelSword && stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe)|| !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) {
return false;
}
TravelUpgrade up = loadFromItem(stack);
@@ -1,48 +0,0 @@
package crazypants.enderio.item.endsteel;
import net.minecraft.item.ItemStack;
import net.minecraft.util.WeightedRandomChestContent;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.ChestGenHooks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.ItemMagnet;
import crazypants.enderio.item.darksteel.ItemDarkSteelSword;
import crazypants.enderio.item.darksteel.PoweredItemRenderer;
public class EndSteelItems {
public static ItemEndSteelArmor itemEndSteelHelmet;
public static ItemEndSteelArmor itemEndSteelChestplate;
public static ItemEndSteelArmor itemEndSteelLeggings;
public static ItemEndSteelArmor itemEndSteelBoots;
public static ItemEndSteelSword itemEndSteelSword;
public static ItemEndSteelPickaxe itemEndSteelPickaxe;
public static ItemEndSteelAxe itemEndSteelAxe;
public static void createEndSteelArmorItems() {
itemEndSteelHelmet = ItemEndSteelArmor.create(0);
itemEndSteelChestplate = ItemEndSteelArmor.create(1);
itemEndSteelLeggings = ItemEndSteelArmor.create(2);
itemEndSteelBoots = ItemEndSteelArmor.create(3);
itemEndSteelSword = ItemEndSteelSword.create();
itemEndSteelPickaxe = ItemEndSteelPickaxe.create();
itemEndSteelAxe = ItemEndSteelAxe.create();
}
@SideOnly(Side.CLIENT)
public static void registerItemRenderer() {
PoweredItemRenderer dsr = new PoweredItemRenderer();
MinecraftForgeClient.registerItemRenderer(itemEndSteelBoots, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelLeggings, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelChestplate, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelHelmet, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelSword, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelPickaxe, dsr);
MinecraftForgeClient.registerItemRenderer(itemEndSteelAxe, dsr);
}
}
@@ -1,7 +0,0 @@
package crazypants.enderio.item.endsteel;
import crazypants.enderio.item.darksteel.IDarkSteelItem;
public interface IEndSteelItem extends IDarkSteelItem {
}
@@ -35,10 +35,10 @@ public class GogglesOfRevealingUpgrade extends AbstractUpgrade {
}
return new GogglesOfRevealingUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME));
}
public static boolean isUpgradeEquipped(EntityPlayer player) {
ItemStack helmet = player.getEquipmentInSlot(4);
return GogglesOfRevealingUpgrade.loadFromItem(helmet) != null;
ItemStack helmet = player.getEquipmentInSlot(4);
return GogglesOfRevealingUpgrade.loadFromItem(helmet) != null;
}
public GogglesOfRevealingUpgrade(NBTTagCompound tag) {
@@ -51,7 +51,7 @@ public class GogglesOfRevealingUpgrade extends AbstractUpgrade {
@Override
public boolean canAddToItem(ItemStack stack) {
if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet || getGoggles() == null) {
if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0) || getGoggles() == null) {
return false;
}
GogglesOfRevealingUpgrade up = loadFromItem(stack);