From 94339c7763ca96ec0ab9be64618e7f52cf21c6b9 Mon Sep 17 00:00:00 2001
From: AsOne2020 <59190831+AsOne2020@users.noreply.github.com>
Date: Wed, 13 Aug 2025 00:29:38 +0800
Subject: [PATCH 1/2] feat(build): support Fabric, Forge, and NeoForge
 platforms

---
 .github/workflows/release.yml                 |   6 +-
 .github/workflows/scripts/matrix.py           |   3 +
 build.gradle                                  |  32 +-
 common.gradle                                 | 314 ++++++++++--------
 gradle.properties                             |  12 +-
 gradlew                                       |   3 +-
 settings.gradle                               |   2 +
 settings.json                                 |  15 +-
 .../me/asone/boatview360/BoatView360.java     |  87 +++++
 .../MixinVehicleEntity.java                   |   2 +-
 .../MixinWarshipEntity.java                   |  12 +-
 src/main/resources/META-INF/mods.toml         |  22 ++
 .../resources/META-INF/neoforge.mods.toml     |  25 ++
 src/main/resources/pack.mcmeta                |   6 +
 versions/1.14.4/gradle.properties             |  15 -
 versions/1.15.2-fabric/gradle.properties      |  18 +
 versions/1.15.2-forge/gradle.properties       |  15 +
 versions/1.17.1-fabric/gradle.properties      |  18 +
 versions/1.17.1-forge/gradle.properties       |  15 +
 .../gradle.properties                         |   9 +-
 versions/1.20.2-forge/gradle.properties       |  16 +
 versions/1.20.6-neoforge/gradle.properties    |  17 +
 .../gradle.properties                         |  11 +-
 versions/1.21.2-forge/gradle.properties       |  15 +
 versions/1.21.2-neoforge/gradle.properties    |  17 +
 versions/mainProject                          |   2 +-
 26 files changed, 530 insertions(+), 179 deletions(-)
 create mode 100644 src/main/java/me/asone/boatview360/BoatView360.java
 create mode 100644 src/main/resources/META-INF/mods.toml
 create mode 100644 src/main/resources/META-INF/neoforge.mods.toml
 create mode 100644 src/main/resources/pack.mcmeta
 delete mode 100644 versions/1.14.4/gradle.properties
 create mode 100644 versions/1.15.2-fabric/gradle.properties
 create mode 100644 versions/1.15.2-forge/gradle.properties
 create mode 100644 versions/1.17.1-fabric/gradle.properties
 create mode 100644 versions/1.17.1-forge/gradle.properties
 rename versions/{1.20.2 => 1.20.2-fabric}/gradle.properties (71%)
 create mode 100644 versions/1.20.2-forge/gradle.properties
 create mode 100644 versions/1.20.6-neoforge/gradle.properties
 rename versions/{1.21.2 => 1.21.2-fabric}/gradle.properties (66%)
 create mode 100644 versions/1.21.2-forge/gradle.properties
 create mode 100644 versions/1.21.2-neoforge/gradle.properties

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3fcccea..dac527c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -183,11 +183,11 @@ jobs:
 
           files: ${{ steps.file_info.outputs.path }}
 
-          name: ${{ format('{0} v{1} for mc{2}', steps.properties_g.outputs.mod_name, steps.properties_g.outputs.mod_version, steps.properties_v.outputs.archive_mc_version) }}
-          version: ${{ format('v{1}-mc{0}', steps.properties_v.outputs.archive_mc_version, steps.properties_g.outputs.mod_version) }}
+          name: ${{ format('[{0}] {1} v{2} for mc{3}', matrix.mod_brand, steps.properties_g.outputs.mod_name, steps.properties_g.outputs.mod_version, steps.properties_v.outputs.archive_mc_version) }}
+          version: ${{ format('v{1}-mc{0}-{2}', steps.properties_v.outputs.archive_mc_version, steps.properties_g.outputs.mod_version, matrix.mod_brand) }}
           version-type: release
 
-          loaders: fabric
+          loaders: ${{ matrix.mod_brand }}
           game-versions: ${{ steps.properties_v.outputs.game_versions }}
           game-version-filter: any
           dependencies: ''  # declare the dependencies explicitly, so mc-publish won't try to load from fabric.mod.json
diff --git a/.github/workflows/scripts/matrix.py b/.github/workflows/scripts/matrix.py
index a20e581..7cc77c2 100644
--- a/.github/workflows/scripts/matrix.py
+++ b/.github/workflows/scripts/matrix.py
@@ -31,8 +31,11 @@ def main():
 
 	matrix_entries = []
 	for subproject in subprojects:
+		mod_brand = subproject.split('-')[-1]
+		assert mod_brand in ['fabric', 'forge', 'neoforge']
 		matrix_entries.append({
 			'subproject': subproject,
+			'mod_brand': mod_brand,
 		})
 	matrix = {'include': matrix_entries}
 	with open(os.environ['GITHUB_OUTPUT'], 'w') as f:
diff --git a/build.gradle b/build.gradle
index d5292dd..b857553 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'maven-publish'
 	id 'com.github.hierynomus.license' version '0.16.1' apply false
-	id 'fabric-loom' version '1.11-SNAPSHOT' apply false
+	id 'dev.architectury.loom' version '1.10-SNAPSHOT' apply false
 
 	// https://github.com/ReplayMod/preprocessor
 	// https://github.com/Fallen-Breath/preprocessor
@@ -12,14 +12,32 @@ plugins {
 }
 
 preprocess {
-	strictExtraMappings = false
+    strictExtraMappings = false
 
-	def mc114  = createNode('1.14.4', 1_14_04, '')
-	def mc1202 = createNode('1.20.2', 1_20_02, '')
-	def mc1212 = createNode('1.21.2', 1_21_02, '')
+    def mc1152_fabric  = createNode('1.15.2-fabric', 1_15_02, '')
+	def mc1171_fabric  = createNode('1.17.1-fabric', 1_17_01, '')
+    def mc1202_fabric = createNode('1.20.2-fabric', 1_20_02, '')
+	def mc1212_fabric = createNode('1.21.2-fabric', 1_21_02, '')
 
-	mc114 .link(mc1202 , null)
-	mc1202 .link(mc1212 , null)
+	def mc1152_forge  = createNode('1.15.2-forge', 1_15_02, '')
+	def mc1171_forge  = createNode('1.17.1-forge', 1_17_01, '')
+    def mc1202_forge = createNode('1.20.2-forge', 1_20_02, '')
+	def mc1212_forge = createNode('1.21.2-forge', 1_21_02, '')
+
+	def mc1206_neoforge = createNode('1.20.6-neoforge', 1_20_06, '')
+    def mc1212_neoforge = createNode('1.21.2-neoforge', 1_21_02, '')
+
+	mc1152_fabric .link(mc1171_fabric , null)
+	mc1171_fabric .link(mc1202_fabric , null)
+	mc1202_fabric .link(mc1212_fabric , null)
+
+	mc1152_fabric .link(mc1152_forge , null)
+	mc1171_fabric .link(mc1171_forge , null)
+	mc1202_fabric .link(mc1202_forge , null)
+	mc1212_fabric .link(mc1212_forge , null)
+
+	mc1202_fabric.link(mc1206_neoforge, null)
+	mc1212_fabric.link(mc1212_neoforge, null)
 }
 
 tasks.register('buildAndGather') {
diff --git a/common.gradle b/common.gradle
index fdc1d63..23b3218 100644
--- a/common.gradle
+++ b/common.gradle
@@ -1,75 +1,101 @@
 apply plugin: 'maven-publish'
 apply plugin: 'com.github.hierynomus.license'
-apply plugin: 'fabric-loom'
+apply plugin: 'dev.architectury.loom'
 apply plugin: 'com.replaymod.preprocess'
 apply plugin: 'me.fallenbreath.yamlang'
 
+def mod_brand = (loom.platform.get() as String).toLowerCase()
+assert mod_brand in ['fabric', 'forge', 'neoforge']
+assert project.name.endsWith('-' + mod_brand)  // optional check
+
 int mcVersion = project.mcVersion
+preprocess {
+    vars.put("MC", mcVersion)
+    vars.put("FABRIC", mod_brand == 'fabric' ? 1 : 0)
+    vars.put("FORGE", mod_brand == 'forge' ? 1 : 0)
+    vars.put("NEOFORGE", mod_brand == 'neoforge' ? 1 : 0)
+    vars.put("FORGE_LIKE", mod_brand in ['forge', 'neoforge'] ? 1 : 0)
+}
 
 repositories {
-	maven {
-		url = 'https://jitpack.io'
-	}
-	maven {
-		url = 'https://maven.fallenbreath.me/releases'
-	}
+    maven {
+        url = 'https://jitpack.io'
+    }
+    maven {
+        url = 'https://maven.fallenbreath.me/releases'
+    }
+    maven {
+        url = 'https://maven.neoforged.net/releases'
+    }
 }
 
 // https://github.com/FabricMC/fabric-loader/issues/783
 configurations {
-	modRuntimeOnly.exclude group: 'net.fabricmc', module: 'fabric-loader'
+    modRuntimeOnly.exclude group: 'net.fabricmc', module: 'fabric-loader'
 }
 
 dependencies {
-	// loom
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    // loom
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings loom.layered {
+        mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+
+        // https://github.com/architectury/architectury-loom/issues/214
+        if (mod_brand == 'neoforge' && project.hasProperty('yarn_mappings_patch')) {
+            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:${project.yarn_mappings_patch}")
+        }
+    }
 
-	// runtime mods
-//	if (mcVersion < 11904) {
+    if (mod_brand == 'fabric') {
+        modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
+    } else if (mod_brand == 'forge') {
+        forge "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
+    } else if (mod_brand == 'neoforge') {
+        neoForge "net.neoforged:neoforge:${project.neoforge_version}"
+    }
+
+    // runtime mods
+//	if (mcVersion < 11904 && mod_brand == 'fabric') {
 //		modRuntimeOnly(mcVersion < 11900 ? "com.github.astei:lazydfu:0.1.2" : "com.github.Fallen-Breath:lazydfu:a7cfc44c0c")
 //	}
-//	// [FEATURE] MIXIN_AUDITOR
-//	modRuntimeOnly 'me.fallenbreath:mixin-auditor:0.1.0'
 
-	// dependencies
-//	include(modImplementation(fabricApi.module("fabric-resource-loader-v0", project.fabric_api_version)))
-	include(modImplementation("me.fallenbreath:conditional-mixin-fabric:${project.conditionalmixin_version}"))
-//	include(annotationProcessor(implementation("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
+    // dependencies
+    include(modImplementation("me.fallenbreath:conditional-mixin-${mod_brand}:${project.conditionalmixin_version}"))
+//    if (mod_brand == 'forge') {
+//        compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${project.mixinextras_version}"))
+//    }
+//    include(annotationProcessor(implementation("io.github.llamalad7:mixinextras-${mod_brand}:${project.mixinextras_version}")))
 }
 
+String MOD_ICON_PATH = 'assets/boatview360/icon.png'
 String MIXIN_CONFIG_PATH = 'boatview360.mixins.json'
 String LANG_DIR = 'assets/boatview360/lang'
 JavaVersion JAVA_COMPATIBILITY
-if (mcVersion >= 12005) {
-	JAVA_COMPATIBILITY = JavaVersion.VERSION_21
+if (mcVersion >= 12005 && !(mcVersion < 12100 && mod_brand == 'forge')) {
+    JAVA_COMPATIBILITY = JavaVersion.VERSION_21
 } else if (mcVersion >= 11800) {
-	JAVA_COMPATIBILITY = JavaVersion.VERSION_17
+    JAVA_COMPATIBILITY = JavaVersion.VERSION_17
 } else if (mcVersion >= 11700) {
-	JAVA_COMPATIBILITY = JavaVersion.VERSION_16
+    JAVA_COMPATIBILITY = JavaVersion.VERSION_16
 } else {
-	JAVA_COMPATIBILITY = JavaVersion.VERSION_1_8
+    JAVA_COMPATIBILITY = JavaVersion.VERSION_1_8
 }
 JavaVersion MIXIN_COMPATIBILITY_LEVEL = JAVA_COMPATIBILITY
 
 loom {
-	def commonVmArgs = ['-Dmixin.debug.export=true', '-Dmixin.debug.countInjections=true']
-	runConfigs.configureEach {
-		// to make sure it generates all "Minecraft Client (:subproject_name)" applications
-		ideConfigGenerated = true
-		runDir '../../run'
-		vmArgs commonVmArgs
-	}
-//	// [FEATURE] MIXIN_AUDITOR
-//	runs {
-//		def auditVmArgs = [*commonVmArgs, '-DmixinAuditor.audit=true']
-//		serverMixinAudit {
-//			server()
-//			vmArgs auditVmArgs
-//			ideConfigGenerated false
-//		}
-//	}
+    def commonVmArgs = ['-Dmixin.debug.export=true', '-Dmixin.debug.countInjections=true']
+    runConfigs.configureEach {
+        // to make sure it generates all "Minecraft Client (:subproject_name)" applications
+        ideConfigGenerated = true
+        runDir '../../run'
+        vmArgs commonVmArgs
+    }
+
+    if (mod_brand == 'forge') {
+        forge {
+            mixinConfigs = [MIXIN_CONFIG_PATH]
+        }
+    }
 }
 
 String modVersionSuffix = ''
@@ -78,139 +104,163 @@ String artifactVersionSuffix = ''
 // detect github action environment variables
 // https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
 if (System.getenv("BUILD_RELEASE") != "true") {
-	String buildNumber = System.getenv("BUILD_ID")
-	modVersionSuffix += buildNumber != null ? ('+build.' + buildNumber) : '-SNAPSHOT'
-	artifactVersionSuffix = '-SNAPSHOT'  // A non-release artifact is always a SNAPSHOT artifact
+    String buildNumber = System.getenv("BUILD_ID")
+    modVersionSuffix += buildNumber != null ? ('+build.' + buildNumber) : '-SNAPSHOT'
+    artifactVersionSuffix = '-SNAPSHOT'  // A non-release artifact is always a SNAPSHOT artifact
 }
 String fullModVersion = project.mod_version + modVersionSuffix
 String fullProjectVersion, fullArtifactVersion
 
 // Example version values:
-//   project.mod_version     1.0.3                      (the base mod version)
-//   modVersionSuffix        +build.88                  (use github action build number if possible)
+//   project.mod_version     1.0.3                             (the base mod version)
+//   modVersionSuffix        +build.88                         (use github action build number if possible)
 //   artifactVersionSuffix   -SNAPSHOT
-//   fullModVersion          1.0.3+build.88             (the actual mod version to use in the mod)
-//   fullProjectVersion      v1.0.3-mc1.15.2+build.88   (in build output jar name)
-//   fullArtifactVersion     1.0.3-mc1.15.2-SNAPSHOT    (maven artifact version)
+//   fullModVersion          1.0.3+build.88                    (the actual mod version to use in the mod)
+//   fullProjectVersion      v1.0.3-mc1.15.2-fabric+build.88   (in build output jar name)
+//   fullArtifactVersion     1.0.3-mc1.15.2-fabric-SNAPSHOT    (maven artifact version)
 
 group = project.maven_group
 if (System.getenv("JITPACK") == "true") {
-	// move mc version into archivesBaseName, so jitpack will be able to organize archives from multiple subprojects correctly
-	base.archivesName = project.archives_base_name + '-mc' + project.archive_mc_version
-	fullProjectVersion = 'v' + project.mod_version + modVersionSuffix
-	fullArtifactVersion = artifactVersion + artifactVersionSuffix
+    // move mc version into archivesBaseName, so jitpack will be able to organize archives from multiple subprojects correctly
+    base.archivesName = project.archives_base_name + '-mc' + project.minecraft_version + '-' + mod_brand
+    fullProjectVersion = 'v' + project.mod_version + modVersionSuffix
+    fullArtifactVersion = artifactVersion + artifactVersionSuffix
 } else {
-	base.archivesName = project.archives_base_name
-	fullProjectVersion = 'v' + project.mod_version + '-mc' + project.archive_mc_version + modVersionSuffix
-	fullArtifactVersion = artifactVersion + '-mc' + project.archive_mc_version + artifactVersionSuffix
+    base.archivesName = project.archives_base_name
+    fullProjectVersion = 'v' + project.mod_version + '-mc' + project.archive_mc_version + '-' + mod_brand + modVersionSuffix
+    fullArtifactVersion = artifactVersion + '-mc' + project.archive_mc_version + '-' + mod_brand + artifactVersionSuffix
 }
 version = fullProjectVersion
 
 // See https://youtrack.jetbrains.com/issue/IDEA-296490
 // if IDEA complains about "Cannot resolve resource filtering of MatchingCopyAction" and you want to know why
 processResources {
-	inputs.property "id", project.mod_id
-	inputs.property "name", project.mod_name
-	inputs.property "version", fullModVersion
-	inputs.property "minecraft_dependency", project.minecraft_dependency
-
-	filesMatching("fabric.mod.json") {
-		def valueMap = [
-				"id": project.mod_id,
-				"name": project.mod_name,
-				"version": fullModVersion,
-				"minecraft_dependency": project.minecraft_dependency,
-		]
-		expand valueMap
-	}
-
-	filesMatching(MIXIN_CONFIG_PATH) {
-		filter { s -> s.replace('{{COMPATIBILITY_LEVEL}}', "JAVA_${MIXIN_COMPATIBILITY_LEVEL.ordinal() + 1}") }
-	}
+    inputs.property "id", project.mod_id
+    inputs.property "name", project.mod_name
+    inputs.property "version", fullModVersion
+    inputs.property "minecraft_dependency", project.minecraft_dependency
+
+    def good_files = [] as Set
+    def all_files = [] as Set
+    [
+            'fabric'  : ['fabric.mod.json'],
+            'forge'   : ['META-INF', 'META-INF/mods.toml', 'pack.mcmeta'],
+            'neoforge': ['META-INF', 'META-INF/neoforge.mods.toml', 'pack.mcmeta'],
+    ].forEach { brand, paths ->
+        all_files.addAll(paths)
+        if (brand == mod_brand) {
+            good_files.addAll(paths)
+        }
+    }
+    all_files.forEach { it2 ->
+        def path = it2 as String
+        if (good_files.contains(path)) {
+            filesMatching(path) {
+                def valueMap = [
+                        "id"                  : project.mod_id,
+                        "name"                : project.mod_name,
+                        "version"             : fullModVersion,
+                        "minecraft_dependency": project.minecraft_dependency,
+                ]
+                expand valueMap
+            }
+        } else {
+            exclude path
+        }
+    }
+
+    filesMatching(MIXIN_CONFIG_PATH) {
+        filter { s -> s.replace('{{COMPATIBILITY_LEVEL}}', "JAVA_${MIXIN_COMPATIBILITY_LEVEL.ordinal() + 1}") }
+    }
+
+    if (mod_brand == 'forge' || mod_brand == 'neoforge') {
+        // forge requires the mod icon file to be at the resource root
+        filesMatching(MOD_ICON_PATH) { f -> f.path = new File(f.path).getName() }
+    }
 }
 
 // https://github.com/Fallen-Breath/yamlang
 yamlang {
-	targetSourceSets = [sourceSets.main]
-	inputDir = LANG_DIR
+    targetSourceSets = [sourceSets.main]
+    inputDir = LANG_DIR
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
 // this fixes some edge cases with special characters not displaying correctly
 // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
 tasks.withType(JavaCompile).configureEach {
-	options.encoding = "UTF-8"
-	options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
-	if (JAVA_COMPATIBILITY <= JavaVersion.VERSION_1_8) {
-		// suppressed "source/target value 8 is obsolete and will be removed in a future release"
-		options.compilerArgs << '-Xlint:-options'
-	}
+    options.encoding = "UTF-8"
+    options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
+    if (JAVA_COMPATIBILITY <= JavaVersion.VERSION_1_8) {
+        // suppressed "source/target value 8 is obsolete and will be removed in a future release"
+        options.compilerArgs << '-Xlint:-options'
+    }
 }
 
 java {
-	sourceCompatibility = JAVA_COMPATIBILITY
-	targetCompatibility = JAVA_COMPATIBILITY
+    sourceCompatibility = JAVA_COMPATIBILITY
+    targetCompatibility = JAVA_COMPATIBILITY
 
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
-	withSourcesJar()
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
-	from(rootProject.file('LICENSE')) {
-		rename { "${it}_${project.archives_base_name}" }
-	}
+    from(rootProject.file('LICENSE')) {
+        rename { "${it}_${project.archives_base_name}" }
+    }
 }
 
 // https://github.com/hierynomus/license-gradle-plugin
 license {
-	// use "gradle licenseFormat" to apply license headers
-	header = rootProject.file('HEADER.txt')
-	include '**/*.java'
-	skipExistingHeaders = true
-
-	headerDefinitions {
-		// ref: https://github.com/mathieucarbou/license-maven-plugin/blob/4c42374bb737378f5022a3a36849d5e23ac326ea/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/header/HeaderType.java#L48
-		// modification: add a newline at the end
-		SLASHSTAR_STYLE_NEWLINE {
-			firstLine = "/*"
-			beforeEachLine = " * "
-			endLine = " */" + System.lineSeparator()
-			afterEachLine = ""
-			skipLinePattern = null
-			firstLineDetectionPattern = "(\\s|\\t)*/\\*.*\$"
-			lastLineDetectionPattern = ".*\\*/(\\s|\\t)*\$"
-			allowBlankLines = false
-			isMultiline = true
-			padLines = false
-		}
-	}
-	mapping {
-		java = 'SLASHSTAR_STYLE_NEWLINE'
-	}
-	ext {
-		name = project.mod_name
-		author = 'As_One'
-		year = Calendar.getInstance().get(Calendar.YEAR).toString()
-	}
+    // use "gradle licenseFormat" to apply license headers
+    header = rootProject.file('HEADER.txt')
+    include '**/*.java'
+    skipExistingHeaders = true
+
+    headerDefinitions {
+        // ref: https://github.com/mathieucarbou/license-maven-plugin/blob/4c42374bb737378f5022a3a36849d5e23ac326ea/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/header/HeaderType.java#L48
+        // modification: add a newline at the end
+        SLASHSTAR_STYLE_NEWLINE {
+            firstLine = "/*"
+            beforeEachLine = " * "
+            endLine = " */" + System.lineSeparator()
+            afterEachLine = ""
+            skipLinePattern = null
+            firstLineDetectionPattern = "(\\s|\\t)*/\\*.*\$"
+            lastLineDetectionPattern = ".*\\*/(\\s|\\t)*\$"
+            allowBlankLines = false
+            isMultiline = true
+            padLines = false
+        }
+    }
+    mapping {
+        java = 'SLASHSTAR_STYLE_NEWLINE'
+    }
+    ext {
+        name = project.mod_name
+        author = 'As_One'
+        year = Calendar.getInstance().get(Calendar.YEAR).toString()
+    }
 }
 classes.dependsOn licenseFormatMain
 testClasses.dependsOn licenseFormatTest
 
 // configure the maven publication
 publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			from components.java
-			artifactId = base.archivesName.get()
-			version = fullArtifactVersion
-		}
-	}
-
-	// select the repositories you want to publish to
-	repositories {
-		// mavenLocal()
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifactId = base.archivesName.get()
+            version = fullArtifactVersion
+        }
+    }
+
+    // select the repositories you want to publish to
+    repositories {
+        // mavenLocal()
 
 //		// [FEATURE] FALLENS_MAVEN
 //		maven {
@@ -223,5 +273,5 @@ publishing {
 //				basic(BasicAuthentication)
 //			}
 //		}
-	}
+    }
 }
diff --git a/gradle.properties b/gradle.properties
index 8ca18fc..6a0910b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,14 +2,10 @@
 org.gradle.jvmargs = -Xmx6G
 org.gradle.parallel = true
 
-# Fabric Basic Properties
-# https://fabricmc.net/versions.html
-loader_version = 0.17.0
-
 # Mod Properties
 mod_id = boatview360
 mod_name = BoatView360
-mod_version = 1.0.2
+mod_version = 1.0.3
 maven_group = me.asone
 archives_base_name = boatview360
 
@@ -18,4 +14,8 @@ archives_base_name = boatview360
 conditionalmixin_version = 0.6.4
 
 # https://github.com/LlamaLad7/MixinExtras
-#	mixinextras_version=0.3.6
+#mixinextras_version = 0.5.0
+
+systemProp.https.proxyHost = 127.0.0.1
+systemProp.https.proxyPort = 7890
+systemProp.https.nonProxyHosts = 10.*|localhost
\ No newline at end of file
diff --git a/gradlew b/gradlew
index f3b75f3..f5feea6 100644
--- a/gradlew
+++ b/gradlew
@@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/settings.gradle b/settings.gradle
index dcf86ee..2097286 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,6 +10,8 @@ pluginManagement {
 			name = 'Jitpack'
 			url = 'https://jitpack.io'
 		}
+		maven { url = "https://maven.architectury.dev/" }
+		maven { url = "https://files.minecraftforge.net/maven/" }
 		mavenCentral()
 		gradlePluginPortal()
 	}
diff --git a/settings.json b/settings.json
index 011ee1d..3663039 100644
--- a/settings.json
+++ b/settings.json
@@ -1,7 +1,16 @@
 {
   "versions": [
-    "1.14.4",
-    "1.20.2",
-    "1.21.2"
+    "1.15.2-fabric",
+    "1.17.1-fabric",
+    "1.20.2-fabric",
+    "1.21.2-fabric",
+
+    "1.15.2-forge",
+    "1.17.1-forge",
+    "1.20.2-forge",
+    "1.21.2-forge",
+
+    "1.20.6-neoforge",
+    "1.21.2-neoforge"
   ]
 }
\ No newline at end of file
diff --git a/src/main/java/me/asone/boatview360/BoatView360.java b/src/main/java/me/asone/boatview360/BoatView360.java
new file mode 100644
index 0000000..a0e9216
--- /dev/null
+++ b/src/main/java/me/asone/boatview360/BoatView360.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the BoatView360 project, licensed under the
+ * GNU Lesser General Public License v3.0
+ *
+ * Copyright (C) 2025  As_One and contributors
+ *
+ * BoatView360 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * BoatView360 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with BoatView360.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.asone.boatview360;
+
+//#if MC >= 11802
+//$$ import com.mojang.logging.LogUtils;
+//$$ import org.slf4j.Logger;
+//#else
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+//#endif
+
+//#if FABRIC
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.metadata.ModMetadata;
+//#elseif FORGE
+//$$ import net.minecraftforge.fml.ModList;
+//$$ import net.minecraftforge.fml.common.Mod;
+//$$ import net.minecraftforge.forgespi.language.IModInfo;
+//#elseif NEOFORGE
+//$$ import net.neoforged.fml.ModList;
+//$$ import net.neoforged.fml.common.Mod;
+//$$ import net.neoforged.neoforgespi.language.IModInfo;
+//#endif
+
+//#if FORGE_LIKE
+//$$ @Mod(BoatView360.MOD_ID)
+//#endif
+public class BoatView360
+		//#if FABRIC
+		implements ModInitializer
+		//#endif
+{
+	public static final Logger LOGGER =
+			//#if MC >= 11802
+			//$$ LogUtils.getLogger();
+			//#else
+			LogManager.getLogger();
+			//#endif
+
+	public static final String MOD_ID = "boatview360";
+	public static String MOD_VERSION = "unknown";
+	public static String MOD_NAME = "unknown";
+
+	//#if FABRIC
+	@Override
+	public void onInitialize()
+	{
+		ModMetadata metadata = FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow(RuntimeException::new).getMetadata();
+		MOD_NAME = metadata.getName();
+		MOD_VERSION = metadata.getVersion().getFriendlyString();
+		this.init();
+	}
+	//#elseif FORGE_LIKE
+	//$$ public BoatView360()
+	//$$ {
+	//$$ 	IModInfo modInfo = ModList.get().getModContainerById(MOD_ID).orElseThrow(RuntimeException::new).getModInfo();
+	//$$ 	MOD_NAME = modInfo.getDisplayName();
+	//$$ 	MOD_VERSION = modInfo.getVersion().toString();
+	//$$ 	this.init();
+	//$$ }
+	//#endif
+
+	private void init()
+	{
+		// common init here
+	}
+}
diff --git a/src/main/java/me/asone/boatview360/mixins/immersive_aircraft/MixinVehicleEntity.java b/src/main/java/me/asone/boatview360/mixins/immersive_aircraft/MixinVehicleEntity.java
index c298110..d0a0bad 100644
--- a/src/main/java/me/asone/boatview360/mixins/immersive_aircraft/MixinVehicleEntity.java
+++ b/src/main/java/me/asone/boatview360/mixins/immersive_aircraft/MixinVehicleEntity.java
@@ -38,7 +38,7 @@
 public class MixinVehicleEntity {
     @Redirect(
             method = "copyEntityData",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/class_3532;method_15363(FFF)F"),
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;clamp(FFF)F",remap = true),
             remap = false
     )
     private float modifyClamp(float value, float min, float max, Entity entity) {
diff --git a/src/main/java/me/asone/boatview360/mixins/immersive_aircraft/MixinWarshipEntity.java b/src/main/java/me/asone/boatview360/mixins/immersive_aircraft/MixinWarshipEntity.java
index 18189d9..10e4b40 100644
--- a/src/main/java/me/asone/boatview360/mixins/immersive_aircraft/MixinWarshipEntity.java
+++ b/src/main/java/me/asone/boatview360/mixins/immersive_aircraft/MixinWarshipEntity.java
@@ -31,14 +31,14 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @SuppressWarnings("UnresolvedMixinReference")
-@Restriction(require = @Condition(value = "immersive_aircraft"))
+@Restriction(require = @Condition(value = "immersive_aircraft", versionPredicates = ">=1.0.0"))
 @Pseudo
 @Mixin(targets = "immersive_aircraft.entity.WarshipEntity")
 public class MixinWarshipEntity {
 
     @Redirect(
             method = "copyEntityData",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/class_3532;method_15363(FFF)F"),
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;clamp(FFF)F", remap = true),
             remap = false
     )
     private float modifyClamp(float value, float min, float max, Entity entity) {
@@ -49,8 +49,14 @@ private float modifyClamp(float value, float min, float max, Entity entity) {
     }
 
     @Redirect(
+            //#if FABRIC
             method = "method_5773",
-            at = @At(value = "INVOKE", target = "Lorg/joml/Math;clamp(FFF)F"),
+            //#elseif FORGE
+            //$$ method = "m_8119_",
+            //#else
+            //$$ method = "tick",
+            //#endif
+            at = @At(value = "INVOKE", target = "Lorg/joml/Math;clamp(FFF)F", remap = false),
             remap = false
     )
     private float modifyClamp(float min, float max, float value) {
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
new file mode 100644
index 0000000..e5a56c8
--- /dev/null
+++ b/src/main/resources/META-INF/mods.toml
@@ -0,0 +1,22 @@
+modLoader = "javafml"
+loaderVersion = "[31,)"
+license = "LGPLv3"
+issueTrackerURL = "https://github.com/AsOne2020/BoatView360/issues"
+
+[[mods]]
+modId = "${id}"
+version = "${version}"
+displayName = "${name}"
+displayURL = "https://github.com/AsOne2020/BoatView360"
+authors = "As_One"
+description = '''
+Removes the 210° view limit in boats, allowing full 360° camera rotation.
+'''
+logoFile = "icon.png"
+
+[[dependencies."${id}"]]
+modId = "minecraft"
+mandatory = true
+versionRange = "${minecraft_dependency}"
+ordering = "NONE"
+side = "BOTH"
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
new file mode 100644
index 0000000..72a2902
--- /dev/null
+++ b/src/main/resources/META-INF/neoforge.mods.toml
@@ -0,0 +1,25 @@
+modLoader = "javafml"
+loaderVersion = "[1,)"
+license = "LGPLv3"
+issueTrackerURL = "https://github.com/AsOne2020/BoatView360/issues"
+
+[[mods]]
+modId = "${id}"
+version = "${version}"
+displayName = "${name}"
+displayURL = "https://github.com/AsOne2020/BoatView360"
+authors = "As_One"
+description = '''
+Removes the 210° view limit in boats, allowing full 360° camera rotation.
+'''
+logoFile = "icon.png"
+
+[[dependencies."${id}"]]
+modId = "minecraft"
+mandatory = true
+versionRange = "${minecraft_dependency}"
+ordering = "NONE"
+side = "BOTH"
+
+[[mixins]]
+config = "${id}.mixins.json"
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
new file mode 100644
index 0000000..98f6a22
--- /dev/null
+++ b/src/main/resources/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "description": "${name}",
+    "pack_format": 6
+  }
+}
diff --git a/versions/1.14.4/gradle.properties b/versions/1.14.4/gradle.properties
deleted file mode 100644
index db2e9e4..0000000
--- a/versions/1.14.4/gradle.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Fabric Properties
-# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.14.4
-minecraft_version = 1.14.4
-yarn_mappings = 1.14.4+build.18
-
-# Fabric Mod Metadata
-minecraft_dependency = >=1.14.4 <=1.20.1
-archive_mc_version = 1.14.4-1.20.1
-
-# Build Information
-# The target mc versions for the mod during mod publishing, separated with \n
-game_versions = 1.14.4\n1.15\n1.15.1\n1.15.2\n1.15.3\n1.15.4\n1.16\n1.16.1\n1.16.2\n1.16.3\n1.16.4\n1.16.5\n1.17\n1.17.1\n1.18\n1.18.1\n1.18.2\n1.19\n1.19.1\n1.19.2\n1.19.3\n1.19.4\n1.20\n1.20.1
-
-# Dependencies
-# fabric_api_version=0.28.5+1.14
diff --git a/versions/1.15.2-fabric/gradle.properties b/versions/1.15.2-fabric/gradle.properties
new file mode 100644
index 0000000..b7bb17f
--- /dev/null
+++ b/versions/1.15.2-fabric/gradle.properties
@@ -0,0 +1,18 @@
+# Loom Properties
+# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.15.2
+minecraft_version = 1.15.2
+yarn_mappings = 1.15.2+build.17
+loom.platform = fabric
+
+# Mod Metadata
+# https://fabricmc.net/versions.html
+fabric_loader_version = 0.16.14
+minecraft_dependency = >=1.14 <=1.16.5
+archive_mc_version = 1.14-1.16.5
+
+# Build Information
+# The target mc versions for the mod during mod publishing, separated with \n
+game_versions = 1.14\n1.14.1\n1.14.2\n1.14.3\n1.14.4\n1.15\n1.15.1\n1.15.2\n1.15.3\n1.15.4\n1.16\n1.16.1\n1.16.2\n1.16.3\n1.16.4\n1.16.5
+
+# Dependencies
+# fabric_api_version=0.28.5+1.15
diff --git a/versions/1.15.2-forge/gradle.properties b/versions/1.15.2-forge/gradle.properties
new file mode 100644
index 0000000..83950d5
--- /dev/null
+++ b/versions/1.15.2-forge/gradle.properties
@@ -0,0 +1,15 @@
+# Loom Properties
+# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.15.2
+minecraft_version = 1.15.2
+yarn_mappings = 1.15.2+build.17
+loom.platform = forge
+
+# Mod Metadata
+# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.15.2.html
+forge_version = 31.2.57
+minecraft_dependency = [1.15.2, 1.16.5]
+archive_mc_version = 1.15.2-1.16.5
+
+# Build Information
+# The target mc versions for the mod during mod publishing, separated with \n
+game_versions = 1.15.2\n1.15.3\n1.15.4\n1.16\n1.16.1\n1.16.2\n1.16.3\n1.16.4\n1.16.5
diff --git a/versions/1.17.1-fabric/gradle.properties b/versions/1.17.1-fabric/gradle.properties
new file mode 100644
index 0000000..d31d3fc
--- /dev/null
+++ b/versions/1.17.1-fabric/gradle.properties
@@ -0,0 +1,18 @@
+# Loom Properties
+# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.17.1
+minecraft_version = 1.17.1
+yarn_mappings = 1.17.1+build.65
+loom.platform = fabric
+
+# Mod Metadata
+# https://fabricmc.net/versions.html
+fabric_loader_version = 0.16.14
+minecraft_dependency = >=1.17 <=1.20.1
+archive_mc_version = 1.17-1.20.1
+
+# Build Information
+# The target mc versions for the mod during mod publishing, separated with \n
+game_versions = 1.17\n1.17.1\n1.18\n1.18.1\n1.18.2\n1.19\n1.19.1\n1.19.2\n1.19.3\n1.19.4\n1.20\n1.20.1
+
+# Dependencies
+# fabric_api_version=0.46.1+1.17
diff --git a/versions/1.17.1-forge/gradle.properties b/versions/1.17.1-forge/gradle.properties
new file mode 100644
index 0000000..53968e1
--- /dev/null
+++ b/versions/1.17.1-forge/gradle.properties
@@ -0,0 +1,15 @@
+# Loom Properties
+# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.17.1
+minecraft_version = 1.17.1
+yarn_mappings = 1.17.1+build.65
+loom.platform = forge
+
+# Mod Metadata
+# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.17.1.html
+forge_version = 37.1.1
+minecraft_dependency = [1.17, 1.20.1]
+archive_mc_version = 1.17-1.20.1
+
+# Build Information
+# The target mc versions for the mod during mod publishing, separated with \n
+game_versions = 1.17\n1.17.1\n1.18\n1.18.1\n1.18.2\n1.19\n1.19.1\n1.19.2\n1.19.3\n1.19.4\n1.20\n1.20.1
diff --git a/versions/1.20.2/gradle.properties b/versions/1.20.2-fabric/gradle.properties
similarity index 71%
rename from versions/1.20.2/gradle.properties
rename to versions/1.20.2-fabric/gradle.properties
index 2216cfe..b922ce1 100644
--- a/versions/1.20.2/gradle.properties
+++ b/versions/1.20.2-fabric/gradle.properties
@@ -1,9 +1,12 @@
 # Fabric Properties
-# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.4
+# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.2
 minecraft_version = 1.20.2
 yarn_mappings = 1.20.2+build.4
+loom.platform = fabric
 
-# Fabric Mod Metadata
+# Mod Metadata
+# https://fabricmc.net/versions.html
+fabric_loader_version = 0.16.14
 minecraft_dependency = >=1.20.2 <=1.21.1
 archive_mc_version = 1.20.2-1.21.1
 
@@ -12,4 +15,4 @@ archive_mc_version = 1.20.2-1.21.1
 game_versions = 1.20.2\n1.20.3\n1.20.4\n1.20.5\n1.20.6\n1.21\n1.21.1
 
 # Dependencies
-# fabric_api_version=0.97.3+1.20.4
+# fabric_api_version=0.97.2+1.20.4
diff --git a/versions/1.20.2-forge/gradle.properties b/versions/1.20.2-forge/gradle.properties
new file mode 100644
index 0000000..b6047c9
--- /dev/null
+++ b/versions/1.20.2-forge/gradle.properties
@@ -0,0 +1,16 @@
+# Loom Properties
+# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.2
+minecraft_version = 1.20.2
+yarn_mappings = 1.20.2+build.4
+loom.platform = forge
+
+# Mod Metadata
+# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.2.html
+forge_version = 48.1.0
+minecraft_dependency = [1.20.2, 1.21.1]
+archive_mc_version = 1.20.2-1.21.1
+
+
+# Build Information
+# The target mc versions for the mod during mod publishing, separated with \n
+game_versions = 1.20.2\n1.20.3\n1.20.4\n1.20.5\n1.20.6\n1.21\n1.21.1
diff --git a/versions/1.20.6-neoforge/gradle.properties b/versions/1.20.6-neoforge/gradle.properties
new file mode 100644
index 0000000..7133a82
--- /dev/null
+++ b/versions/1.20.6-neoforge/gradle.properties
@@ -0,0 +1,17 @@
+# Loom Properties
+# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.6
+minecraft_version = 1.20.6
+yarn_mappings = 1.20.6+build.3
+loom.platform = neoforge
+# https://maven.architectury.dev/dev/architectury/yarn-mappings-patch-neoforge/
+yarn_mappings_patch = 1.20.6+build.4
+
+# Mod Metadata
+# https://projects.neoforged.net/neoforged/neoforge
+neoforge_version = 20.6.135
+minecraft_dependency = [1.20.6, 1.21.1]
+archive_mc_version = 1.20.6-1.21.1
+
+# Build Information
+# The target mc versions for the mod during mod publishing, separated with \n
+game_versions = 1.20.6\n1.21\n1.21.1
diff --git a/versions/1.21.2/gradle.properties b/versions/1.21.2-fabric/gradle.properties
similarity index 66%
rename from versions/1.21.2/gradle.properties
rename to versions/1.21.2-fabric/gradle.properties
index be38043..b1d513c 100644
--- a/versions/1.21.2/gradle.properties
+++ b/versions/1.21.2-fabric/gradle.properties
@@ -1,9 +1,12 @@
 # Fabric Properties
-# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.3
-minecraft_version = 1.21.2
-yarn_mappings = 1.21.2+build.1
+# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.2
+minecraft_version = 1.21.3
+yarn_mappings = 1.21.3+build.2
+loom.platform = fabric
 
-# Fabric Mod Metadata
+# Mod Metadata
+# https://fabricmc.net/versions.html
+fabric_loader_version = 0.16.14
 minecraft_dependency = >=1.21.2
 archive_mc_version = 1.21.2+
 
diff --git a/versions/1.21.2-forge/gradle.properties b/versions/1.21.2-forge/gradle.properties
new file mode 100644
index 0000000..9d7eebe
--- /dev/null
+++ b/versions/1.21.2-forge/gradle.properties
@@ -0,0 +1,15 @@
+# Fabric Properties
+# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.3
+minecraft_version = 1.21.3
+yarn_mappings = 1.21.3+build.2
+loom.platform = forge
+
+# Mod Metadata
+# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.21.3.html
+forge_version = 53.0.25
+minecraft_dependency = [1.21.2, )
+archive_mc_version = 1.21.2+
+
+# Build Information
+# The target mc versions for the mod during mod publishing, separated with \n
+game_versions = 1.21.2\n1.21.3\n1.21.4\n1.21.5\n1.21.6\n1.21.7\n1.21.8
diff --git a/versions/1.21.2-neoforge/gradle.properties b/versions/1.21.2-neoforge/gradle.properties
new file mode 100644
index 0000000..1e3e23c
--- /dev/null
+++ b/versions/1.21.2-neoforge/gradle.properties
@@ -0,0 +1,17 @@
+# Fabric Properties
+# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.3
+minecraft_version = 1.21.3
+yarn_mappings = 1.21.3+build.2
+loom.platform = neoforge
+# https://maven.architectury.dev/dev/architectury/yarn-mappings-patch-neoforge/
+yarn_mappings_patch = 1.21+build.4
+
+# Mod Metadata
+# https://projects.neoforged.net/neoforged/neoforge
+neoforge_version = 21.3.77
+minecraft_dependency = [1.21.2, )
+archive_mc_version = 1.21.2+
+
+# Build Information
+# The target mc versions for the mod during mod publishing, separated with \n
+game_versions = 1.21.2\n1.21.3\n1.21.4\n1.21.5\n1.21.6\n1.21.7\n1.21.8
diff --git a/versions/mainProject b/versions/mainProject
index 6b1a92e..00af18c 100644
--- a/versions/mainProject
+++ b/versions/mainProject
@@ -1 +1 @@
-1.21.2
\ No newline at end of file
+1.21.2-fabric
\ No newline at end of file

From 511e43b57d3d9c75a1d94e6b5c6c030168f0a08b Mon Sep 17 00:00:00 2001
From: AsOne2020 <59190831+AsOne2020@users.noreply.github.com>
Date: Wed, 13 Aug 2025 00:36:08 +0800
Subject: [PATCH 2/2] build: remove HTTPS proxy settings from gradle.properties

---
 gradle.properties | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6a0910b..7085c92 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,8 +14,4 @@ archives_base_name = boatview360
 conditionalmixin_version = 0.6.4
 
 # https://github.com/LlamaLad7/MixinExtras
-#mixinextras_version = 0.5.0
-
-systemProp.https.proxyHost = 127.0.0.1
-systemProp.https.proxyPort = 7890
-systemProp.https.nonProxyHosts = 10.*|localhost
\ No newline at end of file
+#mixinextras_version = 0.5.0
\ No newline at end of file