alexcrea/CustomAnvil
1
0
Fork 0
mirror of https://github.com/alexcrea/CustomAnvil.git synced 2026-06-23 16:16:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some api function not being static.

Browse source
This commit is contained in:
alexcrea 2024-07-08 17:15:39 +02:00
parent 091fb23aac
commit 0761c70286
No known key found for this signature in database
GPG key ID: 43FD265DB0DBF91F
3 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/xyz/alexcrea/cuanvil/api/ConflictAPI.java
View file

@ -22,6 +22,8 @@ import java.util.Set;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class ConflictAPI { public class ConflictAPI {
private ConflictAPI() {}
private static int saveChangeTask = -1; private static int saveChangeTask = -1;
private static int reloadChangeTask = -1; private static int reloadChangeTask = -1;
@ -32,7 +34,7 @@ public class ConflictAPI {
* @param builder The conflict builder to base on * @param builder The conflict builder to base on
* @return True if successful. * @return True if successful.
*/ */
public boolean addConflict(@NotNull ConflictBuilder builder){ public static boolean addConflict(@NotNull ConflictBuilder builder){
FileConfiguration config = ConfigHolder.CONFLICT_HOLDER.getConfig(); FileConfiguration config = ConfigHolder.CONFLICT_HOLDER.getConfig();
if(config.contains(builder.getName())) return false; if(config.contains(builder.getName())) return false;
@ -53,7 +55,7 @@ public class ConflictAPI {
* @param builder The builder source * @param builder The builder source
* @param conflict The conflict target * @param conflict The conflict target
*/ */
protected void appendEnchantments(@NotNull ConflictBuilder builder, @NotNull EnchantConflictGroup conflict){ protected static void appendEnchantments(@NotNull ConflictBuilder builder, @NotNull EnchantConflictGroup conflict){
for (String enchantmentName : builder.getEnchantmentNames()){ for (String enchantmentName : builder.getEnchantmentNames()){
if(appendEnchantment(conflict, EnchantmentApi.getByName(enchantmentName))){ if(appendEnchantment(conflict, EnchantmentApi.getByName(enchantmentName))){
CustomAnvil.instance.getLogger().warning("Could not find enchantment " + enchantmentName + " for conflict " + builder.getName()); CustomAnvil.instance.getLogger().warning("Could not find enchantment " + enchantmentName + " for conflict " + builder.getName());
@ -75,7 +77,7 @@ public class ConflictAPI {
* @param enchantment The enchantment * @param enchantment The enchantment
* @return True if successful. * @return True if successful.
*/ */
protected boolean appendEnchantment(@NotNull EnchantConflictGroup conflict, @Nullable CAEnchantment enchantment){ protected static boolean appendEnchantment(@NotNull EnchantConflictGroup conflict, @Nullable CAEnchantment enchantment){
if(enchantment == null) if(enchantment == null)
return false; return false;
conflict.addEnchantment(enchantment); conflict.addEnchantment(enchantment);
@ -88,7 +90,7 @@ public class ConflictAPI {
* @param builder The builder source * @param builder The builder source
* @return The abstract material group from the builder. * @return The abstract material group from the builder.
*/ */
protected AbstractMaterialGroup extractGroup(@NotNull ConflictBuilder builder){ protected static AbstractMaterialGroup extractGroup(@NotNull ConflictBuilder builder){
ItemGroupManager itemGroupManager = ConfigHolder.ITEM_GROUP_HOLDER.getItemGroupsManager(); ItemGroupManager itemGroupManager = ConfigHolder.ITEM_GROUP_HOLDER.getItemGroupsManager();
IncludeGroup group = new IncludeGroup(EnchantConflictManager.DEFAULT_GROUP_NAME); IncludeGroup group = new IncludeGroup(EnchantConflictManager.DEFAULT_GROUP_NAME);
@ -115,7 +117,7 @@ public class ConflictAPI {
* @param builder The builder * @param builder The builder
* @return True if successful. * @return True if successful.
*/ */
public boolean writeConflict(@NotNull ConflictBuilder builder){ public static boolean writeConflict(@NotNull ConflictBuilder builder){
return writeConflict(builder, true); return writeConflict(builder, true);
} }
@ -128,7 +130,7 @@ public class ConflictAPI {
* @param updatePlanned If we should plan a global update for conflicts * @param updatePlanned If we should plan a global update for conflicts
* @return True if successful. * @return True if successful.
*/ */
public boolean writeConflict(@NotNull ConflictBuilder builder, boolean updatePlanned){ public static boolean writeConflict(@NotNull ConflictBuilder builder, boolean updatePlanned){
FileConfiguration config = ConfigHolder.CONFLICT_HOLDER.getConfig(); FileConfiguration config = ConfigHolder.CONFLICT_HOLDER.getConfig();
String name = builder.getName(); String name = builder.getName();
@ -159,7 +161,7 @@ public class ConflictAPI {
* @return Builder's stored enchantment. * @return Builder's stored enchantment.
*/ */
@NotNull @NotNull
private Set<String> extractEnchantments(@NotNull ConflictBuilder builder){ private static Set<String> extractEnchantments(@NotNull ConflictBuilder builder){
Set<String> result = new HashSet<>(builder.getEnchantmentNames()); Set<String> result = new HashSet<>(builder.getEnchantmentNames());
for (NamespacedKey enchantmentKey : builder.getEnchantmentKeys()) { for (NamespacedKey enchantmentKey : builder.getEnchantmentKeys()) {
result.add(enchantmentKey.getKey()); result.add(enchantmentKey.getKey());
@ -194,7 +196,7 @@ public class ConflictAPI {
} }
private void logConflictOrigin(@NotNull ConflictBuilder builder){ private static void logConflictOrigin(@NotNull ConflictBuilder builder){
CustomAnvil.instance.getLogger().warning("Conflict " + builder.getName() +" came from " + builder.getSourceName() + "."); CustomAnvil.instance.getLogger().warning("Conflict " + builder.getName() +" came from " + builder.getSourceName() + ".");
} }
@ -203,10 +205,9 @@ public class ConflictAPI {
* @return An immutable collection of conflict. * @return An immutable collection of conflict.
*/ */
@NotNull @NotNull
public List<EnchantConflictGroup> getRegisteredConflict(){ public static List<EnchantConflictGroup> getRegisteredConflict(){
List<EnchantConflictGroup> mutableList = ConfigHolder.CONFLICT_HOLDER.getConflictManager().getConflictList(); List<EnchantConflictGroup> mutableList = ConfigHolder.CONFLICT_HOLDER.getConflictManager().getConflictList();
return Collections.unmodifiableList(mutableList); return Collections.unmodifiableList(mutableList);
} }
} }

2
src/main/java/xyz/alexcrea/cuanvil/api/EnchantmentApi.java
View file

@ -114,7 +114,7 @@ public class EnchantmentApi {
* @return An immutable map of enchantment key as map key and custom anvil enchantment as value. * @return An immutable map of enchantment key as map key and custom anvil enchantment as value.
*/ */
@NotNull @NotNull
public Map<NamespacedKey, CAEnchantment> getRegisteredEnchantments(){ public static Map<NamespacedKey, CAEnchantment> getRegisteredEnchantments(){
return Collections.unmodifiableMap(CAEnchantmentRegistry.getInstance().registeredEnchantments()); return Collections.unmodifiableMap(CAEnchantmentRegistry.getInstance().registeredEnchantments());
} }

14
src/main/java/xyz/alexcrea/cuanvil/api/MaterialGroupApi.java
View file

@ -24,6 +24,8 @@ import java.util.Set;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class MaterialGroupApi { public class MaterialGroupApi {
private MaterialGroupApi(){}
private static int saveChangeTask = -1; private static int saveChangeTask = -1;
private static int reloadChangeTask = -1; private static int reloadChangeTask = -1;
@ -34,7 +36,7 @@ public class MaterialGroupApi {
* @param group the group to add * @param group the group to add
* @return true if successful. * @return true if successful.
*/ */
public boolean addMaterialGroup(@NotNull AbstractMaterialGroup group){ public static boolean addMaterialGroup(@NotNull AbstractMaterialGroup group){
ItemGroupManager itemGroupManager = ConfigHolder.ITEM_GROUP_HOLDER.getItemGroupsManager(); ItemGroupManager itemGroupManager = ConfigHolder.ITEM_GROUP_HOLDER.getItemGroupsManager();
if(itemGroupManager.get(group.getName()) != null) return false; if(itemGroupManager.get(group.getName()) != null) return false;
@ -55,7 +57,7 @@ public class MaterialGroupApi {
* @param group the group to write * @param group the group to write
* @return true if successful. * @return true if successful.
*/ */
public boolean writeMaterialGroup(@NotNull AbstractMaterialGroup group){ public static boolean writeMaterialGroup(@NotNull AbstractMaterialGroup group){
return writeMaterialGroup(group, true); return writeMaterialGroup(group, true);
} }
@ -68,7 +70,7 @@ public class MaterialGroupApi {
* @param updatePlanned if we should plan a global update for material groups * @param updatePlanned if we should plan a global update for material groups
* @return true if successful. * @return true if successful.
*/ */
public boolean writeMaterialGroup(@NotNull AbstractMaterialGroup group, boolean updatePlanned){ public static boolean writeMaterialGroup(@NotNull AbstractMaterialGroup group, boolean updatePlanned){
String name = group.getName(); String name = group.getName();
if(name.contains(".")) { if(name.contains(".")) {
CustomAnvil.instance.getLogger().warning("Group " + name +" contain . in its name but should not. this material group is ignored."); CustomAnvil.instance.getLogger().warning("Group " + name +" contain . in its name but should not. this material group is ignored.");
@ -89,7 +91,7 @@ public class MaterialGroupApi {
return true; return true;
} }
private void writeKnownGroup(@NotNull String groupType, @NotNull AbstractMaterialGroup group){ private static void writeKnownGroup(@NotNull String groupType, @NotNull AbstractMaterialGroup group){
FileConfiguration config = ConfigHolder.ITEM_GROUP_HOLDER.getConfig(); FileConfiguration config = ConfigHolder.ITEM_GROUP_HOLDER.getConfig();
String basePath = group.getName() + "."; String basePath = group.getName() + ".";
@ -106,7 +108,7 @@ public class MaterialGroupApi {
} }
private void writeUnknownGroup(@NotNull AbstractMaterialGroup group) { private static void writeUnknownGroup(@NotNull AbstractMaterialGroup group) {
FileConfiguration config = ConfigHolder.ITEM_GROUP_HOLDER.getConfig(); FileConfiguration config = ConfigHolder.ITEM_GROUP_HOLDER.getConfig();
String basePath = group.getName() + "."; String basePath = group.getName() + ".";
@ -161,7 +163,7 @@ public class MaterialGroupApi {
* @return An immutable map of group name as its key and group as mapped value. * @return An immutable map of group name as its key and group as mapped value.
*/ */
@NotNull @NotNull
public Map<String, AbstractMaterialGroup> getRegisteredGroups(){ public static Map<String, AbstractMaterialGroup> getRegisteredGroups(){
return Collections.unmodifiableMap(ConfigHolder.ITEM_GROUP_HOLDER.getItemGroupsManager().getGroupMap()); return Collections.unmodifiableMap(ConfigHolder.ITEM_GROUP_HOLDER.getItemGroupsManager().getGroupMap());
} }