Remove old cells, now uses the DynamicCell, 9 new fluids that need a texture
This commit is contained in:
parent
401093a70b
commit
25ee0b5790
6 changed files with 100 additions and 183 deletions
|
@ -11,6 +11,7 @@ import net.minecraftforge.event.entity.player.FillBucketEvent;
|
|||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.UniversalBucket;
|
||||
import org.apache.commons.lang3.Validate;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.init.ModItems;
|
||||
|
||||
|
@ -80,15 +81,14 @@ public class DynamicCell extends UniversalBucket{
|
|||
}
|
||||
|
||||
public static ItemStack getCellWithFluid(Fluid fluid, int stackSize){
|
||||
Validate.notNull(fluid);
|
||||
ItemStack stack = new ItemStack(ModItems.dynamicCell, stackSize);
|
||||
ModItems.dynamicCell.fill(stack, new FluidStack(fluid, ModItems.dynamicCell.getCapacity()), true);
|
||||
return stack;
|
||||
}
|
||||
|
||||
public static ItemStack getCellWithFluid(Fluid fluid){
|
||||
ItemStack stack = new ItemStack(ModItems.dynamicCell);
|
||||
ModItems.dynamicCell.fill(stack, new FluidStack(fluid, ModItems.dynamicCell.getCapacity()), true);
|
||||
return stack;
|
||||
return getCellWithFluid(fluid, 1);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,71 +1,44 @@
|
|||
package techreborn.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import org.apache.commons.lang3.Validate;
|
||||
import reborncore.common.util.StringUtils;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@Deprecated
|
||||
public class ItemCells extends ItemTextureBase implements IFluidContainerItem
|
||||
public class ItemCells
|
||||
{
|
||||
|
||||
@Deprecated
|
||||
public static final String[] types = new String[] { "Berylium", "biomass", "calciumCarbonate", "calcium", "carbon",
|
||||
"chlorine", "deuterium", "diesel", "ethanol", "glyceryl", "helium3", "helium", "heliumPlasma", "hydrogen",
|
||||
"ice", "lithium", "mercury", "methane", "nitrocarbon", "nitroCoalfuel", "nitroDiesel", "nitrogen",
|
||||
"nitrogenDioxide", "oil", "potassium", "seedOil", "silicon", "sodium", "sodiumPersulfate", "sodiumSulfide",
|
||||
"sulfur", "sulfuricAcid", "tritium", "wolframium", "empty", "lava", "water" };
|
||||
|
||||
public ItemCells()
|
||||
|
||||
@Deprecated
|
||||
public static ItemStack getCellByName(String name, int count, boolean lookForIC2)
|
||||
{
|
||||
setUnlocalizedName("techreborn.cell");
|
||||
setHasSubtypes(true);
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
return getCellByName(name, count);
|
||||
}
|
||||
|
||||
public static ItemStack getCellByName(String name, int count)
|
||||
{
|
||||
return getCellByName(name, count, true);
|
||||
}
|
||||
|
||||
public static ItemStack getCellByName(String name, int count, boolean lookForIC2)
|
||||
{
|
||||
if(name.equalsIgnoreCase("empty") || name.equalsIgnoreCase("cell")){
|
||||
return new ItemStack(ModItems.emptyCell, count);
|
||||
}
|
||||
Fluid fluid = FluidRegistry.getFluid("fluid" + name.toLowerCase());
|
||||
// if (lookForIC2 && IC2Items.getItem("FluidCell") != null) {
|
||||
// if (fluid != null) {
|
||||
// ItemStack stack = IC2Items.getItem("FluidCell").copy();
|
||||
// if (stack != null && stack.getItem() instanceof IFluidContainerItem)
|
||||
// {
|
||||
// IFluidContainerItem containerItem = (IFluidContainerItem)
|
||||
// stack.getItem();
|
||||
// containerItem.fill(stack, new FluidStack(fluid.getID(), 2147483647),
|
||||
// true);
|
||||
// stack.stackSize = count;
|
||||
// return stack;
|
||||
// }
|
||||
// } else {
|
||||
// Core.logHelper.debug("Could not find " + "fluid" + name + " in the
|
||||
// fluid registry!");
|
||||
// }
|
||||
// } //TODO ic2
|
||||
int index = -1;
|
||||
for (int i = 0; i < types.length; i++)
|
||||
{
|
||||
if (types[i].equalsIgnoreCase(name))
|
||||
{
|
||||
index = i;
|
||||
break;
|
||||
if(fluid == null) {
|
||||
fluid = FluidRegistry.getFluid(name.toLowerCase());
|
||||
if(fluid == null) {
|
||||
fluid = FluidRegistry.getFluid("fluid" + StringUtils.toFirstCapital(name.toLowerCase()));
|
||||
}
|
||||
}
|
||||
return new ItemStack(ModItems.cells, count, index);
|
||||
Validate.notNull(fluid, "The fluid " + name + " could not be found");
|
||||
return DynamicCell.getCellWithFluid(fluid, count);
|
||||
}
|
||||
|
||||
public static ItemStack getCellByName(String name)
|
||||
|
@ -73,117 +46,4 @@ public class ItemCells extends ItemTextureBase implements IFluidContainerItem
|
|||
return getCellByName(name, 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
// gets Unlocalized Name depending on meta data
|
||||
public String getUnlocalizedName(ItemStack itemStack)
|
||||
{
|
||||
int meta = itemStack.getItemDamage();
|
||||
if (meta < 0 || meta >= types.length)
|
||||
{
|
||||
meta = 0;
|
||||
}
|
||||
|
||||
return super.getUnlocalizedName() + "." + types[meta];
|
||||
}
|
||||
|
||||
// Adds Dusts SubItems To Creative Tab
|
||||
public void getSubItems(Item item, CreativeTabs creativeTabs, List list)
|
||||
{
|
||||
for (int meta = 0; meta < types.length; ++meta)
|
||||
{
|
||||
ItemStack stack = new ItemStack(item, 1, meta);
|
||||
if (types[meta].toLowerCase().equals("water") || types[meta].toLowerCase().equals("lava"))
|
||||
{
|
||||
this.fill(stack, new FluidStack(FluidRegistry.getFluid(types[meta].toLowerCase()), getCapacity(stack)),
|
||||
true);
|
||||
} else if (FluidRegistry.getFluid("fluid" + types[meta].toLowerCase()) != null)
|
||||
{
|
||||
this.fill(stack,
|
||||
new FluidStack(FluidRegistry.getFluid("fluid" + types[meta].toLowerCase()), getCapacity(stack)),
|
||||
true);
|
||||
}
|
||||
list.add(stack);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack getFluid(ItemStack container)
|
||||
{
|
||||
return FluidStack.loadFluidStackFromNBT(container.getTagCompound());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCapacity(ItemStack container)
|
||||
{
|
||||
return 1000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int fill(ItemStack container, FluidStack resource, boolean doFill)
|
||||
{
|
||||
if (container.stackSize != 1)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
if (resource == null || resource.amount != getCapacity(container))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
if (types[container.getItemDamage()].toLowerCase().equals("water")
|
||||
|| types[container.getItemDamage()].toLowerCase().equals("lava"))
|
||||
{
|
||||
|
||||
} else if (FluidRegistry.getFluid("fluid" + types[container.getItemDamage()].toLowerCase()) == null)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (doFill)
|
||||
{
|
||||
NBTTagCompound tag = container.getTagCompound();
|
||||
if (tag == null)
|
||||
{
|
||||
tag = new NBTTagCompound();
|
||||
}
|
||||
resource.writeToNBT(tag);
|
||||
container.setTagCompound(tag);
|
||||
}
|
||||
return getCapacity(container);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain)
|
||||
{
|
||||
if (maxDrain < getCapacity(container))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
FluidStack fluidStack = getFluid(container);
|
||||
if (doDrain && fluidStack != null)
|
||||
{
|
||||
ItemStack empty = ItemCells.getCellByName("empty");
|
||||
if (empty != null)
|
||||
{
|
||||
container.setItemDamage(empty.getItemDamage());
|
||||
container.setTagCompound(empty.getTagCompound());
|
||||
} else
|
||||
{
|
||||
container.stackSize = 0;
|
||||
}
|
||||
}
|
||||
|
||||
return fluidStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTextureName(int damage)
|
||||
{
|
||||
return ModInfo.MOD_ID + ":items/cells/" + types[damage] + "Cell";
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxMeta()
|
||||
{
|
||||
return types.length;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue