This commit is contained in:
Aidan C. Brady 2015-02-25 08:44:24 -05:00
parent cd25811f31
commit 955160ff45
10 changed files with 20 additions and 10 deletions

View file

@ -94,6 +94,7 @@ public class MekanismRenderer
GasRegistry.getGas("fusionFuelDD").setIcon(event.map.registerIcon("mekanism:LiquidDD"));
GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerIcon("mekanism:LiquidDT"));
GasRegistry.getGas("steam").setIcon(event.map.registerIcon("mekanism:LiquidSteam"));
GasRegistry.getGas("lithium").setIcon(event.map.registerIcon("mekanism:LiquidLithium"));
for(Gas gas : GasRegistry.getRegisteredGasses())
{

View file

@ -26,7 +26,8 @@ public class InfuseStorage
if(contains(storage))
{
amount -= storage.amount;
} else if(type == storage.type)
}
else if(type == storage.type)
{
amount = 0;
}

View file

@ -832,6 +832,7 @@ public class Mekanism
OreDictionary.registerOre("dustSilver", new ItemStack(MekanismItems.Dust, 1, 8));
OreDictionary.registerOre("dustLead", new ItemStack(MekanismItems.Dust, 1, 9));
OreDictionary.registerOre("dustSulfur", new ItemStack(MekanismItems.Dust, 1, 10));
OreDictionary.registerOre("dustLithium", new ItemStack(MekanismItems.Dust, 1, 11));
OreDictionary.registerOre("ingotRefinedObsidian", new ItemStack(MekanismItems.Ingot, 1, 0));
OreDictionary.registerOre("ingotOsmium", new ItemStack(MekanismItems.Ingot, 1, 1));
@ -862,12 +863,6 @@ public class Mekanism
OreDictionary.registerOre("oreCopper", new ItemStack(MekanismBlocks.OreBlock, 1, 1));
OreDictionary.registerOre("oreTin", new ItemStack(MekanismBlocks.OreBlock, 1, 2));
//MC stuff
OreDictionary.registerOre("oreCoal", new ItemStack(Blocks.coal_ore));
OreDictionary.registerOre("ingotIron", new ItemStack(Items.iron_ingot));
OreDictionary.registerOre("ingotGold", new ItemStack(Items.gold_ingot));
OreDictionary.registerOre("oreRedstone", new ItemStack(Blocks.redstone_ore));
if(general.controlCircuitOreDict)
{
OreDictionary.registerOre("circuitBasic", new ItemStack(MekanismItems.ControlCircuit, 1, 0));
@ -1048,6 +1043,7 @@ public class Mekanism
GasRegistry.register(new Gas("fusionFuelDD")).registerFluid();
GasRegistry.register(new Gas("fusionFuelDT")).registerFluid();
GasRegistry.register(new Gas("steam")).registerFluid();
GasRegistry.register(new Gas("lithium")).registerFluid();
FluidRegistry.registerFluid(new Fluid("heavyWater"));

View file

@ -76,6 +76,7 @@ public class MekanismItems
public static final Item Sawdust = new ItemMekanism().setUnlocalizedName("Sawdust");
public static final Item Salt = new ItemMekanism().setUnlocalizedName("Salt");
public static final Item BrineBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("BrineBucket");
public static final Item LithiumBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("LithiumBucket");
public static final Item FrictionBoots = new ItemFreeRunners().setUnlocalizedName("FreeRunners");
public static final ItemJetpack ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack");
public static final Item FilterCard = new ItemFilterCard().setUnlocalizedName("FilterCard");
@ -135,6 +136,7 @@ public class MekanismItems
GameRegistry.registerItem(Sawdust, "Sawdust");
GameRegistry.registerItem(Salt, "Salt");
GameRegistry.registerItem(BrineBucket, "BrineBucket");
GameRegistry.registerItem(LithiumBucket, "LithiumBucket");
GameRegistry.registerItem(Crystal, "Crystal");
GameRegistry.registerItem(FrictionBoots, "FrictionBoots");
GameRegistry.registerItem(ArmoredJetpack, "ArmoredJetpack");
@ -147,6 +149,7 @@ public class MekanismItems
GameRegistry.registerItem(Flamethrower, "Flamethrower");
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(BrineBucket), FluidContainerRegistry.EMPTY_BUCKET);
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("lithium"), new ItemStack(LithiumBucket), FluidContainerRegistry.EMPTY_BUCKET);
MinecraftForge.EVENT_BUS.register(GasMask);
MinecraftForge.EVENT_BUS.register(FrictionBoots);

View file

@ -17,7 +17,7 @@ public class ItemDust extends ItemMekanism
public static String[] en_USNames = {"Iron", "Gold", "Osmium",
"Obsidian", "Diamond", "Steel",
"Copper", "Tin", "Silver",
"Lead", "Sulfur"};
"Lead", "Sulfur", "Lithium"};
public ItemDust()
{
@ -29,7 +29,7 @@ public class ItemDust extends ItemMekanism
@Override
public void registerIcons(IIconRegister register)
{
for(int i = 0; i <= 10; i++)
for(int i = 0; i <= 11; i++)
{
icons[i] = register.registerIcon("mekanism:" + en_USNames[i] + "Dust");
}
@ -44,7 +44,7 @@ public class ItemDust extends ItemMekanism
@Override
public void getSubItems(Item item, CreativeTabs tabs, List itemList)
{
for(int counter = 0; counter <= 10; ++counter)
for(int counter = 0; counter <= 11; ++counter)
{
itemList.add(new ItemStack(item, 1, counter));
}

View file

@ -32,6 +32,7 @@ item.ElectrolyticCore.name=Electrolytic Core
item.Sawdust.name=Sawdust
item.Salt.name=Salt
item.BrineBucket.name=Brine Bucket
item.LithiumBucket.name=Lithium Bucket
item.FreeRunners.name=Free Runners
item.ArmoredJetpack.name=Armored Jetpack
item.FilterCard.name=Filter Card
@ -178,6 +179,7 @@ item.tinDust.name=Tin Dust
item.silverDust.name=Silver Dust
item.leadDust.name=Lead Dust
item.sulfurDust.name=Sulfur Dust
item.lithiumDust.name=Lithium Dust
//Clumps
item.ironClump.name=Iron Clump
@ -244,6 +246,7 @@ gas.sodium=Sodium
gas.brine=Gaseous Brine
gas.deuterium=Deuterium
gas.tritium=Tritium
gas.lithium=Lithium
gas.iron=Iron Slurry
gas.gold=Gold Slurry
@ -279,6 +282,7 @@ fluid.brine=Brine
fluid.ethene=Liquid Ethylene
fluid.sodium=Liquid Sodium
fluid.heavyWater=Heavy Water
fluid.lithium=Liquid Lithium
//OreGas names
oregas.iron=Iron Ore

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB