Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

code Clean up

Browse source 
cleaned up code, remove condernser, re added recipes, fixed recipes for
basic pipes use,etc
This commit is contained in:
Rseifert 2012-07-16 14:15:07 -04:00
parent 9e67cbf2e3
commit 916ddca95d
2 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
minecraft/net/minecraft/src/eui/BlockMachine.java
View file

@ -263,7 +263,6 @@ public class BlockMachine extends net.minecraft.src.universalelectricity.extend.
case 1: return new TileEntityBoiler(); case 1: return new TileEntityBoiler();
case 2: return new TileEntityFireBox(); case 2: return new TileEntityFireBox();
case 3: return new TileEntityGenerator(); case 3: return new TileEntityGenerator();
case 14: return new TileEntityCondenser();
case 15: return new TileEntityNuller(); case 15: return new TileEntityNuller();
} }
return null; return null;

65
minecraft/net/minecraft/src/mod_EUIndustry.java
View file

@ -2,6 +2,10 @@ package net.minecraft.src;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.src.basiccomponents.BasicComponents; import net.minecraft.src.basiccomponents.BasicComponents;
import net.minecraft.src.eui.*; import net.minecraft.src.eui.*;
import net.minecraft.src.eui.boiler.TileEntityBoiler;
import net.minecraft.src.eui.burner.TileEntityFireBox;
import net.minecraft.src.eui.grinder.TileEntityGrinder;
import net.minecraft.src.eui.turbine.TileEntityGenerator;
import net.minecraft.src.forge.*; import net.minecraft.src.forge.*;
import net.minecraft.src.universalelectricity.*; import net.minecraft.src.universalelectricity.*;
@ -26,7 +30,7 @@ public class mod_EUIndustry extends NetworkMod {
@Override @Override
public String getVersion() { public String getVersion() {
// TODO change version on each update ;/ // TODO change version on each update ;/
return "0.0.6"; return "0.0.7";
} }
public static int configurationProperties() public static int configurationProperties()
{ {
@ -44,55 +48,52 @@ public class mod_EUIndustry extends NetworkMod {
config.save(); config.save();
return coalID; return coalID;
} }
@Override
public void modsLoaded()
{
UniversalElectricity.registerAddon(this, "0.4.5");
}
@Override @Override
public void load() { public void load() {
//register //register
UniversalElectricity.registerAddon(this, "0.4.3"); ModLoader.registerBlock(machine, net.minecraft.src.eui.ItemMachine.class);
MinecraftForgeClient.preloadTexture("/eui/Blocks.png"); MinecraftForgeClient.preloadTexture("/eui/Blocks.png");
MinecraftForgeClient.preloadTexture("/eui/Items.png"); MinecraftForgeClient.preloadTexture("/eui/Items.png");
//Blocks //TileEntities..................................
//gen
//machine
ModLoader.registerBlock(machine, net.minecraft.src.eui.ItemMachine.class);
ModLoader.addName((new ItemStack(machine, 1, 0)), "CoalRefiner");
ModLoader.addName((new ItemStack(machine, 1, 1)), "Boiler");
ModLoader.addName((new ItemStack(machine, 1, 2)), "FireBox");
ModLoader.addName((new ItemStack(machine, 1, 3)), "SteamGen");
ModLoader.addName((new ItemStack(machine, 1, 14)), "WaterCondenser");
ModLoader.addName((new ItemStack(machine, 1, 15)), "EUVampire");
ModLoader.registerTileEntity(net.minecraft.src.eui.grinder.TileEntityGrinder.class, "grinder");
ModLoader.registerTileEntity(net.minecraft.src.eui.boiler.TileEntityBoiler.class, "boiler"); ModLoader.registerTileEntity(net.minecraft.src.eui.boiler.TileEntityBoiler.class, "boiler");
ModLoader.registerTileEntity(net.minecraft.src.eui.burner.TileEntityFireBox.class, "fireBox"); ModLoader.registerTileEntity(net.minecraft.src.eui.burner.TileEntityFireBox.class, "fireBox");
ModLoader.registerTileEntity(net.minecraft.src.eui.turbine.TileEntityGenerator.class, "generator"); ModLoader.registerTileEntity(net.minecraft.src.eui.turbine.TileEntityGenerator.class, "generator");
ModLoader.registerTileEntity(net.minecraft.src.eui.TileEntityCondenser.class, "waterPump");
ModLoader.registerTileEntity(net.minecraft.src.eui.TileEntityNuller.class, "EUNuller"); ModLoader.registerTileEntity(net.minecraft.src.eui.TileEntityNuller.class, "EUNuller");
//Items //Names...............
ModLoader.addName((new ItemStack(machine, 1, 1)), "Boiler");
ModLoader.addName((new ItemStack(machine, 1, 2)), "FireBox");
ModLoader.addName((new ItemStack(machine, 1, 3)), "SteamGen");
ModLoader.addName((new ItemStack(machine, 1, 15)), "EUVampire");
ModLoader.addName((new ItemStack(coalNugget, 1, 0)), "CoalNuggets"); ModLoader.addName((new ItemStack(coalNugget, 1, 0)), "CoalNuggets");
ModLoader.addName((new ItemStack(coalNugget, 1, 1)), "CoalPellets"); ModLoader.addName((new ItemStack(coalNugget, 1, 1)), "CoalPellets");
ModLoader.addName((new ItemStack(coalNugget, 1, 2)), "CoalDust"); ModLoader.addName((new ItemStack(coalNugget, 1, 2)), "CoalDust");
//fuels
//Crafting //Crafting
/**
ModLoader.addRecipe(new ItemStack(machine, 1, 0), new Object [] {"@S@", "SCW", "@S@", * case 0: return new TileEntityGrinder(); <-Removed
'S',BasicComponents.ItemSteelIngot, case 1: return new TileEntityBoiler();
case 2: return new TileEntityFireBox();
case 3: return new TileEntityGenerator();
case 14: return new TileEntityCondenser();<-Removed
case 15: return new TileEntityNuller();<-Just for testing Not craftable
*/
ModLoader.addRecipe(new ItemStack(machine, 1, 1), new Object [] {"@T@", "OVO", "@T@",
'T',new ItemStack(mod_BasicPipes.parts, 1,5),
'@',new ItemStack(BasicComponents.ItemSteelPlate), '@',new ItemStack(BasicComponents.ItemSteelPlate),
'C',new ItemStack(BasicComponents.ItemCircuit,1,1), 'O',new ItemStack(mod_BasicPipes.parts, 1,1),
'W',BasicComponents.ItemCopperWire}); 'V',new ItemStack(mod_BasicPipes.parts, 1,6)});
/**ModLoader.addRecipe(new ItemStack(machine, 1, 1), new Object [] {"@T@", "OVO", "@T@",
'T',new ItemStack(parts, 1,1),
'@',new ItemStack(UniversalComponents.ItemSteelPlate),
'O',new ItemStack(parts, 1,4),
'V',new ItemStack(parts, 1,3)});
ModLoader.addRecipe(new ItemStack(machine, 1, 2), new Object [] { "@", "F", ModLoader.addRecipe(new ItemStack(machine, 1, 2), new Object [] { "@", "F",
'F',Block.stoneOvenIdle, 'F',Block.stoneOvenIdle,
'@',new ItemStack(UniversalComponents.ItemSteelPlate)}); '@',new ItemStack(BasicComponents.ItemSteelPlate)});
ModLoader.addRecipe(new ItemStack(machine, 1, 3), new Object [] {"@T@", "PMP", "@T@", ModLoader.addRecipe(new ItemStack(machine, 1, 3), new Object [] {"@T@", "PMP", "@T@",
'T',new ItemStack(parts, 1,4), 'T',new ItemStack(mod_BasicPipes.parts, 1,0),
'@',new ItemStack(UniversalComponents.ItemSteelPlate), '@',new ItemStack(BasicComponents.ItemSteelPlate),
'P',Block.pistonBase, 'P',Block.pistonBase,
'M',new ItemStack(UniversalComponents.ItemMotor)});**/ 'M',new ItemStack(BasicComponents.ItemMotor)});
//smelting
} }