Skip to content

Commit 132b7db

Browse files
YufiriaMazentaYufiriaMazenta
committed
[1.11.0.11-dev]修复重载后插件自带物品源失效的bug;开始编写配方创建页面
1 parent 648f1f9 commit 132b7db

File tree

55 files changed

+1212
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1212
-146
lines changed

‎build.gradle.kts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ repositories {
1616
maven("https://repo.rosewooddev.io/repository/public/")
1717
maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
1818
maven("https://repo.maven.apache.org/maven2/")
19+
//Oraxen
20+
maven("https://repo.oraxen.com/releases")
1921
//MythicDist
2022
maven("https://mvn.lumine.io/repository/maven-public/")
2123
maven("https://r.irepo.space/maven/")
@@ -45,7 +47,7 @@ dependencies {
4547
compileOnly("net.luckperms:api:5.4")
4648
compileOnly("me.clip:placeholderapi:2.11.6")
4749
compileOnly("com.github.LoneDev6:API-ItemsAdder:3.6.3-beta-14")
48-
compileOnly("com.github.oraxen:oraxen:1.160.0")
50+
compileOnly("io.th0rgal:oraxen:1.191.0")
4951
compileOnly("io.lumine:Mythic-Dist:5.3.5")
5052
compileOnly("io.lumine:MythicLib-dist:1.6.2-SNAPSHOT")
5153
compileOnly("net.Indyuce:MMOItems-API:6.9.5-SNAPSHOT")

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
crypticlibVer=1.13.9.0
1+
crypticlibVer=1.13.15.0
22
pluginVer=1.11.0.11-dev

‎src/main/java/pers/yufiria/craftorithm/Craftorithm.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import crypticlib.MinecraftVersion;
77
import crypticlib.action.ActionCompiler;
88
import crypticlib.chat.BukkitMsgSender;
9-
import crypticlib.lifecycle.AutoTask;
109
import crypticlib.lifecycle.BukkitLifeCycleTask;
1110
import crypticlib.lifecycle.LifeCycle;
11+
import crypticlib.lifecycle.LifeCycleTaskSettings;
1212
import crypticlib.lifecycle.TaskRule;
1313
import crypticlib.util.IOHelper;
1414
import org.bukkit.Bukkit;
@@ -25,10 +25,9 @@
2525
import pers.yufiria.craftorithm.util.LangUtils;
2626
import pers.yufiria.craftorithm.util.UpdateChecker;
2727

28-
@AutoTask(
28+
@LifeCycleTaskSettings(
2929
rules = {
3030
@TaskRule(lifeCycle = LifeCycle.ACTIVE, priority = 2),
31-
@TaskRule(lifeCycle = LifeCycle.RELOAD)
3231
}
3332
)
3433
public final class Craftorithm extends BukkitPlugin implements BukkitLifeCycleTask {
@@ -40,8 +39,8 @@ public Craftorithm() {
4039
}
4140

4241
@Override
43-
public void enable() {
44-
CrypticLib.setDebug(PluginConfigs.DEBUG.value());
42+
public void whenEnable() {
43+
CrypticLib.debug = PluginConfigs.DEBUG.value();
4544
IOHelper.info("&7Server Type: " + CrypticLibBukkit.serverAdapter().type() + ", Version: " + MinecraftVersion.current().version());
4645
if (MinecraftVersion.current().before(MinecraftVersion.V1_19_4)) {
4746
BukkitMsgSender.INSTANCE.info("&cUnsupported Version");
@@ -54,7 +53,12 @@ public void enable() {
5453
}
5554

5655
@Override
57-
public void disable() {
56+
public void whenReload() {
57+
CrypticLib.debug = PluginConfigs.DEBUG.value();
58+
}
59+
60+
@Override
61+
public void whenDisable() {
5862
RecipeManager.INSTANCE.resetRecipes();
5963
}
6064

@@ -75,16 +79,12 @@ public static CraftorithmAPI api() {
7579

7680
@Override
7781
public void lifecycle(Plugin plugin, LifeCycle lifeCycle) {
78-
if (lifeCycle == LifeCycle.ACTIVE) {
79-
CrypticLibBukkit.scheduler().sync(() -> {
80-
RecipeManager.INSTANCE.reloadRecipeManager();
81-
OtherPluginsListenerManager.INSTANCE.convertOtherPluginsListeners();
82-
LangUtils.info(Languages.LOAD_FINISH);
83-
loadBStat();
84-
});
85-
} else {
86-
CrypticLib.setDebug(PluginConfigs.DEBUG.value());
87-
}
82+
CrypticLibBukkit.scheduler().sync(() -> {
83+
RecipeManager.INSTANCE.reloadRecipeManager();
84+
OtherPluginsListenerManager.INSTANCE.convertOtherPluginsListeners();
85+
LangUtils.info(Languages.LOAD_FINISH);
86+
loadBStat();
87+
});
8888
}
8989

9090
}

‎src/main/java/pers/yufiria/craftorithm/command/MainCommand.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
import crypticlib.perm.PermInfo;
1010
import pers.yufiria.craftorithm.command.item.ItemCommand;
1111
import pers.yufiria.craftorithm.command.menu.OpenMenuCommand;
12-
import pers.yufiria.craftorithm.command.recipe.*;
12+
import pers.yufiria.craftorithm.command.recipe.CreateRecipeCommand;
13+
import pers.yufiria.craftorithm.command.recipe.DisableRecipeCommand;
14+
import pers.yufiria.craftorithm.command.recipe.DisplayRecipeCommand;
15+
import pers.yufiria.craftorithm.command.recipe.RemoveRecipeCommand;
1316
import pers.yufiria.craftorithm.config.PluginConfigs;
1417

15-
import java.util.Arrays;
16-
1718
@Command(platforms = {PlatformSide.BUKKIT})
1819
public class MainCommand extends CommandTree {
1920

‎src/main/java/pers/yufiria/craftorithm/command/recipe/CreateRecipeCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import crypticlib.command.CommandInfo;
44
import crypticlib.command.CommandInvoker;
55
import crypticlib.command.CommandNode;
6-
import crypticlib.lifecycle.AutoTask;
76
import crypticlib.lifecycle.BukkitLifeCycleTask;
87
import crypticlib.lifecycle.LifeCycle;
8+
import crypticlib.lifecycle.LifeCycleTaskSettings;
99
import crypticlib.lifecycle.TaskRule;
1010
import crypticlib.perm.PermInfo;
1111
import org.bukkit.entity.Player;
@@ -26,7 +26,7 @@
2626
import java.util.regex.Matcher;
2727
import java.util.regex.Pattern;
2828

29-
@AutoTask(
29+
@LifeCycleTaskSettings(
3030
rules = {
3131
@TaskRule(lifeCycle = LifeCycle.ACTIVE)
3232
}

‎src/main/java/pers/yufiria/craftorithm/command/recipe/DisplayRecipeCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.bukkit.Bukkit;
99
import org.bukkit.NamespacedKey;
1010
import org.bukkit.entity.Player;
11-
import org.bukkit.inventory.*;
11+
import org.bukkit.inventory.Recipe;
1212
import org.jetbrains.annotations.NotNull;
1313
import org.jetbrains.annotations.Nullable;
1414
import pers.yufiria.craftorithm.config.Languages;

‎src/main/java/pers/yufiria/craftorithm/config/Languages.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public class Languages {
5555
public static final StringLangEntry MENU_RECIPE_CREATOR_NAME = new StringLangEntry("menu.recipe_creator.name");
5656
public static final StringLangEntry MENU_RECIPE_CREATOR_NULL_RESULT = new StringLangEntry("menu.recipe_creator.null_result");
5757
public static final StringLangEntry MENU_RECIPE_CREATOR_NULL_INGREDIENTS = new StringLangEntry("menu.recipe_creator.null_ingredients");
58+
public static final StringLangEntry MENU_RECIPE_CREATOR_RESULT_FRAME_ICON_NAME = new StringLangEntry("menu.recipe_creator.result_frame_icon_name");
59+
public static final StringLangEntry MENU_RECIPE_CREATOR_CONFIRM_ICON_NAME = new StringLangEntry("menu.recipe_creator.confirm_icon_name");
60+
5861
public static final StringLangEntry MENU_RECIPE_DISPLAY_ANVIL_COST_LEVEL = new StringLangEntry("menu.recipe_display.anvil.cost_level");
5962
public static final StringLangEntry MENU_RECIPE_DISPLAY_VANILLA_SMELTING_TIME = new StringLangEntry("menu.recipe_display.vanilla_smelting.time");
6063
public static final StringLangEntry MENU_RECIPE_DISPLAY_VANILLA_SMELTING_REWARD_EXP = new StringLangEntry("menu.recipe_display.vanilla_smelting.reward_exp");

‎src/main/java/pers/yufiria/craftorithm/config/menu/creator/VanillaShapedCreator.java‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/main/java/pers/yufiria/craftorithm/config/menu/creator/VanillaShapedCreatorConfig.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package pers.yufiria.craftorithm.config.menu.creator;
2+
3+
import com.willfp.eco.core.config.Configs;
4+
import crypticlib.config.ConfigHandler;
5+
import crypticlib.config.node.impl.bukkit.ConfigSectionConfig;
6+
import crypticlib.config.node.impl.bukkit.StringConfig;
7+
8+
@ConfigHandler(path = "menus/internal/creator/vanilla_shaped.yml")
9+
public class VanillaShapedCreatorConfig {
10+
11+
public static final StringConfig TITLE = new StringConfig("title", "<translate:lang:recipe_type_name.vanilla_shaped><translate:lang:menu.recipe_creator.name>");
12+
public static final ConfigSectionConfig FRAME_ICON = new ConfigSectionConfig("frame_icon");
13+
public static final ConfigSectionConfig RESULT_FRAME_ICON = new ConfigSectionConfig("result_frame_icon");
14+
public static final ConfigSectionConfig CONFIRM_ICON = new ConfigSectionConfig("confirm_icon");
15+
16+
}

‎src/main/java/pers/yufiria/craftorithm/hook/PlayerPointsHooker.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package pers.yufiria.craftorithm.hook;
22

3-
import crypticlib.lifecycle.AutoTask;
43
import crypticlib.lifecycle.BukkitLifeCycleTask;
54
import crypticlib.lifecycle.LifeCycle;
5+
import crypticlib.lifecycle.LifeCycleTaskSettings;
66
import crypticlib.lifecycle.TaskRule;
77
import org.black_ixx.playerpoints.PlayerPoints;
88
import org.bukkit.plugin.Plugin;
@@ -12,7 +12,7 @@
1212

1313
import java.util.Map;
1414

15-
@AutoTask(
15+
@LifeCycleTaskSettings(
1616
rules = @TaskRule(lifeCycle = LifeCycle.ACTIVE)
1717
)
1818
public enum PlayerPointsHooker implements PluginHooker, BukkitLifeCycleTask {

0 commit comments

Comments
 (0)