From ba1a5d599572c5b7d488f3bc01a5bb631332c9ec Mon Sep 17 00:00:00 2001 From: Robert S Date: Wed, 13 Aug 2014 11:30:55 -0400 Subject: [PATCH] Updated remaining model path names --- .../archaic/fluid/gutter/TileGutter.java | 2 +- .../archaic/process/RenderCastingMold.java | 2 +- .../machine/boiler/RenderNuclearBoiler.java | 2 +- .../machine/centrifuge/RenderCentrifuge.java | 2 +- .../extractor/RenderChemicalExtractor.java | 2 +- .../machine/plasma/RenderPlasmaHeater.java | 2 +- .../quantum/RenderQuantumAssembler.java | 2 +- .../machine/reactor/RenderReactorCell.java | 6 +++--- .../core/ResonantInduction.scala | 16 +++++++++------- .../electrical/MultipartElectrical.java | 18 ++++++++++-------- .../electrical/generator/RenderMotor.java | 2 +- .../laser/emitter/RenderLaserEmitter.scala | 2 +- .../focus/crystal/RenderFocusCrystal.scala | 2 +- .../electrical/levitator/RenderLevitator.java | 2 +- .../transformer/RenderTransformer.java | 2 +- .../mechanical/fluid/pipe/RenderPipe.java | 2 +- .../mechanical/fluid/transport/RenderPump.java | 4 ++-- .../crusher/RenderMechanicalPiston.java | 2 +- .../process/grinder/RenderGrindingWheel.java | 2 +- .../mechanical/process/mixer/RenderMixer.java | 2 +- .../turbine/RenderElectricTurbine.java | 4 ++-- .../mechanical/turbine/RenderWaterTurbine.java | 2 +- .../mechanical/turbine/RenderWindTurbine.java | 2 +- 23 files changed, 44 insertions(+), 40 deletions(-) diff --git a/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java b/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java index a1e68c0d4..a33334267 100644 --- a/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java +++ b/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java @@ -310,7 +310,7 @@ public class TileGutter extends TilePressureNode { if(MODEL == null) { - MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(),Reference.modelDirectory() + "gutter.tcn")); + MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(),Reference.modelPath() + "gutter.tcn")); } if (TEXTURE == null) { diff --git a/src/main/scala/resonantinduction/archaic/process/RenderCastingMold.java b/src/main/scala/resonantinduction/archaic/process/RenderCastingMold.java index 594c05f3d..b92e0198f 100644 --- a/src/main/scala/resonantinduction/archaic/process/RenderCastingMold.java +++ b/src/main/scala/resonantinduction/archaic/process/RenderCastingMold.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class RenderCastingMold extends TileEntitySpecialRenderer { public static RenderCastingMold INSTANCE = new RenderCastingMold(); - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "castingMold.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "castingMold.tcn")); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float var8) diff --git a/src/main/scala/resonantinduction/atomic/machine/boiler/RenderNuclearBoiler.java b/src/main/scala/resonantinduction/atomic/machine/boiler/RenderNuclearBoiler.java index 1478ada90..9e6fd264d 100644 --- a/src/main/scala/resonantinduction/atomic/machine/boiler/RenderNuclearBoiler.java +++ b/src/main/scala/resonantinduction/atomic/machine/boiler/RenderNuclearBoiler.java @@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderNuclearBoiler extends TileEntitySpecialRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "nuclearBoiler.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "nuclearBoiler.tcn")); public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "nuclearBoiler.png"); public void renderAModelAt(TileNuclearBoiler tileEntity, double x, double y, double z, float f) diff --git a/src/main/scala/resonantinduction/atomic/machine/centrifuge/RenderCentrifuge.java b/src/main/scala/resonantinduction/atomic/machine/centrifuge/RenderCentrifuge.java index 99ad32914..92d5a313b 100644 --- a/src/main/scala/resonantinduction/atomic/machine/centrifuge/RenderCentrifuge.java +++ b/src/main/scala/resonantinduction/atomic/machine/centrifuge/RenderCentrifuge.java @@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderCentrifuge extends TileEntitySpecialRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelDirectory() + "centrifuge.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(),Reference.modelPath() + "centrifuge.tcn")); public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "centrifuge.png"); public void render(TileCentrifuge tileEntity, double x, double y, double z, float f) diff --git a/src/main/scala/resonantinduction/atomic/machine/extractor/RenderChemicalExtractor.java b/src/main/scala/resonantinduction/atomic/machine/extractor/RenderChemicalExtractor.java index c028d873a..68c4d6345 100644 --- a/src/main/scala/resonantinduction/atomic/machine/extractor/RenderChemicalExtractor.java +++ b/src/main/scala/resonantinduction/atomic/machine/extractor/RenderChemicalExtractor.java @@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderChemicalExtractor extends TileEntitySpecialRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelDirectory() + "chemicalExtractor.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelPath() + "chemicalExtractor.tcn")); public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "chemicalExtractor.png"); public void render(TileChemicalExtractor tileEntity, double x, double y, double z, float f) diff --git a/src/main/scala/resonantinduction/atomic/machine/plasma/RenderPlasmaHeater.java b/src/main/scala/resonantinduction/atomic/machine/plasma/RenderPlasmaHeater.java index caba24bbd..9e4a70ea0 100644 --- a/src/main/scala/resonantinduction/atomic/machine/plasma/RenderPlasmaHeater.java +++ b/src/main/scala/resonantinduction/atomic/machine/plasma/RenderPlasmaHeater.java @@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderPlasmaHeater extends RenderTaggedTile { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelDirectory() + "fusionReactor.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelPath() + "fusionReactor.tcn")); public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "fusionReactor.png"); @Override diff --git a/src/main/scala/resonantinduction/atomic/machine/quantum/RenderQuantumAssembler.java b/src/main/scala/resonantinduction/atomic/machine/quantum/RenderQuantumAssembler.java index 88cf211df..234d5a7f4 100644 --- a/src/main/scala/resonantinduction/atomic/machine/quantum/RenderQuantumAssembler.java +++ b/src/main/scala/resonantinduction/atomic/machine/quantum/RenderQuantumAssembler.java @@ -20,7 +20,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderQuantumAssembler extends TileEntitySpecialRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "quantumAssembler.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "quantumAssembler.tcn")); public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "quantumAssembler.png"); private final RenderBlocks renderBlocks = new RenderBlocks(); diff --git a/src/main/scala/resonantinduction/atomic/machine/reactor/RenderReactorCell.java b/src/main/scala/resonantinduction/atomic/machine/reactor/RenderReactorCell.java index 57ffe4ea9..28b4f1009 100644 --- a/src/main/scala/resonantinduction/atomic/machine/reactor/RenderReactorCell.java +++ b/src/main/scala/resonantinduction/atomic/machine/reactor/RenderReactorCell.java @@ -17,9 +17,9 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderReactorCell extends TileEntitySpecialRenderer { - public static final IModelCustom MODEL_TOP = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "reactorCellTop.tcn")); - public static final IModelCustom MODEL_MIDDLE = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "reactorCellMiddle.tcn")); - public static final IModelCustom MODEL_BOTTOM = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "reactorCellBottom.tcn")); + public static final IModelCustom MODEL_TOP = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "reactorCellTop.tcn")); + public static final IModelCustom MODEL_MIDDLE = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "reactorCellMiddle.tcn")); + public static final IModelCustom MODEL_BOTTOM = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "reactorCellBottom.tcn")); public static final ResourceLocation TEXTURE_TOP = new ResourceLocation(Reference.domain(), Reference.modelPath() + "reactorCellTop.png"); public static final ResourceLocation TEXTURE_MIDDLE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "reactorCellMiddle.png"); diff --git a/src/main/scala/resonantinduction/core/ResonantInduction.scala b/src/main/scala/resonantinduction/core/ResonantInduction.scala index 325cbaa8e..aea09fed3 100644 --- a/src/main/scala/resonantinduction/core/ResonantInduction.scala +++ b/src/main/scala/resonantinduction/core/ResonantInduction.scala @@ -61,13 +61,15 @@ object ResonantInduction @EventHandler def init(evt: FMLInitializationEvent) { - metadata.modId = Reference.name - metadata.name = Reference.name - metadata.description = Reference.name + " is a mod... TODO add description" - metadata.url = "http://calclavia.com/resonant-induction/" - metadata.version = Reference.version + Reference.build - metadata.authorList = List[String]("Calclavia", "DarkCow", "tgame14", "Maxwolf") - metadata.autogenerated = false + if(ResonantInduction.metadata != null) { + ResonantInduction.metadata.modId = Reference.name + ResonantInduction.metadata.name = Reference.name + ResonantInduction.metadata.description = Reference.name + " is a mod... TODO add description" + ResonantInduction.metadata.url = "http://calclavia.com/resonant-induction/" + ResonantInduction.metadata.version = Reference.version + Reference.build + ResonantInduction.metadata.authorList = List[String]("Calclavia", "DarkCow", "tgame14", "Maxwolf") + ResonantInduction.metadata.autogenerated = false + } ResourceGenerator.generateOreResources() proxy.init() diff --git a/src/main/scala/resonantinduction/electrical/MultipartElectrical.java b/src/main/scala/resonantinduction/electrical/MultipartElectrical.java index 22fbf5457..dfc76bb4b 100644 --- a/src/main/scala/resonantinduction/electrical/MultipartElectrical.java +++ b/src/main/scala/resonantinduction/electrical/MultipartElectrical.java @@ -8,6 +8,8 @@ import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; import codechicken.multipart.TMultiPart; +import resonantinduction.electrical.wire.flat.PartFlatSwitchWire; +import resonantinduction.electrical.wire.flat.PartFlatWire; public class MultipartElectrical implements IPartFactory { @@ -19,11 +21,11 @@ public class MultipartElectrical implements IPartFactory { MultiPartRegistry.registerParts(this, PART_TYPES); //MultipartGenerator.registerPassThroughInterface("universalelectricity.api.electricity.IVoltageOutput"); - MultipartGenerator.registerTrait("IQuantumGate", "TraitQuantumGate"); + //MultipartGenerator.registerTrait("IQuantumGate", "TraitQuantumGate"); //MultipartGenerator.registerTrait("universalelectricity.api.energy.IConductor", "TraitConductor"); //TODO check if traits are already registered - MultipartGenerator.registerTrait("cofh.api.energy.IEnergyHandler", "TraitEnergyHandler"); - MultipartGenerator.registerTrait("ic2.api.energy.tile.IEnergySink", "TraitEnergySink"); + //MultipartGenerator.registerTrait("cofh.api.energy.IEnergyHandler", "TraitEnergyHandler"); + //MultipartGenerator.registerTrait("ic2.api.energy.tile.IEnergySink", "TraitEnergySink"); } @Override @@ -33,11 +35,11 @@ public class MultipartElectrical implements IPartFactory //return new PartFramedWire(); //else if (name.equals("resonant_induction_switch_wire")) //return new PartFramedSwitchWire(); - //if (name.equals("resonant_induction_flat_wire")) - //return new PartFlatWire(); - //else if (name.equals("resonant_induction_flat_switch_wire")) - //return new PartFlatSwitchWire(); - if (name.equals("resonant_induction_multimeter")) + if (name.equals("resonant_induction_flat_wire")) + return new PartFlatWire(); + else if (name.equals("resonant_induction_flat_switch_wire")) + return new PartFlatSwitchWire(); + else if (name.equals("resonant_induction_multimeter")) return new PartMultimeter(); else if (name.equals("resonant_induction_transformer")) return new PartElectricTransformer(); diff --git a/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java b/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java index 674142d02..aa84c6d73 100644 --- a/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java +++ b/src/main/scala/resonantinduction/electrical/generator/RenderMotor.java @@ -21,7 +21,7 @@ import resonantinduction.core.Reference; */ public class RenderMotor extends TileEntitySpecialRenderer implements ISimpleItemRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelDirectory() + "generator.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelPath() + "generator.tcn")); public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "generator.png"); @Override diff --git a/src/main/scala/resonantinduction/electrical/laser/emitter/RenderLaserEmitter.scala b/src/main/scala/resonantinduction/electrical/laser/emitter/RenderLaserEmitter.scala index e4689a765..d640ba50d 100644 --- a/src/main/scala/resonantinduction/electrical/laser/emitter/RenderLaserEmitter.scala +++ b/src/main/scala/resonantinduction/electrical/laser/emitter/RenderLaserEmitter.scala @@ -17,7 +17,7 @@ import resonantinduction.core.Reference @SideOnly(Side.CLIENT) object RenderLaserEmitter extends TileEntitySpecialRenderer { - val model = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain, Reference.modelDirectory + "laserEmitter.tcn")) + val model = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain, Reference.modelPath + "laserEmitter.tcn")) val texture = new ResourceLocation(Reference.domain, Reference.modelPath + "laserEmitter.png") def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) diff --git a/src/main/scala/resonantinduction/electrical/laser/focus/crystal/RenderFocusCrystal.scala b/src/main/scala/resonantinduction/electrical/laser/focus/crystal/RenderFocusCrystal.scala index 3fe283ff3..029158ce1 100644 --- a/src/main/scala/resonantinduction/electrical/laser/focus/crystal/RenderFocusCrystal.scala +++ b/src/main/scala/resonantinduction/electrical/laser/focus/crystal/RenderFocusCrystal.scala @@ -16,7 +16,7 @@ import resonantinduction.core.Reference @SideOnly(Side.CLIENT) object RenderFocusCrystal extends TileEntitySpecialRenderer { - val model = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain, Reference.modelDirectory + "focusCrystal.tcn")) + val model = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain, Reference.modelPath + "focusCrystal.tcn")) val texture = new ResourceLocation(Reference.domain, Reference.modelPath + "focusCrystal.png") def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) diff --git a/src/main/scala/resonantinduction/electrical/levitator/RenderLevitator.java b/src/main/scala/resonantinduction/electrical/levitator/RenderLevitator.java index 2c5918f9d..6d58bf291 100644 --- a/src/main/scala/resonantinduction/electrical/levitator/RenderLevitator.java +++ b/src/main/scala/resonantinduction/electrical/levitator/RenderLevitator.java @@ -17,7 +17,7 @@ public class RenderLevitator implements ISimpleItemRenderer { public static final RenderLevitator INSTANCE = new RenderLevitator(); - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "levitator.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "levitator.tcn")); public static final ResourceLocation TEXTURE_ON = new ResourceLocation(Reference.domain(), Reference.modelPath() + "levitator_on.png"); public static final ResourceLocation TEXTURE_OFF = new ResourceLocation(Reference.domain(), Reference.modelPath() + "levitator_off.png"); diff --git a/src/main/scala/resonantinduction/electrical/transformer/RenderTransformer.java b/src/main/scala/resonantinduction/electrical/transformer/RenderTransformer.java index f1d0ee43f..1cdc49a26 100644 --- a/src/main/scala/resonantinduction/electrical/transformer/RenderTransformer.java +++ b/src/main/scala/resonantinduction/electrical/transformer/RenderTransformer.java @@ -19,7 +19,7 @@ public class RenderTransformer implements ISimpleItemRenderer { public static final RenderTransformer INSTANCE = new RenderTransformer(); - public static final WavefrontObject MODEL = (WavefrontObject) AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "transformer.obj")); + public static final WavefrontObject MODEL = (WavefrontObject) AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "transformer.obj")); public static final ResourceLocation TEXTURE_COIL = new ResourceLocation(Reference.domain(), Reference.modelPath() + "transformer_winding.png"); public static final ResourceLocation TEXTURE_STONE = new ResourceLocation(Reference.blockTextureDirectory() + "stone.png"); public static final ResourceLocation TEXTURE_IRON = new ResourceLocation(Reference.blockTextureDirectory() + "iron_block.png"); diff --git a/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java b/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java index 573279feb..228a28689 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java @@ -26,7 +26,7 @@ public class RenderPipe implements ISimpleItemRenderer { public static final RenderPipe INSTANCE = new RenderPipe(); - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelDirectory() + "pipe.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelPath() + "pipe.tcn")); public static ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "pipe.png"); public void render(PartPipe part, double x, double y, double z, float f) diff --git a/src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java b/src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java index 89d7a5eb0..819f7697f 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java @@ -16,8 +16,8 @@ import resonantinduction.core.Reference; public class RenderPump extends TileEntitySpecialRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "pump.tcn")); - public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "pump.png"); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "pump.tcn")); + public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "pump.png"); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) diff --git a/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java b/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java index 15107b78f..5298b3d92 100644 --- a/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java +++ b/src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderMechanicalPiston extends TileEntitySpecialRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelDirectory() + "piston/mechanicalPiston.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelPath() + "piston/mechanicalPiston.tcn")); public static ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "piston/mechanicalPiston_iron.png"); @Override diff --git a/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java b/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java index 89654ad40..23ae4c5a1 100644 --- a/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java +++ b/src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java @@ -23,7 +23,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderGrindingWheel extends TileEntitySpecialRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelDirectory() + "grinder.obj")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.modelPath() + "grinder.obj")); @Override public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f) diff --git a/src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java b/src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java index 9523f4078..55ac2e13b 100644 --- a/src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java +++ b/src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java @@ -27,7 +27,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderMixer extends TileEntitySpecialRenderer implements ISimpleItemRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(),Reference.modelDirectory() + "mixer.tcn")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(),Reference.modelPath() + "mixer.tcn")); public static ResourceLocation TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "mixer.png"); @Override diff --git a/src/main/scala/resonantinduction/mechanical/turbine/RenderElectricTurbine.java b/src/main/scala/resonantinduction/mechanical/turbine/RenderElectricTurbine.java index 90a090971..a85dbbec8 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/RenderElectricTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/turbine/RenderElectricTurbine.java @@ -16,8 +16,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderElectricTurbine extends TileEntitySpecialRenderer { - public static final IModelCustom MODEL_SMALL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(),Reference.modelDirectory() + "turbineSmall.tcn")); - public static final IModelCustom MODEL_LARGE = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(),Reference.modelDirectory() + "turbineLarge.tcn")); + public static final IModelCustom MODEL_SMALL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(),Reference.modelPath() + "turbineSmall.tcn")); + public static final IModelCustom MODEL_LARGE = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(),Reference.modelPath() + "turbineLarge.tcn")); public static final ResourceLocation SMALL_TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "turbineSmall.png"); public static final ResourceLocation LARGE_TEXTURE = new ResourceLocation(Reference.domain(), Reference.modelPath() + "turbineLarge.png"); diff --git a/src/main/scala/resonantinduction/mechanical/turbine/RenderWaterTurbine.java b/src/main/scala/resonantinduction/mechanical/turbine/RenderWaterTurbine.java index 4261fb537..fd508ffea 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/RenderWaterTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/turbine/RenderWaterTurbine.java @@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderWaterTurbine extends TileEntitySpecialRenderer implements ISimpleItemRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "waterTurbines.obj")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "waterTurbines.obj")); @Override public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f) diff --git a/src/main/scala/resonantinduction/mechanical/turbine/RenderWindTurbine.java b/src/main/scala/resonantinduction/mechanical/turbine/RenderWindTurbine.java index f8752ba3c..096e56a2c 100644 --- a/src/main/scala/resonantinduction/mechanical/turbine/RenderWindTurbine.java +++ b/src/main/scala/resonantinduction/mechanical/turbine/RenderWindTurbine.java @@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderWindTurbine extends TileEntitySpecialRenderer implements ISimpleItemRenderer { - public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelDirectory() + "windTurbines.obj")); + public static final IModelCustom MODEL = AdvancedModelLoader.loadModel(new ResourceLocation(Reference.domain(), Reference.modelPath() + "windTurbines.obj")); @Override public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f)