tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed proxies not being created due to wrong paths strings

Browse source
This commit is contained in:
Robert S 2014-08-13 11:03:23 -04:00
parent 6999a77cfd
commit e51a50148b
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/scala/resonantinduction/archaic/Archaic.scala
View file

@ -11,7 +11,7 @@ import net.minecraftforge.oredict.{OreDictionary, ShapedOreRecipe}
import resonant.content.loader.ModManager import resonant.content.loader.ModManager
import resonant.lib.recipe.UniversalRecipe import resonant.lib.recipe.UniversalRecipe
import resonantinduction.archaic.blocks.{ItemImprint, TileImprinter, TileTurntable} import resonantinduction.archaic.blocks.{ItemImprint, TileImprinter, TileTurntable}
import resonantinduction.archaic.crate.{BlockCrate, CrateRecipe, ItemBlockCrate, TileCrate} import resonantinduction.archaic.crate.CrateRecipe
import resonantinduction.archaic.engineering.{ItemHammer, TileEngineeringTable} import resonantinduction.archaic.engineering.{ItemHammer, TileEngineeringTable}
import resonantinduction.archaic.firebox.{TileFirebox, TileHotPlate} import resonantinduction.archaic.firebox.{TileFirebox, TileHotPlate}
import resonantinduction.archaic.fluid.grate.TileGrate import resonantinduction.archaic.fluid.grate.TileGrate
@ -39,7 +39,7 @@ object Archaic {
NetworkRegistry.INSTANCE.registerGuiHandler( this, proxy ) NetworkRegistry.INSTANCE.registerGuiHandler( this, proxy )
Settings.config.load() Settings.config.load()
ArchaicBlocks.blockEngineeringTable = contentRegistry.newBlock(classOf[ TileEngineeringTable]) ArchaicBlocks.blockEngineeringTable = contentRegistry.newBlock(classOf[ TileEngineeringTable])
ArchaicBlocks.blockCrate = contentRegistry.newBlock( classOf[ BlockCrate ], classOf[ ItemBlockCrate ], classOf[ TileCrate ] ) //ArchaicBlocks.blockCrate = contentRegistry.newBlock( classOf[ BlockCrate ], classOf[ ItemBlockCrate ], classOf[ TileCrate ] )
ArchaicBlocks.blockImprinter = contentRegistry.newBlock(classOf[ TileImprinter ] ) ArchaicBlocks.blockImprinter = contentRegistry.newBlock(classOf[ TileImprinter ] )
ArchaicBlocks.blockTurntable = contentRegistry.newBlock( classOf[ TileTurntable ] ) ArchaicBlocks.blockTurntable = contentRegistry.newBlock( classOf[ TileTurntable ] )
ArchaicBlocks.blockFirebox = contentRegistry.newBlock(classOf[ TileFirebox ] ) ArchaicBlocks.blockFirebox = contentRegistry.newBlock(classOf[ TileFirebox ] )

2
src/main/scala/resonantinduction/atomic/Atomic.scala
View file

@ -105,7 +105,7 @@ object Atomic {
final val contentRegistry: ModManager = new ModManager().setPrefix(Reference.prefix).setTab(ResonantTab.tab) final val contentRegistry: ModManager = new ModManager().setPrefix(Reference.prefix).setTab(ResonantTab.tab)
private final val SUPPORTED_LANGUAGES: Array[String] = Array[String]("en_US", "pl_PL", "de_DE", "ru_RU") private final val SUPPORTED_LANGUAGES: Array[String] = Array[String]("en_US", "pl_PL", "de_DE", "ru_RU")
var INSTANCE = this var INSTANCE = this
@SidedProxy(clientSide = "ClientProxy", serverSide = "CommonProxy") var proxy: CommonProxy = null @SidedProxy(clientSide = "resonantinduction.atomic.ClientProxy", serverSide = "resonantinduction.atomic.CommonProxy") var proxy: CommonProxy = null
@Mod.Metadata("ResonantInduction|Atomic") var metadata: ModMetadata = null @Mod.Metadata("ResonantInduction|Atomic") var metadata: ModMetadata = null
@EventHandler def preInit(event: FMLPreInitializationEvent) { @EventHandler def preInit(event: FMLPreInitializationEvent) {

2
src/main/scala/resonantinduction/electrical/Electrical.scala
View file

@ -40,7 +40,7 @@ object Electrical {
var INSTANCE = this var INSTANCE = this
@SidedProxy(clientSide = "ClientProxy", serverSide = "CommonProxy") @SidedProxy(clientSide = "resonantinduction.electrical.ClientProxy", serverSide = "resonantinduction.electrical.CommonProxy")
var proxy: CommonProxy = null var proxy: CommonProxy = null
@Mod.Metadata("ResonantInduction|Electrical") @Mod.Metadata("ResonantInduction|Electrical")

4
src/main/scala/resonantinduction/mechanical/Mechanical.java
View file

@ -49,7 +49,7 @@ import java.sql.Ref;
* *
* @author DarkCow, Calclavia * @author DarkCow, Calclavia
*/ */
@Mod(modid = Mechanical.ID, name = "Resonant Induction Mechanical", version = "", dependencies = "before:ThermalExpansion;required-after:ResonantInductionCore;after:ResonantInduction|Archaic", modLanguage = "scala") @Mod(modid = Mechanical.ID, name = "Resonant Induction Mechanical", version = "", dependencies = "before:ThermalExpansion;required-after:ResonantInductionCore;after:ResonantInduction|Archaic")
public class Mechanical public class Mechanical
{ {
/** Mod Information */ /** Mod Information */
@ -59,7 +59,7 @@ public class Mechanical
@Instance(ID) @Instance(ID)
public static Mechanical INSTANCE; public static Mechanical INSTANCE;
@SidedProxy(clientSide = "ClientProxy", serverSide = "CommonProxy") @SidedProxy(clientSide = "resonantinduction.mechanical.ClientProxy", serverSide = "resonantinduction.mechanical.CommonProxy")
public static CommonProxy proxy; public static CommonProxy proxy;
@Mod.Metadata(ID) @Mod.Metadata(ID)