Remove old cells, now uses the DynamicCell, 9 new fluids that need a texture

This commit is contained in:
modmuss50 2016-05-23 18:26:21 +01:00
parent 401093a70b
commit 25ee0b5790
6 changed files with 100 additions and 183 deletions

View file

@ -2,7 +2,12 @@ package techreborn.client;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import techreborn.init.ModItems;
import techreborn.items.DynamicCell;
import java.util.Random;
public class TechRebornCreativeTabMisc extends CreativeTabs
{
@ -17,7 +22,7 @@ public class TechRebornCreativeTabMisc extends CreativeTabs
@Override
public Item getTabIconItem()
{
return ModItems.cells;
return ModItems.dynamicCell;
}
}

View file

@ -82,6 +82,35 @@ public class ModFluids
public static Fluid fluidWolframium = new TechRebornFluid("fluidwolframium");
public static BlockFluidBase BlockFluidWolframium;
public static Fluid fluidCarbon = new TechRebornFluid("fluidcarbon");
public static BlockFluidBase BlockFluidCarbon;
public static Fluid fluidCarbonFiber = new TechRebornFluid("fluidcarbonfiber");
public static BlockFluidBase BlockFluidCarbonFiber;
public static Fluid fluidNitroCarbon = new TechRebornFluid("fluidnitrocarbon");
public static BlockFluidBase BlockFluidNitroCarbon;
public static Fluid fluidSulfur = new TechRebornFluid("fluidSulfur");
public static BlockFluidBase BlockFluidSulfur;
public static Fluid fluidSodiumSulfide= new TechRebornFluid("fluidsodiumSulfide");
public static BlockFluidBase BlockFluidSodiumSulfide;
public static Fluid fluidDiesel= new TechRebornFluid("fluiddiesel");
public static BlockFluidBase BlockFluidDiesel;
public static Fluid fluidNitroDiesel = new TechRebornFluid("fluidnitrodiesel");
public static BlockFluidBase BlockFluidNitroDiesel;
public static Fluid fluidOil = new TechRebornFluid("fluidoil");
public static BlockFluidBase BlockFluidOil;
public static Fluid fluidSulfuricAcid = new TechRebornFluid("fluidsulfuricacid");
public static BlockFluidBase BlockFluidSulfuricAcid;
public static void init()
{
FluidRegistry.registerFluid(fluidberylium);
@ -204,5 +233,50 @@ public class ModFluids
GameRegistry.registerBlock(BlockFluidWolframium,
ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidCarbon);
BlockFluidCarbon = new BlockFluidTechReborn(fluidCarbon, Material.WATER, "techreborn.carbon");
GameRegistry.registerBlock(BlockFluidCarbon,
ModInfo.MOD_ID + "_" + BlockFluidCarbon.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidCarbonFiber);
BlockFluidCarbonFiber = new BlockFluidTechReborn(fluidCarbonFiber, Material.WATER, "techreborn.carbonfiber");
GameRegistry.registerBlock(BlockFluidCarbonFiber,
ModInfo.MOD_ID + "_" + BlockFluidCarbonFiber.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidNitroCarbon);
BlockFluidNitroCarbon= new BlockFluidTechReborn(fluidNitroCarbon, Material.WATER, "techreborn.nitrocarbon");
GameRegistry.registerBlock(BlockFluidNitroCarbon,
ModInfo.MOD_ID + "_" + BlockFluidNitroCarbon.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidSulfur);
BlockFluidSulfur= new BlockFluidTechReborn(fluidSulfur, Material.WATER, "techreborn.sulfur");
GameRegistry.registerBlock(BlockFluidSulfur,
ModInfo.MOD_ID + "_" + BlockFluidSulfur.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidSodiumSulfide);
BlockFluidSodiumSulfide= new BlockFluidTechReborn(fluidSodiumSulfide, Material.WATER, "techreborn.sodiumsulfide");
GameRegistry.registerBlock(BlockFluidSodiumSulfide,
ModInfo.MOD_ID + "_" + BlockFluidSodiumSulfide.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidDiesel);
BlockFluidDiesel = new BlockFluidTechReborn(fluidDiesel, Material.WATER, "techreborn.diesel");
GameRegistry.registerBlock(BlockFluidDiesel,
ModInfo.MOD_ID + "_" + BlockFluidDiesel.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidNitroDiesel);
BlockFluidNitroDiesel = new BlockFluidTechReborn(fluidNitroDiesel, Material.WATER, "techreborn.nitrodiesel");
GameRegistry.registerBlock(BlockFluidNitroDiesel,
ModInfo.MOD_ID + "_" + BlockFluidNitroDiesel.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidOil);
BlockFluidOil = new BlockFluidTechReborn(fluidOil, Material.WATER, "techreborn.oil");
GameRegistry.registerBlock(BlockFluidOil,
ModInfo.MOD_ID + "_" + BlockFluidOil.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidSulfuricAcid);
BlockFluidSulfuricAcid = new BlockFluidTechReborn(fluidSulfuricAcid, Material.WATER, "techreborn.sulfuricacid");
GameRegistry.registerBlock(BlockFluidSulfuricAcid,
ModInfo.MOD_ID + "_" + BlockFluidSulfuricAcid.getUnlocalizedName().substring(5));
}
}

View file

@ -33,8 +33,6 @@ public class ModItems
public static Item dusts;
public static Item smallDusts;
public static Item parts;
@Deprecated
public static Item cells;
public static Item rockCutter;
public static Item lithiumBatpack;
public static Item lapotronpack;
@ -141,22 +139,7 @@ public class ModItems
// registerItem(purifiedCrushedOre, "purifiedCrushedOre");
parts = new ItemParts();
registerItem(parts, "part");
cells = new ItemCells();
registerItem(cells, "cell");
for (int i = 0; i < ItemCells.types.length; i++)
{
if (FluidRegistry.getFluid("fluid" + ItemCells.types[i].toLowerCase()) != null)
{
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluid("fluid" + ItemCells.types[i].toLowerCase()),
ItemCells.getCellByName(ItemCells.types[i]), ItemCells.getCellByName("empty"));
}else if(FluidRegistry.getFluid(ItemCells.types[i].toLowerCase()) != null){
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluid(ItemCells.types[i].toLowerCase()),
ItemCells.getCellByName(ItemCells.types[i]), ItemCells.getCellByName("empty"));
}
}
rockCutter = PoweredItem.createItem(ItemRockCutter.class);
registerItem(rockCutter, "rockCutter");
lithiumBatpack = PoweredItem.createItem(ItemLithiumBatpack.class);

View file

@ -2420,11 +2420,6 @@ public class ModRecipes
ItemCells.getCellByName("oil", 1), ItemDusts.getDustByName("saltpeter", 4),
ItemDusts.getDustByName("coal", 1), new ItemStack(Blocks.SAND, 10), 2500, 5));
// Ice
RecipeHandler.addRecipe(
new CentrifugeRecipe(ItemCells.getCellByName("ice", 1), null, new ItemStack(Blocks.ICE, 1),
ItemCells.getCellByName("empty"), null, null, 40, 5));
// Dust Byproducts
RecipeHandler.addRecipe(

View file

@ -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);
}
}

View file

@ -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;
}
}