diff --git a/src/main/java/resonantinduction/core/Reference.java b/src/main/java/resonantinduction/core/Reference.java index 9c2566ee..53a14079 100644 --- a/src/main/java/resonantinduction/core/Reference.java +++ b/src/main/java/resonantinduction/core/Reference.java @@ -27,7 +27,6 @@ public class Reference public static final String BLOCK_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + "blocks/"; public static final String ITEM_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + "items/"; public static final String MODEL_PATH = "models/"; - public static final String MODEL_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + MODEL_PATH; public static final String MODEL_DIRECTORY = DIRECTORY + MODEL_PATH; public static final String LANGUAGE_DIRECTORY = DIRECTORY + "languages/"; public static final String[] LANGUAGES = new String[] { "en_US", "de_DE" }; diff --git a/src/main/java/resonantinduction/electrical/levitator/RenderLevitator.java b/src/main/java/resonantinduction/electrical/levitator/RenderLevitator.java index e6896a59..98141494 100644 --- a/src/main/java/resonantinduction/electrical/levitator/RenderLevitator.java +++ b/src/main/java/resonantinduction/electrical/levitator/RenderLevitator.java @@ -18,8 +18,8 @@ public class RenderLevitator extends TileEntitySpecialRenderer implements ICusto { public static final ModelEMContractor MODEL = new ModelEMContractor(false); public static final ModelEMContractor MODEL_SPIN = new ModelEMContractor(true); - public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_TEXTURE_DIRECTORY + "em_contractor.png"); - public static final ResourceLocation TEXTURE_PUSH = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_TEXTURE_DIRECTORY + "em_contractor_push.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "em_contractor.png"); + public static final ResourceLocation TEXTURE_PUSH = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "em_contractor_push.png"); @Override public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f) diff --git a/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java b/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java index 9d5aa627..2a33314e 100644 --- a/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java +++ b/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java @@ -24,7 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class RenderMultimeter { public static final ModelMultimeter MODEL = new ModelMultimeter(); - public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_TEXTURE_DIRECTORY + "multimeter.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "multimeter.png"); @SuppressWarnings("incomplete-switch") public static void render(PartMultimeter tileEntity, double x, double y, double z) diff --git a/src/main/java/resonantinduction/electrical/render/FXElectricBolt.java b/src/main/java/resonantinduction/electrical/render/FXElectricBolt.java index 38f12be0..c9821c8b 100644 --- a/src/main/java/resonantinduction/electrical/render/FXElectricBolt.java +++ b/src/main/java/resonantinduction/electrical/render/FXElectricBolt.java @@ -41,7 +41,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class FXElectricBolt extends EntityFX { - public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_TEXTURE_DIRECTORY + "fadedSphere.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "fadedSphere.png"); public static final ResourceLocation PARTICLE_RESOURCE = new ResourceLocation("textures/particle/particles.png"); /** The width of the electrical bolt. */ diff --git a/src/main/java/resonantinduction/electrical/tesla/RenderTesla.java b/src/main/java/resonantinduction/electrical/tesla/RenderTesla.java index b7053702..55121d4a 100644 --- a/src/main/java/resonantinduction/electrical/tesla/RenderTesla.java +++ b/src/main/java/resonantinduction/electrical/tesla/RenderTesla.java @@ -20,9 +20,9 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderTesla extends TileEntitySpecialRenderer { - public static final ResourceLocation TEXTURE_BOTTOM = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_TEXTURE_DIRECTORY + "tesla_bottom.png"); - public static final ResourceLocation TEXTURE_MIDDLE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_TEXTURE_DIRECTORY + "tesla_middle.png"); - public static final ResourceLocation TEXTURE_TOP = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_TEXTURE_DIRECTORY + "tesla_top.png"); + public static final ResourceLocation TEXTURE_BOTTOM = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "tesla_bottom.png"); + public static final ResourceLocation TEXTURE_MIDDLE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "tesla_middle.png"); + public static final ResourceLocation TEXTURE_TOP = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "tesla_top.png"); public static final ModelTeslaBottom MODEL_BOTTOM = new ModelTeslaBottom(); public static final ModelTeslaMiddle MODEL_MIDDLE = new ModelTeslaMiddle(); public static final ModelTeslaTop MODEL_TOP = new ModelTeslaTop(); diff --git a/src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java b/src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java index a131c619..36d99718 100644 --- a/src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java +++ b/src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java @@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class RenderTransformer { public static final ModelTransformer MODEL = new ModelTransformer(); - public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_TEXTURE_DIRECTORY + "transformer.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "transformer.png"); public static void render(PartTransformer part, double x, double y, double z) { diff --git a/src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java b/src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java index 3344b286..a4c5e77e 100644 --- a/src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java +++ b/src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java @@ -35,7 +35,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderPartWire { - private static final ResourceLocation WIRE_SHINE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_TEXTURE_DIRECTORY + "white.png"); + private static final ResourceLocation WIRE_SHINE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "white.png"); public static final Map models; public static final Map shinyModels; public static Icon wireIcon; diff --git a/src/main/resources/assets/resonantinduction/models/em_contractor.png b/src/main/resources/assets/resonantinduction/models/em_contractor.png new file mode 100644 index 00000000..5ec275b6 Binary files /dev/null and b/src/main/resources/assets/resonantinduction/models/em_contractor.png differ diff --git a/src/main/resources/assets/resonantinduction/models/em_contractor_push.png b/src/main/resources/assets/resonantinduction/models/em_contractor_push.png new file mode 100644 index 00000000..ba10e0e7 Binary files /dev/null and b/src/main/resources/assets/resonantinduction/models/em_contractor_push.png differ diff --git a/src/main/resources/assets/resonantinduction/models/fadedSphere.png b/src/main/resources/assets/resonantinduction/models/fadedSphere.png new file mode 100644 index 00000000..f2f38796 Binary files /dev/null and b/src/main/resources/assets/resonantinduction/models/fadedSphere.png differ diff --git a/src/main/resources/assets/resonantinduction/models/multimeter.png b/src/main/resources/assets/resonantinduction/models/multimeter.png new file mode 100644 index 00000000..869357fc Binary files /dev/null and b/src/main/resources/assets/resonantinduction/models/multimeter.png differ diff --git a/src/main/resources/assets/resonantinduction/models/tesla_bottom.png b/src/main/resources/assets/resonantinduction/models/tesla_bottom.png new file mode 100644 index 00000000..9d24ed37 Binary files /dev/null and b/src/main/resources/assets/resonantinduction/models/tesla_bottom.png differ diff --git a/src/main/resources/assets/resonantinduction/models/tesla_middle.png b/src/main/resources/assets/resonantinduction/models/tesla_middle.png new file mode 100644 index 00000000..574870f0 Binary files /dev/null and b/src/main/resources/assets/resonantinduction/models/tesla_middle.png differ diff --git a/src/main/resources/assets/resonantinduction/models/tesla_top.png b/src/main/resources/assets/resonantinduction/models/tesla_top.png new file mode 100644 index 00000000..3d100f53 Binary files /dev/null and b/src/main/resources/assets/resonantinduction/models/tesla_top.png differ diff --git a/src/main/resources/assets/resonantinduction/models/transformer.png b/src/main/resources/assets/resonantinduction/models/transformer.png new file mode 100644 index 00000000..bc0e5f3d Binary files /dev/null and b/src/main/resources/assets/resonantinduction/models/transformer.png differ diff --git a/src/main/resources/assets/resonantinduction/models/white.png b/src/main/resources/assets/resonantinduction/models/white.png new file mode 100644 index 00000000..84dab38f Binary files /dev/null and b/src/main/resources/assets/resonantinduction/models/white.png differ