From e51a50148b141e05a5f42083751d033981d7d6aa Mon Sep 17 00:00:00 2001 From: Robert S Date: Wed, 13 Aug 2014 11:03:23 -0400 Subject: [PATCH] Fixed proxies not being created due to wrong paths strings --- src/main/scala/resonantinduction/archaic/Archaic.scala | 4 ++-- src/main/scala/resonantinduction/atomic/Atomic.scala | 2 +- src/main/scala/resonantinduction/electrical/Electrical.scala | 2 +- src/main/scala/resonantinduction/mechanical/Mechanical.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/scala/resonantinduction/archaic/Archaic.scala b/src/main/scala/resonantinduction/archaic/Archaic.scala index 0fa7cae78..7c61466c0 100644 --- a/src/main/scala/resonantinduction/archaic/Archaic.scala +++ b/src/main/scala/resonantinduction/archaic/Archaic.scala @@ -11,7 +11,7 @@ import net.minecraftforge.oredict.{OreDictionary, ShapedOreRecipe} import resonant.content.loader.ModManager import resonant.lib.recipe.UniversalRecipe 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.firebox.{TileFirebox, TileHotPlate} import resonantinduction.archaic.fluid.grate.TileGrate @@ -39,7 +39,7 @@ object Archaic { NetworkRegistry.INSTANCE.registerGuiHandler( this, proxy ) Settings.config.load() 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.blockTurntable = contentRegistry.newBlock( classOf[ TileTurntable ] ) ArchaicBlocks.blockFirebox = contentRegistry.newBlock(classOf[ TileFirebox ] ) diff --git a/src/main/scala/resonantinduction/atomic/Atomic.scala b/src/main/scala/resonantinduction/atomic/Atomic.scala index 2dcba1fc6..e0d862aca 100644 --- a/src/main/scala/resonantinduction/atomic/Atomic.scala +++ b/src/main/scala/resonantinduction/atomic/Atomic.scala @@ -105,7 +105,7 @@ object Atomic { 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") 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 @EventHandler def preInit(event: FMLPreInitializationEvent) { diff --git a/src/main/scala/resonantinduction/electrical/Electrical.scala b/src/main/scala/resonantinduction/electrical/Electrical.scala index e05191987..e90370431 100644 --- a/src/main/scala/resonantinduction/electrical/Electrical.scala +++ b/src/main/scala/resonantinduction/electrical/Electrical.scala @@ -40,7 +40,7 @@ object Electrical { var INSTANCE = this - @SidedProxy(clientSide = "ClientProxy", serverSide = "CommonProxy") + @SidedProxy(clientSide = "resonantinduction.electrical.ClientProxy", serverSide = "resonantinduction.electrical.CommonProxy") var proxy: CommonProxy = null @Mod.Metadata("ResonantInduction|Electrical") diff --git a/src/main/scala/resonantinduction/mechanical/Mechanical.java b/src/main/scala/resonantinduction/mechanical/Mechanical.java index 51d51ffe5..c5932782e 100644 --- a/src/main/scala/resonantinduction/mechanical/Mechanical.java +++ b/src/main/scala/resonantinduction/mechanical/Mechanical.java @@ -49,7 +49,7 @@ import java.sql.Ref; * * @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 { /** Mod Information */ @@ -59,7 +59,7 @@ public class Mechanical @Instance(ID) public static Mechanical INSTANCE; - @SidedProxy(clientSide = "ClientProxy", serverSide = "CommonProxy") + @SidedProxy(clientSide = "resonantinduction.mechanical.ClientProxy", serverSide = "resonantinduction.mechanical.CommonProxy") public static CommonProxy proxy; @Mod.Metadata(ID)