chore: run formatter. it did a lot

JamCoreModding · Dec 10, 2023 · 662a153 · 662a153
1 parent a620567
commit 662a153
Show file tree

Hide file tree

Showing 19 changed files with 84 additions and 93 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,12 +34,12 @@ subprojects {
     jar {
         manifest {
             attributes([
-                    'Specification-Title'     : mod_name,
-                    'Specification-Version'   : project.jar.archiveVersion,
-                    'Implementation-Title'    : project.name,
-                    'Implementation-Version'  : project.jar.archiveVersion,
-                    'Built-On-Java'           : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})",
-                    'Built-On-Minecraft'      : minecraft_version
+                    'Specification-Title'   : mod_name,
+                    'Specification-Version' : project.jar.archiveVersion,
+                    'Implementation-Title'  : project.name,
+                    'Implementation-Version': project.jar.archiveVersion,
+                    'Built-On-Java'         : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})",
+                    'Built-On-Minecraft'    : minecraft_version
             ])
         }
     }
@@ -82,7 +82,7 @@ allprojects {
     java {
         withSourcesJar()
     }
-    
+
     tasks.publish {
         dependsOn(":githubRelease")
         dependsOn("fabric:publishUnified")

diff --git a/common/src/main/java/io/github/jamalam360/rightclickharvest/HarvestContext.java b/common/src/main/java/io/github/jamalam360/rightclickharvest/HarvestContext.java
@@ -5,7 +5,7 @@
 
 /**
  * @param player The player who harvested the block
- * @param block The block that was harvested
+ * @param block  The block that was harvested
  */
 public record HarvestContext(Player player, Block block) {
 }
diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json
@@ -1,3 +1,3 @@
 {
-	"accessWidener": "rightclickharvest.accesswidener"
+  "accessWidener": "rightclickharvest.accesswidener"
 }
diff --git a/common/src/main/resources/assets/rightclickharvest/lang/ja_jp.json b/common/src/main/resources/assets/rightclickharvest/lang/ja_jp.json
@@ -5,7 +5,7 @@
   "config.rightclickharvest.harvestInRadius": "収穫範囲",
   "config.rightclickharvest.harvestInRadius.tooltip": "クワのランクに応じて、収穫範囲を広げます。「クワを必須にする」がtrueである必要があります。",
   "config.rightclickharvest.hungerLevel": "消費する満腹度",
-    "config.rightclickharvest.hungerLevel.tooltip": "収穫時に消費する満腹度レベル",
+  "config.rightclickharvest.hungerLevel.tooltip": "収穫時に消費する満腹度レベル",
   "config.rightclickharvest.hungerLevel.none": "なし",
   "config.rightclickharvest.hungerLevel.low": "低い",
   "config.rightclickharvest.hungerLevel.normal": "普通",

diff --git a/common/src/main/resources/rightclickharvest.mixins.json b/common/src/main/resources/rightclickharvest.mixins.json
@@ -1,16 +1,16 @@
 {
-    "required": true,
-    "minVersion": "0.8",
-    "package": "io.github.jamalam360.rightclickharvest.mixin",
-    "compatibilityLevel": "JAVA_17",
-    "mixins": [
-    ],
-    "client": [
-    ],
-    "server": [
-    ],
-    "injectors": {
-        "defaultRequire": 1
-    }
+  "required": true,
+  "minVersion": "0.8",
+  "package": "io.github.jamalam360.rightclickharvest.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "mixins": [
+  ],
+  "client": [
+  ],
+  "server": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
 }
 
diff --git a/...n/java/io/github/jamalam360/rightclickharvest/fabriclike/RightClickHarvestFabricLike.java b/...n/java/io/github/jamalam360/rightclickharvest/fabriclike/RightClickHarvestFabricLike.java
@@ -3,7 +3,7 @@
 import io.github.jamalam360.rightclickharvest.RightClickHarvest;
 
 public class RightClickHarvestFabricLike {
-    public static void init() {
-        RightClickHarvest.init();
-    }
+	public static void init() {
+		RightClickHarvest.init();
+	}
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -18,7 +18,7 @@ loom {
 
 configurations {
     common
-    shadowCommon 
+    shadowCommon
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common

diff --git a/.../src/main/java/io/github/jamalam360/rightclickharvest/fabric/RightClickHarvestFabric.java b/.../src/main/java/io/github/jamalam360/rightclickharvest/fabric/RightClickHarvestFabric.java
@@ -1,16 +1,12 @@
 package io.github.jamalam360.rightclickharvest.fabric;
 
 import io.github.jamalam360.rightclickharvest.fabriclike.RightClickHarvestFabricLike;
-import io.github.jamalam360.rightclickharvest.fabriclike.RightClickHarvestFabricLikeCallbacks;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
-
-import java.util.Random;
 
 public class RightClickHarvestFabric implements ModInitializer {
-    
-    @Override
-    public void onInitialize() {
-        RightClickHarvestFabricLike.init();
-    }
+
+	@Override
+	public void onInitialize() {
+		RightClickHarvestFabricLike.init();
+	}
 }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -1,33 +1,33 @@
 {
-    "schemaVersion": 1,
-    "id": "rightclickharvest",
-    "version": "${version}",
-    "name": "Right Click Harvest",
-    "description": "Right click crops to harvest them - with style.",
-    "authors": [
-        "Jamalam"
-    ],
-    "contact": {
-        "homepage": "https://github.com/JamCoreModding/right-click-harvest",
-        "sources": "https://github.com/JamCoreModding/right-click-harvest",
-        "issues": "https://github.com/JamCoreModding/right-click-harvest/issues"
-    },
-    "license": "MIT",
-    "icon": "assets/rightclickharvest/icon.png",
-    "environment": "*",
-    "entrypoints": {
-        "main": [
-            "io.github.jamalam360.rightclickharvest.fabric.RightClickHarvestFabric"
-        ]
-    },
-    "mixins": [
-        "rightclickharvest.mixins.json"
-    ],
-    "depends": {
-        "fabricloader": ">=0.14",
-        "fabric": "*",
-        "minecraft": ">=1.20",
-        "java": ">=17",
-        "architectury": ">=9.1.12"
-    }
+  "schemaVersion": 1,
+  "id": "rightclickharvest",
+  "version": "${version}",
+  "name": "Right Click Harvest",
+  "description": "Right click crops to harvest them - with style.",
+  "authors": [
+    "Jamalam"
+  ],
+  "contact": {
+    "homepage": "https://github.com/JamCoreModding/right-click-harvest",
+    "sources": "https://github.com/JamCoreModding/right-click-harvest",
+    "issues": "https://github.com/JamCoreModding/right-click-harvest/issues"
+  },
+  "license": "MIT",
+  "icon": "assets/rightclickharvest/icon.png",
+  "environment": "*",
+  "entrypoints": {
+    "main": [
+      "io.github.jamalam360.rightclickharvest.fabric.RightClickHarvestFabric"
+    ]
+  },
+  "mixins": [
+    "rightclickharvest.mixins.json"
+  ],
+  "depends": {
+    "fabricloader": ">=0.14",
+    "fabric": "*",
+    "minecraft": ">=1.20",
+    "java": ">=17",
+    "architectury": ">=9.1.12"
+  }
 }
diff --git a/forge/src/main/java/io/github/jamalam360/rightclickharvest/forge/RightClickHarvestForge.java b/forge/src/main/java/io/github/jamalam360/rightclickharvest/forge/RightClickHarvestForge.java
@@ -2,14 +2,9 @@
 
 import dev.architectury.platform.forge.EventBuses;
 import io.github.jamalam360.rightclickharvest.RightClickHarvest;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.level.BlockEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
-import java.util.Random;
-
 @Mod(RightClickHarvest.MOD_ID)
 public class RightClickHarvestForge {
 	public RightClickHarvestForge() {

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -1,13 +1,13 @@
 modLoader = "javafml"
 loaderVersion = "[47,)"
 license = "MIT"
-issueTrackerURL="https://github.com/JamCoreModding/right-click-harvest/issues"
+issueTrackerURL = "https://github.com/JamCoreModding/right-click-harvest/issues"
 
 [[mods]]
 modId = "rightclickharvest"
 version = "${file.jarVersion}"
 displayName = "Right Click Harvest"
-displayURL="https://github.com/JamCoreModding/right-click-harvest"
+displayURL = "https://github.com/JamCoreModding/right-click-harvest"
 logoFile = "icon.png"
 authors = "Jamalam"
 description = '''

diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
-    "pack": {
-        "description": "Right Click Harvest",
-        "pack_format": 15
-    }
+  "pack": {
+    "description": "Right Click Harvest",
+    "pack_format": 15
+  }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,6 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true
-
 version=4.0.2
 minecraft_version=1.20.2
 branch=1.20.2-multiloader

diff --git a/...java/io/github/jamalam360/rightclickharvest/neoforge/RightClickHarvestNeoForgeEvents.java b/...java/io/github/jamalam360/rightclickharvest/neoforge/RightClickHarvestNeoForgeEvents.java
@@ -2,7 +2,6 @@
 
 import io.github.jamalam360.rightclickharvest.HarvestContext;
 import net.neoforged.bus.api.Event;
-import net.neoforged.bus.api.ICancellableEvent;
 import net.neoforged.neoforge.common.NeoForge;
 
 public class RightClickHarvestNeoForgeEvents {

diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
@@ -1,13 +1,13 @@
 modLoader = "javafml"
 loaderVersion = "[1,)"
 license = "MIT"
-issueTrackerURL="https://github.com/JamCoreModding/right-click-harvest/issues"
+issueTrackerURL = "https://github.com/JamCoreModding/right-click-harvest/issues"
 
 [[mods]]
 modId = "rightclickharvest"
 version = "${file.jarVersion}"
 displayName = "Right Click Harvest"
-displayURL="https://github.com/JamCoreModding/right-click-harvest"
+displayURL = "https://github.com/JamCoreModding/right-click-harvest"
 logoFile = "icon.png"
 authors = "Jamalam"
 description = '''

diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
-    "pack": {
-        "description": "Right Click Harvest",
-        "pack_format": 15
-    }
+  "pack": {
+    "description": "Right Click Harvest",
+    "pack_format": 15
+  }
 }
diff --git a/quilt/build.gradle b/quilt/build.gradle
@@ -18,14 +18,14 @@ loom {
 
 configurations {
     common
-    shadowCommon 
+    shadowCommon
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
 }
 
 repositories {
-    maven { 
+    maven {
         name = "Quilt"
         url = "https://maven.quiltmc.org/repository/release/"
     }

diff --git a/quilt/src/main/java/io/github/jamalam360/rightclickharvest/quilt/RightClickHarvestQuilt.java b/quilt/src/main/java/io/github/jamalam360/rightclickharvest/quilt/RightClickHarvestQuilt.java
@@ -5,8 +5,8 @@
 import org.quiltmc.qsl.base.api.entrypoint.ModInitializer;
 
 public class RightClickHarvestQuilt implements ModInitializer {
-    @Override
-    public void onInitialize(ModContainer mod) {
-        RightClickHarvestFabricLike.init();
-    }
+	@Override
+	public void onInitialize(ModContainer mod) {
+		RightClickHarvestFabricLike.init();
+	}
 }
diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json
@@ -20,7 +20,9 @@
     },
     "intermediate_mappings": "net.fabricmc:intermediary",
     "entrypoints": {
-      "init": ["io.github.jamalam360.rightclickharvest.quilt.RightClickHarvestQuilt"]
+      "init": [
+        "io.github.jamalam360.rightclickharvest.quilt.RightClickHarvestQuilt"
+      ]
     },
     "depends": [
       {