From ea11910af2c3474ad6a810dd780bc1dd41e8bcc5 Mon Sep 17 00:00:00 2001 From: Philipp Rustemeier Date: Fri, 16 Mar 2018 17:40:50 +0100 Subject: [PATCH] Post-merge fixups In particular, act as if a spellbook has been discovered during tooltip generation if player is null. This allows JEI to index all the spell names. --- build.gradle | 6 +++--- src/main/java/electroblob/wizardry/Wizardry.java | 7 +------ .../electroblob/wizardry/item/ItemArmourUpgrade.java | 2 ++ .../wizardry/item/ItemSpectralArmour.java | 4 ++-- .../electroblob/wizardry/item/ItemSpellBook.java | 5 ++--- .../electroblob/wizardry/item/ItemWizardArmour.java | 10 +++++----- .../wizardry/item/ItemWizardHandbook.java | 2 ++ .../wizardry/registry/WizardryRegistry.java | 3 ++- src/main/java/electroblob/wizardry/spell/Spell.java | 12 ++++++------ 9 files changed, 25 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index 712ab42d..462b77b1 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { maven { url = "http://files.minecraftforge.net/maven" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } apply plugin: 'net.minecraftforge.gradle.forge' @@ -21,7 +21,7 @@ compileJava { } minecraft { - version = "1.11.2-13.20.1.2588" + version = "1.12.2-14.23.2.2611" runDir = "run" // the mappings can be changed at any time, and must be in the following format. @@ -29,7 +29,7 @@ minecraft { // stable_# stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not always work. // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "stable_32" + mappings = "snapshot_20180316" // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. } diff --git a/src/main/java/electroblob/wizardry/Wizardry.java b/src/main/java/electroblob/wizardry/Wizardry.java index a0dbfd24..62e092da 100644 --- a/src/main/java/electroblob/wizardry/Wizardry.java +++ b/src/main/java/electroblob/wizardry/Wizardry.java @@ -158,11 +158,6 @@ public class Wizardry { NetworkRegistry.INSTANCE.registerGuiHandler(this, new WizardryGuiHandler()); WizardryPacketHandler.initPackets(); - // Recipes - WizardryRegistry.registerRecipes(); - - WizardryTabs.sort(); - proxy.initGuiBits(); } @@ -200,7 +195,7 @@ public class Wizardry { @EventHandler public static void onMissingMappingEvent(RegistryEvent.MissingMappings event){ // Just get, not getAll, since the mod id didn't change! - for(MissingMappings.Mapping mapping : event.getAllMappings()){ + for(RegistryEvent.MissingMappings.Mapping mapping : event.getAllMappings()){ if(mapping.key.getResourceDomain().equals(Wizardry.MODID)){ Item replacement = null; diff --git a/src/main/java/electroblob/wizardry/item/ItemArmourUpgrade.java b/src/main/java/electroblob/wizardry/item/ItemArmourUpgrade.java index 77e971c7..b058bf9d 100644 --- a/src/main/java/electroblob/wizardry/item/ItemArmourUpgrade.java +++ b/src/main/java/electroblob/wizardry/item/ItemArmourUpgrade.java @@ -13,6 +13,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; + public class ItemArmourUpgrade extends Item { public ItemArmourUpgrade(){ diff --git a/src/main/java/electroblob/wizardry/item/ItemSpectralArmour.java b/src/main/java/electroblob/wizardry/item/ItemSpectralArmour.java index 24a995f7..1250c083 100644 --- a/src/main/java/electroblob/wizardry/item/ItemSpectralArmour.java +++ b/src/main/java/electroblob/wizardry/item/ItemSpectralArmour.java @@ -82,9 +82,9 @@ public class ItemSpectralArmour extends ItemArmor implements IConjuredItem { @Override public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type){ - if(slot == EntityEquipmentSlot.LEGS) return "wizardry:textures/armour/spectral_armour_legs.png"; + if(slot == EntityEquipmentSlot.LEGS) return "ebwizardry:textures/armour/spectral_armour_legs.png"; - return "wizardry:textures/armour/spectral_armour.png"; + return "ebwizardry:textures/armour/spectral_armour.png"; } @Override diff --git a/src/main/java/electroblob/wizardry/item/ItemSpellBook.java b/src/main/java/electroblob/wizardry/item/ItemSpellBook.java index e60c212e..5be6a328 100644 --- a/src/main/java/electroblob/wizardry/item/ItemSpellBook.java +++ b/src/main/java/electroblob/wizardry/item/ItemSpellBook.java @@ -62,12 +62,11 @@ public class ItemSpellBook extends Item { // Tooltip is left blank for wizards buying generic spell books. if(itemstack.getItemDamage() != OreDictionary.WILDCARD_VALUE){ EntityPlayerSP player = Minecraft.getMinecraft().player; - if (player == null) { return; } - + Spell spell = Spell.get(itemstack.getItemDamage()); boolean discovered = true; - if(Wizardry.settings.discoveryMode && !player.capabilities.isCreativeMode && WizardData.get(player) != null + if(player != null && Wizardry.settings.discoveryMode && !player.capabilities.isCreativeMode && WizardData.get(player) != null && !WizardData.get(player).hasSpellBeenDiscovered(spell)){ discovered = false; } diff --git a/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java b/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java index 7c1657dc..e03c2ec4 100644 --- a/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java +++ b/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java @@ -139,14 +139,14 @@ public class ItemWizardArmour extends ItemArmor implements ISpecialArmor { // Do note however that a texture pack could override this. if(entity instanceof EntityLivingBase && ((EntityLivingBase)entity).isInvisible() && !entity.getEntityData().getBoolean(Petrify.NBT_KEY)) - return "wizardry:textures/armour/invisible_armour.png"; + return "ebwizardry:textures/armour/invisible_armour.png"; if(slot == EntityEquipmentSlot.LEGS) - return this.element == null ? "wizardry:textures/armour/wizard_armour_legs.png" - : "wizardry:textures/armour/wizard_armour_" + this.element.getUnlocalisedName() + "_legs.png"; + return this.element == null ? "ebwizardry:textures/armour/wizard_armour_legs.png" + : "ebwizardry:textures/armour/wizard_armour_" + this.element.getUnlocalisedName() + "_legs.png"; - return this.element == null ? "wizardry:textures/armour/wizard_armour.png" - : "wizardry:textures/armour/wizard_armour_" + this.element.getUnlocalisedName() + ".png"; + return this.element == null ? "ebwizardry:textures/armour/wizard_armour.png" + : "ebwizardry:textures/armour/wizard_armour_" + this.element.getUnlocalisedName() + ".png"; } @Override diff --git a/src/main/java/electroblob/wizardry/item/ItemWizardHandbook.java b/src/main/java/electroblob/wizardry/item/ItemWizardHandbook.java index cd012593..22262bff 100644 --- a/src/main/java/electroblob/wizardry/item/ItemWizardHandbook.java +++ b/src/main/java/electroblob/wizardry/item/ItemWizardHandbook.java @@ -15,6 +15,8 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import javax.annotation.Nullable; + public class ItemWizardHandbook extends Item { // Yep, I hardcoded my own name into the mod. Don't want people changing it now, do I? diff --git a/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java b/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java index 7d71c3ab..fab3ced3 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java @@ -1,5 +1,6 @@ package electroblob.wizardry.registry; +import com.google.common.collect.Lists; import electroblob.wizardry.Wizardry; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.Tier; @@ -20,6 +21,7 @@ import net.minecraft.init.Biomes; import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.Biome; @@ -36,7 +38,6 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.registries.IForgeRegistry; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/electroblob/wizardry/spell/Spell.java b/src/main/java/electroblob/wizardry/spell/Spell.java index 8ca229f4..94fdb086 100644 --- a/src/main/java/electroblob/wizardry/spell/Spell.java +++ b/src/main/java/electroblob/wizardry/spell/Spell.java @@ -1,11 +1,5 @@ package electroblob.wizardry.spell; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - import electroblob.wizardry.Wizardry; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.SpellType; @@ -30,6 +24,12 @@ import net.minecraftforge.registries.ForgeRegistry; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; + /** * Generic spell class which is the superclass to all spells in wizardry. When extending this class, you must do the * following: