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

Initial 1.11.2 update

Browse Source
This commit is contained in:
Electroblob
2018-02-07 21:15:50 +00:00
parent 67f6be0671
commit 3df5597dcc
368 changed files with 17234 additions and 15082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/registry/WizardryTabs.java
+40 -79
View File
@@ -14,11 +14,13 @@ import electroblob.wizardry.spell.Spell;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
/**
* Class responsible for defining and storing all of wizardry's creative tabs. Also handles sorting of the items.
*
* @author Electroblob
* @since Wizardry 2.1
*/
@@ -32,13 +34,13 @@ public final class WizardryTabs {
@Override
@SideOnly(Side.CLIENT)
public Item getTabIconItem() {
return WizardryItems.wizard_handbook;
public ItemStack getTabIconItem(){
return new ItemStack(WizardryItems.wizard_handbook);
}
@Override
@SideOnly(Side.CLIENT)
public void displayAllRelevantItems(List<ItemStack> items) {
public void displayAllRelevantItems(NonNullList<ItemStack> items){
super.displayAllRelevantItems(items);
Collections.sort(items, itemSorter);
}
@@ -47,25 +49,25 @@ public final class WizardryTabs {
@Override
@SideOnly(Side.CLIENT)
public Item getTabIconItem() {
return WizardryItems.spell_book;
public ItemStack getTabIconItem(){
return new ItemStack(WizardryItems.spell_book);
}
@Override
@SideOnly(Side.CLIENT)
public void displayAllRelevantItems(List<ItemStack> items) {
public void displayAllRelevantItems(NonNullList<ItemStack> items){
super.displayAllRelevantItems(items);
Collections.sort(items, spellItemSorter);
}
@Override
public boolean hasSearchBar() {
public boolean hasSearchBar(){
return true;
}
@Override
@SideOnly(Side.CLIENT)
public String getBackgroundImageName() {
public String getBackgroundImageName(){
return "item_search.png";
}
};
@@ -74,85 +76,44 @@ public final class WizardryTabs {
public static void sort(){
List<Item> orderedItemList = Arrays.asList(
Item.getItemFromBlock(WizardryBlocks.arcane_workbench),
Item.getItemFromBlock(WizardryBlocks.crystal_ore),
Item.getItemFromBlock(WizardryBlocks.crystal_block),
Item.getItemFromBlock(WizardryBlocks.crystal_flower),
Item.getItemFromBlock(WizardryBlocks.transportation_stone),
WizardryItems.magic_crystal,
WizardryItems.magic_wand,
WizardryItems.apprentice_wand,
WizardryItems.advanced_wand,
WizardryItems.master_wand,
WizardryItems.arcane_tome,
WizardryItems.wizard_handbook,
WizardryItems.basic_fire_wand,
WizardryItems.basic_ice_wand,
WizardryItems.basic_lightning_wand,
WizardryItems.basic_necromancy_wand,
WizardryItems.basic_earth_wand,
WizardryItems.basic_sorcery_wand,
WizardryItems.basic_healing_wand,
WizardryItems.smoke_bomb,
WizardryItems.firebomb,
WizardryItems.poison_bomb,
WizardryItems.blank_scroll,
WizardryItems.identification_scroll,
WizardryItems.mana_flask,
WizardryItems.storage_upgrade,
WizardryItems.siphon_upgrade,
WizardryItems.condenser_upgrade,
WizardryItems.range_upgrade,
WizardryItems.duration_upgrade,
WizardryItems.cooldown_upgrade,
WizardryItems.blast_upgrade,
WizardryItems.attunement_upgrade,
WizardryItems.magic_silk,
WizardryItems.armour_upgrade,
WizardryItems.wizard_hat,
WizardryItems.wizard_robe,
WizardryItems.wizard_leggings,
WizardryItems.wizard_boots,
WizardryItems.wizard_hat_fire,
WizardryItems.wizard_robe_fire,
WizardryItems.wizard_leggings_fire,
WizardryItems.wizard_boots_fire,
WizardryItems.wizard_hat_ice,
WizardryItems.wizard_robe_ice,
WizardryItems.wizard_leggings_ice,
WizardryItems.wizard_boots_ice,
WizardryItems.wizard_hat_lightning,
WizardryItems.wizard_robe_lightning,
WizardryItems.wizard_leggings_lightning,
WizardryItems.wizard_boots_lightning,
WizardryItems.wizard_hat_necromancy,
WizardryItems.wizard_robe_necromancy,
WizardryItems.wizard_leggings_necromancy,
WizardryItems.wizard_boots_necromancy,
WizardryItems.wizard_hat_earth,
WizardryItems.wizard_robe_earth,
WizardryItems.wizard_leggings_earth,
WizardryItems.wizard_boots_earth,
WizardryItems.wizard_hat_sorcery,
WizardryItems.wizard_robe_sorcery,
WizardryItems.wizard_leggings_sorcery,
WizardryItems.wizard_boots_sorcery,
WizardryItems.wizard_hat_healing,
WizardryItems.wizard_robe_healing,
WizardryItems.wizard_leggings_healing,
WizardryItems.wizard_boots_healing);
itemSorter = Ordering.explicit(orderedItemList).onResultOf(new Function<ItemStack, Item>() {
Item.getItemFromBlock(WizardryBlocks.arcane_workbench),
Item.getItemFromBlock(WizardryBlocks.crystal_ore), Item.getItemFromBlock(WizardryBlocks.crystal_block),
Item.getItemFromBlock(WizardryBlocks.crystal_flower),
Item.getItemFromBlock(WizardryBlocks.transportation_stone), WizardryItems.magic_crystal,
WizardryItems.magic_wand, WizardryItems.apprentice_wand, WizardryItems.advanced_wand,
WizardryItems.master_wand, WizardryItems.arcane_tome, WizardryItems.wizard_handbook,
WizardryItems.basic_fire_wand, WizardryItems.basic_ice_wand, WizardryItems.basic_lightning_wand,
WizardryItems.basic_necromancy_wand, WizardryItems.basic_earth_wand, WizardryItems.basic_sorcery_wand,
WizardryItems.basic_healing_wand, WizardryItems.smoke_bomb, WizardryItems.firebomb,
WizardryItems.poison_bomb, WizardryItems.blank_scroll, WizardryItems.identification_scroll,
WizardryItems.mana_flask, WizardryItems.storage_upgrade, WizardryItems.siphon_upgrade,
WizardryItems.condenser_upgrade, WizardryItems.range_upgrade, WizardryItems.duration_upgrade,
WizardryItems.cooldown_upgrade, WizardryItems.blast_upgrade, WizardryItems.attunement_upgrade,
WizardryItems.magic_silk, WizardryItems.armour_upgrade, WizardryItems.wizard_hat,
WizardryItems.wizard_robe, WizardryItems.wizard_leggings, WizardryItems.wizard_boots,
WizardryItems.wizard_hat_fire, WizardryItems.wizard_robe_fire, WizardryItems.wizard_leggings_fire,
WizardryItems.wizard_boots_fire, WizardryItems.wizard_hat_ice, WizardryItems.wizard_robe_ice,
WizardryItems.wizard_leggings_ice, WizardryItems.wizard_boots_ice, WizardryItems.wizard_hat_lightning,
WizardryItems.wizard_robe_lightning, WizardryItems.wizard_leggings_lightning,
WizardryItems.wizard_boots_lightning, WizardryItems.wizard_hat_necromancy,
WizardryItems.wizard_robe_necromancy, WizardryItems.wizard_leggings_necromancy,
WizardryItems.wizard_boots_necromancy, WizardryItems.wizard_hat_earth, WizardryItems.wizard_robe_earth,
WizardryItems.wizard_leggings_earth, WizardryItems.wizard_boots_earth, WizardryItems.wizard_hat_sorcery,
WizardryItems.wizard_robe_sorcery, WizardryItems.wizard_leggings_sorcery,
WizardryItems.wizard_boots_sorcery, WizardryItems.wizard_hat_healing, WizardryItems.wizard_robe_healing,
WizardryItems.wizard_leggings_healing, WizardryItems.wizard_boots_healing);
itemSorter = Ordering.explicit(orderedItemList).onResultOf(new Function<ItemStack, Item>(){
@Override
public Item apply(ItemStack input) {
public Item apply(ItemStack input){
return input.getItem();
}
});
spellItemSorter = new Comparator<ItemStack>(){
@Override
public int compare(ItemStack stack1, ItemStack stack2) {
public int compare(ItemStack stack1, ItemStack stack2){
if((stack1.getItem() instanceof ItemSpellBook && stack2.getItem() instanceof ItemSpellBook)
|| (stack1.getItem() instanceof ItemScroll && stack2.getItem() instanceof ItemScroll)){