From 96382a1a4b2b5376eda74bd5878b41c831cfd8da Mon Sep 17 00:00:00 2001 From: Senne Date: Sat, 2 Oct 2021 00:05:08 +0200 Subject: [PATCH 1/7] Add wiki.json pages --- src/main/resources/wiki.json | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/resources/wiki.json b/src/main/resources/wiki.json index a23770f37..5d86e443b 100644 --- a/src/main/resources/wiki.json +++ b/src/main/resources/wiki.json @@ -17,6 +17,7 @@ "AUTO_ENCHANTER" : "Auto-Enchanter", "AUTOMATED_PANNING_MACHINE" : "Automated-Panning-Machine", "AUTOMATED_IGNITION_CHAMBER" : "Automated-Ignition-Chamber", + "BANDAGE" : "Medical-Supplies", "BASIC_CIRCUIT_BOARD" : "Circuit-Boards", "BATTERY" : "Battery", "BEEF_JERKY" : "Meat-Jerky", @@ -24,8 +25,11 @@ "BILLON_INGOT" : "Billon-Ingot", "BLADE_OF_VAMPIRES" : "Blade-of-Vampires", "BLISTERING_INGOT" : "Blistering-Ingot", + "BLISTERING_INGOT_2" : "Blistering-Ingot", + "BLISTERING_INGOT_3" : "Blistering-Ingot", "BLOCK_PLACER" : "Block-Placer", "BOOSTED_URANIUM" : "Boosted-Uranium", + "BOUND_BACKPACK" : "Backpacks", "BRASS_INGOT" : "Brass-Ingot", "BROKEN_SPAWNER" : "Broken-Spawner", "BRONZE_INGOT" : "Bronze-Ingot", @@ -37,8 +41,9 @@ "CACTUS_LEGGINGS" : "Armor", "CACTUS_BOOTS" : "Armor", "CARBON" : "Carbon", + "CARBON_CHUNK" : "Carbon", "CARBON_PRESS" : "Carbon-Press", - "CARBONDAO" : "Carbonado", + "CARBONADO" : "Carbonado", "CARBONADO_EDGED_CAPACITOR" : "Energy-Capacitors", "CARBONADO_EDGED_FURNACE" : "Enhanced-Furnaces", "CARGO_INPUT" : "Input-Node", @@ -133,6 +138,7 @@ "FORTUNE_COOKIE" : "Fortune-Cookie", "FREEZER" : "Freezer", "GEO_MINER" : "GEO-Miner", + "GILDED_BACKPACK" : "Backpacks", "GILDED_IRON" : "Gilded-Iron", "GILDED_IRON_BOOTS" : "Armor", "GILDED_IRON_CHESTPLATE" : "Armor", @@ -180,12 +186,15 @@ "HEATING_COIL" : "Heating-Coil", "HERCULES_PICKAXE" : "Hercules'-Pickaxe", "ICY_BOW" : "Bows", + "IGNITION_CHAMBER" : "Automatic-Ignition-Chamber", "INDUSTRIAL_MINER" : "Industrial-Miners", "INFUSED_ELYTRA" : "Elytras", "INFUSED_HOPPER" : "Infused-Hopper", "INFUSED_MAGNET" : "Infused-Magnet", + "JUICER" : "Juicer", "IRON_DUST" : "Iron-Dust", "KELP_COOKIE" : "Kelp-Cookie", + "LARGE_BACKPACK" : "Backpacks", "LARGE_CAPACITOR" : "Energy-Capacitors", "LAVA_GENERATOR" : "Lava-Generator", "LEAD_DUST" : "Lead-Dust", @@ -200,6 +209,8 @@ "MAGNESIUM_SALT" : "Magnesium-Salt", "MAGNESIUM_POWERED_GENERATOR" : "Magnesium-powered-Generator", "MAGNET" : "Magnet", + "MEDICINE" : "Medical-Supplies", + "MEDIUM_BACKPACK" : "Backpacks", "MEDIUM_CAPACITOR" : "Energy-Capacitors", "MELON_JUICE" : "Juices", "MINER_ANDROID" : "Miner-Andoirds", @@ -207,6 +218,7 @@ "MUTTON_JERKY" : "Meat-Jerky", "NEPTUNIUM" : "Neptunium", "NETHER_GOLD_PAN" : "Nether-Gold-Pan", + "NETHER_ICE" : "Nether-Ice", "NETHER_ICE_COOLANT_CELL" : "Coolant-Cells", "NICKEL_INGOT" : "Nickel-Ingot", "OIL_PUMP" : "Oil-Pump", @@ -225,6 +237,8 @@ "PRESSURE_CHAMBER" : "Pressure-Chamber", "PUMPKIN_JUICE" : "Juices", "RABBIT_JERKY" : "Meat-Jerky", + "RADIANT_BACKPACK" : "Backpacks", + "RAG": "Medical-Supplies", "RAINBOW_CLAY" : "Rainbow-Blocks", "RAINBOW_CLAY_XMAS" : "Christmas-Seasonal-Category", "RAINBOW_CONCRETE" : "Rainbow-Blocks", @@ -237,6 +251,7 @@ "RAINBOW_GLAZED_TERRACOTTA_XMAS" : "Christmas-Seasonal-Category", "RAINBOW_WOOL" : "Rainbow-Blocks", "RAINBOW_WOOL_XMAS" : "Christmas-Seasonal-Category", + "RAW_CARBONADO" : "Carbonado", "REACTOR_COOLANT_CELL" : "Coolant-Cells", "REDSTONE_ALLOY" : "Redstone-Alloy-Ingot", "REINFORCED_ALLOY_BOOTS" : "Armor", @@ -254,6 +269,7 @@ "SILICON" : "Silicon", "SILVER_DUST" : "Silver-Dust", "SILVER_INGOT" : "Silver-Ingot", + "SMALL_BACKPACK" : "Backpacks", "SMALL_CAPACITOR" : "Energy-Capacitors", "SMELTERS_PICKAXE" : "Smelter's-Pickaxe", "SMELTERY" : "Smeltery", @@ -283,6 +299,7 @@ "SOULBOUND_SHOVEL" : "Soulbound-Weapons", "SOULBOUND_SWORD" : "Soulbound-Weapons", "SOULBOUND_TRIDENT" : "Soulbound-Weapons", + "SPLINT" : "Medical-Supplies", "STEEL_INGOT" : "Steel-Ingot", "STEEL_THRUSTER" : "Steel-Thruster", "SULFATE" : "Sulfate", @@ -299,9 +316,11 @@ "TOTEM_OF_UNDYING" : "Totem-Of-Undying", "TRASH_CAN" : "Trash-Can", "URANIUM" : "Uranium", + "VITAMINS" : "Medical-Supplies", "WITHER_PROOF_OBSIDIAN" : "Wither-Proof-Blocks", "WITHER_PROOF_GLASS" : "Wither-Proof-Blocks", "WOODCUTTER_ANDROID" : "Woodcutter-Androids", + "WOVEN_BACKPACK" : "Backpacks", "ZINC_DUST" : "Zinc-Dust", "ZINC_INGOT" : "Zinc-Ingot" } From 1aa2260cf0bc2136d9a3f9c1498ca0f6889d9ae6 Mon Sep 17 00:00:00 2001 From: Senne Date: Sat, 2 Oct 2021 15:32:46 +0200 Subject: [PATCH 2/7] wiki.json until Talisman category --- .../items/magical/talismans/Talisman.java | 6 +- src/main/resources/wiki.json | 91 ++++++++++++++++++- 2 files changed, 92 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java index 805c3b230..bd137eb0d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java @@ -40,6 +40,7 @@ public class Talisman extends SlimefunItem { protected static final ItemGroup TALISMANS_ITEMGROUP = new ItemGroup(new NamespacedKey(Slimefun.instance(), "talismans"), new CustomItemStack(SlimefunItems.COMMON_TALISMAN, "&7Talismans - &aTier I"), 2); + private final String wikiPage = "Talismans"; private final SlimefunItemStack enderTalisman; protected final String suffix; @@ -72,6 +73,7 @@ public class Talisman extends SlimefunItem { this.suffix = messageSuffix; this.effects = effects; this.chance = chance; + addOfficialWikipage(wikiPage); if (!(this instanceof EnderTalisman)) { String name = "&5Ender " + ChatColor.stripColor(getItem().getItemMeta().getDisplayName()); @@ -125,6 +127,7 @@ public class Talisman extends SlimefunItem { @Override public void postRegister() { EnderTalisman talisman = new EnderTalisman(this, getEnderVariant()); + talisman.addOfficialWikipage(wikiPage); talisman.register(getAddon()); } @@ -315,5 +318,4 @@ public class Talisman extends SlimefunItem { return null; } - -} \ No newline at end of file +} diff --git a/src/main/resources/wiki.json b/src/main/resources/wiki.json index 5d86e443b..6acebde88 100644 --- a/src/main/resources/wiki.json +++ b/src/main/resources/wiki.json @@ -1,6 +1,7 @@ { "ADVANCED_CIRCUIT_BOARD" : "Circuit-Boards", "ADVANCED_INDUSTRIAL_MINER" : "Industrial-Miners", + "AIR_RUNE" : "Ancient-Runes", "ALUMINUM_BRASS_INGOT" : "Aluminum-Brass-Ingot", "ALUMINUM_BRONZE_INGOT" : "Aluminum-Bronze-Ingot", "ALUMINUM_DUST" : "Aluminum-Dust", @@ -8,6 +9,7 @@ "ANCIENT_ALTAR" : "Ancient-Altar", "ANCIENT_PEDESTAL" : "Ancient-Pedestal", "ANCIENT_RUNE_SOULBOUND" : "Soulbound-Rune", + "ANDROID_MEMORY_CORE" : "Androids", "ANIMAL_GROWTH_ACCELERATOR" : "Animal-Growth-Accelerator", "APPLE_JUICE" : "Juices", "ARMOR_FORGE" : "Armor-Forge", @@ -20,15 +22,21 @@ "BANDAGE" : "Medical-Supplies", "BASIC_CIRCUIT_BOARD" : "Circuit-Boards", "BATTERY" : "Battery", + "BEE_HELMET" : "Magical-Items#bee-armor", + "BEE_WINGS" : "Magical-Items#bee-armor", + "BEE_LEGGINGS" : "Magical-Items#bee-armor", + "BEE_BOOTS" : "Magical-Items#bee-armor", "BEEF_JERKY" : "Meat-Jerky", "BIG_CAPACITOR" : "Energy-Capacitors", "BILLON_INGOT" : "Billon-Ingot", "BLADE_OF_VAMPIRES" : "Blade-of-Vampires", + "BLANK_RUNE" : "Ancient-Runes", "BLISTERING_INGOT" : "Blistering-Ingot", "BLISTERING_INGOT_2" : "Blistering-Ingot", "BLISTERING_INGOT_3" : "Blistering-Ingot", "BLOCK_PLACER" : "Block-Placer", "BOOSTED_URANIUM" : "Boosted-Uranium", + "BOOTS_OF_THE_STOMPER" : "Magical-Armor#boots-of-the-stomper", "BOUND_BACKPACK" : "Backpacks", "BRASS_INGOT" : "Brass-Ingot", "BROKEN_SPAWNER" : "Broken-Spawner", @@ -36,10 +44,12 @@ "BUCKET_OF_FUEL" : "Bucket-Of-Fuel", "BUCKET_OF_OIL" : "Bucket-Of-Oil", "BUTCHER_ANDROID" : "Butcher-Androids", + "BUTTER" : "Miscellaneous-Items", "CACTUS_HELMET" : "Armor", "CACTUS_CHESTPLATE" : "Armor", "CACTUS_LEGGINGS" : "Armor", "CACTUS_BOOTS" : "Armor", + "CAN" : "Miscellaneous-Items", "CARBON" : "Carbon", "CARBON_CHUNK" : "Carbon", "CARBON_PRESS" : "Carbon-Press", @@ -53,6 +63,8 @@ "CARGO_OUTPUT" : "Output-Node", "CARGO_OUTPUT_ADVANCED" : "Advanced-Output-Node", "CARROT_JUICE" : "Juices", + "CHAIN" : "Miscellaneous-Items", + "CHEESE" : "Miscellaneous-Items", "CHICKEN_JERKY" : "Meat-Jerky", "CHRISTMAS_MILK" : "Christmas-Items", "CHRISTMAS_CHOCOLATE_MILK" : "Christmas-Items", @@ -68,12 +80,13 @@ "CHRISTMAS_CHOCOLATE_APPLE" : "Christmas-Items", "CHRISTMAS_PRESENT" : "Christmas-Items", "CIRCUIT_BOARD" : "Circuit-Board", + "CLOTH" : "Miscellaneous-Items", "COAL_GENERATOR" : "Coal-Generator", "COAL_GENERATOR_2" : "Coal-Generator", "COBALT_INGOT" : "Cobalt-Ingot", "COBALT_PICKAXE" : "Cobalt-Pickaxe", "COMBUSTION_REACTOR" : "Combustion-Reactor", - "COMMON_TALISMAN" : "Talismans", + "COMMON_TALISMAN" : "Magical-Items#common-talisman", "COMPOSTER" : "Composter", "COMPRESSED_CARBON" : "Carbon", "COMPRESSOR" : "Compressor", @@ -85,13 +98,16 @@ "CORINTHIAN_BRONZE_INGOT" : "Corinthian-Bronze-Ingot", "CROP_GROWTH_ACCELERATOR" : "Crop-Growth-Accelerator", "CRUCIBLE" : "Crucible", + "CRUSHED_ORE" : "Miscellaneous-Items", "DAMASCUS_STEEL_BOOTS" : "Armor", "DAMASCUS_STEEL_CHESTPLATE" : "Armor", "DAMASCUS_STEEL_HELMET" : "Armor", "DAMASCUS_STEEL_INGOT" : "Damascus-Steel-Ingot", "DAMASCUS_STEEL_LEGGINGS" : "Armor", "DIET_COOKIE" : "Diet-Cookie", + "DUCT_TAPE" : "Miscellaneous-Items", "DURALUMIN_INGOT" : "Duralumin-Ingot", + "EARTH_RUNE" : "Ancient-Runes", "ELECTRIC_GOLD_PAN" : "Electric-Gold-Pan", "ELECTRIC_INGOT_FACTORY" : "Electric-Ingot-Factory", "ELECTRIC_INGOT_PULVERIZER" : "Electric-Ingot-Pulverizer", @@ -102,13 +118,18 @@ "ELECTRIFIED_CRUCIBLE" : "Electrified-Crucible", "ELECTRO_MAGNET" : "Electromagnet", "ELEVATOR_PLATE" : "Elevator-Plate", + "ELYTRA_CAP" : "Magical-Armor#elytra-cap", "ELYTRA_SCALE" : "Elytras", + "ENCHANTMENT_RUNE" : "Ancient-Runes#enchantment-rune", "ENDER_BACKPACK" : "Ender-Backpack", "ENDER_BOOTS" : "Magical-Armor", "ENDER_CHESTPLATE" : "Magical-Armor", "ENDER_HELMET" : "Magical-Armor", "ENDER_LEGGINGS" : "Magical-Armor", - "ENDER_TALISMAN" : "Talismans", + "ENDER_LUMP_1" : "Lumps", + "ENDER_LUMP_2" : "Lumps", + "ENDER_LUMP_3" : "Lumps", + "ENDER_RUNE" : "Ancient-Runes", "ENERGY_REGULATOR" : "Energy-Regulator", "ENHANCED_CRAFTING_TABLE" : "Enhanced-Crafting-Table", "ENHANCED_FURNACE" : "Enhanced-Furnaces", @@ -123,12 +144,15 @@ "ENHANCED_FURNACE_10" : "Enhanced-Furnaces", "ENHANCED_FURNACE_11" : "Enhanced-Furnaces", "ENRICHED_NETHER_ICE" : "Enriched-Nether-Ice", + "ESSENCE_OF_AFTERLIFE" : "Magical-Items#essence-of-afterlife", "EXP_COLLECTOR" : "EXP-Collector", "EXPLOSIVE_BOW" : "Bows", "EXPLOSIVE_PICKAXE" : "Explosive-Pickaxe", "EXPLOSIVE_SHOVEL" : "Explosive-Shovel", "FARMER_ANDROID" : "Farmer-Androids", + "FARMER_SHOES" : "Magical-Armor#farmer-shoes", "FERROSILICON" : "Ferrosilicon", + "FIRE_RUNE" : "Ancient-Runes", "FISH_JERKY" : "Meat-Jerky", "FISHERMAN_ANDROID" : "Fisherman-Androids", "FLASK_OF_KNOWLEDGE" : "Flask-Of-Knowledge", @@ -163,6 +187,7 @@ "GOLD_20K" : "Gold-Ingot", "GOLD_22K" : "Gold-Ingot", "GOLD_24K" : "Gold-Ingot", + "GOLD_24K_BLOCK" : "Miscellaneous-Items", "GOLD_DUST" : "Gold-Dust", "GOLD_PAN" : "Gold-Pan", "GOLDEN_APPLE_JUICE" : "Juices", @@ -184,7 +209,9 @@ "HAZMAT_CHESTPLATE" : "Hazmat-Suit", "HAZMAT_LEGGINGS" : "Hazmat-Suit", "HEATING_COIL" : "Heating-Coil", + "HEAVY_CREAM" : "Miscellaneous-Items", "HERCULES_PICKAXE" : "Hercules'-Pickaxe", + "HOOK" : "Miscellaneous-Items", "ICY_BOW" : "Bows", "IGNITION_CHAMBER" : "Automatic-Ignition-Chamber", "INDUSTRIAL_MINER" : "Industrial-Miners", @@ -196,11 +223,18 @@ "KELP_COOKIE" : "Kelp-Cookie", "LARGE_BACKPACK" : "Backpacks", "LARGE_CAPACITOR" : "Energy-Capacitors", + "LAVA_CRYSTAL" : "Magical-Items#lava-crystal", "LAVA_GENERATOR" : "Lava-Generator", "LEAD_DUST" : "Lead-Dust", "LEAD_INGOT" : "Lead-Ingot", + "LIGHTNING_RUNE" : "Ancient-Runes", "LUMBER_AXE" : "Lumber-Axe", "MAGIC_EYE_OF_ENDER" : "Magic-Eye-Of-Ender", + "MAGICAL_BOOK_COVER" : "Magical-Items#magical-book-cover", + "MAGICAL_GLASS" : "Magical-Items#magical-glass", + "MAGIC_LUMP_1" : "Lumps", + "MAGIC_LUMP_2" : "Lumps", + "MAGIC_LUMP_3" : "Lumps", "MAGIC_SUGAR" : "Magic-Sugar", "MAGIC_WORKBENCH" : "Magic-Workbench", "MAGIC_ZOMBIE_PILL" : "Magic-Zombie-Pills", @@ -216,6 +250,7 @@ "MINER_ANDROID" : "Miner-Andoirds", "MONSTER_JERKY" : "Monster-Jerky", "MUTTON_JERKY" : "Meat-Jerky", + "NECROTIC_SKULL" : "Magical-Items#necrotic-skull", "NEPTUNIUM" : "Neptunium", "NETHER_GOLD_PAN" : "Nether-Gold-Pan", "NETHER_ICE" : "Nether-Ice", @@ -224,6 +259,28 @@ "OIL_PUMP" : "Oil-Pump", "ORE_CRUSHER" : "Ore-Crusher", "ORE_WASHER" : "Ore-Washer", + "ORGANIC_FOOD" : "Miscellaneous-Items", + "ORGANIC_FOOD_WHEAT" : "Miscellaneous-Items", + "ORGANIC_FOOD_CARROT" : "Miscellaneous-Items", + "ORGANIC_FOOD_POTATO" : "Miscellaneous-Items", + "ORGANIC_FOOD_SEEDS" : "Miscellaneous-Items", + "ORGANIC_FOOD_BEETROOT" : "Miscellaneous-Items", + "ORGANIC_FOOD_MELON" : "Miscellaneous-Items", + "ORGANIC_FOOD_APPLE" : "Miscellaneous-Items", + "ORGANIC_FOOD_SWEET_BERRIES" : "Miscellaneous-Items", + "ORGANIC_FOOD_KELP" : "Miscellaneous-Items", + "ORGANIC_FOOD_COCOA" : "Miscellaneous-Items", + "FERTILIZER_FOOD" : "Miscellaneous-Items", + "FERTILIZER_WHEAT" : "Miscellaneous-Items", + "FERTILIZER_CARROT" : "Miscellaneous-Items", + "FERTILIZER_POTATO" : "Miscellaneous-Items", + "FERTILIZER_SEEDS" : "Miscellaneous-Items", + "FERTILIZER_BEETROOT" : "Miscellaneous-Items", + "FERTILIZER_MELON" : "Miscellaneous-Items", + "FERTILIZER_APPLE" : "Miscellaneous-Items", + "FERTILIZER_SWEET_BERRIES" : "Miscellaneous-Items", + "FERTILIZER_KELP" : "Miscellaneous-Items", + "FERTILIZER_COCOA" : "Miscellaneous-Items", "OUTPUT_CHEST" : "Output-Chest", "PICKAXE_OF_CONTAINMENT" : "Pickaxe-of-Containment", "PICKAXE_OF_VEIN_MINING" : "Pickaxe-of-Vein-Mining", @@ -235,24 +292,39 @@ "PORK_JERKY" : "Meat-Jerky", "POWER_CRYSTAL" : "Power-Crystal", "PRESSURE_CHAMBER" : "Pressure-Chamber", + "PULVERIZED_ORE" : "Miscellaneous-Items", "PUMPKIN_JUICE" : "Juices", + "PURE_ORE_CLUSTER" : "Miscellaneous-Items", "RABBIT_JERKY" : "Meat-Jerky", "RADIANT_BACKPACK" : "Backpacks", "RAG": "Medical-Supplies", "RAINBOW_CLAY" : "Rainbow-Blocks", + "RAINBOW_CLAY_HALLOWEEN" : "Halloween-Seasonal-Category", + "RAINBOW_CLAY_VALENTINE" : "Valentines-Day-Seasonal-Category", "RAINBOW_CLAY_XMAS" : "Christmas-Seasonal-Category", "RAINBOW_CONCRETE" : "Rainbow-Blocks", + "RAINBOW_CONCRETE_HALLLOWEEN" : "Halloween-Seasonal-Category", + "RAINBOW_CONCRETE_VALENTINE" : "Valentines-Day-Seasonal-Category", "RAINBOW_CONCRETE_XMAS" : "Christmas-Seasonal-Category", "RAINBOW_GLASS" : "Rainbow-Blocks", + "RAINBOW_GLASS_HALLOWEEN" : "Halloween-Seasonal-Category", + "RAINBOW_GLASS_VALENTINE" : "Valentines-Day-Seasonal-Category", "RAINBOW_GLASS_XMAS" : "Christmas-Seasonal-Category", "RAINBOW_GLASS_PANE" : "Rainbow-Blocks", + "RAINBOW_GLASS_PANE_HALLOWEEN" : "Halloween-Seasonal-Category", + "RAINBOW_GLASS_PANE_VALENTINE" : "Valentines-Day-Seasonal-Category", "RAINBOW_GLASS_PANE_XMAS" : "Christmas-Seasonal-Category", "RAINBOW_GLAZED_TERRACOTTA" : "Rainbow-Blocks", + "RAINBOW_GLAZED_TERRACOTTA_HALLOWEEN" : "Halloween-Seasonal-Category", + "RAINBOW_GLAZED_TERRACOTTA_VALENTINE" : "Valentines-Day-Seasonal-Category", "RAINBOW_GLAZED_TERRACOTTA_XMAS" : "Christmas-Seasonal-Category", + "RAINBOW_RUNE" : "Ancient-Runes", "RAINBOW_WOOL" : "Rainbow-Blocks", + "RAINBOW_WOOL_HALLOWEEN" : "Halloween-Seasonal-Category", + "RAINBOW_WOOL_VALENTINE" : "Valentines-Day-Seasonal-Category", "RAINBOW_WOOL_XMAS" : "Christmas-Seasonal-Category", "RAW_CARBONADO" : "Carbonado", - "REACTOR_COOLANT_CELL" : "Coolant-Cells", + "REACTOR_COLLANT_CELL" : "Coolant-Cells", "REDSTONE_ALLOY" : "Redstone-Alloy-Ingot", "REINFORCED_ALLOY_BOOTS" : "Armor", "REINFORCED_ALLOY_CHESTPLATE" : "Armor", @@ -260,8 +332,10 @@ "REINFORCED_ALLOY_INGOT" : "Reinforced-Alloy-Ingot", "REINFORCED_ALLOY_LEGGINGS" : "Armor", "REINFORCED_FURNACE" : "Enhanced-Furnaces", + "REINFORCED_PLATE" : "Miscellaneous-Items", "REPAIRED_SPAWNER" : "Reinforced-Spawner", "RUBBER_BOOTS" : "Hazmat-Suit", + "SALT" : "Miscellaneous-Items", "SCUBA_HELMET" : "Hazmat-Suit", "SCROLL_OF_DIMENSIONAL_TELEPOSITION" : "Scroll-of-Dimensional-Teleposition", "SEISMIC_AXE" : "Seismic-Axe", @@ -271,6 +345,7 @@ "SILVER_INGOT" : "Silver-Ingot", "SMALL_BACKPACK" : "Backpacks", "SMALL_CAPACITOR" : "Energy-Capacitors", + "SMALL_UURANIUM" : "Miscellaneous-Items", "SMELTERS_PICKAXE" : "Smelter's-Pickaxe", "SMELTERY" : "Smeltery", "SLIME_BOOTS" : "Magical-Armor", @@ -296,27 +371,37 @@ "SOULBOUND_HOE" : "Soulbound-Weapons", "SOULBOUND_LEGGINGS" : "Soulbound-Armor", "SOULBOUND_PICKAXE" : "Soulbound-Weapons", + "SOULBOUND_RUNE" : "Ancient-Runes#soulbound-rune", "SOULBOUND_SHOVEL" : "Soulbound-Weapons", "SOULBOUND_SWORD" : "Soulbound-Weapons", "SOULBOUND_TRIDENT" : "Soulbound-Weapons", "SPLINT" : "Medical-Supplies", "STEEL_INGOT" : "Steel-Ingot", + "STEEL_PLATE" : "Miscellaneous-Items", "STEEL_THRUSTER" : "Steel-Thruster", + "STONE_CHUNK" : "Miscellaneous-Items", + "STRANGE_NETHER_GOO" : "Magical-Items#strange-nether-goo", "SULFATE" : "Sulfate", "SYNTHETIC_DIAMOND" : "Synthetic-Diamond", "SYNTHETIC_EMERALD" : "Synthetic-Emerald", "SYNTHETIC_SAPPHIRE" : "Synthetic-Sapphire", + "SYNTHETIC_SHULKER_SHELL" : "Magical-Items#synthetic-shulker-shell", "SWEET_BERRY_JUICE" : "Juices", "SWORD_OF_BEHEADING" : "Sword-of-Beheading", "TABLE_SAW" : "Table-Saw", + "TALISMAN_ANVIL" : "Talismans", "TELEPORTER" : "Teleporter", "TIN_DUST" : "Tin-Dust", "TIN_INGOT" : "Tin-Ingot", + "TINY_URANIUM" : "Miscellaneous-Items", "TOME_OF_KNOWLEDGE_SHARING" : "Tome-Of-Knowledge-Sharing", "TOTEM_OF_UNDYING" : "Totem-Of-Undying", "TRASH_CAN" : "Trash-Can", "URANIUM" : "Uranium", + "VILLAGER_RUNE" : "Ancient-Runes", "VITAMINS" : "Medical-Supplies", + "WATER_RUNE" : "Ancient-Runes", + "WHEAT_FLOUR" : "Miscellaneous-Items", "WITHER_PROOF_OBSIDIAN" : "Wither-Proof-Blocks", "WITHER_PROOF_GLASS" : "Wither-Proof-Blocks", "WOODCUTTER_ANDROID" : "Woodcutter-Androids", From e1a0ade1240f4d6c397754c57eef89fc1ab8121f Mon Sep 17 00:00:00 2001 From: Senne Date: Sat, 2 Oct 2021 17:13:59 +0200 Subject: [PATCH 3/7] Finish wiki.json --- .../items/electric/gadgets/Jetpack.java | 1 - src/main/resources/wiki.json | 114 ++++++++++++++++-- 2 files changed, 106 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Jetpack.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Jetpack.java index 612e28449..3ffd8915a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Jetpack.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Jetpack.java @@ -42,5 +42,4 @@ public class Jetpack extends SlimefunItem implements Rechargeable { public float getMaxItemCharge(ItemStack item) { return capacity; } - } diff --git a/src/main/resources/wiki.json b/src/main/resources/wiki.json index 6acebde88..bf199037f 100644 --- a/src/main/resources/wiki.json +++ b/src/main/resources/wiki.json @@ -9,14 +9,23 @@ "ANCIENT_ALTAR" : "Ancient-Altar", "ANCIENT_PEDESTAL" : "Ancient-Pedestal", "ANCIENT_RUNE_SOULBOUND" : "Soulbound-Rune", + "ANDROID_INTERFACE_FUEL" : "Android-Interfaces", + "ANDROID_INTERFACE_ITEMS" : "Android-Interfaces", "ANDROID_MEMORY_CORE" : "Androids", "ANIMAL_GROWTH_ACCELERATOR" : "Animal-Growth-Accelerator", "APPLE_JUICE" : "Juices", "ARMOR_FORGE" : "Armor-Forge", + "ARMORED_JETBOOTS" : "Jet-Boots", + "ARMORED_JETPACK" : "Jetpacks", "AUTO_ANVIL" : "Auto-Anvil", + "AUTO_ANVIL_2" : "Auto-Anvil", "AUTO_BREEDER" : "Auto-Breeder", + "AUTO_BREWER" : "Auto-Brewer", "AUTO_DISENCHANTER" : "Auto-Disenchanter", + "AUTO_DISENCHANTER_2" : "Auto-Disenchanter", + "AUTO_DRIER" : "Auto-Drier", "AUTO_ENCHANTER" : "Auto-Enchanter", + "AUTO_ENCHANTER_2" : "Auto-Enchanter", "AUTOMATED_PANNING_MACHINE" : "Automated-Panning-Machine", "AUTOMATED_IGNITION_CHAMBER" : "Automated-Ignition-Chamber", "BANDAGE" : "Medical-Supplies", @@ -29,12 +38,18 @@ "BEEF_JERKY" : "Meat-Jerky", "BIG_CAPACITOR" : "Energy-Capacitors", "BILLON_INGOT" : "Billon-Ingot", + "BILLON_JETBOOTS" : "Jet-Boots", + "BILLON_JETPACK" : "Jetpacks", + "BILLON_MULTI_TOOL" : "Multi-Tools", + "BIO_REACTOR" : "Bio-Reactor", + "BIRTHDAY_CAKE" : "Birthday-Seasonal-Category", "BLADE_OF_VAMPIRES" : "Blade-of-Vampires", "BLANK_RUNE" : "Ancient-Runes", "BLISTERING_INGOT" : "Blistering-Ingot", "BLISTERING_INGOT_2" : "Blistering-Ingot", "BLISTERING_INGOT_3" : "Blistering-Ingot", "BLOCK_PLACER" : "Block-Placer", + "BOOK_BINDER" : "Book-Binder", "BOOSTED_URANIUM" : "Boosted-Uranium", "BOOTS_OF_THE_STOMPER" : "Magical-Armor#boots-of-the-stomper", "BOUND_BACKPACK" : "Backpacks", @@ -43,7 +58,6 @@ "BRONZE_INGOT" : "Bronze-Ingot", "BUCKET_OF_FUEL" : "Bucket-Of-Fuel", "BUCKET_OF_OIL" : "Bucket-Of-Oil", - "BUTCHER_ANDROID" : "Butcher-Androids", "BUTTER" : "Miscellaneous-Items", "CACTUS_HELMET" : "Armor", "CACTUS_CHESTPLATE" : "Armor", @@ -53,17 +67,23 @@ "CARBON" : "Carbon", "CARBON_CHUNK" : "Carbon", "CARBON_PRESS" : "Carbon-Press", + "CARBON_PRESS_2" : "Carbon-Press", "CARBONADO" : "Carbonado", "CARBONADO_EDGED_CAPACITOR" : "Energy-Capacitors", "CARBONADO_EDGED_FURNACE" : "Enhanced-Furnaces", + "CARBONADO_JETBOOTS" : "Jet-Boots", + "CARBONADO_JETPACK" : "Jetpacks", + "CARBONADO_MULTI_TOOL" : "Multi-Tools", "CARGO_INPUT" : "Input-Node", "CARGO_MANAGER" : "Cargo-Manager", "CARGO_MOTOR" : "Cargo-Motor", "CARGO_NODE" : "Connector-Node", - "CARGO_OUTPUT" : "Output-Node", - "CARGO_OUTPUT_ADVANCED" : "Advanced-Output-Node", + "CARGO_NODE_INPUT" : "Input-Node", + "CARGO_NODE_OUTPUT" : "Output-Node", + "CARGO_NODE_OUTPUT_ADVANCED" : "Advanced-Output-Node", "CARROT_JUICE" : "Juices", "CHAIN" : "Miscellaneous-Items", + "CHARGING_BENCH" : "Charging-Bench", "CHEESE" : "Miscellaneous-Items", "CHICKEN_JERKY" : "Meat-Jerky", "CHRISTMAS_MILK" : "Christmas-Items", @@ -97,27 +117,51 @@ "COPPER_WIRE" : "Copper-Wire", "CORINTHIAN_BRONZE_INGOT" : "Corinthian-Bronze-Ingot", "CROP_GROWTH_ACCELERATOR" : "Crop-Growth-Accelerator", + "CROP_GROWTH_ACCELERATOR_2" : "Crop-Growth-Accelerator", "CRUCIBLE" : "Crucible", "CRUSHED_ORE" : "Miscellaneous-Items", "DAMASCUS_STEEL_BOOTS" : "Armor", "DAMASCUS_STEEL_CHESTPLATE" : "Armor", "DAMASCUS_STEEL_HELMET" : "Armor", "DAMASCUS_STEEL_INGOT" : "Damascus-Steel-Ingot", + "DAMASCUS_STEEL_JETBOOTS" : "Jet-Boots", + "DAMASCUS_STEEL_JETPACK" : "Jetpacks", + "DAMASCUS_STEEL_MULTI_TOOL" : "Multi-Tools", "DAMASCUS_STEEL_LEGGINGS" : "Armor", "DIET_COOKIE" : "Diet-Cookie", "DUCT_TAPE" : "Miscellaneous-Items", "DURALUMIN_INGOT" : "Duralumin-Ingot", + "DURALUMIN_JETBOOTS" : "Jet-Boots", + "DURALUMIN_JETPACK" : "Jetpacks", + "DURALUMIN_MULTI_TOOL" : "Multi-Tools", "EARTH_RUNE" : "Ancient-Runes", + "ELECTRIC_DUST_WASHER" : "Electric-Dust-Washer", + "ELECTRIC_DUST_WASHER_2" : "Electric-Dust-Washer", + "ELECTRIC_DUST_WASHER_3" : "Electric-Dust-Washer", "ELECTRIC_GOLD_PAN" : "Electric-Gold-Pan", + "ELECTRIC_GOLD_PAN_2" : "Electric-Gold-Pan", + "ELECTRIC_GOLD_PAN_3" : "Electric-Gold-Pan", + "ELECTRIC_FURNACE" : "Electric-Furnace", + "ELECTRIC_FURNACE_2" : "Electric-Furnace", + "ELECTRIC_FURNACE_3" : "Electric-Furnace", "ELECTRIC_INGOT_FACTORY" : "Electric-Ingot-Factory", + "ELECTRIC_INGOT_FACTORY_2" : "Electric-Ingot-Factory", + "ELECTRIC_INGOT_FACTORY_3" : "Electric-Ingot-Factory", "ELECTRIC_INGOT_PULVERIZER" : "Electric-Ingot-Pulverizer", "ELECTRIC_MOTOR" : "Electric-Motor", "ELECTRIC_ORE_GRINDER" : "Electric-Ore-Grinder", + "ELECTRIC_ORE_GRINDER_2" : "Electric-Ore-Grinder", + "ELECTRIC_ORE_GRINDER_3" : "Electric-Ore-Grinder", "ELECTRIC_PRESS" : "Electric-Press", + "ELECTRIC_PRESS_2" : "Electric-Press", "ELECTRIC_SMELTERY" : "Electric-Smeltery", + "ELECTRIC_SMELTERY_2" : "Electric-Smeltery", "ELECTRIFIED_CRUCIBLE" : "Electrified-Crucible", + "ELECTRIFIED_CRUCIBLE_2" : "Electrified-Crucible", + "ELECTRIFIED_CRUCIBLE_3" : "Electrified-Crucible", "ELECTRO_MAGNET" : "Electromagnet", "ELEVATOR_PLATE" : "Elevator-Plate", + "ELYTRA" : "Elytras", "ELYTRA_CAP" : "Magical-Armor#elytra-cap", "ELYTRA_SCALE" : "Elytras", "ENCHANTMENT_RUNE" : "Ancient-Runes#enchantment-rune", @@ -130,6 +174,8 @@ "ENDER_LUMP_2" : "Lumps", "ENDER_LUMP_3" : "Lumps", "ENDER_RUNE" : "Ancient-Runes", + "ENERGIZED_CAPACITOR" : "Energy-Capacitors", + "ENERGY_CONNECTOR" : "Energy-Connector", "ENERGY_REGULATOR" : "Energy-Regulator", "ENHANCED_CRAFTING_TABLE" : "Enhanced-Crafting-Table", "ENHANCED_FURNACE" : "Enhanced-Furnaces", @@ -149,18 +195,19 @@ "EXPLOSIVE_BOW" : "Bows", "EXPLOSIVE_PICKAXE" : "Explosive-Pickaxe", "EXPLOSIVE_SHOVEL" : "Explosive-Shovel", - "FARMER_ANDROID" : "Farmer-Androids", "FARMER_SHOES" : "Magical-Armor#farmer-shoes", "FERROSILICON" : "Ferrosilicon", "FIRE_RUNE" : "Ancient-Runes", "FISH_JERKY" : "Meat-Jerky", - "FISHERMAN_ANDROID" : "Fisherman-Androids", "FLASK_OF_KNOWLEDGE" : "Flask-Of-Knowledge", "FLUID_PUMP" : "Fluid-Pump", "FOOD_COMPOSTER" : "Food-Composter", + "FOOD_COMPOSTER_2" : "Food-Composter", "FOOD_FABRICATOR" : "Food-Fabricator", + "FOOD_FABRICATOR_2" : "Food-Fabricator", "FORTUNE_COOKIE" : "Fortune-Cookie", "FREEZER" : "Freezer", + "FREEZER_2" : "Freezer", "GEO_MINER" : "GEO-Miner", "GILDED_BACKPACK" : "Backpacks", "GILDED_IRON" : "Gilded-Iron", @@ -200,6 +247,9 @@ "GPS_TELEPORTATION_MATRIX" : "GPS-Teleporter-Matrix", "GPS_TELEPORTER_PYLON" : "GPS-Teleporter-Pylon", "GPS_TRANSMITTER" : "GPS-Transmitter", + "GPS_TRANSMITTER_2" : "GPS-Transmitter", + "GPS_TRANSMITTER_3" : "GPS-Transmitter", + "GPS_TRANSMITTER_4" : "GPS-Transmitter", "GRAPPLING_HOOK" : "Grappling-Hook", "GRANDMAS_WALKING_STICK" : "Walking-Sticks", "GRANDPAS_WALKING_STICK" : "Walking-Sticks", @@ -208,16 +258,21 @@ "HARDENED_METAL_INGOT" : "Hardened-Metal", "HAZMAT_CHESTPLATE" : "Hazmat-Suit", "HAZMAT_LEGGINGS" : "Hazmat-Suit", + "HEATED_PRESSURE_CHAMBER" : "Heated-Pressure-Chamber", + "HEATED_PRESSURE_CHAMBER_2" : "Heated-Pressure-Chamber", "HEATING_COIL" : "Heating-Coil", "HEAVY_CREAM" : "Miscellaneous-Items", "HERCULES_PICKAXE" : "Hercules'-Pickaxe", + "HOLOGRAM_PROJECTOR" : "Hologram-Projector", "HOOK" : "Miscellaneous-Items", "ICY_BOW" : "Bows", "IGNITION_CHAMBER" : "Automatic-Ignition-Chamber", "INDUSTRIAL_MINER" : "Industrial-Miners", + "INFERNAL_BONEMEAL" : "Infernal-Bonemeal", "INFUSED_ELYTRA" : "Elytras", "INFUSED_HOPPER" : "Infused-Hopper", "INFUSED_MAGNET" : "Infused-Magnet", + "IRON_GOLEM_ASSEMBLER" : "Iron-Golem-Assembler", "JUICER" : "Juicer", "IRON_DUST" : "Iron-Dust", "KELP_COOKIE" : "Kelp-Cookie", @@ -225,6 +280,7 @@ "LARGE_CAPACITOR" : "Energy-Capacitors", "LAVA_CRYSTAL" : "Magical-Items#lava-crystal", "LAVA_GENERATOR" : "Lava-Generator", + "LAVA_GENERATOR_2" : "Lava-Generator", "LEAD_DUST" : "Lead-Dust", "LEAD_INGOT" : "Lead-Ingot", "LIGHTNING_RUNE" : "Ancient-Runes", @@ -232,6 +288,7 @@ "MAGIC_EYE_OF_ENDER" : "Magic-Eye-Of-Ender", "MAGICAL_BOOK_COVER" : "Magical-Items#magical-book-cover", "MAGICAL_GLASS" : "Magical-Items#magical-glass", + "MAGICAL_ZOMBIE_PILLS" : "Magical-Zombie-Pills", "MAGIC_LUMP_1" : "Lumps", "MAGIC_LUMP_2" : "Lumps", "MAGIC_LUMP_3" : "Lumps", @@ -240,6 +297,7 @@ "MAGIC_ZOMBIE_PILL" : "Magic-Zombie-Pills", "MAGNESIUM_DUST" : "Magnesium-Dust", "MAGNESIUM_INGOT" : "Magnesium-Ingot", + "MAGNESIUM_GENERATOR" : "Magnesium-powered-Generator", "MAGNESIUM_SALT" : "Magnesium-Salt", "MAGNESIUM_POWERED_GENERATOR" : "Magnesium-powered-Generator", "MAGNET" : "Magnet", @@ -247,15 +305,18 @@ "MEDIUM_BACKPACK" : "Backpacks", "MEDIUM_CAPACITOR" : "Energy-Capacitors", "MELON_JUICE" : "Juices", - "MINER_ANDROID" : "Miner-Andoirds", "MONSTER_JERKY" : "Monster-Jerky", + "MULTIMETER" : "Technical-Gadgets#multimeter", "MUTTON_JERKY" : "Meat-Jerky", "NECROTIC_SKULL" : "Magical-Items#necrotic-skull", "NEPTUNIUM" : "Neptunium", + "NETHERSTAR_REACTOR" : "Reactors", "NETHER_GOLD_PAN" : "Nether-Gold-Pan", "NETHER_ICE" : "Nether-Ice", "NETHER_ICE_COOLANT_CELL" : "Coolant-Cells", "NICKEL_INGOT" : "Nickel-Ingot", + "NIGHT_VISION_GOGGLES" : "Technical-Gadgets#night-vision-goggles", + "NUCLEAR_REACTOR" : "Reactors", "OIL_PUMP" : "Oil-Pump", "ORE_CRUSHER" : "Ore-Crusher", "ORE_WASHER" : "Ore-Washer", @@ -282,6 +343,7 @@ "FERTILIZER_KELP" : "Miscellaneous-Items", "FERTILIZER_COCOA" : "Miscellaneous-Items", "OUTPUT_CHEST" : "Output-Chest", + "PARACHUTE" : "Technical-Gadgets#parachute", "PICKAXE_OF_CONTAINMENT" : "Pickaxe-of-Containment", "PICKAXE_OF_VEIN_MINING" : "Pickaxe-of-Vein-Mining", "PICKAXE_OF_THE_SEEKER" : "Pickaxe-of-the-Seeker", @@ -289,9 +351,24 @@ "PORTABLE_CRAFTER" : "Portable-Crafter", "PORTABLE_DUSTBIN" : "Portable-Dustbin", "PORTABLE_GEO_SCANNER" : "Portable-Geo-Scanner", + "PORTABLE_TELEPORTER" : "Portable-Teleporter", "PORK_JERKY" : "Meat-Jerky", "POWER_CRYSTAL" : "Power-Crystal", "PRESSURE_CHAMBER" : "Pressure-Chamber", + "PRODUCE_COLLECTOR" : "Produce-Collector", + "PROGRAMMABLE_ANDROID" : "Normal-Androids", + "PROGRAMMABLE_ANDROID_BUTCHER" : "Butcher-Androids", + "PROGRAMMABLE_ANDROID_FARMER" : "Farmer-Androids", + "PROGRAMMABLE_ANDROID_FISHERMAN" : "Fisherman-Androids", + "PROGRAMMABLE_ANDROID_MINER" : "Miner-Androids", + "PROGRAMMABLE_ANDROID_WOODCUTTER" : "Woodcutter-Androids", + "PROGRAMMABLE_ANDROID_2" : "Normal-Androids", + "PROGRAMMABLE_ANDROID_2_BUTCHER" : "Butcher-Androids", + "PROGRAMMABLE_ANDROID_2_FARMER" : "Farmer-Androids", + "PROGRAMMABLE_ANDROID_2_FISHERMAN" : "Fisherman-Androids", + "PROGRAMMABLE_ANDROID_3" : "Normal-Androids", + "PROGRAMMABLE_ANDROID_3_BUTCHER" : "Butcher-Androids", + "PROGRAMMABLE_ANDROID_3_FISHERMAN" : "Fisherman-Androids", "PULVERIZED_ORE" : "Miscellaneous-Items", "PUMPKIN_JUICE" : "Juices", "PURE_ORE_CLUSTER" : "Miscellaneous-Items", @@ -324,16 +401,21 @@ "RAINBOW_WOOL_VALENTINE" : "Valentines-Day-Seasonal-Category", "RAINBOW_WOOL_XMAS" : "Christmas-Seasonal-Category", "RAW_CARBONADO" : "Carbonado", + "REACTOR_ACCESS_PORT" : "Reactors#reactor-access-port", "REACTOR_COLLANT_CELL" : "Coolant-Cells", "REDSTONE_ALLOY" : "Redstone-Alloy-Ingot", + "REFINERY" : "Refinery", "REINFORCED_ALLOY_BOOTS" : "Armor", "REINFORCED_ALLOY_CHESTPLATE" : "Armor", "REINFORCED_ALLOY_HELMET" : "Armor", "REINFORCED_ALLOY_INGOT" : "Reinforced-Alloy-Ingot", + "REINFORCED_ALLOY_JETBOOTS" : "Jet-Boots", + "REINFORCED_ALLOY_JETPACK" : "Jetpacks", + "REINFORCED_ALLOY_MULTI_TOOL" : "Multi-Tools", "REINFORCED_ALLOY_LEGGINGS" : "Armor", "REINFORCED_FURNACE" : "Enhanced-Furnaces", "REINFORCED_PLATE" : "Miscellaneous-Items", - "REPAIRED_SPAWNER" : "Reinforced-Spawner", + "REINFORCED_SPAWNER" : "Reinforced-Spawner", "RUBBER_BOOTS" : "Hazmat-Suit", "SALT" : "Miscellaneous-Items", "SCUBA_HELMET" : "Hazmat-Suit", @@ -360,8 +442,12 @@ "SOLAR_GENERATOR_2" : "Solar-Generator", "SOLAR_GENERATOR_3" : "Solar-Generator", "SOLAR_GENERATOR_4" : "Solar-Generator", + "SOLAR_HELMET" : "Technical-Gadgets#solar-helmet", "SOLAR_PANEL" : "Solar-Panel", "SOLDER_INGOT" : "Solder-Ingot", + "SOLDER_JETBOOTS" : "Jet-Boots", + "SOLDER_JETPACK" : "Jetpacks", + "SOLDER_MULTI_TOOL" : "Multi-Tools", "SOULBOUND_AXE" : "Soulbound-Weapons", "SOULBOUND_BOOTS" : "Soulbound-Armor", "SOULBOUND_BOW" : "Soulbound-Weapons", @@ -376,7 +462,15 @@ "SOULBOUND_SWORD" : "Soulbound-Weapons", "SOULBOUND_TRIDENT" : "Soulbound-Weapons", "SPLINT" : "Medical-Supplies", + "STAFF_ELEMENTAL" : "Elemental-Staves", + "STAFF_ELEMENTAL_WIND" : "Elemental-Staves", + "STAFF_ELEMENTAL_FIRE" : "Elemental-Staves", + "STAFF_ELEMENTAL_WATER" : "Elemental-Staves", + "STAFF_ELEMENTAL_STORM" : "Elemental-Staves", "STEEL_INGOT" : "Steel-Ingot", + "STEEL_JETBOOTS" : "Jet-Boots", + "STEEL_JETPACK" : "Jetpacks", + "STEEL_MULTI_TOOL" : "Multi-Tools", "STEEL_PLATE" : "Miscellaneous-Items", "STEEL_THRUSTER" : "Steel-Thruster", "STONE_CHUNK" : "Miscellaneous-Items", @@ -397,15 +491,19 @@ "TOME_OF_KNOWLEDGE_SHARING" : "Tome-Of-Knowledge-Sharing", "TOTEM_OF_UNDYING" : "Totem-Of-Undying", "TRASH_CAN" : "Trash-Can", + "TRASH_CAN_BLOCK" : "Trash-Can", + "TREE_GROWTH_ACCELERATOR" : "Tree-Growth-Accelerator", + "TRIDENT" : "Magical-Gadgets", "URANIUM" : "Uranium", "VILLAGER_RUNE" : "Ancient-Runes", "VITAMINS" : "Medical-Supplies", "WATER_RUNE" : "Ancient-Runes", "WHEAT_FLOUR" : "Miscellaneous-Items", + "WITHER_ASSEMBLER" : "Wither-Assembler", "WITHER_PROOF_OBSIDIAN" : "Wither-Proof-Blocks", "WITHER_PROOF_GLASS" : "Wither-Proof-Blocks", - "WOODCUTTER_ANDROID" : "Woodcutter-Androids", "WOVEN_BACKPACK" : "Backpacks", + "XP_COLLECTOR" : "EXP-Collector", "ZINC_DUST" : "Zinc-Dust", "ZINC_INGOT" : "Zinc-Ingot" } From 42e647020f4505d3afe7310f01f8ae6711d39a40 Mon Sep 17 00:00:00 2001 From: Senne Date: Sat, 9 Oct 2021 12:42:56 +0200 Subject: [PATCH 4/7] Remove redundant line --- .../implementation/items/magical/talismans/Talisman.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java index bd137eb0d..8129bb07c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java @@ -127,7 +127,6 @@ public class Talisman extends SlimefunItem { @Override public void postRegister() { EnderTalisman talisman = new EnderTalisman(this, getEnderVariant()); - talisman.addOfficialWikipage(wikiPage); talisman.register(getAddon()); } From cd76f924d0134a4bbb37975d15541f2c2cb8b98c Mon Sep 17 00:00:00 2001 From: Senne Date: Sat, 23 Oct 2021 14:05:40 +0200 Subject: [PATCH 5/7] Make field static --- .../implementation/items/magical/talismans/Talisman.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java index 8129bb07c..71bf57090 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java @@ -39,8 +39,8 @@ import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; public class Talisman extends SlimefunItem { protected static final ItemGroup TALISMANS_ITEMGROUP = new ItemGroup(new NamespacedKey(Slimefun.instance(), "talismans"), new CustomItemStack(SlimefunItems.COMMON_TALISMAN, "&7Talismans - &aTier I"), 2); - - private final String wikiPage = "Talismans"; + private static final String wikiPage = "Talismans"; + private final SlimefunItemStack enderTalisman; protected final String suffix; From 0f176694a640f6cc3442dcc831f008adab2b18e3 Mon Sep 17 00:00:00 2001 From: svr333 Date: Thu, 28 Oct 2021 12:24:59 +0200 Subject: [PATCH 6/7] Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java Co-authored-by: Daniel Walsh --- .../implementation/items/magical/talismans/Talisman.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java index 71bf57090..306d3a2a0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java @@ -39,7 +39,7 @@ import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; public class Talisman extends SlimefunItem { protected static final ItemGroup TALISMANS_ITEMGROUP = new ItemGroup(new NamespacedKey(Slimefun.instance(), "talismans"), new CustomItemStack(SlimefunItems.COMMON_TALISMAN, "&7Talismans - &aTier I"), 2); - private static final String wikiPage = "Talismans"; + private static final String WIKI_PAGE = "Talismans"; private final SlimefunItemStack enderTalisman; From 29585eb1a152fdc8949e3bda41fb352b7af492bc Mon Sep 17 00:00:00 2001 From: svr333 Date: Thu, 28 Oct 2021 13:07:43 +0200 Subject: [PATCH 7/7] Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java Co-authored-by: TheBusyBiscuit --- .../implementation/items/magical/talismans/Talisman.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java index 306d3a2a0..2f61a9682 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java @@ -73,7 +73,7 @@ public class Talisman extends SlimefunItem { this.suffix = messageSuffix; this.effects = effects; this.chance = chance; - addOfficialWikipage(wikiPage); + addOfficialWikipage(WIKI_PAGE); if (!(this instanceof EnderTalisman)) { String name = "&5Ender " + ChatColor.stripColor(getItem().getItemMeta().getDisplayName());