From a4fd88f21da024621ae28ccfe189d7908f56882b Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Fri, 10 Apr 2020 00:17:01 +0100 Subject: [PATCH] Organise texture folders and misc cleanup --- .../client/WizardryClientEventHandler.java | 24 +++++------ .../client/gui/GuiArcaneWorkbench.java | 2 +- .../wizardry/client/gui/GuiBookshelf.java | 2 +- .../client/gui/GuiButtonSpellSort.java | 2 +- .../wizardry/client/gui/GuiLectern.java | 2 +- .../gui/handbook/GuiWizardHandbook.java | 2 +- .../client/renderer/RenderArcaneLock.java | 8 ++-- .../renderer/RenderArcaneWorkbench.java | 4 +- .../client/renderer/RenderBlackHole.java | 14 +++---- .../client/renderer/RenderBubble.java | 38 +++++++++--------- .../renderer/RenderContainmentField.java | 8 ++-- .../wizardry/client/renderer/RenderDecay.java | 6 +-- .../client/renderer/RenderEvilWizard.java | 7 ++-- .../client/renderer/RenderMagicLight.java | 12 +++--- .../client/renderer/RenderWizard.java | 6 +-- .../wizardry/constants/Element.java | 2 +- .../inventory/ContainerArcaneWorkbench.java | 6 +-- .../wizardry/potion/CurseEnfeeblement.java | 2 +- .../wizardry/potion/CurseUndeath.java | 2 +- .../wizardry/potion/PotionContainment.java | 2 +- .../wizardry/potion/PotionDecay.java | 2 +- .../wizardry/potion/PotionFrost.java | 2 +- .../wizardry/potion/PotionFrostStep.java | 2 +- .../wizardry/potion/PotionSlowTime.java | 2 +- .../ebwizardry/texts/handbook_en_gb.json | 18 ++++----- .../ebwizardry/texts/handbook_en_us.json | 18 ++++----- .../ebwizardry/texts/handbook_es_es.json | 18 ++++----- .../ebwizardry/texts/handbook_zh_cn.json | 18 ++++----- .../ebwizardry/texts/handbook_zh_tw.json | 18 ++++----- .../{entity => blocks}/arcane_lock_0.png | Bin .../{entity => blocks}/arcane_lock_1.png | Bin .../{entity => blocks}/arcane_lock_2.png | Bin .../{entity => blocks}/arcane_lock_3.png | Bin .../{entity => blocks}/arcane_lock_4.png | Bin .../{entity => blocks}/arcane_lock_5.png | Bin .../{entity => blocks}/arcane_lock_6.png | Bin .../{entity => blocks}/arcane_lock_7.png | Bin .../{rune.png => arcane_workbench_rune.png} | Bin .../ebwizardry/textures/entity/aura.png | Bin 1165 -> 0 bytes .../{black_hole.png => black_hole/centre.png} | Bin .../{dark_ray.png => black_hole/ray.png} | Bin .../textures/entity/{ => decay}/decay_0.png | Bin .../textures/entity/{ => decay}/decay_1.png | Bin .../textures/entity/{ => decay}/decay_2.png | Bin .../textures/entity/{ => decay}/decay_3.png | Bin .../textures/entity/{ => decay}/decay_4.png | Bin .../textures/entity/{ => decay}/decay_5.png | Bin .../textures/entity/{ => decay}/decay_6.png | Bin .../textures/entity/{ => decay}/decay_7.png | Bin .../textures/entity/{ => decay}/decay_8.png | Bin .../textures/entity/{ => decay}/decay_9.png | Bin .../entity/{dark_orb.png => entrapment.png} | Bin .../{ => evil_wizard}/evil_wizard_0.png | Bin .../{ => evil_wizard}/evil_wizard_1.png | Bin .../{ => evil_wizard}/evil_wizard_2.png | Bin .../{ => evil_wizard}/evil_wizard_3.png | Bin .../{ => evil_wizard}/evil_wizard_4.png | Bin .../{ => evil_wizard}/evil_wizard_5.png | Bin .../{light_aura.png => light/flare.png} | Bin .../entity/{light_ray.png => light/ray.png} | Bin .../textures/entity/{ => wizard}/wizard_0.png | Bin .../textures/entity/{ => wizard}/wizard_1.png | Bin .../textures/entity/{ => wizard}/wizard_2.png | Bin .../textures/entity/{ => wizard}/wizard_3.png | Bin .../textures/entity/{ => wizard}/wizard_4.png | Bin .../textures/entity/{ => wizard}/wizard_5.png | Bin .../textures/entity/{ => wizard}/wizard_7.png | Bin .../textures/entity/{ => wizard}/wizard_8.png | Bin .../entity/{ => wizard}/wizard_female_0.png | Bin .../entity/{ => wizard}/wizard_female_1.png | Bin .../entity/{ => wizard}/wizard_female_2.png | Bin .../containment_field_0.png | Bin .../containment_field_1.png | Bin .../containment_field_2.png | Bin .../containment_field_3.png | Bin .../containment_field_4.png | Bin .../containment_field_5.png | Bin .../containment_field_6.png | Bin .../containment_field_7.png | Bin .../gui/{ => container}/arcane_workbench.png | Bin .../gui/{ => container}/bookshelf.png | Bin .../{ => container}/element_icon_earth.png | Bin .../gui/{ => container}/element_icon_fire.png | Bin .../{ => container}/element_icon_healing.png | Bin .../gui/{ => container}/element_icon_ice.png | Bin .../element_icon_lightning.png | Bin .../{ => container}/element_icon_magic.png | Bin .../element_icon_necromancy.png | Bin .../{ => container}/element_icon_sorcery.png | Bin .../{ => container}/empty_slot_crystal.png | Bin .../{ => container}/empty_slot_upgrade.png | Bin .../textures/gui/{ => container}/lectern.png | Bin .../{ => container}/spell_sort_buttons.png | Bin .../textures/gui/{ => handbook}/handbook.png | Bin .../pictures}/arcane_workbench_picture.png | Bin .../pictures}/armour_picture.png | Bin .../pictures}/elements_picture.png | Bin .../pictures}/flower_picture.png | Bin .../pictures}/obelisk_picture.png | Bin .../{ => handbook/pictures}/ore_picture.png | Bin .../pictures}/shrine_picture.png | Bin .../{ => handbook/pictures}/tiers_picture.png | Bin .../{ => handbook/pictures}/tower_picture.png | Bin .../textures/{entity => gui}/pointer.png | Bin .../arcane_jammer.png} | Bin .../containment.png} | Bin .../curse_of_enfeeblement.png} | Bin .../curse_of_soulbinding.png} | Bin .../curse_of_undeath.png} | Bin .../decay.png} | Bin .../empowerment.png} | Bin .../fear.png} | Bin .../fireskin.png} | Bin .../font_of_mana.png} | Bin .../frost.png} | Bin .../frost_step.png} | Bin .../ice_shroud.png} | Bin .../mind_control.png} | Bin .../mind_trick.png} | Bin .../muffle.png} | Bin .../paralysis.png} | Bin .../sixth_sense.png} | Bin .../slow_time.png} | Bin .../static_aura.png} | Bin .../transience.png} | Bin .../ward.png} | Bin .../sixth_sense_marker.png} | Bin .../{entity => gui}/target_pointer.png | Bin 128 files changed, 125 insertions(+), 124 deletions(-) rename src/main/resources/assets/ebwizardry/textures/{entity => blocks}/arcane_lock_0.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => blocks}/arcane_lock_1.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => blocks}/arcane_lock_2.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => blocks}/arcane_lock_3.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => blocks}/arcane_lock_4.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => blocks}/arcane_lock_5.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => blocks}/arcane_lock_6.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => blocks}/arcane_lock_7.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{rune.png => arcane_workbench_rune.png} (100%) delete mode 100644 src/main/resources/assets/ebwizardry/textures/entity/aura.png rename src/main/resources/assets/ebwizardry/textures/entity/{black_hole.png => black_hole/centre.png} (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{dark_ray.png => black_hole/ray.png} (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => decay}/decay_0.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => decay}/decay_1.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => decay}/decay_2.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => decay}/decay_3.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => decay}/decay_4.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => decay}/decay_5.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => decay}/decay_6.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => decay}/decay_7.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => decay}/decay_8.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => decay}/decay_9.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{dark_orb.png => entrapment.png} (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => evil_wizard}/evil_wizard_0.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => evil_wizard}/evil_wizard_1.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => evil_wizard}/evil_wizard_2.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => evil_wizard}/evil_wizard_3.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => evil_wizard}/evil_wizard_4.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => evil_wizard}/evil_wizard_5.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{light_aura.png => light/flare.png} (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{light_ray.png => light/ray.png} (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_0.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_1.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_2.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_3.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_4.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_5.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_7.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_8.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_female_0.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_female_1.png (100%) rename src/main/resources/assets/ebwizardry/textures/entity/{ => wizard}/wizard_female_2.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => environment}/containment_field_0.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => environment}/containment_field_1.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => environment}/containment_field_2.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => environment}/containment_field_3.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => environment}/containment_field_4.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => environment}/containment_field_5.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => environment}/containment_field_6.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => environment}/containment_field_7.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/arcane_workbench.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/bookshelf.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/element_icon_earth.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/element_icon_fire.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/element_icon_healing.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/element_icon_ice.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/element_icon_lightning.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/element_icon_magic.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/element_icon_necromancy.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/element_icon_sorcery.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/empty_slot_crystal.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/empty_slot_upgrade.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/lectern.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => container}/spell_sort_buttons.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => handbook}/handbook.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => handbook/pictures}/arcane_workbench_picture.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => handbook/pictures}/armour_picture.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => handbook/pictures}/elements_picture.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => handbook/pictures}/flower_picture.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => handbook/pictures}/obelisk_picture.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => handbook/pictures}/ore_picture.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => handbook/pictures}/shrine_picture.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => handbook/pictures}/tiers_picture.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{ => handbook/pictures}/tower_picture.png (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => gui}/pointer.png (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_arcane_jammer.png => potion_icons/arcane_jammer.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_containment.png => potion_icons/containment.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_curse_of_enfeeblement.png => potion_icons/curse_of_enfeeblement.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_curse_of_soulbinding.png => potion_icons/curse_of_soulbinding.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_curse_of_undeath.png => potion_icons/curse_of_undeath.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_decay.png => potion_icons/decay.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_empowerment.png => potion_icons/empowerment.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_fear.png => potion_icons/fear.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_fireskin.png => potion_icons/fireskin.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_font_of_mana.png => potion_icons/font_of_mana.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_frost.png => potion_icons/frost.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_frost_step.png => potion_icons/frost_step.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_ice_shroud.png => potion_icons/ice_shroud.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_mind_control.png => potion_icons/mind_control.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_mind_trick.png => potion_icons/mind_trick.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_muffle.png => potion_icons/muffle.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_paralysis.png => potion_icons/paralysis.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_sixth_sense.png => potion_icons/sixth_sense.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_slow_time.png => potion_icons/slow_time.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_static_aura.png => potion_icons/static_aura.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_transience.png => potion_icons/transience.png} (100%) rename src/main/resources/assets/ebwizardry/textures/gui/{potion_icon_ward.png => potion_icons/ward.png} (100%) rename src/main/resources/assets/ebwizardry/textures/{entity/sixth_sense.png => gui/sixth_sense_marker.png} (100%) rename src/main/resources/assets/ebwizardry/textures/{entity => gui}/target_pointer.png (100%) diff --git a/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java b/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java index 4a5586da..aacade75 100644 --- a/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java +++ b/src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java @@ -55,12 +55,12 @@ import java.util.List; @Mod.EventBusSubscriber(Side.CLIENT) public final class WizardryClientEventHandler { - private static final ResourceLocation sixthSenseTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/sixth_sense.png"); - private static final ResourceLocation sixthSenseOverlayTexture = new ResourceLocation(Wizardry.MODID, "textures/gui/sixth_sense_overlay.png"); - private static final ResourceLocation frostOverlayTexture = new ResourceLocation(Wizardry.MODID, "textures/gui/frost_overlay.png"); - private static final ResourceLocation blinkOverlayTexture = new ResourceLocation(Wizardry.MODID, "textures/gui/blink_overlay.png"); - private static final ResourceLocation pointerTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/pointer.png"); - private static final ResourceLocation targetPointerTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/target_pointer.png"); + private static final ResourceLocation SIXTH_SENSE_MARKER_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/sixth_sense_marker.png"); + private static final ResourceLocation SIXTH_SENSE_OVERLAY_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/sixth_sense_overlay.png"); + private static final ResourceLocation FROST_OVERLAY_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/frost_overlay.png"); + private static final ResourceLocation BLINK_OVERLAY_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/blink_overlay.png"); + private static final ResourceLocation POINTER_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/pointer.png"); + private static final ResourceLocation TARGET_POINTER_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/target_pointer.png"); /** The remaining time for which the blink screen overlay effect will be displayed in first-person. Since this is * only for the first-person player (the instance of which is itself stored in a static variable), this can simply @@ -298,7 +298,7 @@ public final class WizardryClientEventHandler { buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - mc.renderEngine.bindTexture(targetPointerTexture); + mc.renderEngine.bindTexture(TARGET_POINTER_TEXTURE); buffer.pos(-0.2, 0.24, 0).tex(0, 0).endVertex(); buffer.pos(0.2, 0.24, 0).tex(9f / 16f, 0).endVertex(); @@ -340,7 +340,7 @@ public final class WizardryClientEventHandler { buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - mc.renderEngine.bindTexture(pointerTexture); + mc.renderEngine.bindTexture(POINTER_TEXTURE); buffer.pos(-0.2, 0.24, 0).tex(0, 0).endVertex(); buffer.pos(0.2, 0.24, 0).tex(9f / 16f, 0).endVertex(); @@ -385,7 +385,7 @@ public final class WizardryClientEventHandler { buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - mc.renderEngine.bindTexture(sixthSenseTexture); + mc.renderEngine.bindTexture(SIXTH_SENSE_MARKER_TEXTURE); buffer.pos(-0.6, 0.6, 0).tex(0, 0).endVertex(); buffer.pos(0.6, 0.6, 0).tex(1, 0).endVertex(); @@ -414,7 +414,7 @@ public final class WizardryClientEventHandler { GlStateManager.color(1, 1, 1, 1); GlStateManager.disableAlpha(); - renderScreenOverlay(event, sixthSenseOverlayTexture); + renderScreenOverlay(event, SIXTH_SENSE_OVERLAY_TEXTURE); GlStateManager.enableAlpha(); GlStateManager.color(1, 1, 1, 1); @@ -426,7 +426,7 @@ public final class WizardryClientEventHandler { GlStateManager.color(1, 1, 1, 1); GlStateManager.disableAlpha(); - renderScreenOverlay(event, frostOverlayTexture); + renderScreenOverlay(event, FROST_OVERLAY_TEXTURE); GlStateManager.enableAlpha(); GlStateManager.color(1, 1, 1, 1); @@ -440,7 +440,7 @@ public final class WizardryClientEventHandler { GlStateManager.color(1, 1, 1, alpha); GlStateManager.disableAlpha(); - renderScreenOverlay(event, blinkOverlayTexture); + renderScreenOverlay(event, BLINK_OVERLAY_TEXTURE); GlStateManager.enableAlpha(); GlStateManager.color(1, 1, 1, 1); diff --git a/src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java b/src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java index 29445ed8..07590df6 100644 --- a/src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java +++ b/src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java @@ -52,7 +52,7 @@ import java.util.Locale; public class GuiArcaneWorkbench extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID, - "textures/gui/arcane_workbench.png"); + "textures/gui/container/arcane_workbench.png"); private static final int TOOLTIP_WIDTH = 144; private static final int TOOLTIP_TEXT_INSET = 6; diff --git a/src/main/java/electroblob/wizardry/client/gui/GuiBookshelf.java b/src/main/java/electroblob/wizardry/client/gui/GuiBookshelf.java index 67091424..476674dd 100644 --- a/src/main/java/electroblob/wizardry/client/gui/GuiBookshelf.java +++ b/src/main/java/electroblob/wizardry/client/gui/GuiBookshelf.java @@ -14,7 +14,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiBookshelf extends GuiContainer { - private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/bookshelf.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/container/bookshelf.png"); /** The player inventory bound to this GUI. */ private final InventoryPlayer playerInventory; /** The inventory contained within the corresponding bookshelf. */ diff --git a/src/main/java/electroblob/wizardry/client/gui/GuiButtonSpellSort.java b/src/main/java/electroblob/wizardry/client/gui/GuiButtonSpellSort.java index 8e5c8439..cfde6624 100644 --- a/src/main/java/electroblob/wizardry/client/gui/GuiButtonSpellSort.java +++ b/src/main/java/electroblob/wizardry/client/gui/GuiButtonSpellSort.java @@ -11,7 +11,7 @@ import net.minecraft.util.ResourceLocation; public class GuiButtonSpellSort extends GuiButton { - private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/spell_sort_buttons.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/container/spell_sort_buttons.png"); private static final int TEXTURE_WIDTH = 32; private static final int TEXTURE_HEIGHT = 32; diff --git a/src/main/java/electroblob/wizardry/client/gui/GuiLectern.java b/src/main/java/electroblob/wizardry/client/gui/GuiLectern.java index 188329ee..c795d842 100644 --- a/src/main/java/electroblob/wizardry/client/gui/GuiLectern.java +++ b/src/main/java/electroblob/wizardry/client/gui/GuiLectern.java @@ -42,7 +42,7 @@ import java.util.stream.Collectors; public class GuiLectern extends GuiSpellInfo implements ISpellSortable { - private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/lectern.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/container/lectern.png"); /** The distance of the page buttons from the bottom outside corners of the GUI. */ private static final int PAGE_BUTTON_INSET_X = 22, PAGE_BUTTON_INSET_Y = 13; /** The distance between adjacent page turn buttons. */ diff --git a/src/main/java/electroblob/wizardry/client/gui/handbook/GuiWizardHandbook.java b/src/main/java/electroblob/wizardry/client/gui/handbook/GuiWizardHandbook.java index bf947a03..ca2dc312 100644 --- a/src/main/java/electroblob/wizardry/client/gui/handbook/GuiWizardHandbook.java +++ b/src/main/java/electroblob/wizardry/client/gui/handbook/GuiWizardHandbook.java @@ -54,7 +54,7 @@ public class GuiWizardHandbook extends GuiScreen { private static final ResourceLocation DEFAULT = new ResourceLocation(Wizardry.MODID, "texts/handbook_en_us.json"); - static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID, "textures/gui/handbook.png"); + static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID, "textures/gui/handbook/handbook.png"); /** Global Gson instance for the handbook. */ private static final Gson gson = new Gson(); diff --git a/src/main/java/electroblob/wizardry/client/renderer/RenderArcaneLock.java b/src/main/java/electroblob/wizardry/client/renderer/RenderArcaneLock.java index a9f36d1e..7722bc6d 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/RenderArcaneLock.java +++ b/src/main/java/electroblob/wizardry/client/renderer/RenderArcaneLock.java @@ -26,11 +26,11 @@ import java.util.List; @Mod.EventBusSubscriber(Side.CLIENT) public class RenderArcaneLock { - private static final ResourceLocation[] textures = new ResourceLocation[8]; + private static final ResourceLocation[] TEXTURES = new ResourceLocation[8]; static { - for(int i=0; i { - private static final ResourceLocation runeTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/rune.png"); + private static final ResourceLocation RUNE_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/entity/arcane_workbench_rune.png"); public RenderArcaneWorkbench(){} @@ -56,7 +56,7 @@ public class RenderArcaneWorkbench extends TileEntitySpecialRenderer { - private static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID, - "textures/entity/dark_ray.png"); - private static final ResourceLocation texture2 = new ResourceLocation(Wizardry.MODID, - "textures/entity/black_hole.png"); + private static final ResourceLocation RAY_TEXTURE = new ResourceLocation(Wizardry.MODID, + "textures/entity/black_hole/ray.png"); + private static final ResourceLocation CENTRE_TEXTURE = new ResourceLocation(Wizardry.MODID, + "textures/entity/black_hole/centre.png"); public RenderBlackHole(RenderManager renderManager){ super(renderManager); @@ -57,7 +57,7 @@ public class RenderBlackHole extends Render { GlStateManager.scale(scale, scale, scale); } - this.bindTexture(texture); + this.bindTexture(RAY_TEXTURE); // In theory this stuff should sort the rays into the correct render order based on the distance from // the 'camera' (i.e. the player's viewpoint) @@ -142,7 +142,7 @@ public class RenderBlackHole extends Render { buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - this.bindTexture(texture2); + this.bindTexture(CENTRE_TEXTURE); buffer.pos(-0.4, 0.4, 0).tex(0, 0).endVertex(); buffer.pos(0.4, 0.4, 0).tex(1, 0).endVertex(); @@ -164,7 +164,7 @@ public class RenderBlackHole extends Render { @Override protected ResourceLocation getEntityTexture(EntityBlackHole entity){ - return texture; + return RAY_TEXTURE; } } diff --git a/src/main/java/electroblob/wizardry/client/renderer/RenderBubble.java b/src/main/java/electroblob/wizardry/client/renderer/RenderBubble.java index 2694f1e8..dedc3bd8 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/RenderBubble.java +++ b/src/main/java/electroblob/wizardry/client/renderer/RenderBubble.java @@ -11,14 +11,14 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; public class RenderBubble extends Render { - private static final ResourceLocation particleTextures = new ResourceLocation("textures/particle/particles.png"); - private static final ResourceLocation darkOrbTexture = new ResourceLocation(Wizardry.MODID, - "textures/entity/dark_orb.png"); + private static final ResourceLocation PARTICLE_TEXTURES = new ResourceLocation("textures/particle/particles.png"); + private static final ResourceLocation ENTRAPMENT_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/entity/entrapment.png"); public RenderBubble(RenderManager renderManager){ super(renderManager); @@ -33,18 +33,20 @@ public class RenderBubble extends Render { float yOffset = 0; - if(WizardryUtilities.getRider(entity) != null){ - yOffset = WizardryUtilities.getRider(entity).height / 2; + Entity rider = WizardryUtilities.getRider(entity); + + if(rider != null){ + yOffset = rider.height / 2; } GlStateManager.translate((float)par2, (float)par4 + yOffset, (float)par6); - this.bindTexture(((EntityBubble)entity).isDarkOrb ? darkOrbTexture : particleTextures); + this.bindTexture(entity.isDarkOrb ? ENTRAPMENT_TEXTURE : PARTICLE_TEXTURES); float f6 = 1.0F; float f7 = 0.5F; float f8 = 0.5F; - if(((EntityBubble)entity).isDarkOrb){ + if(entity.isDarkOrb){ GlStateManager.disableLighting(); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); }else{ @@ -74,24 +76,22 @@ public class RenderBubble extends Render { // tessellator.setColorRGBA_I(k1, 128); // buffer.normal(0.0F, 1.0F, 0.0F); - if(((EntityBubble)entity).isDarkOrb){ - buffer.pos((double)(0.0F - f7), (double)(0.0F - f8), 0.0D).tex(0, 1).endVertex(); - buffer.pos((double)(f6 - f7), (double)(0.0F - f8), 0.0D).tex(1, 1).endVertex(); - buffer.pos((double)(f6 - f7), (double)(1.0F - f8), 0.0D).tex(1, 0).endVertex(); - buffer.pos((double)(0.0F - f7), (double)(1.0F - f8), 0.0D).tex(0, 0).endVertex(); + if(entity.isDarkOrb){ + buffer.pos(0.0F - f7, 0.0F - f8, 0.0D).tex(0, 1).endVertex(); + buffer.pos(f6 - f7, 0.0F - f8, 0.0D).tex(1, 1).endVertex(); + buffer.pos(f6 - f7, 1.0F - f8, 0.0D).tex(1, 0).endVertex(); + buffer.pos(0.0F - f7, 1.0F - f8, 0.0D).tex(0, 0).endVertex(); }else{ - buffer.pos((double)(0.0F - f7), (double)(0.0F - f8), 0.0D).tex(pixelwidth, pixelwidth * 24).endVertex(); - buffer.pos((double)(f6 - f7), (double)(0.0F - f8), 0.0D).tex(pixelwidth * 8, pixelwidth * 24).endVertex(); - buffer.pos((double)(f6 - f7), (double)(1.0F - f8), 0.0D).tex(pixelwidth * 8, pixelwidth * 17).endVertex(); - buffer.pos((double)(0.0F - f7), (double)(1.0F - f8), 0.0D).tex(pixelwidth, pixelwidth * 17).endVertex(); + buffer.pos(0.0F - f7, 0.0F - f8, 0.0D).tex(pixelwidth, pixelwidth * 24).endVertex(); + buffer.pos(f6 - f7, 0.0F - f8, 0.0D).tex(pixelwidth * 8, pixelwidth * 24).endVertex(); + buffer.pos(f6 - f7, 1.0F - f8, 0.0D).tex(pixelwidth * 8, pixelwidth * 17).endVertex(); + buffer.pos(0.0F - f7, 1.0F - f8, 0.0D).tex(pixelwidth, pixelwidth * 17).endVertex(); } tessellator.draw(); GlStateManager.disableBlend(); - if(((EntityBubble)entity).isDarkOrb){ - GlStateManager.enableLighting(); - } + if(entity.isDarkOrb) GlStateManager.enableLighting(); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); diff --git a/src/main/java/electroblob/wizardry/client/renderer/RenderContainmentField.java b/src/main/java/electroblob/wizardry/client/renderer/RenderContainmentField.java index b52b83b0..25660b04 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/RenderContainmentField.java +++ b/src/main/java/electroblob/wizardry/client/renderer/RenderContainmentField.java @@ -24,14 +24,14 @@ import org.lwjgl.opengl.GL11; @Mod.EventBusSubscriber(Side.CLIENT) public class RenderContainmentField { - private static final ResourceLocation[] textures = new ResourceLocation[8]; + private static final ResourceLocation[] TEXTURES = new ResourceLocation[8]; private static final float ANIMATION_SPEED = 0.004f; private static final float FADE_DISTANCE_SQUARED = 15; static { - for(int i=0; i { - private static final ResourceLocation[] textures = new ResourceLocation[10]; + private static final ResourceLocation[] TEXTURES = new ResourceLocation[10]; public RenderDecay(RenderManager renderManager){ super(renderManager); for(int i = 0; i < 10; i++){ - textures[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/decay_" + i + ".png"); + TEXTURES[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/decay/decay_" + i + ".png"); } } @@ -36,7 +36,7 @@ public class RenderDecay extends Render { GlStateManager.translate((float)par2, (float)par4 + yOffset, (float)par6); - this.bindTexture(textures[((EntityDecay)entity).textureIndex]); + this.bindTexture(TEXTURES[((EntityDecay)entity).textureIndex]); float f6 = 1.0F; float f7 = 0.5F; float f8 = 0.5F; diff --git a/src/main/java/electroblob/wizardry/client/renderer/RenderEvilWizard.java b/src/main/java/electroblob/wizardry/client/renderer/RenderEvilWizard.java index 34299e1c..e4470c75 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/RenderEvilWizard.java +++ b/src/main/java/electroblob/wizardry/client/renderer/RenderEvilWizard.java @@ -10,14 +10,15 @@ import net.minecraft.util.ResourceLocation; //@SideOnly(Side.CLIENT) public class RenderEvilWizard extends RenderBiped { - static final ResourceLocation[] textures = new ResourceLocation[6]; + + static final ResourceLocation[] TEXTURES = new ResourceLocation[6]; public RenderEvilWizard(RenderManager renderManager){ super(renderManager, new ModelWizard(), 0.5F); for(int i = 0; i < 6; i++){ - textures[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/evil_wizard_" + i + ".png"); + TEXTURES[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/evil_wizard/evil_wizard_" + i + ".png"); } // Just using the default without overriding models, since the armour sets its own model anyway. this.addLayer(new LayerBipedArmor(this)); @@ -25,7 +26,7 @@ public class RenderEvilWizard extends RenderBiped { @Override protected ResourceLocation getEntityTexture(EntityEvilWizard wizard){ - return textures[wizard.textureIndex]; + return TEXTURES[wizard.textureIndex]; } } diff --git a/src/main/java/electroblob/wizardry/client/renderer/RenderMagicLight.java b/src/main/java/electroblob/wizardry/client/renderer/RenderMagicLight.java index a0e2a2ce..1d6d1f65 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/RenderMagicLight.java +++ b/src/main/java/electroblob/wizardry/client/renderer/RenderMagicLight.java @@ -12,10 +12,10 @@ import org.lwjgl.opengl.GL11; public class RenderMagicLight extends TileEntitySpecialRenderer { - private static final ResourceLocation texture = new ResourceLocation(Wizardry.MODID, - "textures/entity/light_ray.png"); - private static final ResourceLocation texture2 = new ResourceLocation(Wizardry.MODID, - "textures/entity/light_aura.png"); + private static final ResourceLocation RAY_TEXTURE = new ResourceLocation(Wizardry.MODID, + "textures/entity/light/ray.png"); + private static final ResourceLocation FLARE_TEXTURE = new ResourceLocation(Wizardry.MODID, + "textures/entity/light/flare.png"); @Override public void render(TileEntityMagicLight tileentity, double x, double y, double z, float f, @@ -60,7 +60,7 @@ public class RenderMagicLight extends TileEntitySpecialRenderer= 30){ for(int j = 0; j < 30; j++){ diff --git a/src/main/java/electroblob/wizardry/client/renderer/RenderWizard.java b/src/main/java/electroblob/wizardry/client/renderer/RenderWizard.java index 566bc5a7..120e3447 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/RenderWizard.java +++ b/src/main/java/electroblob/wizardry/client/renderer/RenderWizard.java @@ -11,14 +11,14 @@ import net.minecraft.util.ResourceLocation; //@SideOnly(Side.CLIENT) public class RenderWizard extends RenderBiped { - static final ResourceLocation[] textures = new ResourceLocation[6]; + static final ResourceLocation[] TEXTURES = new ResourceLocation[6]; public RenderWizard(RenderManager renderManager){ super(renderManager, new ModelWizard(), 0.5F); for(int i = 0; i < 6; i++){ - textures[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/wizard_" + i + ".png"); + TEXTURES[i] = new ResourceLocation(Wizardry.MODID, "textures/entity/wizard/wizard_" + i + ".png"); } // Just using the default without overriding models, since the armour sets its own model anyway. this.addLayer(new LayerBipedArmor(this)); @@ -26,7 +26,7 @@ public class RenderWizard extends RenderBiped { @Override protected ResourceLocation getEntityTexture(EntityWizard wizard){ - return textures[wizard.textureIndex]; + return TEXTURES[wizard.textureIndex]; } } diff --git a/src/main/java/electroblob/wizardry/constants/Element.java b/src/main/java/electroblob/wizardry/constants/Element.java index 7b433693..49dc4be4 100644 --- a/src/main/java/electroblob/wizardry/constants/Element.java +++ b/src/main/java/electroblob/wizardry/constants/Element.java @@ -37,7 +37,7 @@ public enum Element implements IStringSerializable { Element(Style colour, String name, String modid){ this.colour = colour; this.unlocalisedName = name; - this.icon = new ResourceLocation(modid, "textures/gui/element_icon_" + unlocalisedName + ".png"); + this.icon = new ResourceLocation(modid, "textures/gui/container/element_icon_" + unlocalisedName + ".png"); } /** Returns the element with the given name, or throws an {@link java.lang.IllegalArgumentException} if no such diff --git a/src/main/java/electroblob/wizardry/inventory/ContainerArcaneWorkbench.java b/src/main/java/electroblob/wizardry/inventory/ContainerArcaneWorkbench.java index 884ed425..c3e8b16b 100644 --- a/src/main/java/electroblob/wizardry/inventory/ContainerArcaneWorkbench.java +++ b/src/main/java/electroblob/wizardry/inventory/ContainerArcaneWorkbench.java @@ -52,8 +52,8 @@ public class ContainerArcaneWorkbench extends Container implements ISpellSortabl /** The arcane workbench tile entity associated with this container. */ public TileEntityArcaneWorkbench tileentity; - public static final ResourceLocation EMPTY_SLOT_CRYSTAL = new ResourceLocation(Wizardry.MODID, "gui/empty_slot_crystal"); - public static final ResourceLocation EMPTY_SLOT_UPGRADE = new ResourceLocation(Wizardry.MODID, "gui/empty_slot_upgrade"); + public static final ResourceLocation EMPTY_SLOT_CRYSTAL = new ResourceLocation(Wizardry.MODID, "gui/container/empty_slot_crystal"); + public static final ResourceLocation EMPTY_SLOT_UPGRADE = new ResourceLocation(Wizardry.MODID, "gui/container/empty_slot_upgrade"); public static final int CRYSTAL_SLOT = 8; public static final int CENTRE_SLOT = 9; @@ -192,7 +192,7 @@ public class ContainerArcaneWorkbench extends Container implements ISpellSortabl int centreX = this.getSlot(CENTRE_SLOT).xPos; int centreY = this.getSlot(CENTRE_SLOT).yPos; - + // Show however many spell book slots are necessary for(int i = 0; i < spellSlots; i++){ diff --git a/src/main/java/electroblob/wizardry/potion/CurseEnfeeblement.java b/src/main/java/electroblob/wizardry/potion/CurseEnfeeblement.java index 69daa132..234bc8b9 100644 --- a/src/main/java/electroblob/wizardry/potion/CurseEnfeeblement.java +++ b/src/main/java/electroblob/wizardry/potion/CurseEnfeeblement.java @@ -24,7 +24,7 @@ public class CurseEnfeeblement extends Curse { } public CurseEnfeeblement(boolean isBadEffect, int liquiidColour){ - super(isBadEffect, liquiidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_curse_of_enfeeblement.png")); + super(isBadEffect, liquiidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/curse_of_enfeeblement.png")); // This needs to be here because registerPotionAttributeModifier doesn't like it if the potion has no name yet. this.setPotionName("potion." + Wizardry.MODID + ":curse_of_enfeeblement"); this.registerPotionAttributeModifier(SharedMonsterAttributes.MAX_HEALTH, diff --git a/src/main/java/electroblob/wizardry/potion/CurseUndeath.java b/src/main/java/electroblob/wizardry/potion/CurseUndeath.java index 6f2d0a9f..4bea1099 100644 --- a/src/main/java/electroblob/wizardry/potion/CurseUndeath.java +++ b/src/main/java/electroblob/wizardry/potion/CurseUndeath.java @@ -10,7 +10,7 @@ import net.minecraft.util.math.BlockPos; public class CurseUndeath extends Curse { public CurseUndeath(boolean isBadEffect, int liquiidColour){ - super(isBadEffect, liquiidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_curse_of_undeath.png")); + super(isBadEffect, liquiidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/curse_of_undeath.png")); // This needs to be here because registerPotionAttributeModifier doesn't like it if the potion has no name yet. this.setPotionName("potion." + Wizardry.MODID + ":curse_of_undeath"); } diff --git a/src/main/java/electroblob/wizardry/potion/PotionContainment.java b/src/main/java/electroblob/wizardry/potion/PotionContainment.java index ec8d269d..46188438 100644 --- a/src/main/java/electroblob/wizardry/potion/PotionContainment.java +++ b/src/main/java/electroblob/wizardry/potion/PotionContainment.java @@ -21,7 +21,7 @@ public class PotionContainment extends PotionMagicEffect { public static final String ENTITY_TAG = "containmentPos"; public PotionContainment(boolean isBadEffect, int liquidColour){ - super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_containment.png")); + super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/containment.png")); this.setPotionName("potion." + Wizardry.MODID + ":containment"); } diff --git a/src/main/java/electroblob/wizardry/potion/PotionDecay.java b/src/main/java/electroblob/wizardry/potion/PotionDecay.java index c4562d3c..7ce204ff 100644 --- a/src/main/java/electroblob/wizardry/potion/PotionDecay.java +++ b/src/main/java/electroblob/wizardry/potion/PotionDecay.java @@ -19,7 +19,7 @@ import java.util.List; public class PotionDecay extends PotionMagicEffect { public PotionDecay(boolean isBadEffect, int liquidColour){ - super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_decay.png")); + super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/decay.png")); // This needs to be here because registerPotionAttributeModifier doesn't like it if the potion has no name yet. this.setPotionName("potion." + Wizardry.MODID + ":decay"); this.registerPotionAttributeModifier(SharedMonsterAttributes.MOVEMENT_SPEED, diff --git a/src/main/java/electroblob/wizardry/potion/PotionFrost.java b/src/main/java/electroblob/wizardry/potion/PotionFrost.java index 28b89553..dc4366dd 100644 --- a/src/main/java/electroblob/wizardry/potion/PotionFrost.java +++ b/src/main/java/electroblob/wizardry/potion/PotionFrost.java @@ -16,7 +16,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionFrost extends PotionMagicEffect implements ICustomPotionParticles { public PotionFrost(boolean isBadEffect, int liquidColour){ - super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_frost.png")); + super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/frost.png")); // This needs to be here because registerPotionAttributeModifier doesn't like it if the potion has no name yet. this.setPotionName("potion." + Wizardry.MODID + ":frost"); // With -0.5 as the 'amount', frost 1 slows the entity down by a half and frost 2 roots it to the spot diff --git a/src/main/java/electroblob/wizardry/potion/PotionFrostStep.java b/src/main/java/electroblob/wizardry/potion/PotionFrostStep.java index 4c369526..44377266 100644 --- a/src/main/java/electroblob/wizardry/potion/PotionFrostStep.java +++ b/src/main/java/electroblob/wizardry/potion/PotionFrostStep.java @@ -32,7 +32,7 @@ public class PotionFrostStep extends PotionMagicEffect implements ICustomPotionP private static final Field prevBlockPos = ObfuscationReflectionHelper.findField(EntityLivingBase.class, "field_184620_bC"); public PotionFrostStep(boolean isBadEffect, int liquidColour){ - super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_frost_step.png")); + super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/frost_step.png")); this.setPotionName("potion." + Wizardry.MODID + ":frost_step"); } diff --git a/src/main/java/electroblob/wizardry/potion/PotionSlowTime.java b/src/main/java/electroblob/wizardry/potion/PotionSlowTime.java index e849de0c..0a00a31d 100644 --- a/src/main/java/electroblob/wizardry/potion/PotionSlowTime.java +++ b/src/main/java/electroblob/wizardry/potion/PotionSlowTime.java @@ -34,7 +34,7 @@ public class PotionSlowTime extends PotionMagicEffect implements ISyncedPotion { public static final String NBT_KEY = "time_slowed"; public PotionSlowTime(boolean isBadEffect, int liquidColour){ - super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icon_slow_time.png")); + super(isBadEffect, liquidColour, new ResourceLocation(Wizardry.MODID, "textures/gui/potion_icons/slow_time.png")); this.setPotionName("potion." + Wizardry.MODID + ":slow_time"); } diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json b/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json index a040b1c2..3b821cb6 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json @@ -11,7 +11,7 @@ "images": { "workbench": { - "location": "ebwizardry:textures/gui/arcane_workbench_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesarcane_workbench_picture.png", "caption": "The Arcane Workbench", "u": 0, "v": 0, @@ -19,7 +19,7 @@ "height": 110 }, "crystal_ore": { - "location": "ebwizardry:textures/gui/ore_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesore_picture.png", "caption": "Crystal Ore", "u": 0, "v": 0, @@ -47,7 +47,7 @@ "border": false }, "crystal_flower": { - "location": "ebwizardry:textures/gui/flower_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesflower_picture.png", "caption": "A Crystal Flower", "u": 0, "v": 0, @@ -55,7 +55,7 @@ "height": 48 }, "wizard_tower": { - "location": "ebwizardry:textures/gui/tower_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturestower_picture.png", "caption": "A Wizard's Tower", "u": 0, "v": 0, @@ -63,7 +63,7 @@ "height": 110 }, "wizard_armour": { - "location": "ebwizardry:textures/gui/armour_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesarmour_picture.png", "caption": "A Set Of Wizard Armour", "u": 0, "v": 0, @@ -71,7 +71,7 @@ "height": 90 }, "obelisk": { - "location": "ebwizardry:textures/gui/obelisk_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesobelisk_picture.png", "caption": "An Obelisk", "u": 0, "v": 0, @@ -79,7 +79,7 @@ "height": 67 }, "shrine": { - "location": "ebwizardry:textures/gui/shrine_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesshrine_picture.png", "caption": "An Earth Shrine", "u": 0, "v": 0, @@ -87,7 +87,7 @@ "height": 67 }, "tiers": { - "location": "ebwizardry:textures/gui/tiers_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturestiers_picture.png", "caption": "The 4 Tiers Of Wand", "u": 0, "v": 0, @@ -96,7 +96,7 @@ "border": false }, "elements": { - "location": "ebwizardry:textures/gui/elements_picture.png", + "location": "ebwizardry:textures/gui/handbook/pictureselements_picture.png", "caption": "The 7 Arcane Elements", "u": 0, "v": 0, diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json b/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json index 45d60db3..34703d44 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json @@ -11,7 +11,7 @@ "images": { "workbench": { - "location": "ebwizardry:textures/gui/arcane_workbench_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesarcane_workbench_picture.png", "caption": "The Arcane Workbench", "u": 0, "v": 0, @@ -19,7 +19,7 @@ "height": 110 }, "crystal_ore": { - "location": "ebwizardry:textures/gui/ore_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesore_picture.png", "caption": "Crystal Ore", "u": 0, "v": 0, @@ -47,7 +47,7 @@ "border": false }, "crystal_flower": { - "location": "ebwizardry:textures/gui/flower_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesflower_picture.png", "caption": "A Crystal Flower", "u": 0, "v": 0, @@ -55,7 +55,7 @@ "height": 48 }, "wizard_tower": { - "location": "ebwizardry:textures/gui/tower_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturestower_picture.png", "caption": "A Wizard's Tower", "u": 0, "v": 0, @@ -63,7 +63,7 @@ "height": 110 }, "wizard_armour": { - "location": "ebwizardry:textures/gui/armour_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesarmour_picture.png", "caption": "A Set Of Wizard Armour", "u": 0, "v": 0, @@ -71,7 +71,7 @@ "height": 90 }, "obelisk": { - "location": "ebwizardry:textures/gui/obelisk_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesobelisk_picture.png", "caption": "An Obelisk", "u": 0, "v": 0, @@ -79,7 +79,7 @@ "height": 67 }, "shrine": { - "location": "ebwizardry:textures/gui/shrine_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesshrine_picture.png", "caption": "An Earth Shrine", "u": 0, "v": 0, @@ -87,7 +87,7 @@ "height": 67 }, "tiers": { - "location": "ebwizardry:textures/gui/tiers_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturestiers_picture.png", "caption": "The 4 Tiers Of Wand", "u": 0, "v": 0, @@ -96,7 +96,7 @@ "border": false }, "elements": { - "location": "ebwizardry:textures/gui/elements_picture.png", + "location": "ebwizardry:textures/gui/handbook/pictureselements_picture.png", "caption": "The 7 Arcane Elements", "u": 0, "v": 0, diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json b/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json index a8b933ab..1ab4d80d 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json @@ -11,7 +11,7 @@ "images": { "workbench": { - "location": "ebwizardry:textures/gui/arcane_workbench_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesarcane_workbench_picture.png", "caption": "Mesa Arcana", "u": 0, "v": 0, @@ -19,7 +19,7 @@ "height": 110 }, "crystal_ore": { - "location": "ebwizardry:textures/gui/ore_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesore_picture.png", "caption": "Mena de Cristal Mágico", "u": 0, "v": 0, @@ -47,7 +47,7 @@ "border": false }, "crystal_flower": { - "location": "ebwizardry:textures/gui/flower_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesflower_picture.png", "caption": "Flor de Cristal", "u": 0, "v": 0, @@ -55,7 +55,7 @@ "height": 48 }, "wizard_tower": { - "location": "ebwizardry:textures/gui/tower_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturestower_picture.png", "caption": "Torre de mago", "u": 0, "v": 0, @@ -63,7 +63,7 @@ "height": 110 }, "wizard_armour": { - "location": "ebwizardry:textures/gui/armour_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesarmour_picture.png", "caption": "Conjunto de Armadura de mago", "u": 0, "v": 0, @@ -71,7 +71,7 @@ "height": 90 }, "obelisk": { - "location": "ebwizardry:textures/gui/obelisk_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesobelisk_picture.png", "caption": "Obelisco", "u": 0, "v": 0, @@ -79,7 +79,7 @@ "height": 67 }, "shrine": { - "location": "ebwizardry:textures/gui/shrine_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesshrine_picture.png", "caption": "Santuario de la tierra", "u": 0, "v": 0, @@ -87,7 +87,7 @@ "height": 67 }, "tiers": { - "location": "ebwizardry:textures/gui/tiers_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturestiers_picture.png", "caption": "Los 4 niveles en las Varitas", "u": 0, "v": 0, @@ -96,7 +96,7 @@ "border": false }, "elements": { - "location": "ebwizardry:textures/gui/elements_picture.png", + "location": "ebwizardry:textures/gui/handbook/pictureselements_picture.png", "caption": "Los 7 elementos Arcanos", "u": 0, "v": 0, diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json b/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json index 1fa2da89..5d892c93 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json @@ -11,7 +11,7 @@ "images": { "workbench": { - "location": "ebwizardry:textures/gui/arcane_workbench_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesarcane_workbench_picture.png", "caption": "The Arcane Workbench", "u": 0, "v": 0, @@ -19,7 +19,7 @@ "height": 110 }, "crystal_ore": { - "location": "ebwizardry:textures/gui/ore_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesore_picture.png", "caption": "Crystal Ore", "u": 0, "v": 0, @@ -47,7 +47,7 @@ "border": false }, "crystal_flower": { - "location": "ebwizardry:textures/gui/flower_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesflower_picture.png", "caption": "A Crystal Flower", "u": 0, "v": 0, @@ -55,7 +55,7 @@ "height": 48 }, "wizard_tower": { - "location": "ebwizardry:textures/gui/tower_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturestower_picture.png", "caption": "A Wizard's Tower", "u": 0, "v": 0, @@ -63,7 +63,7 @@ "height": 110 }, "wizard_armour": { - "location": "ebwizardry:textures/gui/armour_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesarmour_picture.png", "caption": "A Set Of Wizard Armour", "u": 0, "v": 0, @@ -71,7 +71,7 @@ "height": 90 }, "obelisk": { - "location": "ebwizardry:textures/gui/obelisk_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesobelisk_picture.png", "caption": "An Obelisk", "u": 0, "v": 0, @@ -79,7 +79,7 @@ "height": 67 }, "shrine": { - "location": "ebwizardry:textures/gui/shrine_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesshrine_picture.png", "caption": "An Earth Shrine", "u": 0, "v": 0, @@ -87,7 +87,7 @@ "height": 67 }, "tiers": { - "location": "ebwizardry:textures/gui/tiers_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturestiers_picture.png", "caption": "The 4 Tiers Of Wand", "u": 0, "v": 0, @@ -96,7 +96,7 @@ "border": false }, "elements": { - "location": "ebwizardry:textures/gui/elements_picture.png", + "location": "ebwizardry:textures/gui/handbook/pictureselements_picture.png", "caption": "The 7 Arcane Elements", "u": 0, "v": 0, diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json b/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json index 7158605b..9b6f7e35 100644 --- a/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json +++ b/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json @@ -11,7 +11,7 @@ "images": { "workbench": { - "location": "ebwizardry:textures/gui/arcane_workbench_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesarcane_workbench_picture.png", "caption": "法術工作台", "u": 0, "v": 0, @@ -19,7 +19,7 @@ "height": 110 }, "crystal_ore": { - "location": "ebwizardry:textures/gui/ore_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesore_picture.png", "caption": "水晶礦", "u": 0, "v": 0, @@ -47,7 +47,7 @@ "border": false }, "crystal_flower": { - "location": "ebwizardry:textures/gui/flower_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesflower_picture.png", "caption": "水晶花", "u": 0, "v": 0, @@ -55,7 +55,7 @@ "height": 48 }, "wizard_tower": { - "location": "ebwizardry:textures/gui/tower_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturestower_picture.png", "caption": "法師塔", "u": 0, "v": 0, @@ -63,7 +63,7 @@ "height": 110 }, "wizard_armour": { - "location": "ebwizardry:textures/gui/armour_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesarmour_picture.png", "caption": "法師服", "u": 0, "v": 0, @@ -71,7 +71,7 @@ "height": 90 }, "obelisk": { - "location": "ebwizardry:textures/gui/obelisk_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesobelisk_picture.png", "caption": "方尖碑", "u": 0, "v": 0, @@ -79,7 +79,7 @@ "height": 67 }, "shrine": { - "location": "ebwizardry:textures/gui/shrine_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturesshrine_picture.png", "caption": "神殿", "u": 0, "v": 0, @@ -87,7 +87,7 @@ "height": 67 }, "tiers": { - "location": "ebwizardry:textures/gui/tiers_picture.png", + "location": "ebwizardry:textures/gui/handbook/picturestiers_picture.png", "caption": "四種等級的法杖", "u": 0, "v": 0, @@ -96,7 +96,7 @@ "border": false }, "elements": { - "location": "ebwizardry:textures/gui/elements_picture.png", + "location": "ebwizardry:textures/gui/handbook/pictureselements_picture.png", "caption": "七種法術元素", "u": 0, "v": 0, diff --git a/src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_0.png b/src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_0.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_0.png rename to src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_0.png diff --git a/src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_1.png b/src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_1.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_1.png rename to src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_1.png diff --git a/src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_2.png b/src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_2.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_2.png rename to src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_2.png diff --git a/src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_3.png b/src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_3.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_3.png rename to src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_3.png diff --git a/src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_4.png b/src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_4.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_4.png rename to src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_4.png diff --git a/src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_5.png b/src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_5.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_5.png rename to src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_5.png diff --git a/src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_6.png b/src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_6.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_6.png rename to src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_6.png diff --git a/src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_7.png b/src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_7.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/entity/arcane_lock_7.png rename to src/main/resources/assets/ebwizardry/textures/blocks/arcane_lock_7.png diff --git a/src/main/resources/assets/ebwizardry/textures/entity/rune.png b/src/main/resources/assets/ebwizardry/textures/entity/arcane_workbench_rune.png similarity index 100% rename from src/main/resources/assets/ebwizardry/textures/entity/rune.png rename to src/main/resources/assets/ebwizardry/textures/entity/arcane_workbench_rune.png diff --git a/src/main/resources/assets/ebwizardry/textures/entity/aura.png b/src/main/resources/assets/ebwizardry/textures/entity/aura.png deleted file mode 100644 index 89e2234bca4424726056e7dab295eb5196610de8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1165 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Y)RhkE)0_xCNpThPYOK6 zz`(#+;1OBOz`!jG!i)^F=14FwFtC?+`ns||;N<2NWZU%EQH6nlK{hiaqQp5rH#aq} zgaHJci&7IyQd1PlGfOfQ+&z5*QuI>U85o#9db&7yi_y*fzRUEo;#+Sp7%wQr0~ zoOUiUvyVJ2dU{7wCg-!qI{}tM;vCnK<6r%8Jbx)`3rBeB>SbX|=f3>+>-F;k!t-Zy zKmFC6ceng&_# z8eJ3&uL_rO>2rw_tkvI|TRKQNE+1~0=T=}SLD z87^pUHx-`9_25^CrNyLnhP;14-{S29_C0s#VeWX+bj0B;gHF!boLc5Q*ClK_EW^Lu zzw`2xaKpA3?k%k95JW9U|~x5=Bo&0KrJh09}p*V@SVndjRN+Qzo6$Wm2G zjlN%dCSUK$^9&|~GKaFc-g~r#j#@ByPggWFom}m;z@|pu=lm2K#f=BN8N)0LcK1zu z&UfU*(xl{5?gw>!PxLTJtb7&Vl9j7)Jye{3<*D8(2bbw0+v0sM9$FJFE}YDMX88w! z6}QETa;+J5>hh;Z9B?V;d7JapNGmdyS_nifW$CWwPVXl z-p$bH<&EF4X~Hzg1FP>Zb=FPfy>sl#Ihh5A9QGLOGCbtO8sox!_SdX! zBC2>gi{ww7yDR^SDMPeweN2e?x;x7@dxv)gzuM~OH>H~Y!KVm8!O*K$0;1H9XzR?a z5B{L*8<9FSKe75%!9LDS(GB(g0*ZF38_2DQE&Z%&R(kLhMY^Sf`5M8;<|WnqJibhh#Bms3+vX$1 zJfkLL)59uR1^LLW0xLsGuU$UBn%8(COWC747U)|(?8}Ia=TV+-B*