More cleanup, prepare for new config options

Author: onebeastchris

build-logic/settings.gradle.kts

@@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage")
+
 dependencyResolutionManagement {
     repositories {
         gradlePluginPortal()

build-logic/src/main/kotlin/hurricane.build-logic.gradle.kts

@@ -3,10 +3,6 @@ plugins {
     `maven-publish`
 }
 
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
-
 tasks {
     processResources {
         filesMatching(listOf("fabric.mod.json", "META-INF/neoforge.mods.toml")) {
@@ -23,6 +19,10 @@ tasks {
             )
         }
     }
+
+    withType(JavaCompile::class) {
+        options.encoding = "UTF-8"
+    }
 }
 
 repositories {
@@ -41,10 +41,4 @@ repositories {
 
 group = properties["group"] as String
 version = properties["version"] as String
-java.sourceCompatibility = JavaVersion.VERSION_21
-
-publishing {
-    publications.create<MavenPublication>("maven") {
-        from(components["java"])
-    }
-}
+java.sourceCompatibility = JavaVersion.VERSION_21

core/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    id("hurricane.shadow-conventions")
+}
+
+dependencies {
+    api(libs.configurate.hocon) {
+        exclude("org.checkerframework")
+    }
+    compileOnly(libs.bundles.geyser)
+}

…eysermc/hurricane/util/BedrockUtils.java …org/geysermc/hurricane/BedrockUtils.javamod-shared/src/main/java/org/geysermc/hurricane/util/BedrockUtils.java renamed to core/src/main/java/org/geysermc/hurricane/BedrockUtils.java mod-shared/src/main/java/org/geysermc/hurricane/util/BedrockUtils.java renamed to core/src/main/java/org/geysermc/hurricane/BedrockUtils.java

@@ -1,6 +1,5 @@
-package org.geysermc.hurricane.util;
+package org.geysermc.hurricane;
 
-import org.geysermc.hurricane.Hurricane;
 import org.geysermc.floodgate.api.FloodgateApi;
 import org.geysermc.geyser.api.GeyserApi;
 
@@ -9,8 +8,7 @@
 public class BedrockUtils {
 
     private static boolean floodgatePresent;
-
-    private static boolean geyserPresent = false;
+    private static boolean geyserPresent;
 
     static {
         try {
@@ -23,13 +21,12 @@ public class BedrockUtils {
                 geyserPresent = true;
             } catch (ClassNotFoundException ex) {
                 geyserPresent = false;
-                Hurricane.LOGGER.debug("Geyser/Floodgate not found, disabling Bedrock support.");
             }
         }
     }
 
     public static boolean isGeyserOrFloodgateInstalled() {
-            return floodgatePresent || geyserPresent;
+        return floodgatePresent || geyserPresent;
     }
 
     public static boolean isBedrockPlayer(UUID uuid){

core/src/main/java/org/geysermc/hurricane/HurricaneLogger.java

@@ -0,0 +1,12 @@
+package org.geysermc.hurricane;
+
+public interface HurricaneLogger {
+
+    void info(String message);
+
+    void info(String message, Object... args);
+
+    void warn(String message);
+
+    void warn(String message, Object... args);
+}

core/src/main/java/org/geysermc/hurricane/HurricanePlatform.java

@@ -0,0 +1,22 @@
+package org.geysermc.hurricane;
+
+import org.geysermc.hurricane.config.HurricaneConfiguration;
+
+public interface HurricanePlatform {
+
+    HurricaneConfiguration configuration();
+
+    HurricaneLogger logger();
+
+    default void enable(HurricaneConfiguration configuration) {
+        verifyConfig(configuration);
+
+        if (configuration.collisionFixes().bamboo() || configuration.collisionFixes().pointedDripstone()) {
+            registerCollisionFixes(configuration);
+        }
+    }
+
+    void registerCollisionFixes(HurricaneConfiguration configuration);
+
+    void verifyConfig(HurricaneConfiguration configuration);
+}

…sermc/hurricane/config/ConfigLoader.java …sermc/hurricane/config/ConfigLoader.javaspigot/src/main/java/org/geysermc/hurricane/config/ConfigLoader.java renamed to core/src/main/java/org/geysermc/hurricane/config/ConfigLoader.java spigot/src/main/java/org/geysermc/hurricane/config/ConfigLoader.java renamed to core/src/main/java/org/geysermc/hurricane/config/ConfigLoader.java

@@ -13,9 +13,10 @@ public final class ConfigLoader {
 
     private final static ConfigurationTransformation.Versioned TRANSFORMER = ConfigurationTransformation.versionedBuilder()
             .addVersion(1, noneToOne())
+            .addVersion(2, oneToTwo())
             .build();
 
-    private static final int LATEST_CONFIG_VERSION = 1;
+    private static final int LATEST_CONFIG_VERSION = 2;
 
     public static HurricaneConfiguration loadConfig(Path dataFolder) throws ConfigurateException {
         final HoconConfigurationLoader loader = HoconConfigurationLoader.builder()
@@ -24,7 +25,6 @@ public static HurricaneConfiguration loadConfig(Path dataFolder) throws Configur
                 .build();
 
         final CommentedConfigurationNode node = loader.load();
-
         int version = TRANSFORMER.version(node);
 
         if (version != LATEST_CONFIG_VERSION) {
@@ -37,7 +37,6 @@ public static HurricaneConfiguration loadConfig(Path dataFolder) throws Configur
         // Save config again to e.g. add new options, or to create the file
         // Hocon automatically sorts configuration options alphabetically, so we don't need an intermediary node
         loader.save(node);
-
         return config;
     }
 
@@ -46,4 +45,11 @@ private static ConfigurationTransformation noneToOne() {
                 .addAction(NodePath.path("item-steerable-fix"), TransformAction.remove())
                 .build();
     }
+
+    private static ConfigurationTransformation oneToTwo() {
+        return ConfigurationTransformation.builder()
+                // Was only ever in the modded config, but no longer necessary
+                .addAction(NodePath.path("suppress-warnings"), TransformAction.remove())
+                .build();
+    }
 }

…icane/config/HurricaneConfiguration.java …icane/config/HurricaneConfiguration.javaspigot/src/main/java/org/geysermc/hurricane/config/HurricaneConfiguration.java renamed to core/src/main/java/org/geysermc/hurricane/config/HurricaneConfiguration.java spigot/src/main/java/org/geysermc/hurricane/config/HurricaneConfiguration.java renamed to core/src/main/java/org/geysermc/hurricane/config/HurricaneConfiguration.java

@@ -31,5 +31,19 @@ public boolean bamboo() {
         public boolean pointedDripstone() {
             return pointedDripstone;
         }
+
+        public void setBamboo(boolean bamboo) {
+            this.bamboo = bamboo;
+        }
+
+        public void setPointedDripstone(boolean pointedDripstone) {
+            this.pointedDripstone = pointedDripstone;
+        }
+    }
+
+    @ConfigSerializable
+    public static final class BlockBreakingFixes {
+        private boolean applyToJava = false;
+        // TODO
     }
 }

fabric/build.gradle.kts

@@ -28,7 +28,7 @@ tasks {
 dependencies {
     modImplementation(libs.fabric.loader)
     modApi(libs.fabric.api)
-    common(project(":mod-shared", configuration = "namedElements")) { isTransitive = false }
+    common(project(":mod-shared", configuration = "namedElements"))
     shadow(project(path = ":mod-shared", configuration = "transformProductionFabric")) {
         isTransitive = false
     }

fabric/src/main/java/org/geysermc/hurricane/platform/fabric/FabricBlockPlaceEvent.java

@@ -12,8 +12,8 @@
 
 public class FabricBlockPlaceEvent {
 
-    // TODO: proper checks
-    public void registerInteractBlockCallback() {
+    // TODO: proper checks, separate!!!
+    public static void registerInteractBlockCallback() {
         UseBlockCallback.EVENT.register((player, level, hand, blockHitResult) -> {
             Item item = player.getItemInHand(hand).getItem();
             if (item.equals(Items.BAMBOO)) {