Transparent rendering fix

.gitignore

@@ -21,6 +21,7 @@ output
 # other
 eclipse
 run
+run-server
 refresh.bat
 AdvancedRocketry.txt
 changelog.html

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017
+Copyright (c) 2024
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -1,5 +1,5 @@
 # Advanced Rocketry - Reworked
-This is a fork of Advanced Rocketry where we fix all the bugs of the mod because the devs don't do it.
+This is a fork of Advanced Rocketry.
 
 You can download the new mod from curseforge: https://www.curseforge.com/minecraft/mc-mods/advanced-rocketry-2
 
@@ -10,23 +10,6 @@ original github repo: https://github.com/Advanced-Rocketry/AdvancedRocketry
 
 old documentation: http://arwiki.dmodoomsirius.me/
 
-
-## Current bugfixes:
-- satellites disconnect on server restart fixed
-- biome remote crash fixed
-- warp fuel displays incorrect fixed
-- rocket stuck in orbit 25 secs  (fixed)
-- biome changer energy consumption system fixed
-- asteroid field available as custom Icon: customIcon="asteroid"
-- improved planetary map
-- space elevator fixed
-- void miner fixed (void miner does not actually break blocks on planet)
-- gas mining: gas selection not updating fixed
-- solar panels crash near stars fixed
-- #### AR had over 200 open issues. I fixed so many of them that I stopped writing them all down because it would be a very long list. Just look at the commit history and you can see all that changed.
-
-
-## Improvements:
-- There are many improvements but same as with bugs, I stopped writing them all down because it would be a very long list
+You can see all bugfixes / improvements in the commit history
 
 

build.gradle.kts

@@ -32,6 +32,10 @@ val startGitRev: String by project
 group = "zmaster587.advancedRocketry"
 setProperty("archivesBaseName", archiveBase)
 
+legacy {
+    fixClasspath = true
+}
+
 val buildNumber: String by lazy { System.getenv("BUILD_NUMBER") ?: getDate() }
 
 fun getDate(): String {
@@ -41,7 +45,7 @@ fun getDate(): String {
     return format.format(Date())
 }
 
-version = "$modVersion-$buildNumber"
+version = "$modVersion"
 
 println("$archiveBase v$mcVersion-$version")
 
@@ -51,10 +55,26 @@ java {
     }
 }
 
-configurations.configureEach {
-    exclude(group = "net.minecraftforge", module = "mergetool")
+tasks {
+    javadoc {
+        options.encoding = "UTF-8"
+    }
+    compileJava {
+        options.encoding = "UTF-8"
+    }
+    compileTestJava {
+        options.encoding = "UTF-8"
+    }
+
+//    withType(JavaCompile) {
+//        options.encoding = "UTF-8"
+//    }
 }
 
+//configurations.configureEach {
+//    exclude(group = "net.minecraftforge", module = "mergetool")
+//}
+
 //sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 tasks.compileJava {
     sourceCompatibility = "1.8"
@@ -63,7 +83,7 @@ tasks.compileJava {
 
 
 minecraft {
-    mappings("snapshot", "20170624-1.12")
+    mappings("snapshot", "20171003-1.12")
 
     accessTransformer(file("src/main/resources/META-INF/accessTransformer.cfg"))
 
@@ -131,10 +151,10 @@ repositories {
         name = "ModMaven"
         url = uri("https://modmaven.k-4u.nl")
     }
-    maven {
-        name = "Galacticraft"
-        url = uri("https://maven.galacticraft.dev/repository/legacy-releases/")
-    }
+    //maven {
+    //    name = "Galacticraft"
+    //    url = uri("https://maven.galacticraft.dev/repository/legacy-releases/")
+    //}
 //    maven {
 //        name = "LibVulpes"
 //        url = uri("http://maven.dmodoomsirius.me/")
@@ -152,15 +172,17 @@ dependencies {
     //compileOnly("net.industrial-craft:industrialcraft-2:$icVersion:dev")
     //implementation("zmaster587.libVulpes:LibVulpes:$mcVersion-$libVulpesVersion-$libVulpesBuildNum-deobf")
 
-    compileOnly(fg.deobf("dev.galacticraft:galacticraft-legacy:$gcVersion"))
-
+    //compileOnly(fg.deobf("dev.galacticraft:galacticraft-legacy:$gcVersion"))
+    compileOnly(fg.deobf("curse.maven:galacticraft-legacy-564236:4671122"))
     compileOnly(fg.deobf("mezz.jei:jei_${mcVersion}:${jeiVersion}:api"))
-    runtimeOnly(fg.deobf("mezz.jei:jei_${mcVersion}:${jeiVersion}"))
+    implementation(fg.deobf("mezz.jei:jei_${mcVersion}:${jeiVersion}")) // Sorry but it won't start wihout jei...
+    //runtimeOnly(fg.deobf("mezz.jei:jei_${mcVersion}:${jeiVersion}")) // I think this crashes the game for me when running from IntelliJ
 
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    compileOnly(fileTree(mapOf("dir" to "libs/compileOnly", "include" to listOf("*.jar"))))
 
-    implementation ("net.minecraftforge:mergetool:0.2.3.3")
-    // implementation ("zmaster587.libVulpes:libVulpes:1.12.2-0.4.2+:deobf")
+//    implementation ("net.minecraftforge:mergetool:0.2.3.3")
+    implementation ("net.minecraftforge:mergetool") { version { strictly("0.2.3.3") } }
 }
 
 tasks.processResources {
@@ -206,6 +228,7 @@ tasks.withType(Jar::class) {
                 "Implementation-Title" to archiveBase,
                 "Implementation-Version" to project.version,
                 "Git-Hash" to gitHash,
+                "FMLAT" to "accessTransformer.cfg",
                 "FMLCorePlugin" to "zmaster587.advancedRocketry.asm.AdvancedRocketryPlugin",
                 "FMLCorePluginContainsFMLMod" to "true"
         )
@@ -308,4 +331,4 @@ idea {
     module {
         inheritOutputDirs = true
     }
-}
+}

gradle.properties

@@ -4,12 +4,10 @@ org.gradle.daemon=false
 # Project
 mcVersion=1.12.2
 forgeVersion=14.23.5.2860
-modVersion=2.0.11
+modVersion=2.1.7
 archiveBase=AdvancedRocketry
 startGitRev=8e676bd
 
 # Dependencies
-libVulpesVersion=0.4.3
+libVulpesVersion=0.5.0
 jeiVersion=4.16.1.301
-icVersion=2.7.39-ex111
-gcVersion=4.0.6

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
+#Sun Jul 07 14:46:24 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,6 +1,7 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
+        mavenCentral()
         maven {
             name = "MinecraftForge"
             url = uri("https://maven.minecraftforge.net/")
@@ -9,6 +10,10 @@ pluginManagement {
             name = "FancyGradle"
             url = uri("https://maven.gofancy.wtf/releases")
         }
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
     }
 }
 

src/main/java/zmaster587/advancedRocketry/ARHookLoader.java

@@ -0,0 +1,18 @@
+package zmaster587.advancedRocketry;
+
+
+import zmaster587.advancedRocketry.repack.gloomyfolken.hooklib.minecraft.HookLoader;
+import zmaster587.advancedRocketry.repack.gloomyfolken.hooklib.minecraft.PrimaryClassTransformer;
+
+public class ARHookLoader extends HookLoader {
+
+    @Override
+    public String[] getASMTransformerClass() {
+        return new String[]{PrimaryClassTransformer.class.getName()};
+    }
+
+    @Override
+    public void registerHooks() {
+        registerHookContainer("zmaster587.advancedRocketry.ARHooks");
+    }
+}