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

Cleanup

Browse Source
This commit is contained in:
Electroblob77
2020-06-12 13:48:21 +01:00
parent b4b32d52e3
commit ee56aa50be
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/ClientProxy.java
+6 -6
View File
@@ -128,7 +128,7 @@ public class ClientProxy extends CommonProxy {
/** The wrap width for standard multi-line descriptions (see {@link ClientProxy#addMultiLineDescription(List, String, Style, Object...)}). */ /** The wrap width for standard multi-line descriptions (see {@link ClientProxy#addMultiLineDescription(List, String, Style, Object...)}). */
private static final int TOOLTIP_WRAP_WIDTH = 140; private static final int TOOLTIP_WRAP_WIDTH = 140;
// SECTION Registry // Registry
// =============================================================================================================== // ===============================================================================================================
@Override @Override
@@ -167,7 +167,7 @@ public class ClientProxy extends CommonProxy {
WizardryAntiqueAtlasIntegration.registerMarkers(); WizardryAntiqueAtlasIntegration.registerMarkers();
} }
// SECTION Misc // Misc
// =============================================================================================================== // ===============================================================================================================
@Override @Override
@@ -255,7 +255,7 @@ public class ClientProxy extends CommonProxy {
} }
} }
// SECTION Items // Items
// =============================================================================================================== // ===============================================================================================================
@Override @Override
@@ -354,7 +354,7 @@ public class ClientProxy extends CommonProxy {
tooltip.addAll(Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(translate(key, style, args), TOOLTIP_WRAP_WIDTH)); tooltip.addAll(Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(translate(key, style, args), TOOLTIP_WRAP_WIDTH));
} }
// SECTION Particles // Particles
// =============================================================================================================== // ===============================================================================================================
/** Use {@link ParticleWizardry#registerParticle(ResourceLocation, IWizardryParticleFactory)}, this is internal. */ /** Use {@link ParticleWizardry#registerParticle(ResourceLocation, IWizardryParticleFactory)}, this is internal. */
@@ -405,7 +405,7 @@ public class ClientProxy extends CommonProxy {
Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleTornado(world, maxAge, x, z, radius, y, velX, velZ, block).setBlockPos(pos));// , world.rand.nextInt(6))); Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleTornado(world, maxAge, x, z, radius, y, velX, velZ, block).setBlockPos(pos));// , world.rand.nextInt(6)));
} }
// SECTION Packet Handlers // Packet Handlers
// =============================================================================================================== // ===============================================================================================================
@Override @Override
@@ -692,7 +692,7 @@ public class ClientProxy extends CommonProxy {
}else Wizardry.logger.warn("Received a PacketConquerShrine, but there was no shrine core at the position sent"); }else Wizardry.logger.warn("Received a PacketConquerShrine, but there was no shrine core at the position sent");
} }
// SECTION Rendering // Rendering
// =============================================================================================================== // ===============================================================================================================
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");
src/main/java/electroblob/wizardry/spell/ArcaneJammer.java
+1
View File
@@ -98,6 +98,7 @@ public class ArcaneJammer extends SpellRay {
event.setCanceled(true); event.setCanceled(true);
// TODO: This currently doesn't play nicely with continuous or charge-up spells
if(event.getSource() == Source.WAND || event.getSource() == Source.SCROLL){ if(event.getSource() == Source.WAND || event.getSource() == Source.SCROLL){
event.getCaster().setActiveHand(EnumHand.MAIN_HAND); event.getCaster().setActiveHand(EnumHand.MAIN_HAND);
} }