From 8a816895e633e457ab4c95f08e94fb775b9cedd7 Mon Sep 17 00:00:00 2001 From: ybw0014 Date: Sun, 12 May 2024 17:30:51 -0400 Subject: [PATCH] =?UTF-8?q?chore(wiki):=20=E6=B7=BB=E5=8A=A0=20Wiki=20?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- .../ncbpfluffybear/fluffymachines/FluffyMachines.java | 9 +++++++++ .../io/ncbpfluffybear/fluffymachines/items/Barrel.java | 7 +++++++ .../fluffymachines/objects/AutoCrafter.java | 7 +++++++ .../fluffymachines/utils/FluffyItems.java | 8 ++++---- src/main/resources/wiki.json | 10 ++++++++++ 6 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/wiki.json diff --git a/pom.xml b/pom.xml index 726a163b..6e097e30 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ com.github.StarWishsama Slimefun4 - eabaa21b05 + 2024.3 provided @@ -142,14 +142,14 @@ org.projectlombok lombok - 1.18.24 + 1.18.32 provided org.bstats bstats-bukkit - 3.0.0 + 3.0.2 compile diff --git a/src/main/java/io/ncbpfluffybear/fluffymachines/FluffyMachines.java b/src/main/java/io/ncbpfluffybear/fluffymachines/FluffyMachines.java index ef057554..ad057c74 100644 --- a/src/main/java/io/ncbpfluffybear/fluffymachines/FluffyMachines.java +++ b/src/main/java/io/ncbpfluffybear/fluffymachines/FluffyMachines.java @@ -23,9 +23,11 @@ import java.util.Map; import java.util.logging.Level; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import lombok.SneakyThrows; import net.guizhanss.guizhanlibplugin.updater.GuizhanUpdater; +import net.guizhanss.slimefun4.utils.WikiUtils; import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -109,6 +111,8 @@ public void onEnable() { FluffyItemSetup.setup(this); FluffyItemSetup.setupBarrels(this); + WikiUtils.setupJson(this); + // Register Events Class getServer().getPluginManager().registerEvents(new Events(), this); getServer().getPluginManager().registerEvents(new KeyedCrafterListener(), this); @@ -213,6 +217,11 @@ public String getBugTrackerURL() { return "https://github.com/SlimefunGuguProject/FluffyMachines/issues"; } + @Override + public String getWikiURL() { + return "https://slimefun-addons-wiki.guizhanss.cn/fluffy-machines/{0}"; + } + @Nonnull @Override public JavaPlugin getJavaPlugin() { diff --git a/src/main/java/io/ncbpfluffybear/fluffymachines/items/Barrel.java b/src/main/java/io/ncbpfluffybear/fluffymachines/items/Barrel.java index 2f30b336..f6e5a17f 100644 --- a/src/main/java/io/ncbpfluffybear/fluffymachines/items/Barrel.java +++ b/src/main/java/io/ncbpfluffybear/fluffymachines/items/Barrel.java @@ -49,6 +49,8 @@ public class Barrel extends NonHopperableBlock implements DoubleHologramOwner { + private final String WIKI_PAGE = "barrels"; + private final int[] inputBorder = {9, 10, 11, 12, 18, 21, 27, 28, 29, 30}; private final int[] outputBorder = {14, 15, 16, 17, 23, 26, 32, 33, 34, 35}; private final int[] plainBorder = {0, 1, 2, 3, 4, 5, 6, 7, 8, 13, 36, 37, 38, 39, 40, 41, 42, 43, 44}; @@ -318,6 +320,11 @@ public boolean isSynchronized() { }); } + @Override + public void postRegister() { + addWikiPage(WIKI_PAGE); + } + protected void tick(Block b) { BlockMenu inv = StorageCacheUtils.getMenu(b.getLocation()); int capacity = getCapacity(b); diff --git a/src/main/java/io/ncbpfluffybear/fluffymachines/objects/AutoCrafter.java b/src/main/java/io/ncbpfluffybear/fluffymachines/objects/AutoCrafter.java index 66fe352f..9e956601 100644 --- a/src/main/java/io/ncbpfluffybear/fluffymachines/objects/AutoCrafter.java +++ b/src/main/java/io/ncbpfluffybear/fluffymachines/objects/AutoCrafter.java @@ -38,6 +38,8 @@ public class AutoCrafter extends SlimefunItem implements EnergyNetComponent { + private static final String WIKI_PAGE = "machines/auto-crafters"; + public static final int ENERGY_CONSUMPTION = 128; public static final int CAPACITY = ENERGY_CONSUMPTION * 3; private final int[] border = {0, 1, 3, 4, 5, 7, 8, 13, 14, 15, 16, 17, 50, 51, 52, 53}; @@ -61,6 +63,11 @@ public AutoCrafter(ItemGroup category, SlimefunItemStack item, RecipeType recipe addItemHandler(onBreak()); } + @Override + public void postRegister() { + addWikiPage(WIKI_PAGE); + } + private void constructMenu(String displayName) { new BlockMenuPreset(getId(), displayName) { diff --git a/src/main/java/io/ncbpfluffybear/fluffymachines/utils/FluffyItems.java b/src/main/java/io/ncbpfluffybear/fluffymachines/utils/FluffyItems.java index c7600aa6..48aa26d5 100644 --- a/src/main/java/io/ncbpfluffybear/fluffymachines/utils/FluffyItems.java +++ b/src/main/java/io/ncbpfluffybear/fluffymachines/utils/FluffyItems.java @@ -316,7 +316,7 @@ private FluffyItems() { public static final SlimefunItemStack ADVANCED_AUTO_DISENCHANTER = new SlimefunItemStack( "ADVANCED_AUTO_DISENCHANTER", Material.ENCHANTING_TABLE, - "&c高级全自动驱魔机", + "&c高级全自动祛魔机", "", "&7从一个物品中移除第一个附魔", "&7需要一本&6远古之书&7来操作", @@ -334,10 +334,10 @@ private FluffyItems() { public static final SlimefunItemStack UPGRADED_LUMBER_AXE = new SlimefunItemStack( "UPGRADED_LUMBER_AXE", Material.DIAMOND_AXE, - "&6&l改进斧头", + "&6&l改进伐木斧", "", - "&7一次砍下整棵树", - "&7右键给树削皮" + "&7一次砍下整棵树。", + "&7右键给树削皮。" ); public static final SlimefunItemStack DOLLY = new SlimefunItemStack( "DOLLY", diff --git a/src/main/resources/wiki.json b/src/main/resources/wiki.json new file mode 100644 index 00000000..b397cb02 --- /dev/null +++ b/src/main/resources/wiki.json @@ -0,0 +1,10 @@ +{ + "GENERATOR_CORE": "multiblock/crank-generator", + "CRANK_GENERATOR": "multiblock/crank-generator", + "FOUNDRY": "multiblock/foundry", + "SUPERHEATED_FURNACE": "multiblock/foundry", + "AUTO_CRAFTING_TABLE": "machines/auto-crafting-table", + "ADVANCED_CHARGING_BENCH": "machines/advanced-charging-bench", + "ACB_UPGRADE_CARD": "machines/advanced-charging-bench", + "SMART_FACTORY": "machines/smart-factory" +}