fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Even more cleanup

Browse Source
This commit is contained in:
Electroblob
2018-02-16 22:36:26 +00:00
parent 3be254a247
commit 338f6d54d0
2 changed files with 111 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/Wizardry.java
+40 -120
View File
@@ -228,126 +228,46 @@ public class Wizardry {
switch(mapping.resourceLocation.getResourcePath()){ switch(mapping.resourceLocation.getResourcePath()){
case "wand_basic": case "wand_basic": replacement = WizardryItems.magic_wand; break;
replacement = WizardryItems.magic_wand; case "wand_basic_fire": replacement = WizardryItems.basic_fire_wand; break;
break; case "wand_basic_ice": replacement = WizardryItems.basic_ice_wand; break;
case "wand_basic_fire": case "wand_basic_lightning": replacement = WizardryItems.basic_lightning_wand; break;
replacement = WizardryItems.basic_fire_wand; case "wand_basic_necromancy": replacement = WizardryItems.basic_necromancy_wand; break;
break; case "wand_basic_earth": replacement = WizardryItems.basic_earth_wand; break;
case "wand_basic_ice": case "wand_basic_sorcery": replacement = WizardryItems.basic_sorcery_wand; break;
replacement = WizardryItems.basic_ice_wand; case "wand_basic_healing": replacement = WizardryItems.basic_healing_wand; break;
break; case "wand_apprentice": replacement = WizardryItems.apprentice_wand; break;
case "wand_basic_lightning": case "wand_apprentice_fire": replacement = WizardryItems.apprentice_fire_wand; break;
replacement = WizardryItems.basic_lightning_wand; case "wand_apprentice_ice": replacement = WizardryItems.apprentice_ice_wand; break;
break; case "wand_apprentice_lightning": replacement = WizardryItems.apprentice_lightning_wand; break;
case "wand_basic_necromancy": case "wand_apprentice_necromancy": replacement = WizardryItems.apprentice_necromancy_wand; break;
replacement = WizardryItems.basic_necromancy_wand; case "wand_apprentice_earth": replacement = WizardryItems.apprentice_earth_wand; break;
break; case "wand_apprentice_sorcery": replacement = WizardryItems.apprentice_sorcery_wand; break;
case "wand_basic_earth": case "wand_apprentice_healing": replacement = WizardryItems.apprentice_healing_wand; break;
replacement = WizardryItems.basic_earth_wand; case "wand_advanced": replacement = WizardryItems.advanced_wand; break;
break; case "wand_advanced_fire": replacement = WizardryItems.advanced_fire_wand; break;
case "wand_basic_sorcery": case "wand_advanced_ice": replacement = WizardryItems.advanced_ice_wand; break;
replacement = WizardryItems.basic_sorcery_wand; case "wand_advanced_lightning": replacement = WizardryItems.advanced_lightning_wand; break;
break; case "wand_advanced_necromancy": replacement = WizardryItems.advanced_necromancy_wand; break;
case "wand_basic_healing": case "wand_advanced_earth": replacement = WizardryItems.advanced_earth_wand; break;
replacement = WizardryItems.basic_healing_wand; case "wand_advanced_sorcery": replacement = WizardryItems.advanced_sorcery_wand; break;
break; case "wand_advanced_healing": replacement = WizardryItems.advanced_healing_wand; break;
case "wand_apprentice": case "wand_master": replacement = WizardryItems.master_wand; break;
replacement = WizardryItems.apprentice_wand; case "wand_master_fire": replacement = WizardryItems.master_fire_wand; break;
break; case "wand_master_ice": replacement = WizardryItems.master_ice_wand; break;
case "wand_apprentice_fire": case "wand_master_lightning": replacement = WizardryItems.master_lightning_wand; break;
replacement = WizardryItems.apprentice_fire_wand; case "wand_master_necromancy": replacement = WizardryItems.master_necromancy_wand; break;
break; case "wand_master_earth": replacement = WizardryItems.master_earth_wand; break;
case "wand_apprentice_ice": case "wand_master_sorcery": replacement = WizardryItems.master_sorcery_wand; break;
replacement = WizardryItems.apprentice_ice_wand; case "wand_master_healing": replacement = WizardryItems.master_healing_wand; break;
break; case "upgrade_storage": replacement = WizardryItems.storage_upgrade; break;
case "wand_apprentice_lightning": case "upgrade_siphon": replacement = WizardryItems.siphon_upgrade; break;
replacement = WizardryItems.apprentice_lightning_wand; case "upgrade_condenser": replacement = WizardryItems.condenser_upgrade; break;
break; case "upgrade_range": replacement = WizardryItems.range_upgrade; break;
case "wand_apprentice_necromancy": case "upgrade_duration": replacement = WizardryItems.duration_upgrade; break;
replacement = WizardryItems.apprentice_necromancy_wand; case "upgrade_cooldown": replacement = WizardryItems.cooldown_upgrade; break;
break; case "upgrade_blast": replacement = WizardryItems.blast_upgrade; break;
case "wand_apprentice_earth": case "upgrade_attunement": replacement = WizardryItems.attunement_upgrade; break;
replacement = WizardryItems.apprentice_earth_wand;
break;
case "wand_apprentice_sorcery":
replacement = WizardryItems.apprentice_sorcery_wand;
break;
case "wand_apprentice_healing":
replacement = WizardryItems.apprentice_healing_wand;
break;
case "wand_advanced":
replacement = WizardryItems.advanced_wand;
break;
case "wand_advanced_fire":
replacement = WizardryItems.advanced_fire_wand;
break;
case "wand_advanced_ice":
replacement = WizardryItems.advanced_ice_wand;
break;
case "wand_advanced_lightning":
replacement = WizardryItems.advanced_lightning_wand;
break;
case "wand_advanced_necromancy":
replacement = WizardryItems.advanced_necromancy_wand;
break;
case "wand_advanced_earth":
replacement = WizardryItems.advanced_earth_wand;
break;
case "wand_advanced_sorcery":
replacement = WizardryItems.advanced_sorcery_wand;
break;
case "wand_advanced_healing":
replacement = WizardryItems.advanced_healing_wand;
break;
case "wand_master":
replacement = WizardryItems.master_wand;
break;
case "wand_master_fire":
replacement = WizardryItems.master_fire_wand;
break;
case "wand_master_ice":
replacement = WizardryItems.master_ice_wand;
break;
case "wand_master_lightning":
replacement = WizardryItems.master_lightning_wand;
break;
case "wand_master_necromancy":
replacement = WizardryItems.master_necromancy_wand;
break;
case "wand_master_earth":
replacement = WizardryItems.master_earth_wand;
break;
case "wand_master_sorcery":
replacement = WizardryItems.master_sorcery_wand;
break;
case "wand_master_healing":
replacement = WizardryItems.master_healing_wand;
break;
case "upgrade_storage":
replacement = WizardryItems.storage_upgrade;
break;
case "upgrade_siphon":
replacement = WizardryItems.siphon_upgrade;
break;
case "upgrade_condenser":
replacement = WizardryItems.condenser_upgrade;
break;
case "upgrade_range":
replacement = WizardryItems.range_upgrade;
break;
case "upgrade_duration":
replacement = WizardryItems.duration_upgrade;
break;
case "upgrade_cooldown":
replacement = WizardryItems.cooldown_upgrade;
break;
case "upgrade_blast":
replacement = WizardryItems.blast_upgrade;
break;
case "upgrade_attunement":
replacement = WizardryItems.attunement_upgrade;
break;
// If it didn't match any of the ones that changed, do nothing. // If it didn't match any of the ones that changed, do nothing.
default: default:
return; return;
src/main/java/electroblob/wizardry/client/ClientProxy.java
+71 -100
View File
@@ -155,10 +155,8 @@ public class ClientProxy extends CommonProxy {
public static MixedFontRenderer mixedFontRenderer; public static MixedFontRenderer mixedFontRenderer;
// Key Bindings // Key Bindings
public static final KeyBinding NEXT_SPELL = new KeyBinding("key.wizardry:next_spell", Keyboard.KEY_N, public static final KeyBinding NEXT_SPELL = new KeyBinding("key.wizardry:next_spell", Keyboard.KEY_N, "key.categories.wizardry");
"key.categories.wizardry"); public static final KeyBinding PREVIOUS_SPELL = new KeyBinding("key.wizardry:previous_spell", Keyboard.KEY_B, "key.categories.wizardry");
public static final KeyBinding PREVIOUS_SPELL = new KeyBinding("key.wizardry:previous_spell", Keyboard.KEY_B,
"key.categories.wizardry");
// Armour Model // Armour Model
public static final ModelBiped WIZARD_ARMOUR_MODEL = new ModelWizardArmour(0.75f); public static final ModelBiped WIZARD_ARMOUR_MODEL = new ModelWizardArmour(0.75f);
@@ -184,8 +182,8 @@ public class ClientProxy extends CommonProxy {
@Override @Override
public void initMixedFontRenderer(){ public void initMixedFontRenderer(){
mixedFontRenderer = new MixedFontRenderer(Minecraft.getMinecraft().gameSettings, mixedFontRenderer = new MixedFontRenderer(Minecraft.getMinecraft().gameSettings, new ResourceLocation("textures/font/ascii.png"),
new ResourceLocation("textures/font/ascii.png"), Minecraft.getMinecraft().renderEngine, false); Minecraft.getMinecraft().renderEngine, false);
} }
// SECTION Misc // SECTION Misc
@@ -203,8 +201,7 @@ public class ClientProxy extends CommonProxy {
@Override @Override
public void playMovingSound(Entity entity, SoundEvent sound, float volume, float pitch, boolean repeat){ public void playMovingSound(Entity entity, SoundEvent sound, float volume, float pitch, boolean repeat){
Minecraft.getMinecraft().getSoundHandler() Minecraft.getMinecraft().getSoundHandler().playSound(new MovingSoundEntity(entity, sound, volume, pitch, repeat));
.playSound(new MovingSoundEntity(entity, sound, volume, pitch, repeat));
} }
// SECTION Items // SECTION Items
@@ -221,8 +218,7 @@ public class ClientProxy extends CommonProxy {
spell = Spell.get(stack.getItemDamage()); spell = Spell.get(stack.getItemDamage());
} }
if(Minecraft.getMinecraft().player != null && Wizardry.settings.discoveryMode if(Minecraft.getMinecraft().player != null && Wizardry.settings.discoveryMode && WizardData.get(Minecraft.getMinecraft().player) != null
&& WizardData.get(Minecraft.getMinecraft().player) != null
&& !Minecraft.getMinecraft().player.capabilities.isCreativeMode && !Minecraft.getMinecraft().player.capabilities.isCreativeMode
&& !WizardData.get(Minecraft.getMinecraft().player).hasSpellBeenDiscovered(spell)){ && !WizardData.get(Minecraft.getMinecraft().player).hasSpellBeenDiscovered(spell)){
return mixedFontRenderer; return mixedFontRenderer;
@@ -243,16 +239,15 @@ public class ClientProxy extends CommonProxy {
boolean discovered = true; boolean discovered = true;
// It seems that this method is called when the world is loading, before thePlayer has been initialised. // It seems that this method is called when the world is loading, before thePlayer has been initialised.
// If the player is null, the spell is assumed to be discovered. // If the player is null, the spell is assumed to be discovered.
if(player != null && Wizardry.settings.discoveryMode && !player.capabilities.isCreativeMode if(player != null && Wizardry.settings.discoveryMode && !player.capabilities.isCreativeMode && WizardData.get(player) != null
&& WizardData.get(player) != null && !WizardData.get(player).hasSpellBeenDiscovered(spell)){ && !WizardData.get(player).hasSpellBeenDiscovered(spell)){
discovered = false; discovered = false;
} }
if(discovered){ if(discovered){
return I18n.format("item.wizardry:scroll.name", spell.getDisplayName()).trim(); return I18n.format("item.wizardry:scroll.name", spell.getDisplayName()).trim();
}else{ }else{
return I18n.format("item.wizardry:scroll.undiscovered.name", return I18n.format("item.wizardry:scroll.undiscovered.name", "#" + SpellGlyphData.getGlyphName(spell, player.world) + "#").trim();
"#" + SpellGlyphData.getGlyphName(spell, player.world) + "#").trim();
} }
} }
@@ -269,8 +264,8 @@ public class ClientProxy extends CommonProxy {
// =============================================================================================================== // ===============================================================================================================
@Override @Override
public void spawnParticle(WizardryParticleType type, World world, double x, double y, double z, double velX, public void spawnParticle(WizardryParticleType type, World world, double x, double y, double z, double velX, double velY, double velZ, int maxAge,
double velY, double velZ, int maxAge, float r, float g, float b, boolean doGravity, double radius){ float r, float g, float b, boolean doGravity, double radius){
// Colour values are now automatically clamped to between 0 and 1, as values outside this range seem to // Colour values are now automatically clamped to between 0 and 1, as values outside this range seem to
// cause strange effects in 1.10 (or more specifically, particles that are bright pink!) // cause strange effects in 1.10 (or more specifically, particles that are bright pink!)
@@ -285,36 +280,28 @@ public class ClientProxy extends CommonProxy {
Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleBlizzard(world, maxAge, x, z, radius, y)); Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleBlizzard(world, maxAge, x, z, radius, y));
break; break;
case BRIGHT_DUST: case BRIGHT_DUST:
Minecraft.getMinecraft().effectRenderer Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleDust(world, x, y, z, velX, velY, velZ, r, g, b, false));
.addEffect(new ParticleDust(world, x, y, z, velX, velY, velZ, r, g, b, false));
break; break;
case DARK_MAGIC: case DARK_MAGIC:
Minecraft.getMinecraft().effectRenderer Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleDarkMagic(world, x, y, z, velX, velY, velZ, r, g, b));
.addEffect(new ParticleDarkMagic(world, x, y, z, velX, velY, velZ, r, g, b));
break; break;
case DUST: case DUST:
Minecraft.getMinecraft().effectRenderer Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleDust(world, x, y, z, velX, velY, velZ, r, g, b, true));
.addEffect(new ParticleDust(world, x, y, z, velX, velY, velZ, r, g, b, true));
break; break;
case ICE: case ICE:
Minecraft.getMinecraft().effectRenderer Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleIce(world, x, y, z, velX, velY, velZ, maxAge));
.addEffect(new ParticleIce(world, x, y, z, velX, velY, velZ, maxAge));
break; break;
case LEAF: case LEAF:
Minecraft.getMinecraft().effectRenderer Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleLeaf(world, x, y, z, velX, velY, velZ, maxAge));
.addEffect(new ParticleLeaf(world, x, y, z, velX, velY, velZ, maxAge));
break; break;
case MAGIC_BUBBLE: case MAGIC_BUBBLE:
Minecraft.getMinecraft().effectRenderer Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleGiantBubble(world, x, y, z, velX, velY, velZ));
.addEffect(new ParticleGiantBubble(world, x, y, z, velX, velY, velZ));
break; break;
case MAGIC_FIRE: case MAGIC_FIRE:
Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleMagicFlame(world, x, y, z, velX, velY, velZ, Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleMagicFlame(world, x, y, z, velX, velY, velZ, maxAge, r == 0 ? 1 + world.rand.nextFloat() : r));
maxAge, r == 0 ? 1 + world.rand.nextFloat() : r));
break; break;
case PATH: case PATH:
Minecraft.getMinecraft().effectRenderer Minecraft.getMinecraft().effectRenderer.addEffect(new ParticlePath(world, x, y, z, velX, velY, velZ, r, g, b, maxAge));
.addEffect(new ParticlePath(world, x, y, z, velX, velY, velZ, r, g, b, maxAge));
break; break;
case SNOW: case SNOW:
Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleSnow(world, x, y, z, velX, velY, velZ)); Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleSnow(world, x, y, z, velX, velY, velZ));
@@ -323,12 +310,10 @@ public class ClientProxy extends CommonProxy {
Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleSpark(world, x, y, z, velX, velY, velZ)); Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleSpark(world, x, y, z, velX, velY, velZ));
break; break;
case SPARKLE: case SPARKLE:
Minecraft.getMinecraft().effectRenderer Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleSparkle(world, x, y, z, velX, velY, velZ, r, g, b, maxAge, doGravity));
.addEffect(new ParticleSparkle(world, x, y, z, velX, velY, velZ, r, g, b, maxAge, doGravity));
break; break;
case SPARKLE_ROTATING: case SPARKLE_ROTATING:
Minecraft.getMinecraft().effectRenderer Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleRotatingSparkle(world, maxAge, x, z, radius, y, r, g, b));
.addEffect(new ParticleRotatingSparkle(world, maxAge, x, z, radius, y, r, g, b));
break; break;
default: default:
break; break;
@@ -336,11 +321,10 @@ public class ClientProxy extends CommonProxy {
} }
@Override @Override
public void spawnTornadoParticle(World world, double x, double y, double z, double velX, double velZ, double radius, public void spawnTornadoParticle(World world, double x, double y, double z, double velX, double velZ, double radius, int maxAge,
int maxAge, IBlockState block, BlockPos pos){ IBlockState block, BlockPos pos){
Minecraft.getMinecraft().effectRenderer Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleTornado(world, maxAge, x, z, radius, y, velX, velZ, block).setBlockPos(pos));// ,
.addEffect(new ParticleTornado(world, maxAge, x, z, radius, y, velX, velZ, block).setBlockPos(pos));// , // world.rand.nextInt(6)));
// world.rand.nextInt(6)));
} }
// SECTION Packet Handlers // SECTION Packet Handlers
@@ -364,7 +348,7 @@ public class ClientProxy extends CommonProxy {
Source source = Source.OTHER; Source source = Source.OTHER;
Item item = ((EntityPlayer)caster).getHeldItem(message.hand).getItem(); Item item = ((EntityPlayer)caster).getHeldItem(message.hand).getItem();
if(item instanceof ItemWand){ if(item instanceof ItemWand){
source = Source.WAND; source = Source.WAND;
}else if(item instanceof ItemScroll){ }else if(item instanceof ItemScroll){
@@ -373,8 +357,7 @@ public class ClientProxy extends CommonProxy {
// No need to check if the spell succeeded, because the packet is only ever sent when it succeeds. // No need to check if the spell succeeded, because the packet is only ever sent when it succeeds.
// The handler for this event now deals with discovery. // The handler for this event now deals with discovery.
MinecraftForge.EVENT_BUS MinecraftForge.EVENT_BUS.post(new SpellCastEvent.Post((EntityPlayer)caster, spell, message.modifiers, source));
.post(new SpellCastEvent.Post((EntityPlayer)caster, spell, message.modifiers, source));
}else{ }else{
Wizardry.logger.warn("Recieved a PacketCastSpell, but the caster ID was not the ID of a player"); Wizardry.logger.warn("Recieved a PacketCastSpell, but the caster ID was not the ID of a player");
@@ -419,8 +402,7 @@ public class ClientProxy extends CommonProxy {
spell.cast(world, (EntityLiving)caster, message.hand, 0, (EntityLivingBase)target, message.modifiers); spell.cast(world, (EntityLiving)caster, message.hand, 0, (EntityLivingBase)target, message.modifiers);
// Again, no need to check if the spell succeeded, because the packet is only ever sent when it // Again, no need to check if the spell succeeded, because the packet is only ever sent when it
// succeeds. // succeeds.
MinecraftForge.EVENT_BUS MinecraftForge.EVENT_BUS.post(new SpellCastEvent.Post((EntityLiving)caster, spell, message.modifiers, Source.NPC));
.post(new SpellCastEvent.Post((EntityLiving)caster, spell, message.modifiers, Source.NPC));
} }
if(caster instanceof ISpellCaster){ if(caster instanceof ISpellCaster){
@@ -448,8 +430,8 @@ public class ClientProxy extends CommonProxy {
double x = caster.posX + radius * Math.cos(angle); double x = caster.posX + radius * Math.cos(angle);
double y = caster.getEntityBoundingBox().minY + world.rand.nextDouble() * 2; double y = caster.getEntityBoundingBox().minY + world.rand.nextDouble() * 2;
double z = caster.posZ + radius * Math.sin(angle); double z = caster.posZ + radius * Math.sin(angle);
Minecraft.getMinecraft().effectRenderer.addEffect( Minecraft.getMinecraft().effectRenderer
new ParticleSparkle(world, x, y, z, 0, 0.02, 0, 0.6f, 1.0f, 0.6f, 80 + world.rand.nextInt(10))); .addEffect(new ParticleSparkle(world, x, y, z, 0, 0.02, 0, 0.6f, 1.0f, 0.6f, 80 + world.rand.nextInt(10)));
} }
for(int i = 0; i < 20; i++){ for(int i = 0; i < 20; i++){
double radius = 1; double radius = 1;
@@ -517,7 +499,7 @@ public class ClientProxy extends CommonProxy {
private static final ResourceLocation ICE_WRAITH_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/entity/ice_wraith.png"); private static final ResourceLocation ICE_WRAITH_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/entity/ice_wraith.png");
private static final ResourceLocation LIGHTNING_WRAITH_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/entity/lightning_wraith.png"); private static final ResourceLocation LIGHTNING_WRAITH_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/entity/lightning_wraith.png");
/** Static instance of the statue renderer, used to access the block breaking texture. */ /** Static instance of the statue renderer, used to access the block breaking texture. */
public static RenderStatue renderStatue; public static RenderStatue renderStatue;
@@ -534,13 +516,12 @@ public class ClientProxy extends CommonProxy {
// just want the vanilla one for the mob you're extending. // just want the vanilla one for the mob you're extending.
// An anonymous class in a lambda expression! No point writing a separate class really, is there? // An anonymous class in a lambda expression! No point writing a separate class really, is there?
RenderingRegistry.registerEntityRenderingHandler(EntityLightningWraith.class, RenderingRegistry.registerEntityRenderingHandler(EntityLightningWraith.class, manager -> new RenderBlaze(manager){
manager -> new RenderBlaze(manager){ @Override
@Override protected ResourceLocation getEntityTexture(EntityBlaze entity){
protected ResourceLocation getEntityTexture(EntityBlaze entity){ return LIGHTNING_WRAITH_TEXTURE;
return LIGHTNING_WRAITH_TEXTURE; }
} });
});
RenderingRegistry.registerEntityRenderingHandler(EntityIceWraith.class, manager -> new RenderBlaze(manager){ RenderingRegistry.registerEntityRenderingHandler(EntityIceWraith.class, manager -> new RenderBlaze(manager){
@Override @Override
@@ -553,16 +534,12 @@ public class ClientProxy extends CommonProxy {
RenderingRegistry.registerEntityRenderingHandler(EntityPhoenix.class, RenderPhoenix::new); RenderingRegistry.registerEntityRenderingHandler(EntityPhoenix.class, RenderPhoenix::new);
// Projectiles // Projectiles
RenderingRegistry.registerEntityRenderingHandler(EntityMagicMissile.class, RenderingRegistry.registerEntityRenderingHandler(EntityMagicMissile.class, manager -> new RenderMagicArrow(manager,
manager -> new RenderMagicArrow(manager, new ResourceLocation(Wizardry.MODID, "textures/entity/magic_missile.png"), false, 8.0, 4.0, 16, 9, false));
new ResourceLocation(Wizardry.MODID, "textures/entity/magic_missile.png"), false, 8.0, 4.0, 16,
9, false));
RenderingRegistry.registerEntityRenderingHandler(EntityIceShard.class, manager -> new RenderMagicArrow(manager, RenderingRegistry.registerEntityRenderingHandler(EntityIceShard.class, manager -> new RenderMagicArrow(manager,
new ResourceLocation(Wizardry.MODID, "textures/entity/ice_shard.png"), false, 8.0, 2.0, 16, 5, false)); new ResourceLocation(Wizardry.MODID, "textures/entity/ice_shard.png"), false, 8.0, 2.0, 16, 5, false));
RenderingRegistry.registerEntityRenderingHandler(EntityLightningArrow.class, RenderingRegistry.registerEntityRenderingHandler(EntityLightningArrow.class, manager -> new RenderMagicArrow(manager,
manager -> new RenderMagicArrow(manager, new ResourceLocation(Wizardry.MODID, "textures/entity/lightning_arrow.png"), true, 8.0, 2.0, 16, 5, false));
new ResourceLocation(Wizardry.MODID, "textures/entity/lightning_arrow.png"), true, 8.0, 2.0, 16,
5, false));
RenderingRegistry.registerEntityRenderingHandler(EntityDart.class, manager -> new RenderMagicArrow(manager, RenderingRegistry.registerEntityRenderingHandler(EntityDart.class, manager -> new RenderMagicArrow(manager,
new ResourceLocation(Wizardry.MODID, "textures/entity/dart.png"), false, 8.0, 2.0, 16, 5, true)); new ResourceLocation(Wizardry.MODID, "textures/entity/dart.png"), false, 8.0, 2.0, 16, 5, true));
RenderingRegistry.registerEntityRenderingHandler(EntityIceLance.class, manager -> new RenderMagicArrow(manager, RenderingRegistry.registerEntityRenderingHandler(EntityIceLance.class, manager -> new RenderMagicArrow(manager,
@@ -571,38 +548,33 @@ public class ClientProxy extends CommonProxy {
RenderingRegistry.registerEntityRenderingHandler(EntityForceArrow.class, RenderForceArrow::new); RenderingRegistry.registerEntityRenderingHandler(EntityForceArrow.class, RenderForceArrow::new);
// Creatures // Creatures
RenderingRegistry.registerEntityRenderingHandler(EntitySpiritWolf.class, RenderingRegistry.registerEntityRenderingHandler(EntitySpiritWolf.class, manager -> new RenderSpiritWolf(manager));
manager -> new RenderSpiritWolf(manager)); RenderingRegistry.registerEntityRenderingHandler(EntitySpiritHorse.class, manager -> new RenderSpiritHorse(manager));
RenderingRegistry.registerEntityRenderingHandler(EntitySpiritHorse.class,
manager -> new RenderSpiritHorse(manager));
RenderingRegistry.registerEntityRenderingHandler(EntityWizard.class, RenderWizard::new); RenderingRegistry.registerEntityRenderingHandler(EntityWizard.class, RenderWizard::new);
RenderingRegistry.registerEntityRenderingHandler(EntityEvilWizard.class, RenderEvilWizard::new); RenderingRegistry.registerEntityRenderingHandler(EntityEvilWizard.class, RenderEvilWizard::new);
RenderingRegistry.registerEntityRenderingHandler(EntityDecoy.class, RenderDecoy::new); RenderingRegistry.registerEntityRenderingHandler(EntityDecoy.class, RenderDecoy::new);
// Throwables // Throwables
RenderingRegistry.registerEntityRenderingHandler(EntitySparkBomb.class, manager -> new RenderProjectile(manager, RenderingRegistry.registerEntityRenderingHandler(EntitySparkBomb.class,
0.6f, new ResourceLocation(Wizardry.MODID, "textures/entity/spark_bomb.png"), false)); manager -> new RenderProjectile(manager, 0.6f, new ResourceLocation(Wizardry.MODID, "textures/entity/spark_bomb.png"), false));
RenderingRegistry.registerEntityRenderingHandler(EntityFirebomb.class, manager -> new RenderProjectile(manager, RenderingRegistry.registerEntityRenderingHandler(EntityFirebomb.class,
0.6f, new ResourceLocation(Wizardry.MODID, "textures/items/firebomb.png"), false)); manager -> new RenderProjectile(manager, 0.6f, new ResourceLocation(Wizardry.MODID, "textures/items/firebomb.png"), false));
RenderingRegistry.registerEntityRenderingHandler(EntityPoisonBomb.class, RenderingRegistry.registerEntityRenderingHandler(EntityPoisonBomb.class,
manager -> new RenderProjectile(manager, 0.6f, manager -> new RenderProjectile(manager, 0.6f, new ResourceLocation(Wizardry.MODID, "textures/items/poison_bomb.png"), false));
new ResourceLocation(Wizardry.MODID, "textures/items/poison_bomb.png"), false)); RenderingRegistry.registerEntityRenderingHandler(EntityIceCharge.class,
RenderingRegistry.registerEntityRenderingHandler(EntityIceCharge.class, manager -> new RenderProjectile(manager, manager -> new RenderProjectile(manager, 0.6f, new ResourceLocation(Wizardry.MODID, "textures/entity/ice_charge.png"), false));
0.6f, new ResourceLocation(Wizardry.MODID, "textures/entity/ice_charge.png"), false)); RenderingRegistry.registerEntityRenderingHandler(EntityForceOrb.class,
RenderingRegistry.registerEntityRenderingHandler(EntityForceOrb.class, manager -> new RenderProjectile(manager, manager -> new RenderProjectile(manager, 0.7f, new ResourceLocation(Wizardry.MODID, "textures/entity/force_orb.png"), true));
0.7f, new ResourceLocation(Wizardry.MODID, "textures/entity/force_orb.png"), true)); RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class,
RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, manager -> new RenderProjectile(manager, manager -> new RenderProjectile(manager, 0.4f, new ResourceLocation(Wizardry.MODID, "textures/entity/spark.png"), true));
0.4f, new ResourceLocation(Wizardry.MODID, "textures/entity/spark.png"), true));
RenderingRegistry.registerEntityRenderingHandler(EntityDarknessOrb.class, RenderingRegistry.registerEntityRenderingHandler(EntityDarknessOrb.class,
manager -> new RenderProjectile(manager, 0.6f, manager -> new RenderProjectile(manager, 0.6f, new ResourceLocation(Wizardry.MODID, "textures/entity/darkness_orb.png"), true));
new ResourceLocation(Wizardry.MODID, "textures/entity/darkness_orb.png"), true)); RenderingRegistry.registerEntityRenderingHandler(EntityFirebolt.class,
RenderingRegistry.registerEntityRenderingHandler(EntityFirebolt.class, manager -> new RenderProjectile(manager, manager -> new RenderProjectile(manager, 0.2f, new ResourceLocation(Wizardry.MODID, "textures/entity/firebolt.png"), false));
0.2f, new ResourceLocation(Wizardry.MODID, "textures/entity/firebolt.png"), false));
RenderingRegistry.registerEntityRenderingHandler(EntityLightningDisc.class, RenderingRegistry.registerEntityRenderingHandler(EntityLightningDisc.class,
manager -> new RenderLightningDisc(manager, manager -> new RenderLightningDisc(manager, new ResourceLocation(Wizardry.MODID, "textures/entity/lightning_sigil.png"), 2.0f));
new ResourceLocation(Wizardry.MODID, "textures/entity/lightning_sigil.png"), 2.0f)); RenderingRegistry.registerEntityRenderingHandler(EntitySmokeBomb.class,
RenderingRegistry.registerEntityRenderingHandler(EntitySmokeBomb.class, manager -> new RenderProjectile(manager, manager -> new RenderProjectile(manager, 0.6f, new ResourceLocation(Wizardry.MODID, "textures/items/smoke_bomb.png"), false));
0.6f, new ResourceLocation(Wizardry.MODID, "textures/items/smoke_bomb.png"), false));
// Effects and constructs // Effects and constructs
RenderingRegistry.registerEntityRenderingHandler(EntityArc.class, RenderArc::new); RenderingRegistry.registerEntityRenderingHandler(EntityArc.class, RenderArc::new);
@@ -624,19 +596,18 @@ public class ClientProxy extends CommonProxy {
RenderingRegistry.registerEntityRenderingHandler(EntityHailstorm.class, RenderBlank::new); RenderingRegistry.registerEntityRenderingHandler(EntityHailstorm.class, RenderBlank::new);
// Runes on ground // Runes on ground
RenderingRegistry.registerEntityRenderingHandler(EntityHealAura.class, manager -> new RenderSigil(manager, RenderingRegistry.registerEntityRenderingHandler(EntityHealAura.class,
new ResourceLocation(Wizardry.MODID, "textures/entity/healing_aura.png"), 5.0f, false)); manager -> new RenderSigil(manager, new ResourceLocation(Wizardry.MODID, "textures/entity/healing_aura.png"), 5.0f, false));
RenderingRegistry.registerEntityRenderingHandler(EntityFireSigil.class, manager -> new RenderSigil(manager, RenderingRegistry.registerEntityRenderingHandler(EntityFireSigil.class,
new ResourceLocation(Wizardry.MODID, "textures/entity/fire_sigil.png"), 2.0f, true)); manager -> new RenderSigil(manager, new ResourceLocation(Wizardry.MODID, "textures/entity/fire_sigil.png"), 2.0f, true));
RenderingRegistry.registerEntityRenderingHandler(EntityFrostSigil.class, manager -> new RenderSigil(manager, RenderingRegistry.registerEntityRenderingHandler(EntityFrostSigil.class,
new ResourceLocation(Wizardry.MODID, "textures/entity/frost_sigil.png"), 2.0f, true)); manager -> new RenderSigil(manager, new ResourceLocation(Wizardry.MODID, "textures/entity/frost_sigil.png"), 2.0f, true));
RenderingRegistry.registerEntityRenderingHandler(EntityLightningSigil.class, manager -> new RenderSigil(manager, RenderingRegistry.registerEntityRenderingHandler(EntityLightningSigil.class,
new ResourceLocation(Wizardry.MODID, "textures/entity/lightning_sigil.png"), 2.0f, true)); manager -> new RenderSigil(manager, new ResourceLocation(Wizardry.MODID, "textures/entity/lightning_sigil.png"), 2.0f, true));
RenderingRegistry.registerEntityRenderingHandler(EntityFireRing.class, manager -> new RenderFireRing(manager, RenderingRegistry.registerEntityRenderingHandler(EntityFireRing.class,
new ResourceLocation(Wizardry.MODID, "textures/entity/ring_of_fire.png"), 5.0f)); manager -> new RenderFireRing(manager, new ResourceLocation(Wizardry.MODID, "textures/entity/ring_of_fire.png"), 5.0f));
RenderingRegistry.registerEntityRenderingHandler(EntityDecay.class, RenderDecay::new); RenderingRegistry.registerEntityRenderingHandler(EntityDecay.class, RenderDecay::new);
RenderingRegistry.registerEntityRenderingHandler(EntityLightningPulse.class, RenderingRegistry.registerEntityRenderingHandler(EntityLightningPulse.class, manager -> new RenderLightningPulse(manager, 8.0f));
manager -> new RenderLightningPulse(manager, 8.0f));
// TESRs // TESRs
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityArcaneWorkbench.class, new RenderArcaneWorkbench()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityArcaneWorkbench.class, new RenderArcaneWorkbench());