Lots of changes!

This commit is contained in:
Alchemist committed 2013-09-10 23:49:38 +00:00
1 parent b14d856ba7
commit cdfe7e750c
19 files changed
+131 -27

No files matched your search

+6 -2
View File
@@ -15,8 +15,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStoppedEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.TickRegistry;
import cpw.mods.fml.relauncher.Side;
import crazypants.enderio.conduit.BlockConduitBundle;
import crazypants.enderio.conduit.ConduitRecipes;
import crazypants.enderio.conduit.facade.BlockConduitFacade;
@@ -47,9 +45,11 @@ import crazypants.enderio.machine.solar.BlockSolarPanel;
import crazypants.enderio.material.BlockFusedQuartz;
import crazypants.enderio.material.BlockMachineChassi;
import crazypants.enderio.material.ItemAlloy;
import crazypants.enderio.material.ItemBasicGear;
import crazypants.enderio.material.ItemCapacitor;
import crazypants.enderio.material.ItemFusedQuartzFrame;
import crazypants.enderio.material.ItemIndustrialBinder;
import crazypants.enderio.material.ItemMJReader;
import crazypants.enderio.material.ItemRedstoneInductor;
import crazypants.enderio.material.ItemYetaWrench;
import crazypants.enderio.material.MaterialRecipes;
@@ -74,6 +74,7 @@ public class EnderIO {
public static ItemFusedQuartzFrame itemFusedQuartzFrame;
public static ItemRedstoneInductor itemRedstoneInductor;
public static BlockMachineChassi blockMachineChassi;
public static ItemBasicGear itemBasicGear;
// Enderface
public static BlockEnderIO blockEnderIo;
@@ -108,6 +109,7 @@ public class EnderIO {
public static BlockLightNode blockLightNode;
public static ItemYetaWrench itemYetaWench;
public static ItemMJReader itemMJReader;
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
@@ -132,6 +134,7 @@ public class EnderIO {
itemFusedQuartzFrame = ItemFusedQuartzFrame.create();
itemRedstoneInductor = ItemRedstoneInductor.create();
blockMachineChassi = BlockMachineChassi.create();
itemBasicGear = ItemBasicGear.create();
blockEnderIo = BlockEnderIO.create();
itemEnderface = ItemEnderface.create();
@@ -165,6 +168,7 @@ public class EnderIO {
blockLightNode = BlockLightNode.create();
itemYetaWench = ItemYetaWrench.create();
itemMJReader = ItemMJReader.create();
}
@EventHandler
+3 -1
View File
@@ -25,7 +25,8 @@ public enum ModObject {
itemIndustrialBinder(++Config.IID, CATEGORY_ITEM, "Industrial Binder"),
itemBasicCapacitor(++Config.IID, CATEGORY_ITEM, "Basic Capacitor"),
itemAlloy(++Config.IID, CATEGORY_ITEM, "Alloy"),
itemRedstoneInductor(++Config.IID, CATEGORY_BLOCK, "Redstone Inductor"),
itemRedstoneInductor(++Config.IID, CATEGORY_ITEM, "Redstone Inductor"),
itemBasicGear(++Config.IID, CATEGORY_ITEM, "Basic Gear"),
blockFusedQuartz(++Config.BID, CATEGORY_BLOCK, "Fused Quartz"),
blockMachineChassi(++Config.BID, CATEGORY_BLOCK, "Machine Chassi"),
@@ -51,6 +52,7 @@ public enum ModObject {
blockCapacitorBank(++Config.BID, CATEGORY_BLOCK, "Capacitor Bank"),
itemYetaWrench(++Config.IID, CATEGORY_ITEM, "Yeta Wrench"),
itemMJReader(++Config.IID, CATEGORY_ITEM, "MJ Reader (WIP)"),
blockCustomSlab(++Config.BID, CATEGORY_BLOCK, "Painted Slab"),
blockCustomDoubleSlab(++Config.BID, CATEGORY_BLOCK, "Painted Slab"),
@@ -1,22 +1,22 @@
package crazypants.enderio.machine;
import static crazypants.enderio.ModObject.blockAlloySmelter;
import static crazypants.enderio.ModObject.blockCapacitorBank;
import static crazypants.enderio.ModObject.blockCrusher;
import static crazypants.enderio.ModObject.blockElectricLight;
import static crazypants.enderio.ModObject.blockPainter;
import static crazypants.enderio.ModObject.blockReservoir;
import static crazypants.enderio.ModObject.blockCrusher;
import static crazypants.enderio.ModObject.blockSolarPanel;
import static crazypants.enderio.ModObject.blockStirlingGenerator;
import static crazypants.enderio.ModObject.itemBasicCapacitor;
import static crazypants.enderio.ModObject.itemIndustrialBinder;
import static crazypants.enderio.ModObject.blockCapacitorBank;
import static crazypants.enderio.ModObject.itemBasicGear;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.ModObject;
import crazypants.enderio.material.Alloy;
import crazypants.enderio.material.ItemCapacitor;
import crazypants.enderio.power.Capacitors;
public class MachineRecipes {
@@ -24,9 +24,11 @@ public class MachineRecipes {
public static void addRecipes() {
ItemStack industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0);
ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0);
ItemStack machineChassi = new ItemStack(ModObject.blockMachineChassi.actualId, 1, 0);
ItemStack stirlingGen = new ItemStack(blockStirlingGenerator.actualId, 1, 0);
GameRegistry.addShapedRecipe(stirlingGen, "bbb", "bfb", "bcb", 'b', industialBinder, 'f', Block.furnaceIdle, 'c', capacitor);
ItemStack basicGear = new ItemStack(itemBasicGear.actualId, 1, 0);
GameRegistry.addShapedRecipe(stirlingGen, " s ", "sfs", "gpg", 's', Block.stone, 'f', Block.furnaceIdle, 'p', Block.pistonBase, 'g', basicGear);
ItemStack painter = new ItemStack(blockPainter.actualId, 1, 0);
ItemStack red = new ItemStack(Item.dyePowder, 1, 1);
@@ -43,15 +45,15 @@ public class MachineRecipes {
GameRegistry.addShapedRecipe(alloySmelter, "bbb", "CfC", "bcb", 'b', industialBinder, 'f', Block.furnaceIdle, 'c', capacitor, 'C', Item.cauldron);
ItemStack crusher = new ItemStack(blockCrusher.actualId, 1, 0);
GameRegistry.addShapedRecipe(crusher, "iii", "ipi", "ici", 'i', Item.ingotIron, 'c', capacitor, 'p', Block.pistonBase);
GameRegistry.addShapedRecipe(crusher, "f f", "imi", "ipi", 'i', Item.ingotIron, 'm', machineChassi, 'f', Item.flint, 'p', Block.pistonBase);
ItemStack solarPanel = new ItemStack(blockSolarPanel.actualId, 1, 0);
ItemStack activatedIron = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_IRON.ordinal());
ItemStack activatedGold = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_GOLD.ordinal());
ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0);
ItemStack redstoneInductor = new ItemStack(ModObject.itemRedstoneInductor.actualId, 1, 0);
GameRegistry.addShapedRecipe(solarPanel, "qqq", "gig", "bcb", 'q', fusedQuartz, 'g', activatedGold, 'i', activatedIron, 'b', industialBinder, 'c',
capacitor);
GameRegistry.addShapedRecipe(solarPanel, "fff", "fdf", "cic", 'd', Block.daylightSensor, 'f', fusedQuartz, 'c', Item.coal, 'i', redstoneInductor);
ItemStack electricLight = new ItemStack(blockElectricLight.actualId, 1, 0);
ItemStack glowstone = new ItemStack(Item.glowstone);
@@ -61,7 +63,8 @@ public class MachineRecipes {
ItemStack capacitorBank = new ItemStack(blockCapacitorBank.actualId,1,0);
GameRegistry.addShapedRecipe(capacitorBank , "bab", "aca", "bab", 'a', activtedCapacitor,'b', industialBinder, 'c', capacitor);
//To-do: Sort this class
}
}
@@ -37,5 +37,4 @@ public class BlockMachineChassi extends Block {
public void registerIcons(IconRegister iconRegister) {
blockIcon = iconRegister.registerIcon("enderio:machineChassi");
}
}
@@ -0,0 +1,38 @@
package crazypants.enderio.material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
public class ItemBasicGear extends Item {
public static ItemBasicGear create() {
ItemBasicGear result = new ItemBasicGear();
result.init();
return result;
}
protected ItemBasicGear() {
super(ModObject.itemBasicGear.id);
setCreativeTab(EnderIOTab.tabEnderIO);
setUnlocalizedName(ModObject.itemBasicGear.unlocalisedName);
setMaxStackSize(64);
}
protected void init() {
LanguageRegistry.addName(this, ModObject.itemBasicGear.name);
GameRegistry.registerItem(this, ModObject.itemBasicGear.unlocalisedName);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister) {
itemIcon = iconRegister.registerIcon("enderio:basicGear");
}
}
@@ -0,0 +1,38 @@
package crazypants.enderio.material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
public class ItemMJReader extends Item {
public static ItemMJReader create() {
ItemMJReader result = new ItemMJReader();
result.init();
return result;
}
protected ItemMJReader() {
super(ModObject.itemMJReader.id);
setCreativeTab(EnderIOTab.tabEnderIO);
setUnlocalizedName(ModObject.itemMJReader.unlocalisedName);
setMaxStackSize(64);
}
protected void init() {
LanguageRegistry.addName(this, ModObject.itemMJReader.name);
GameRegistry.registerItem(this, ModObject.itemMJReader.unlocalisedName);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister) {
itemIcon = iconRegister.registerIcon("enderio:mJReader");
}
}
@@ -15,7 +15,8 @@ import crazypants.enderio.machine.alloy.VanillaSmeltingRecipe;
public class MaterialRecipes {
public static void addRecipes() {
public static void addRecipes() {
ItemStack industialBinder;
if(Config.useAlternateBinderRecipe) {
@@ -26,30 +27,36 @@ public class MaterialRecipes {
industialBinder = new ItemStack(itemIndustrialBinder.actualId, 4, 0);
GameRegistry.addSmelting(Block.gravel.blockID, industialBinder, 0);
}
industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0);
ItemStack redstoneInductor = new ItemStack(ModObject.itemRedstoneInductor.actualId, 1, 0);
ItemStack basicGear = new ItemStack(ModObject.itemBasicGear.actualId, 1, 0);
ItemStack IndustrialBinder = new ItemStack(ModObject.itemIndustrialBinder.actualId, 1, 0);
ItemStack basicCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0);
GameRegistry.addShapedRecipe(basicCapacitor, " ", "gwi", "RbR", 'b', industialBinder, 'g', new ItemStack(Item.ingotGold), 'i', new ItemStack(
Item.ingotIron), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth);
ItemStack wrench = new ItemStack(ModObject.itemYetaWrench.actualId,1,0);
ItemStack blueSteel = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.BLUE_STEEL.ordinal());
ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 1);
ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 2);
ItemStack fusedQuartzFrame = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, 0);
ItemStack machineChassi = new ItemStack(ModObject.blockMachineChassi.actualId, 1, 0);
ItemStack mJReader = new ItemStack(ModObject.itemMJReader.actualId, 1, 0);
//Basic Capacitor
GameRegistry.addShapedRecipe(basicCapacitor, " ", "rpr", " ", 'r', redstoneInductor, 'p', Item.paper);
//Activated Capacitor
GameRegistry.addShapedRecipe(activatedCapacitor, " ", "gwi", "RbR", 'b', blueSteel, 'g', new ItemStack(ModObject.itemAlloy.actualId, 1,
Alloy.ACTIVATED_GOLD.ordinal()), 'i',
new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_IRON.ordinal()), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth);
ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 2);
//Ender Capacitor
GameRegistry.addShapedRecipe(enderCapacitor, " ", "gwi", "RbR", 'b', blueSteel, 'g',
new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENDER_GOLD.ordinal()), 'i',
new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENDER_IRON.ordinal()), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth);
int meta = 0;
for (Alloy alloy : Alloy.values()) {
ItemStack ingot = new ItemStack(ModObject.itemAlloy.actualId, 1, meta);
IMachineRecipe recipe = new BasicAlloyRecipe(ingot, alloy.unlocalisedName, alloy.ingrediants);
ItemStack nugget = new ItemStack(ModObject.itemAlloy.actualId, 9, meta + Alloy.values().length);
GameRegistry.addShapelessRecipe(nugget, ingot);
nugget = nugget.copy();
@@ -63,12 +70,25 @@ public class MaterialRecipes {
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, new FusedQuartzRecipe());
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, new VanillaSmeltingRecipe());
ItemStack fusedQuartzFrame = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, 0);
//Industrial Binder - will be removed!
GameRegistry.addShapedRecipe(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', industialBinder, 's', new ItemStack(Item.stick));
ItemStack wrench = new ItemStack(ModObject.itemYetaWrench.actualId,1,0);
//Wrench
GameRegistry.addShapedRecipe(wrench, "i i", " b ", " i ", 'b', industialBinder, 'i', new ItemStack(Item.ingotIron));
//Machine Chassi
GameRegistry.addShapedRecipe(machineChassi, "fff", "iri", "fff", 'f', Block.fenceIron, 'i', Item.ingotIron, 'r', redstoneInductor);
//Redstone Inductor
GameRegistry.addShapedRecipe(redstoneInductor, "grg", "gig", "grg", 'r', Item.redstone, 'g', Item.goldNugget, 'i', Item.ingotIron);
//Basic Gear
GameRegistry.addShapedRecipe(basicGear, "scs", "c c", "scs", 's', Item.stick, 'c', Block.cobblestone);
//MJ Reader
GameRegistry.addShapedRecipe(mJReader, "r r", "rir", "gxg", 'r', Item.redstone, 'i', Item.ingotIron, 'g', basicGear, 'x', redstoneInductor);
//TO-DO: Sort this class!
}
}
@@ -11,11 +11,11 @@ public enum Capacitors {
ACTIVATED_CAPACITOR(
new BasicCapacitor(40, 20000, 6),
"Activated Capacitor", "activatedCapacitor"),
"D-L Capacitor", "activatedCapacitor"),
ENDER_CAPACITOR(
new BasicCapacitor(100, 100000, 10),
"Ender Capacitor", "enderCapacitor");
"Hybrid Capacitor", "enderCapacitor");
public final ICapacitor capacitor;
public final String unlocalisedName;
File renamed without changes.

Before

Width:  |  Height:  |  Size: 780 B

After

Width:  |  Height:  |  Size: 780 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 622 B

After

Width:  |  Height:  |  Size: 647 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 622 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 667 B

After

Width:  |  Height:  |  Size: 650 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 446 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B