From 2d4c695a32d4173d9e97ef50209fe7ca341770fa Mon Sep 17 00:00:00 2001 From: Kino Date: Mon, 27 Nov 2017 22:45:58 -0500 Subject: [PATCH] Removed individual factory renderers for each entity --- .../AetherEntityRenderingRegistry.java | 149 ++++++++++-------- .../entities/factory/AechorPlantFactory.java | 19 --- .../entities/factory/AerbunnyFactory.java | 19 --- .../entities/factory/AerwhaleFactory.java | 19 --- .../entities/factory/CockatriceFactory.java | 19 --- .../renders/entities/factory/DartFactory.java | 19 --- .../entities/factory/FireBallFactory.java | 19 --- .../entities/factory/FireMinionFactory.java | 19 --- .../factory/FloatingBlockFactory.java | 19 --- .../entities/factory/FlyingCowFactory.java | 19 --- .../factory/HammerProjectileFactory.java | 19 --- .../entities/factory/IceyBallFactory.java | 19 --- .../factory/LightningKnifeFactory.java | 19 --- .../entities/factory/MimicFactory.java | 19 --- .../entities/factory/MiniCloudFactory.java | 19 --- .../renders/entities/factory/MoaFactory.java | 19 --- .../entities/factory/ParachuteFactory.java | 19 --- .../entities/factory/PhoenixArrowFactory.java | 19 --- .../renders/entities/factory/PhygFactory.java | 19 --- .../entities/factory/SentryFactory.java | 19 --- .../entities/factory/SheepuffFactory.java | 19 --- .../entities/factory/SliderFactory.java | 19 --- .../entities/factory/SunSpiritFactory.java | 19 --- .../renders/entities/factory/SwetFactory.java | 19 --- .../entities/factory/TNTPresentFactory.java | 19 --- .../entities/factory/ThunderBallFactory.java | 19 --- .../entities/factory/ValkyrieFactory.java | 19 --- .../factory/ValkyrieQueenFactory.java | 19 --- .../entities/factory/ZephyrFactory.java | 19 --- .../factory/ZephyrSnowballFactory.java | 19 --- .../entities/projectile/DartBaseRenderer.java | 14 +- 31 files changed, 91 insertions(+), 623 deletions(-) delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/AechorPlantFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/AerbunnyFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/AerwhaleFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/CockatriceFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/DartFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/FireBallFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/FireMinionFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/FloatingBlockFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/FlyingCowFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/HammerProjectileFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/IceyBallFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/LightningKnifeFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/MimicFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/MiniCloudFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/MoaFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/ParachuteFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/PhoenixArrowFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/PhygFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/SentryFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/SheepuffFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/SliderFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/SunSpiritFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/SwetFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/TNTPresentFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/ThunderBallFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/ValkyrieFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/ValkyrieQueenFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/ZephyrFactory.java delete mode 100644 src/main/java/com/legacy/aether/client/renders/entities/factory/ZephyrSnowballFactory.java diff --git a/src/main/java/com/legacy/aether/client/renders/AetherEntityRenderingRegistry.java b/src/main/java/com/legacy/aether/client/renders/AetherEntityRenderingRegistry.java index 1030901..bf13bf4 100644 --- a/src/main/java/com/legacy/aether/client/renders/AetherEntityRenderingRegistry.java +++ b/src/main/java/com/legacy/aether/client/renders/AetherEntityRenderingRegistry.java @@ -2,6 +2,8 @@ package com.legacy.aether.client.renders; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelPlayer; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -10,36 +12,37 @@ import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; -import com.legacy.aether.client.renders.entities.factory.AechorPlantFactory; -import com.legacy.aether.client.renders.entities.factory.AerbunnyFactory; -import com.legacy.aether.client.renders.entities.factory.AerwhaleFactory; -import com.legacy.aether.client.renders.entities.factory.CockatriceFactory; -import com.legacy.aether.client.renders.entities.factory.DartFactory; -import com.legacy.aether.client.renders.entities.factory.FireBallFactory; -import com.legacy.aether.client.renders.entities.factory.FireMinionFactory; -import com.legacy.aether.client.renders.entities.factory.FloatingBlockFactory; -import com.legacy.aether.client.renders.entities.factory.FlyingCowFactory; -import com.legacy.aether.client.renders.entities.factory.HammerProjectileFactory; -import com.legacy.aether.client.renders.entities.factory.IceyBallFactory; -import com.legacy.aether.client.renders.entities.factory.LightningKnifeFactory; -import com.legacy.aether.client.renders.entities.factory.MimicFactory; -import com.legacy.aether.client.renders.entities.factory.MiniCloudFactory; -import com.legacy.aether.client.renders.entities.factory.MoaFactory; -import com.legacy.aether.client.renders.entities.factory.ParachuteFactory; -import com.legacy.aether.client.renders.entities.factory.PhoenixArrowFactory; -import com.legacy.aether.client.renders.entities.factory.PhygFactory; -import com.legacy.aether.client.renders.entities.factory.SentryFactory; -import com.legacy.aether.client.renders.entities.factory.SheepuffFactory; -import com.legacy.aether.client.renders.entities.factory.SliderFactory; -import com.legacy.aether.client.renders.entities.factory.SunSpiritFactory; -import com.legacy.aether.client.renders.entities.factory.SwetFactory; -import com.legacy.aether.client.renders.entities.factory.TNTPresentFactory; -import com.legacy.aether.client.renders.entities.factory.ThunderBallFactory; -import com.legacy.aether.client.renders.entities.factory.ValkyrieFactory; -import com.legacy.aether.client.renders.entities.factory.ValkyrieQueenFactory; -import com.legacy.aether.client.renders.entities.factory.ZephyrFactory; -import com.legacy.aether.client.renders.entities.factory.ZephyrSnowballFactory; +import com.legacy.aether.client.renders.entities.AechorPlantRenderer; +import com.legacy.aether.client.renders.entities.AerbunnyRenderer; +import com.legacy.aether.client.renders.entities.AerwhaleRenderer; +import com.legacy.aether.client.renders.entities.CockatriceRenderer; +import com.legacy.aether.client.renders.entities.FireMinionRenderer; +import com.legacy.aether.client.renders.entities.FloatingBlockRenderer; +import com.legacy.aether.client.renders.entities.FlyingCowRenderer; +import com.legacy.aether.client.renders.entities.MimicRenderer; +import com.legacy.aether.client.renders.entities.MiniCloudRenderer; +import com.legacy.aether.client.renders.entities.MoaRenderer; +import com.legacy.aether.client.renders.entities.ParachuteRenderer; +import com.legacy.aether.client.renders.entities.PhygRenderer; +import com.legacy.aether.client.renders.entities.SentryRenderer; +import com.legacy.aether.client.renders.entities.SheepuffRenderer; +import com.legacy.aether.client.renders.entities.SliderRenderer; +import com.legacy.aether.client.renders.entities.SunSpiritRenderer; +import com.legacy.aether.client.renders.entities.SwetRenderer; +import com.legacy.aether.client.renders.entities.TNTPresentRenderer; +import com.legacy.aether.client.renders.entities.ValkyrieQueenRenderer; +import com.legacy.aether.client.renders.entities.ValkyrieRenderer; +import com.legacy.aether.client.renders.entities.WhirlwindRenderer; +import com.legacy.aether.client.renders.entities.ZephyrRenderer; import com.legacy.aether.client.renders.entities.layer.AccessoriesLayer; +import com.legacy.aether.client.renders.entities.projectile.DartBaseRenderer; +import com.legacy.aether.client.renders.entities.projectile.FireBallRenderer; +import com.legacy.aether.client.renders.entities.projectile.HammerProjectileRenderer; +import com.legacy.aether.client.renders.entities.projectile.IceyBallRenderer; +import com.legacy.aether.client.renders.entities.projectile.LightningKnifeRenderer; +import com.legacy.aether.client.renders.entities.projectile.PhoenixArrowRenderer; +import com.legacy.aether.client.renders.entities.projectile.ThunderBallRenderer; +import com.legacy.aether.client.renders.entities.projectile.ZephyrSnowballRenderer; import com.legacy.aether.common.blocks.BlocksAether; import com.legacy.aether.common.entities.block.EntityFloatingBlock; import com.legacy.aether.common.entities.block.EntityTNTPresent; @@ -52,6 +55,7 @@ import com.legacy.aether.common.entities.hostile.EntityAechorPlant; import com.legacy.aether.common.entities.hostile.EntityCockatrice; import com.legacy.aether.common.entities.hostile.EntityMimic; import com.legacy.aether.common.entities.hostile.EntitySentry; +import com.legacy.aether.common.entities.hostile.EntityWhirlwind; import com.legacy.aether.common.entities.hostile.EntityZephyr; import com.legacy.aether.common.entities.passive.EntityAerwhale; import com.legacy.aether.common.entities.passive.EntityMiniCloud; @@ -65,14 +69,11 @@ import com.legacy.aether.common.entities.passive.mountable.EntitySwet; import com.legacy.aether.common.entities.projectile.EntityHammerProjectile; import com.legacy.aether.common.entities.projectile.EntityLightningKnife; import com.legacy.aether.common.entities.projectile.EntityPhoenixArrow; -import com.legacy.aether.common.entities.projectile.EntityPoisonNeedle; import com.legacy.aether.common.entities.projectile.EntityZephyrSnowball; import com.legacy.aether.common.entities.projectile.crystals.EntityFireBall; import com.legacy.aether.common.entities.projectile.crystals.EntityIceyBall; import com.legacy.aether.common.entities.projectile.crystals.EntityThunderBall; -import com.legacy.aether.common.entities.projectile.darts.EntityDartEnchanted; -import com.legacy.aether.common.entities.projectile.darts.EntityDartGolden; -import com.legacy.aether.common.entities.projectile.darts.EntityDartPoison; +import com.legacy.aether.common.entities.projectile.darts.EntityDartBase; import com.legacy.aether.common.tile_entities.TileEntityChestMimic; import com.legacy.aether.common.tile_entities.TileEntityTreasureChest; @@ -82,48 +83,46 @@ public class AetherEntityRenderingRegistry public static void initialize() { /* Misc */ - register(EntityHammerProjectile.class, new HammerProjectileFactory()); - register(EntityFloatingBlock.class, new FloatingBlockFactory()); - register(EntityParachute.class, new ParachuteFactory()); - register(EntityZephyrSnowball.class, new ZephyrSnowballFactory()); - register(EntityPhoenixArrow.class, new PhoenixArrowFactory()); - register(EntityLightningKnife.class, new LightningKnifeFactory()); + register(EntityHammerProjectile.class, HammerProjectileRenderer.class); + register(EntityFloatingBlock.class, FloatingBlockRenderer.class); + register(EntityParachute.class, ParachuteRenderer.class); + register(EntityZephyrSnowball.class, ZephyrSnowballRenderer.class); + register(EntityPhoenixArrow.class, PhoenixArrowRenderer.class); + register(EntityLightningKnife.class, LightningKnifeRenderer.class); /* Darts */ - register(EntityDartEnchanted.class, new DartFactory()); - register(EntityPoisonNeedle.class, new DartFactory()); - register(EntityDartGolden.class, new DartFactory()); - register(EntityDartPoison.class, new DartFactory()); + register(EntityDartBase.class, DartBaseRenderer.class); /* Crystals */ - register(EntityFireBall.class, new FireBallFactory()); - register(EntityIceyBall.class, new IceyBallFactory()); - register(EntityThunderBall.class, new ThunderBallFactory()); + register(EntityFireBall.class, FireBallRenderer.class); + register(EntityIceyBall.class, IceyBallRenderer.class); + register(EntityThunderBall.class, ThunderBallRenderer.class); /* Bosses */ - register(EntitySlider.class, new SliderFactory()); - register(EntityValkyrieQueen.class, new ValkyrieQueenFactory()); - register(EntitySunSpirit.class, new SunSpiritFactory()); + register(EntitySlider.class, SliderRenderer.class); + register(EntityValkyrieQueen.class, ValkyrieQueenRenderer.class); + register(EntitySunSpirit.class, SunSpiritRenderer.class); /* Hostile */ - register(EntityMimic.class, new MimicFactory()); - register(EntitySentry.class, new SentryFactory()); - register(EntityAechorPlant.class, new AechorPlantFactory()); - register(EntityFireMinion.class, new FireMinionFactory()); - register(EntityZephyr.class, new ZephyrFactory()); - register(EntityValkyrie.class, new ValkyrieFactory()); - register(EntityCockatrice.class, new CockatriceFactory()); + register(EntityMimic.class, MimicRenderer.class); + register(EntitySentry.class, SentryRenderer.class); + register(EntityAechorPlant.class, AechorPlantRenderer.class); + register(EntityFireMinion.class, FireMinionRenderer.class); + register(EntityZephyr.class, ZephyrRenderer.class); + register(EntityValkyrie.class, ValkyrieRenderer.class); + register(EntityCockatrice.class, CockatriceRenderer.class); /* Passive */ - register(EntityMoa.class, new MoaFactory()); - register(EntityPhyg.class, new PhygFactory()); - register(EntityFlyingCow.class, new FlyingCowFactory()); - register(EntitySheepuff.class, new SheepuffFactory()); - register(EntityAerwhale.class, new AerwhaleFactory()); - register(EntityAerbunny.class, new AerbunnyFactory()); - register(EntitySwet.class, new SwetFactory()); - register(EntityMiniCloud.class, new MiniCloudFactory()); - register(EntityTNTPresent.class, new TNTPresentFactory()); + register(EntityMoa.class, MoaRenderer.class); + register(EntityPhyg.class, PhygRenderer.class); + register(EntityFlyingCow.class, FlyingCowRenderer.class); + register(EntitySheepuff.class, SheepuffRenderer.class); + register(EntityAerwhale.class, AerwhaleRenderer.class); + register(EntityAerbunny.class, AerbunnyRenderer.class); + register(EntitySwet.class, SwetRenderer.class); + register(EntityMiniCloud.class, MiniCloudRenderer.class); + register(EntityTNTPresent.class, TNTPresentRenderer.class); + register(EntityWhirlwind.class, WhirlwindRenderer.class); } @SuppressWarnings("deprecation") @@ -145,9 +144,25 @@ public class AetherEntityRenderingRegistry default_render.addLayer(new AccessoriesLayer(false, (ModelPlayer) default_render.getMainModel())); } - public static void register(Class classes, IRenderFactory factory) + public static void register(Class classes, final Class> render) { - RenderingRegistry.registerEntityRenderingHandler(classes, factory); + RenderingRegistry.registerEntityRenderingHandler(classes, new IRenderFactory() { + + @Override + public Render createRenderFor(RenderManager manager) + { + try + { + return render.getConstructor(RenderManager.class).newInstance(manager); + } + catch (Exception e) + { + e.printStackTrace(); + } + + return null; + } + }); } } \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/AechorPlantFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/AechorPlantFactory.java deleted file mode 100644 index 03ca268..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/AechorPlantFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.AechorPlantRenderer; -import com.legacy.aether.common.entities.hostile.EntityAechorPlant; - -public class AechorPlantFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new AechorPlantRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/AerbunnyFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/AerbunnyFactory.java deleted file mode 100644 index 7cde920..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/AerbunnyFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.AerbunnyRenderer; -import com.legacy.aether.common.entities.passive.mountable.EntityAerbunny; - -public class AerbunnyFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new AerbunnyRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/AerwhaleFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/AerwhaleFactory.java deleted file mode 100644 index ed43491..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/AerwhaleFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.AerwhaleRenderer; -import com.legacy.aether.common.entities.passive.EntityAerwhale; - -public class AerwhaleFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new AerwhaleRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/CockatriceFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/CockatriceFactory.java deleted file mode 100644 index e4e475b..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/CockatriceFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.CockatriceRenderer; -import com.legacy.aether.common.entities.hostile.EntityCockatrice; - -public class CockatriceFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new CockatriceRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/DartFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/DartFactory.java deleted file mode 100644 index 6511eb9..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/DartFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.projectile.DartBaseRenderer; -import com.legacy.aether.common.entities.projectile.darts.EntityDartBase; - -public class DartFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new DartBaseRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/FireBallFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/FireBallFactory.java deleted file mode 100644 index b4d6586..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/FireBallFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.projectile.FireBallRenderer; -import com.legacy.aether.common.entities.projectile.crystals.EntityFireBall; - -public class FireBallFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new FireBallRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/FireMinionFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/FireMinionFactory.java deleted file mode 100644 index a5bb0a7..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/FireMinionFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.FireMinionRenderer; -import com.legacy.aether.common.entities.bosses.EntityFireMinion; - -public class FireMinionFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new FireMinionRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/FloatingBlockFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/FloatingBlockFactory.java deleted file mode 100644 index 7ed73e6..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/FloatingBlockFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.FloatingBlockRenderer; -import com.legacy.aether.common.entities.block.EntityFloatingBlock; - -public class FloatingBlockFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new FloatingBlockRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/FlyingCowFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/FlyingCowFactory.java deleted file mode 100644 index 20a320d..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/FlyingCowFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.FlyingCowRenderer; -import com.legacy.aether.common.entities.passive.mountable.EntityFlyingCow; - -public class FlyingCowFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new FlyingCowRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/HammerProjectileFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/HammerProjectileFactory.java deleted file mode 100644 index be816ae..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/HammerProjectileFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.projectile.HammerProjectileRenderer; -import com.legacy.aether.common.entities.projectile.EntityHammerProjectile; - -public class HammerProjectileFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new HammerProjectileRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/IceyBallFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/IceyBallFactory.java deleted file mode 100644 index db138ee..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/IceyBallFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.projectile.IceyBallRenderer; -import com.legacy.aether.common.entities.projectile.crystals.EntityIceyBall; - -public class IceyBallFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new IceyBallRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/LightningKnifeFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/LightningKnifeFactory.java deleted file mode 100644 index 0b7760c..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/LightningKnifeFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.projectile.LightningKnifeRenderer; -import com.legacy.aether.common.entities.projectile.EntityLightningKnife; - -public class LightningKnifeFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new LightningKnifeRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/MimicFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/MimicFactory.java deleted file mode 100644 index 7773946..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/MimicFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.MimicRenderer; -import com.legacy.aether.common.entities.hostile.EntityMimic; - -public class MimicFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new MimicRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/MiniCloudFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/MiniCloudFactory.java deleted file mode 100644 index f9c1867..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/MiniCloudFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.MiniCloudRenderer; -import com.legacy.aether.common.entities.passive.EntityMiniCloud; - -public class MiniCloudFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new MiniCloudRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/MoaFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/MoaFactory.java deleted file mode 100644 index 386a39e..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/MoaFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.MoaRenderer; -import com.legacy.aether.common.entities.passive.mountable.EntityMoa; - -public class MoaFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new MoaRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/ParachuteFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/ParachuteFactory.java deleted file mode 100644 index 0d85b4c..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/ParachuteFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.ParachuteRenderer; -import com.legacy.aether.common.entities.passive.mountable.EntityParachute; - -public class ParachuteFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new ParachuteRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/PhoenixArrowFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/PhoenixArrowFactory.java deleted file mode 100644 index 52ced32..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/PhoenixArrowFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.projectile.PhoenixArrowRenderer; -import com.legacy.aether.common.entities.projectile.EntityPhoenixArrow; - -public class PhoenixArrowFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new PhoenixArrowRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/PhygFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/PhygFactory.java deleted file mode 100644 index 4d373e7..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/PhygFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.PhygRenderer; -import com.legacy.aether.common.entities.passive.mountable.EntityPhyg; - -public class PhygFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new PhygRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/SentryFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/SentryFactory.java deleted file mode 100644 index c476360..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/SentryFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.SentryRenderer; -import com.legacy.aether.common.entities.hostile.EntitySentry; - -public class SentryFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new SentryRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/SheepuffFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/SheepuffFactory.java deleted file mode 100644 index 90f7ba5..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/SheepuffFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.SheepuffRenderer; -import com.legacy.aether.common.entities.passive.EntitySheepuff; - -public class SheepuffFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new SheepuffRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/SliderFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/SliderFactory.java deleted file mode 100644 index 7b40fca..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/SliderFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.SliderRenderer; -import com.legacy.aether.common.entities.bosses.slider.EntitySlider; - -public class SliderFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new SliderRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/SunSpiritFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/SunSpiritFactory.java deleted file mode 100644 index 1e7a1be..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/SunSpiritFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.SunSpiritRenderer; -import com.legacy.aether.common.entities.bosses.sun_spirit.EntitySunSpirit; - -public class SunSpiritFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new SunSpiritRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/SwetFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/SwetFactory.java deleted file mode 100644 index 46374aa..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/SwetFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.SwetRenderer; -import com.legacy.aether.common.entities.passive.mountable.EntitySwet; - -public class SwetFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new SwetRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/TNTPresentFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/TNTPresentFactory.java deleted file mode 100644 index e13b8f7..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/TNTPresentFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.TNTPresentRenderer; -import com.legacy.aether.common.entities.block.EntityTNTPresent; - -public class TNTPresentFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new TNTPresentRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/ThunderBallFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/ThunderBallFactory.java deleted file mode 100644 index d53b0b6..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/ThunderBallFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.projectile.ThunderBallRenderer; -import com.legacy.aether.common.entities.projectile.crystals.EntityThunderBall; - -public class ThunderBallFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new ThunderBallRenderer(manager); - } - -} diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/ValkyrieFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/ValkyrieFactory.java deleted file mode 100644 index 6d9c58b..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/ValkyrieFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.ValkyrieRenderer; -import com.legacy.aether.common.entities.bosses.EntityValkyrie; - -public class ValkyrieFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new ValkyrieRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/ValkyrieQueenFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/ValkyrieQueenFactory.java deleted file mode 100644 index 5fe92ca..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/ValkyrieQueenFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.ValkyrieQueenRenderer; -import com.legacy.aether.common.entities.bosses.valkyrie_queen.EntityValkyrieQueen; - -public class ValkyrieQueenFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new ValkyrieQueenRenderer(manager); - } - -} diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/ZephyrFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/ZephyrFactory.java deleted file mode 100644 index 4ff2068..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/ZephyrFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.ZephyrRenderer; -import com.legacy.aether.common.entities.hostile.EntityZephyr; - -public class ZephyrFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new ZephyrRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/factory/ZephyrSnowballFactory.java b/src/main/java/com/legacy/aether/client/renders/entities/factory/ZephyrSnowballFactory.java deleted file mode 100644 index b617b04..0000000 --- a/src/main/java/com/legacy/aether/client/renders/entities/factory/ZephyrSnowballFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.legacy.aether.client.renders.entities.factory; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.client.registry.IRenderFactory; - -import com.legacy.aether.client.renders.entities.projectile.ZephyrSnowballRenderer; -import com.legacy.aether.common.entities.projectile.EntityZephyrSnowball; - -public class ZephyrSnowballFactory implements IRenderFactory -{ - - @Override - public Render createRenderFor(RenderManager manager) - { - return new ZephyrSnowballRenderer(manager); - } - -} \ No newline at end of file diff --git a/src/main/java/com/legacy/aether/client/renders/entities/projectile/DartBaseRenderer.java b/src/main/java/com/legacy/aether/client/renders/entities/projectile/DartBaseRenderer.java index baeeb06..dd583b2 100644 --- a/src/main/java/com/legacy/aether/client/renders/entities/projectile/DartBaseRenderer.java +++ b/src/main/java/com/legacy/aether/client/renders/entities/projectile/DartBaseRenderer.java @@ -16,16 +16,17 @@ import com.legacy.aether.common.entities.projectile.darts.EntityDartBase; import com.legacy.aether.common.entities.projectile.darts.EntityDartEnchanted; import com.legacy.aether.common.entities.projectile.darts.EntityDartGolden; -public class DartBaseRenderer extends Render +public class DartBaseRenderer extends Render { - public DartBaseRenderer(RenderManager renderManager) + public DartBaseRenderer(RenderManager renderManager) { super(renderManager); + this.shadowSize = 0.0F; } - public void renderDart(DART dart, double d, double d1, double d2, float f, float f1) + public void renderDart(EntityDartBase dart, double d, double d1, double d2, float f, float f1) { if (dart.isInvisible()) { @@ -92,13 +93,16 @@ public class DartBaseRenderer extends Render GL11.glPopMatrix(); } - public void doRender(DART entity, double d, double d1, double d2, float f, float f1) + @Override + public void doRender(EntityDartBase entity, double d, double d1, double d2, float f, float f1) { this.renderDart(entity, d, d1, d2, f, f1); + super.doRender(entity, d, d1, d2, f, f1); } - protected ResourceLocation getEntityTexture(DART entity) + @Override + protected ResourceLocation getEntityTexture(EntityDartBase entity) { String base = entity instanceof EntityDartGolden ? "golden" : entity instanceof EntityDartEnchanted ? "enchanted" : "poison"; return new ResourceLocation("aether_legacy", "textures/entities/projectile/dart/" + base + (entity instanceof EntityPoisonNeedle ? "_needle" : "_dart") + ".png");