Various fixes, clean, etc

Author: Arona74

README.md

@@ -2,6 +2,19 @@
 
 <img alt="Factions Mod Icon" src="src/main/resources/assets/factions/icon.png">
 
+<p style="color:red;">### **YOU ARE ON THE FORK MADE BY ARONA74**
+
+This fork was made to provide lastest features and bug fixes of Factions Mod to MC 1.20.1 version.
+
+Features NOT included:
+- Translations
+- GUI
+- Prevent Explosions in claims
+
+No support will be provided by original Factions Mod dev team, this fork is provided as is.
+
+&nbsp;</p>
+
 # Factions Mod
 
 Highly customizable, lightweight and elegant factions mod for the [Fabric loader][fabric] in Minecraft 1.20.1

build.gradle

@@ -12,6 +12,7 @@ group = project.maven_group
 
 repositories {
     maven { url "https://jitpack.io" }
+    maven { url 'https://repo.bluecolored.de/releases' }
     maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     maven { url "https://repo.mikeprimm.com/" }
     maven { url "https://maven.nucleoid.xyz/" }
@@ -43,7 +44,7 @@ dependencies {
     include "com.flowpowered:flow-math:${project.flow_version}"
     implementation "com.flowpowered:flow-math:${project.flow_version}"
     modCompileOnly "us.dynmap:DynmapCoreAPI:${project.dynmap_api_version}"
-    modCompileOnly "com.github.BlueMap-Minecraft:BlueMapAPI:${project.bluemap_api_version}"
+    modCompileOnly "de.bluecolored.bluemap:BlueMapAPI:${project.bluemap_api_version}"
     modCompileOnly "maven.modrinth:styled-chat:${project.styled_chat_version}"
     modCompileOnly "xyz.jpenilla:squaremap-api:${project.squaremap_api_version}"
 }

gradle.properties

@@ -6,7 +6,7 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.14.22
 
 # Mod Properties
-mod_version = 2.5.1.custom2.9.0
+mod_version = 2.9.0
 maven_group = io.icker
 archives_base_name = factions
 
@@ -16,6 +16,6 @@ lucko_permissions_version=0.3.1
 dynmap_api_version=3.7-SNAPSHOT
 papi_version=2.1.3+1.20.1
 styled_chat_version=7dmapSQA
-bluemap_api_version=v2.5.1
+bluemap_api_version=2.7.1
 squaremap_api_version=1.2.3
 flow_version=1.0.3

src/main/java/io/icker/factions/api/events/FactionEvents.java

@@ -106,7 +106,7 @@ public interface MemberJoin {
         void onMemberJoin(Faction faction, User user);
     }
 
-    // TODO add Reason: LEAVE, KICK, DISBAND
+    // TO DO add Reason: LEAVE, KICK, DISBAND
     @FunctionalInterface
     public interface MemberLeave {
         void onMemberLeave(Faction faction, User user);

src/main/java/io/icker/factions/api/events/PlayerEvents.java

@@ -4,17 +4,17 @@
 
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
-import net.minecraft.block.BlockState;
+//import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
+//import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
-import net.minecraft.world.explosion.Explosion;
+//import net.minecraft.world.explosion.Explosion;
 
 /** Events related to player actions */
 public class PlayerEvents {

src/main/java/io/icker/factions/api/persistents/Claim.java

@@ -40,7 +40,6 @@ public Claim(int x, int z, String level, UUID factionID) {
         this.accessLevel = Rank.MEMBER;
     }
 
-    @SuppressWarnings("unused")
     public Claim() {}
 
     public String getKey() {

src/main/java/io/icker/factions/api/persistents/Faction.java

@@ -76,10 +76,8 @@ public Faction(String name, String description, String motd, Formatting color, b
         this.power = power;
     }
 
-    @SuppressWarnings("unused")
     public Faction() {}
 
-    @SuppressWarnings("unused")
     public String getKey() {
         return id.toString();
     }
@@ -102,7 +100,6 @@ public static Collection<Faction> all() {
         return STORE.values();
     }
 
-    @SuppressWarnings("unused")
     public static List<Faction> allBut(UUID id) {
         return STORE.values().stream().filter(f -> f.id != id).toList();
     }
@@ -305,7 +302,7 @@ public static void save() {
         Database.save(Faction.class, STORE.values().stream().toList());
     }
 
-    // TODO(samu): import per-player power patch
+    // TO DO(samu): import per-player power patch
     public int calculateMaxPower() {
         return FactionsMod.CONFIG.POWER.BASE
                 + (getUsers().size() * FactionsMod.CONFIG.POWER.MEMBER)

src/main/java/io/icker/factions/api/persistents/Relationship.java

@@ -29,6 +29,5 @@ public Relationship(UUID target, Status status) {
         this.status = status;
     }
 
-    @SuppressWarnings("unused")
     public Relationship() {}
 }

src/main/java/io/icker/factions/api/persistents/User.java

@@ -63,7 +63,6 @@ public User(UUID id) {
 
     public User() {}
 
-    @SuppressWarnings("unused")
     public String getKey() {
         return id.toString();
     }

src/main/java/io/icker/factions/command/ClaimCommand.java

@@ -278,6 +278,8 @@ private int setAccessLevel(CommandContext<ServerCommandSource> context, boolean
                 case LEADER -> claim.accessLevel = User.Rank.OWNER;
                 case COMMANDER -> claim.accessLevel = User.Rank.LEADER;
                 case MEMBER -> claim.accessLevel = User.Rank.COMMANDER;
+                case GUEST -> throw new UnsupportedOperationException("Unimplemented case: " + claim.accessLevel);
+                default -> throw new IllegalArgumentException("Unexpected value: " + claim.accessLevel);
             }
         } else {
             if (claim.accessLevel.ordinal() <= user.rank.ordinal()) {
@@ -296,6 +298,8 @@ private int setAccessLevel(CommandContext<ServerCommandSource> context, boolean
                             .fail().send(player, false);
                     return 0;
                 }
+                case GUEST -> throw new UnsupportedOperationException("Unimplemented case: " + claim.accessLevel);
+                default -> throw new IllegalArgumentException("Unexpected value: " + claim.accessLevel);
             }
         }