Skip to content

Commit

Permalink
Manual Work
Browse files Browse the repository at this point in the history
continues #14
  • Loading branch information
pauljoda committed Mar 2, 2015
1 parent 55e2ed9 commit 90a92fc
Show file tree
Hide file tree
Showing 5 changed files with 332 additions and 23 deletions.
22 changes: 11 additions & 11 deletions src/main/java/com/dyonovan/modernalchemy/handlers/BlockHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ public static void init() {
GameRegistry.registerBlock(blockFluidAir, "blockFluidAir");

//Ore Actinium
registerBlock(blockOreActinium = new BlockOreActinium(), "oreActinium", null);
registerBlock(blockOreActinium = new BlockOreActinium(), "blockOreActinium", null);

//Ore Copper
registerBlock(blockOreCopper = new BlockOreCopper(), "oreCopper", null);
registerBlock(blockOreCopper = new BlockOreCopper(), "blockOreCopper", null);
OreDictionary.registerOre("oreCopper", new ItemStack(blockOreCopper));

//BlockElectricBellows
Expand All @@ -80,25 +80,25 @@ public static void init() {
registerBlock(blockAmalgamator = new BlockAmalgamator(), "blockAmalgamator", TileAmalgamator.class);

// Block Pattern Recorder
registerBlock(blockPatternRecorder = new BlockPatternRecorder(), "patternRecorder", TilePatternRecorder.class);
registerBlock(blockPatternRecorder = new BlockPatternRecorder(), "blockPatternRecorder", TilePatternRecorder.class);

//ArcFurnaceCore
registerBlock(blockArcFurnaceCore = new BlockArcFurnaceCore(), "arcFurnaceCore", TileArcFurnaceCore.class);
registerBlock(blockArcFurnaceCore = new BlockArcFurnaceCore(), "blockArcFurnaceCore", TileArcFurnaceCore.class);

//ArcFurnaceDummy
registerBlock(blockArcFurnaceDummy = new BlockDummy("arcFurnaceDummy"), "arcFurnaceDummy", TileDummy.class);
registerBlock(blockArcFurnaceDummy = new BlockDummy("blockArcFurnaceDummy"), "blockArcFurnaceDummy", TileDummy.class);

//ArcFurnaceDummy Energy
registerBlock(blockArcFurnaceDummyEnergy = new BlockDummyEnergyReciever("arcFurnaceDummyEnergy"), "arcFurnaceDummyEnergy", TileDummyEnergyReciever.class);
registerBlock(blockArcFurnaceDummyEnergy = new BlockDummyEnergyReciever("blockArcFurnaceDummyEnergy"), "blockArcFurnaceDummyEnergy", TileDummyEnergyReciever.class);

//ArcFurnaceDummyItemIO
registerBlock(blockArcFurnaceDummyItemIO = new BlockItemIODummy("arcFurnaceDummyItemIO"), "arcFurnaceDummyItemIO", TileDummyItemIO.class);
registerBlock(blockArcFurnaceDummyItemIO = new BlockItemIODummy("blockArcFurnaceDummyItemIO"), "blockArcFurnaceDummyItemIO", TileDummyItemIO.class);

//ArcFurnaceDummyAirValue
registerBlock(blockArcFurnaceDummyAirValve = new BlockDummyAirValve("arcFurnaceDummyAirValve"), "arcFurnaceDummyAirValve", TileDummyAirValve.class);
registerBlock(blockArcFurnaceDummyAirValve = new BlockDummyAirValve("blockArcFurnaceDummyAirValve"), "blockArcFurnaceDummyAirValve", TileDummyAirValve.class);

//ArcFurnaceDummyOutputValue
registerBlock(blockArcFurnaceDummyOutputValve = new BlockDummyOutputValve("arcFurnaceDummyOutputValve"), "arcFurnaceDummyOutputValve", TileDummyOutputValve.class);
registerBlock(blockArcFurnaceDummyOutputValve = new BlockDummyOutputValve("blockArcFurnaceDummyOutputValve"), "blockArcFurnaceDummyOutputValve", TileDummyOutputValve.class);

//Tesla Base
registerBlock(blockTeslaBase = new BlockTeslaBase(), "blockTeslaBase", TileTeslaBase.class);
Expand All @@ -107,7 +107,7 @@ public static void init() {
registerBlock(blockTeslaStand = new BlockTeslaStand(), "blockTeslaStand", TileTeslaStand.class);

//Tesla Coil
registerBlock(blockCoil = new BlockTeslaCoil(), "blockCoil", TileTeslaCoil.class);
registerBlock(blockCoil = new BlockTeslaCoil(), "blockTeslaCoil", TileTeslaCoil.class);

//BlockFrameEnergy
registerBlock(blockReplicatorCPU = new BlockReplicatorCPU(), "blockReplicatorCPU", TileReplicatorCPU.class);
Expand All @@ -119,7 +119,7 @@ public static void init() {
registerBlock(blockReplicatorStand = new BlockReplicatorStand(), "blockReplicatorStand", TileReplicatorStand.class);

//BlockFurnace
registerBlock(blockAdvancedFurnace = new BlockAdvancedCrafter(), "blockAdvancedFurnace", TileAdvancedCrafter.class);
registerBlock(blockAdvancedFurnace = new BlockAdvancedCrafter(), "blockAdvancedCrafter", TileAdvancedCrafter.class);
}

public static void registerBlock(Block registerBlock, String name, Class<? extends TileEntity> tileEntity) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package com.dyonovan.modernalchemy.manual.component;

import com.dyonovan.modernalchemy.handlers.BlockHandler;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
Expand Down
16 changes: 11 additions & 5 deletions src/main/resources/assets/modernalchemy/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@ tile.modernalchemy:blockTeslaStand.name=Tesla Coil Stand
tile.modernalchemy:fluidCompressedAir.name=Compressed Air
tile.modernalchemy:fluidActinium.name=Molten Actinium
tile.modernalchemy:blockOreActinium.name=Actinium Ore
tile.modernalchemy:arcFurnaceDummy.name=Arc Furnace Casing
tile.modernalchemy:blockArcFurnaceDummy.name=Arc Furnace Casing
tile.modernalchemy:blockArcFurnaceCore.name=Arc Furnace Processor
tile.modernalchemy:blockElectricBellows.name=Electric Bellows
tile.modernalchemy:blockAmalgamator.name=Amalgamator
tile.modernalchemy:blockPatternRecorder.name=Pattern Recorder
tile.modernalchemy:arcFurnaceDummyOutputValue.name=Arc Furnace Output Valve
tile.modernalchemy:arcFurnaceDummyItemIO.name=Arc Furnace Item I/O
tile.modernalchemy:arcFurnaceDummyEnergy.name=Arc Furnace Energy Receiver
tile.modernalchemy:arcFurnaceDummyAirValue.name=Arc Furnace Compressed Air Valve
tile.modernalchemy:blockArcFurnaceDummyOutputValve.name=Arc Furnace Output Valve
tile.modernalchemy:blockArcFurnaceDummyItemIO.name=Arc Furnace Item I/O
tile.modernalchemy:blockArcFurnaceDummyEnergy.name=Arc Furnace Energy Receiver
tile.modernalchemy:blockArcFurnaceDummyAirValve.name=Arc Furnace Compressed Air Valve
tile.modernalchemy:blockTeslaBase.name=Tesla Coil Base
tile.modernalchemy:blockReplicatorFrame.name=Replicator Frame
tile.modernalchemy:blockReplicatorCPU.name=Replicator Controller
tile.modernalchemy:blockReplicatorStand.name=Replicator Stand
tile.modernalchemy:blockAdvancedCrafter.name=Advanced Crafter
tile.modernalchemy:blockCopperOre.name=Copper Ore

item.modernalchemy:pattern.name=Replicator Pattern
item.modernalchemy:bucketActinium.name=Bucket of Actinium
Expand Down Expand Up @@ -48,6 +50,10 @@ mainPage.authors.list=Dyonovan, pauljoda, Dominance, beef
mainPage.categories.header=Categories

blocksPage.title=Blocks
blocksPage.machines=Machines
blocksPage.arcFurnace=Arc Furnace
blockPage.replicator=Replicator
blockPage.teslaCoil=Tesla Coil

pageTeslaCoil.description=The Tesla Coil is a monument of engineering, it will accept RF in through the bottom and convert to Tesla energy and transmit it via its head piece to nearby machines and devices.
pageTeslaCoil.moreInfo=The Tesla Coil has a side effect called death, it will hurt and ignite you if you come in contact with a bolt of energy. To prevent accidental death or personal injury wear a pair of Faraday Armor, bolts also can kill mobs and charge creepers.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"text": "",
"destination": "",
"type": "ITEM_RENDER",
"item": "modernalchemy:blockCoil:0",
"item": "modernalchemy:blockTeslaCoil:0",
"alignment" : 0,
"resource": {
"resourceDomain": "",
Expand Down
Loading

0 comments on commit 90a92fc

Please sign in to comment.