#746 added speed downgrade to item conduit

This commit is contained in:
Matthias Mann committed 2015-01-24 21:26:33 +01:00
1 parent a201b48dc0
commit 259ccdd1b8
7 files changed
+106 -22

No files matched your search

@@ -89,7 +89,11 @@ public class ConduitRecipes {
ItemStack speedUpgrade = new ItemStack(EnderIO.itemExtractSpeedUpgrade, 1, 0);
GameRegistry.addShapedRecipe(speedUpgrade, "iii","epe","ere", 'p', Blocks.piston, 'e', electricalSteel, 'r', Blocks.redstone_torch, 'i', Items.iron_ingot);
ItemStack speedDowngrade = new ItemStack(EnderIO.itemExtractSpeedUpgrade, 1, 1);
GameRegistry.addRecipe(new ShapedOreRecipe(speedDowngrade, "iii","ese","ete", 's', "slimeball", 'e', electricalSteel, 't', "stickWood", 'i', Items.iron_ingot));
GameRegistry.addRecipe(new ShapedOreRecipe(speedDowngrade, "iii","ese","ete", 's', "slimeball", 'e', electricalSteel, 't', "woodStick", 'i', Items.iron_ingot));
if (MEUtil.isMEEnabled()) {
addAeRecipes();
}
@@ -11,10 +11,12 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.EnderIO;
import crazypants.enderio.conduit.IConduitBundle;
import crazypants.enderio.conduit.gui.item.InventoryFilterUpgrade;
import crazypants.enderio.conduit.gui.item.InventorySpeedUpgrades;
import crazypants.enderio.conduit.item.IItemConduit;
import crazypants.enderio.conduit.item.SpeedUpgrade;
import crazypants.enderio.conduit.item.filter.IItemFilter;
public class ExternalConnectionContainer extends Container {
@@ -24,6 +26,7 @@ public class ExternalConnectionContainer extends Container {
private ForgeDirection dir;
private IItemConduit itemConduit;
private int speedUpgradeSlotLimit = 15;
private IItemFilter inputFilter;
private IItemFilter outputFilter;
@@ -86,7 +89,11 @@ public class ExternalConnectionContainer extends Container {
public boolean isItemValid(ItemStack par1ItemStack) {
return si.isItemValidForSlot(0, par1ItemStack);
}
@Override
public int getSlotStackLimit() {
return speedUpgradeSlotLimit;
}
});
slotLocations.add(new Point(x, y));
@@ -193,6 +200,11 @@ public class ExternalConnectionContainer extends Container {
@Override
public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) {
ItemStack st = par4EntityPlayer.inventory.getItemStack();
if(st != null && st.getItem() == EnderIO.itemExtractSpeedUpgrade) {
SpeedUpgrade speedUpgrade = EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(st);
speedUpgradeSlotLimit = speedUpgrade.maxStackSize;
}
if(par4EntityPlayer.worldObj != null) {
if(par1 >= startFilterSlot && itemConduit != null) {
itemConduit.setInputFilter(dir, inputFilter);
@@ -404,26 +404,18 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
@Override
public int getMaximumExtracted(ForgeDirection dir) {
int numUpgrades = getNumSpeedUpgrades(dir);
//int res = (int)Math.pow(4, numUpgrades);
int res = 4 + (numUpgrades * 4);
return res;
ItemStack stack = speedUpgrades.get(dir);
if(stack == null) {
return SpeedUpgrade.BASE_MAX_EXTRACTED;
}
SpeedUpgrade speedUpgrade = EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(stack);
return speedUpgrade.getMaximumExtracted(stack.stackSize);
}
@Override
public float getTickTimePerItem(ForgeDirection dir) {
int numUpgrades = getNumSpeedUpgrades(dir);
float maxExtract = 10f / getMaximumExtracted(dir);
return maxExtract;
}
private int getNumSpeedUpgrades(ForgeDirection dir) {
ItemStack stack = speedUpgrades.get(dir);
if(stack == null) {
return 0;
}
return stack.stackSize;
}
@Override
@@ -1,8 +1,13 @@
package crazypants.enderio.conduit.item;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -11,7 +16,11 @@ import crazypants.enderio.ModObject;
import crazypants.enderio.gui.IResourceTooltipProvider;
public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipProvider {
private static final SpeedUpgrade UPGRADES[] = SpeedUpgrade.values();
private final IIcon[] icons;
public static ItemExtractSpeedUpgrade create() {
ItemExtractSpeedUpgrade result = new ItemExtractSpeedUpgrade();
result.init();
@@ -21,22 +30,52 @@ public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipPro
protected ItemExtractSpeedUpgrade() {
setCreativeTab(EnderIOTab.tabEnderIO);
setUnlocalizedName(ModObject.itemExtractSpeedUpgrade.unlocalisedName);
setHasSubtypes(true);
setMaxDamage(0);
setMaxStackSize(64);
icons = new IIcon[UPGRADES.length];
}
protected void init() {
GameRegistry.registerItem(this, ModObject.itemExtractSpeedUpgrade.unlocalisedName);
}
@Override
public IIcon getIconFromDamage(int damage) {
damage = MathHelper.clamp_int(damage, 0, icons.length - 1);
return icons[damage];
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister IIconRegister) {
itemIcon = IIconRegister.registerIcon("enderio:extractSpeedUpgrade");
public void registerIcons(IIconRegister iconRegister) {
for (int i = 0; i < UPGRADES.length; i++) {
icons[i] = iconRegister.registerIcon(UPGRADES[i].iconName);
}
}
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return getSpeedUpgrade(par1ItemStack).unlocName;
}
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for (int j = 0; j < UPGRADES.length; ++j) {
par3List.add(new ItemStack(par1, 1, j));
}
}
public SpeedUpgrade getSpeedUpgrade(ItemStack par1ItemStack) {
int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, UPGRADES.length - 1);
return UPGRADES[i];
}
@Override
public String getUnlocalizedNameForTooltip(ItemStack itemStack) {
return getUnlocalizedName();
return getUnlocalizedName(itemStack);
}
}
@@ -0,0 +1,32 @@
package crazypants.enderio.conduit.item;
public enum SpeedUpgrade {
UPGRADE("enderio:extractSpeedUpgrade", "item.itemExtractSpeedUpgrade", 15) {
@Override
public int getMaximumExtracted(int stackSize) {
return BASE_MAX_EXTRACTED + Math.min(stackSize, maxStackSize) * 4;
}
},
DOWNGRADE("enderio:extractSpeedDowngrade", "item.itemExtractSpeedDowngrade", 1) {
@Override
public int getMaximumExtracted(int stackSize) {
return 1;
}
};
public static final int BASE_MAX_EXTRACTED = 4;
public final String iconName;
public final String unlocName;
public final int maxStackSize;
private SpeedUpgrade(String iconName, String unlocName, int maxStackSize) {
this.iconName = iconName;
this.unlocName = unlocName;
this.maxStackSize = maxStackSize;
}
public abstract int getMaximumExtracted(int stackSize);
}