From dcec7c72816ad785d6bc8e47b55d2de6020b9880 Mon Sep 17 00:00:00 2001 From: Electroblob <35599699+Electroblob77@users.noreply.github.com> Date: Tue, 5 Jun 2018 21:24:09 +0100 Subject: [PATCH] Miscellaneous cleanup and commenting --- src/main/java/electroblob/wizardry/Wizardry.java | 8 +++++++- .../electroblob/wizardry/block/BlockSpectral.java | 6 ++---- .../wizardry/client/WizardryClientEventHandler.java | 5 +++++ .../wizardry/client/renderer/LayerStone.java | 2 ++ .../electroblob/wizardry/enchantment/Imbuement.java | 2 +- .../wizardry/entity/living/EntityWizard.java | 11 +++++------ 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/electroblob/wizardry/Wizardry.java b/src/main/java/electroblob/wizardry/Wizardry.java index 996258b9..6e5e1ab5 100644 --- a/src/main/java/electroblob/wizardry/Wizardry.java +++ b/src/main/java/electroblob/wizardry/Wizardry.java @@ -87,7 +87,13 @@ public class Wizardry { /** Static instance of the {@link Settings} object for Wizardry. */ public static final Settings settings = new Settings(); - /** Static instance of the {@link Logger} object for Wizardry. */ + /** Static instance of the {@link Logger} object for Wizardry. + *

+ * Logging conventions for wizardry (only these levels are used currently): + *

+ * - ERROR: Anything that threw an exception; may or may not crash the game.
+ * - WARN: Anything that isn't supposed to happen during normal operation, but didn't throw an exception.
+ * - INFO: Anything that might happen during normal mod operation that the user needs to know about. */ public static Logger logger; // private static Pattern entityNamePattern; diff --git a/src/main/java/electroblob/wizardry/block/BlockSpectral.java b/src/main/java/electroblob/wizardry/block/BlockSpectral.java index 1aa8948f..708f3fe6 100644 --- a/src/main/java/electroblob/wizardry/block/BlockSpectral.java +++ b/src/main/java/electroblob/wizardry/block/BlockSpectral.java @@ -45,10 +45,8 @@ public class BlockSpectral extends BlockContainer { return EnumBlockRenderType.MODEL; } - // Apparently it's OK to override this, despite it being deprecated. More - // importantly, it being deprecated is not - // Forge's doing, rather it is Mojang themselves misusing the @Deprecated - // annotation to mean 'internal, don't call'. + // Apparently it's OK to override this, despite it being deprecated. More importantly, it being deprecated is not + // Forge's doing, rather it is Mojang themselves misusing the @Deprecated annotation to mean 'internal, don't call'. @Override public boolean isOpaqueCube(IBlockState state){ return false; diff --git a/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java b/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java index ea695342..d188784f 100644 --- a/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java +++ b/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java @@ -79,8 +79,13 @@ public final class WizardryClientEventHandler { @SubscribeEvent public static void onTextureStitchEvent(TextureStitchEvent.Pre event){ + event.getMap().registerSprite(ContainerArcaneWorkbench.EMPTY_SLOT_CRYSTAL); event.getMap().registerSprite(ContainerArcaneWorkbench.EMPTY_SLOT_UPGRADE); + +// for(int i=0; i<7; i++){ +// event.getMap().registerSprite(new ResourceLocation(Wizardry.MODID, "particle/ice_" + i)); +// } } // Shift-scrolling to change spells diff --git a/src/main/java/electroblob/wizardry/client/renderer/LayerStone.java b/src/main/java/electroblob/wizardry/client/renderer/LayerStone.java index 82f5950f..3630e58a 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/LayerStone.java +++ b/src/main/java/electroblob/wizardry/client/renderer/LayerStone.java @@ -53,6 +53,8 @@ public class LayerStone implements LayerRenderer { this.renderer = renderer; this.model = renderer.getMainModel(); } + + // FIXME: Does not work with zombie pigmen, I have no idea why. @Override public void doRenderLayer(EntityLivingBase entity, float limbSwing, float limbSwingAmount, float partialTicks, diff --git a/src/main/java/electroblob/wizardry/enchantment/Imbuement.java b/src/main/java/electroblob/wizardry/enchantment/Imbuement.java index 959e73fe..0aa62bf8 100644 --- a/src/main/java/electroblob/wizardry/enchantment/Imbuement.java +++ b/src/main/java/electroblob/wizardry/enchantment/Imbuement.java @@ -78,7 +78,7 @@ public interface Imbuement { // If any imbuements were removed, replaces the enchantments on the book with the new ones, or // deletes the book entirely if there are none left. if(enchantments.isEmpty()){ - slot.putStack(ItemStack.EMPTY); // NOTE: Will need changing in 1.11 + slot.putStack(ItemStack.EMPTY); Wizardry.logger.info("Deleted enchanted book with illegal enchantments"); }else{ EnchantmentHelper.setEnchantments(enchantments, slot.getStack()); diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java b/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java index b686924c..5e70bd7f 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java @@ -161,12 +161,12 @@ public class EntityWizard extends EntityVillager implements ISpellCaster, IEntit // ... and is a mob, a summoned creature ... if((entity instanceof IMob || entity instanceof ISummonedCreature - // ... or in the whitelist ... + // ... or in the whitelist ... || Arrays.asList(Wizardry.settings.summonedCreatureTargetsWhitelist) - .contains(EntityList.getEntityString(entity).toLowerCase(Locale.ROOT))) + .contains(EntityList.getEntityString(entity).toLowerCase(Locale.ROOT))) // ... and isn't in the blacklist ... && !Arrays.asList(Wizardry.settings.summonedCreatureTargetsBlacklist) - .contains(EntityList.getEntityString(entity).toLowerCase(Locale.ROOT))){ + .contains(EntityList.getEntityString(entity).toLowerCase(Locale.ROOT))){ // ... it can be attacked. return true; } @@ -520,7 +520,7 @@ public class EntityWizard extends EntityVillager implements ISpellCaster, IEntit } // TODO: Switch all of this over to some kind of loot pool system? - + private ItemStack getRandomPrice(Tier tier){ ItemStack itemstack = ItemStack.EMPTY; switch(this.rand.nextInt(3)){ @@ -594,8 +594,7 @@ public class EntityWizard extends EntityVillager implements ISpellCaster, IEntit }else if(randomiser < 8){ return new ItemStack(WizardryItems.arcane_tome, 1, 1); }else if(randomiser < 10){ - EntityEquipmentSlot slot = WizardryUtilities.ARMOUR_SLOTS[rand - .nextInt(WizardryUtilities.ARMOUR_SLOTS.length)]; + EntityEquipmentSlot slot = WizardryUtilities.ARMOUR_SLOTS[rand.nextInt(WizardryUtilities.ARMOUR_SLOTS.length)]; if(this.getElement() != Element.MAGIC && rand.nextInt(4) > 0){ // This means it is more likely for armour sold to be of the same element as the wizard if the // wizard has an element.