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

Updated remaining model path names

Browse source
This commit is contained in:
Robert S 2014-08-13 11:30:55 -04:00
parent da4e046df5
commit ba1a5d5995
23 changed files with 44 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java
View file

@ -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)
{

2
src/main/scala/resonantinduction/archaic/process/RenderCastingMold.java
View file

@ -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)

2
src/main/scala/resonantinduction/atomic/machine/boiler/RenderNuclearBoiler.java
View file

@ -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)

2
src/main/scala/resonantinduction/atomic/machine/centrifuge/RenderCentrifuge.java
View file

@ -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)

2
src/main/scala/resonantinduction/atomic/machine/extractor/RenderChemicalExtractor.java
View file

@ -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)

2
src/main/scala/resonantinduction/atomic/machine/plasma/RenderPlasmaHeater.java
View file

@ -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

2
src/main/scala/resonantinduction/atomic/machine/quantum/RenderQuantumAssembler.java
View file

@ -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();

6
src/main/scala/resonantinduction/atomic/machine/reactor/RenderReactorCell.java
View file

@ -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");

16
src/main/scala/resonantinduction/core/ResonantInduction.scala
View file

@ -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()

18
src/main/scala/resonantinduction/electrical/MultipartElectrical.java
View file

@ -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();

2
src/main/scala/resonantinduction/electrical/generator/RenderMotor.java
View file

@ -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

2
src/main/scala/resonantinduction/electrical/laser/emitter/RenderLaserEmitter.scala
View file

@ -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)

2
src/main/scala/resonantinduction/electrical/laser/focus/crystal/RenderFocusCrystal.scala
View file

@ -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)

2
src/main/scala/resonantinduction/electrical/levitator/RenderLevitator.java
View file

@ -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");

2
src/main/scala/resonantinduction/electrical/transformer/RenderTransformer.java
View file

@ -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");

2
src/main/scala/resonantinduction/mechanical/fluid/pipe/RenderPipe.java
View file

@ -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)

4
src/main/scala/resonantinduction/mechanical/fluid/transport/RenderPump.java
View file

@ -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)

2
src/main/scala/resonantinduction/mechanical/process/crusher/RenderMechanicalPiston.java
View file

@ -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

2
src/main/scala/resonantinduction/mechanical/process/grinder/RenderGrindingWheel.java
View file

@ -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)

2
src/main/scala/resonantinduction/mechanical/process/mixer/RenderMixer.java
View file

@ -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

4
src/main/scala/resonantinduction/mechanical/turbine/RenderElectricTurbine.java
View file

@ -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");

2
src/main/scala/resonantinduction/mechanical/turbine/RenderWaterTurbine.java
View file

@ -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)

2
src/main/scala/resonantinduction/mechanical/turbine/RenderWindTurbine.java
View file

@ -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)