Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Bump to Forge 1095, and proper use of ObjectHolder (protip: instance variable names should match object names for easier ObjectHolder use)

Browse source
This commit is contained in:
Pahimar 2014-05-26 11:28:51 -04:00
parent abde1fc874
commit b1cad58550
6 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -22,7 +22,7 @@ group = "com.pahimar.ee3" // http://maven.apache.org/guides/mini/guide-naming-co
archivesBaseName = "EquivalentExchange3"
minecraft {
version = "1.7.2-10.12.1.1091"
version = "1.7.2-10.12.1.1095"
assetDir = "run/assets"
}

2
src/main/java/com/pahimar/ee3/creativetab/CreativeTab.java
View file

@ -14,7 +14,7 @@ public class CreativeTab
@Override
public Item getTabIconItem()
{
return ModItems.philosophersStone;
return ModItems.stonePhilosophers;
}
@Override

6
src/main/java/com/pahimar/ee3/handler/FuelHandler.java
View file

@ -15,9 +15,9 @@ public class FuelHandler implements IFuelHandler
private static final ItemStack MOBIUS_FUEL = new ItemStack(ModItems.alchemicalFuel, 1, 1);
private static final ItemStack AETERNALIS_FUEL = new ItemStack(ModItems.alchemicalFuel, 1, 2);
private static final ItemStack ALCHEMICAL_COAL_BLOCK = new ItemStack(ModBlocks.alchemicalFuel, 1, 0);
private static final ItemStack MOBIUS_FUEL_BLOCK = new ItemStack(ModBlocks.alchemicalFuel, 1, 1);
private static final ItemStack AETERNALIS_FUEL_BLOCK = new ItemStack(ModBlocks.alchemicalFuel, 1, 2);
private static final ItemStack ALCHEMICAL_COAL_BLOCK = new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 0);
private static final ItemStack MOBIUS_FUEL_BLOCK = new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 1);
private static final ItemStack AETERNALIS_FUEL_BLOCK = new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 2);
@Override
public int getBurnTime(ItemStack fuel)

11
src/main/java/com/pahimar/ee3/init/ModBlocks.java
View file

@ -4,13 +4,14 @@ import com.pahimar.ee3.block.*;
import com.pahimar.ee3.item.ItemBlockAlchemicalChest;
import com.pahimar.ee3.item.ItemBlockAlchemicalFuel;
import com.pahimar.ee3.reference.Names;
import com.pahimar.ee3.reference.Reference;
import cpw.mods.fml.common.registry.GameRegistry;
//@GameRegistry.ObjectHolder(Reference.MOD_ID)
@GameRegistry.ObjectHolder(Reference.MOD_ID)
public class ModBlocks
{
public static final BlockEE chalk = new BlockChalk();
public static final BlockEE alchemicalFuel = new BlockAlchemicalFuel();
public static final BlockEE chalkBlock = new BlockChalk();
public static final BlockEE alchemicalFuelBlock = new BlockAlchemicalFuel();
public static final BlockEE alchemicalChest = new BlockAlchemicalChest();
public static final BlockEE aludel = new BlockAludel();
public static final BlockEE calcinator = new BlockCalcinator();
@ -19,8 +20,8 @@ public class ModBlocks
public static void init()
{
GameRegistry.registerBlock(chalk, Names.Blocks.CHALK);
GameRegistry.registerBlock(alchemicalFuel, ItemBlockAlchemicalFuel.class, Names.Blocks.ALCHEMICAL_FUEL);
GameRegistry.registerBlock(chalkBlock, Names.Blocks.CHALK);
GameRegistry.registerBlock(alchemicalFuelBlock, ItemBlockAlchemicalFuel.class, Names.Blocks.ALCHEMICAL_FUEL);
GameRegistry.registerBlock(alchemicalChest, ItemBlockAlchemicalChest.class, Names.Blocks.ALCHEMICAL_CHEST);
GameRegistry.registerBlock(aludel, Names.Blocks.ALUDEL);
GameRegistry.registerBlock(calcinator, Names.Blocks.CALCINATOR);

23
src/main/java/com/pahimar/ee3/init/ModItems.java
View file

@ -2,19 +2,20 @@ package com.pahimar.ee3.init;
import com.pahimar.ee3.item.*;
import com.pahimar.ee3.reference.Names;
import com.pahimar.ee3.reference.Reference;
import cpw.mods.fml.common.registry.GameRegistry;
//@GameRegistry.ObjectHolder(Reference.MOD_ID)
@GameRegistry.ObjectHolder(Reference.MOD_ID)
public class ModItems
{
public static final ItemEE alchemicalBag = new ItemAlchemicalBag();
public static final ItemEE alchemicalDust = new ItemAlchemicalDust();
public static final ItemEE alchemicalFuel = new ItemAlchemicalFuel();
public static final ItemEE inertStone = new ItemInertStone();
public static final ItemEE miniumShard = new ItemMiniumShard();
public static final ItemEE miniumStone = new ItemMiniumStone();
public static final ItemEE philosophersStone = new ItemPhilosophersStone();
public static final ItemEE alchemicalInventoryUpgrade = new ItemAlchemicalInventoryUpgrade();
public static final ItemEE stoneInert = new ItemInertStone();
public static final ItemEE shardMinium = new ItemMiniumShard();
public static final ItemEE stoneMinium = new ItemMiniumStone();
public static final ItemEE stonePhilosophers = new ItemPhilosophersStone();
public static final ItemEE alchemicalUpgrade = new ItemAlchemicalInventoryUpgrade();
public static final ItemEE chalk = new ItemChalk();
public static final ItemEE diviningRod = new ItemDiviningRod();
@ -23,12 +24,12 @@ public class ModItems
GameRegistry.registerItem(alchemicalBag, Names.Items.ALCHEMICAL_BAG);
GameRegistry.registerItem(alchemicalDust, Names.Items.ALCHEMICAL_DUST);
GameRegistry.registerItem(alchemicalFuel, Names.Items.ALCHEMICAL_FUEL);
GameRegistry.registerItem(inertStone, Names.Items.INERT_STONE);
GameRegistry.registerItem(miniumShard, Names.Items.MINIUM_SHARD);
GameRegistry.registerItem(miniumStone, Names.Items.MINIUM_STONE);
GameRegistry.registerItem(philosophersStone, Names.Items.PHILOSOPHERS_STONE);
GameRegistry.registerItem(stoneInert, Names.Items.INERT_STONE);
GameRegistry.registerItem(shardMinium, Names.Items.MINIUM_SHARD);
GameRegistry.registerItem(stoneMinium, Names.Items.MINIUM_STONE);
GameRegistry.registerItem(stonePhilosophers, Names.Items.PHILOSOPHERS_STONE);
GameRegistry.registerItem(chalk, Names.Items.CHALK);
GameRegistry.registerItem(alchemicalInventoryUpgrade, Names.Items.ALCHEMICAL_UPGRADE);
GameRegistry.registerItem(alchemicalUpgrade, Names.Items.ALCHEMICAL_UPGRADE);
GameRegistry.registerItem(diviningRod, Names.Items.DIVINING_ROD);
}
}

2
src/main/java/com/pahimar/ee3/item/ItemBlockAlchemicalFuel.java
View file

@ -9,6 +9,6 @@ public class ItemBlockAlchemicalFuel extends ItemMultiTexture
{
public ItemBlockAlchemicalFuel(Block block)
{
super(ModBlocks.alchemicalFuel, ModBlocks.alchemicalFuel, Names.Items.ALCHEMICAL_FUEL_SUBTYPES);
super(ModBlocks.alchemicalFuelBlock, ModBlocks.alchemicalFuelBlock, Names.Items.ALCHEMICAL_FUEL_SUBTYPES);
}
}