Gp/1.7.0 dev

.gitattributes

@@ -0,0 +1,11 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.java text eol=lf
+*.json text eol=lf
+src/generated/resources/.cache/** text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary

README.md

@@ -47,7 +47,7 @@ All Code is issued under LGPL-3.0 unless explicitly stated within the file heade
 ### All Files with the extension `.mtl` and `.obj` are All Rights reserved.
 ### All assets in `resources/assets/cosmiccore/textures` are licensed under All Rights Reserved by default
 Exclusions to this rule are as follows  
- - All files contained in the subfolder(s) `items` are licensed as MIT
+ - All files contained in the subfolder(s) `item` are licensed as MIT
  - All files contained in the subfolder(s) `block` EXCLUDING `iris` are licensed as MIT
 
 ```
@@ -60,4 +60,4 @@ Using code/assets from this project requires attribution in both cases and requi
 
 Credits;
 Thanks to [Gregtech Modern](https://github.com/GregTechCEu/GregTech-Modern) for plenty of useful code references and invaluable knowledge in learning Java.
-Thanks to ULSTICK's [GregTech: Refreshed](https://modrinth.com/resourcepack/gregtech-refreshed) for providing me the ability to learn to make modern MC pixelart.
+Thanks to ULSTICK's [GregTech: Refreshed](https://modrinth.com/resourcepack/gregtech-refreshed) for helping me learn how to make Jappa-style pixel art.

build.gradle

@@ -5,7 +5,6 @@ plugins {
     id "maven-publish"
 
     alias libs.plugins.modDevGradle
-    alias libs.plugins.machete // automatic jar compressing on build
     alias libs.plugins.spotless
     alias libs.plugins.lombok
 }
@@ -17,7 +16,12 @@ boolean isCI = System.getenv("CI") != null
 java {
     toolchain.languageVersion = JavaLanguageVersion.of(17)
 }
-
+//NOTE ; Uncomment if GTM Snapshot source is being silly, rebuild and refresh, then recomment out. Having this here constantly isn't great of an idea
+configurations.all {
+    resolutionStrategy {
+        cacheChangingModulesFor 0, 'seconds'
+    }
+}
 sourceSets {
     // Include resources generated by data generators.
     main.resources {
@@ -39,14 +43,6 @@ tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << "-Aquiet=true"
 }
 
-machete {
-    // disable machete locally for faster builds
-    enabled = isCI
-    // Only optimize reobf jars
-    ignoredTasks.addAll("jar", "slimJar")
-    additionalTasks.addAll("reobfJar", "reobfSlimJar")
-}
-
 lombok {
     version = "1.18.36"
 }

dependencies.gradle

@@ -11,7 +11,7 @@ dependencies {
     modImplementation(forge.configuration)
 
     // GTCEu
-    modImplementation(variantOf(forge.gtceu) { classifier("slim") })
+    modImplementation(forge.gtceu)
 
     // Mixin (& Extras)
     annotationProcessor(variantOf(libs.mixin) { classifier("processor") })
@@ -35,7 +35,9 @@ dependencies {
 
     // AE2
     modImplementation(forge.ae2)
-    modImplementation(forge.modernAe2Additions)
+    modCompileOnly(forge.modernAe2Additions)
+    clientAdditionalRuntimeClasspath(forge.modernAe2Additions)
+    client2AdditionalRuntimeClasspath(forge.modernAe2Additions)
 
     // LSO
     modImplementation(forge.legendarySurvivalOverhaul)
@@ -71,13 +73,17 @@ dependencies {
     modRuntimeOnly(forge.patchouli)
 
     // Embedium / Occulus
-    modImplementation(forge.embeddium)
-    modImplementation(forge.oculus)
-    modRuntimeOnly(forge.jcpp)
+    modCompileOnly(forge.embeddium)
+    clientAdditionalRuntimeClasspath(forge.embeddium)
+    modCompileOnly(forge.oculus)
+    clientAdditionalRuntimeClasspath(forge.oculus)
+    clientAdditionalRuntimeClasspath(forge.jcpp)
+
 
     // Teams
-    modCompileOnly(forge.ftblibrary.cm)
-    modCompileOnly(forge.ftbteams.cm)
+    modImplementation(forge.ftblibrary.cm)
+    modImplementation(forge.ftbteams.cm)
+
 
     //Occultism & Dependencies
     modImplementation(forge.occultism)
@@ -86,5 +92,8 @@ dependencies {
     modImplementation(forge.smartBrainLib)
     // Runtime Recipe Viewers - uncomment whichever one you want to use //
     modRuntimeOnly(forge.emi)
-    // modRuntimeOnly(forge.jei.forge.impl)
+//     modRuntimeOnly(forge.jei.forge.impl)
+
+    //Modern Fix
+    modImplementation(forge.modernFix)
 }

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.caching = true
 # Mod Properties
 mod_id = cosmiccore
 mod_name = Cosmic Core
-mod_version = 0.6.8
+mod_version = 0.7.0
 mod_description = The Core of Cosmic Frontiers!
 mod_authors = Ghostipedia
 mod_license = All rights reserved

gradle/forge.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-ldlib = "1.0.34"
-gtceu = "1.6.4"
+ldlib = "1.0.40.b"
+gtceu = "7.0.0-SNAPSHOT"
 registrate = "MC1.20-1.3.11"
 configuration = "2.2.0"
 mixinExtras = "0.2.0"
 
 jei = "15.20.0.105"
 emi = "1.1.13+1.20.1"
-ae2 = "15.2.13"
-kubejs = "2001.6.5-build.17"
-rhino = "2001.2.3-build.10"
+ae2 = "15.3.3"
+kubejs = "2001.6.4-build.120"
+rhino = "2001.2.3-build.6"
 architectury = "9.2.14"
 patchouli = "1.20.1-81-FORGE"
 curios = "5.9.0+1.20.1"
@@ -40,11 +40,12 @@ oculus = "1.20.1-1.7.0"
 ftblibrary-cm = "5567591"
 ftbteams-cm = "6130786"
 modernAe2Additions = "5826205"
-legendarySurvivalOverhaul = "5921074"
+legendarySurvivalOverhaul = "6286507"
 create = "4762216"
 newThinAir = "4848005"
 puzzlesLib = "4924184"
 smartBrainLib = "5654964"
+modernFix = "6025611"
 
 [libraries]
 ldlib                     = { module = "com.lowdragmc.ldlib:ldlib-forge-1.20.1", version.ref = "ldlib" }
@@ -97,6 +98,7 @@ create                    = { module = "curse.maven:create-328085", version.ref
 newThinAir                = { module = "curse.maven:new-thin-air-878379", version.ref = "newThinAir" }
 puzzlesLib                = { module = "curse.maven:puzzles-lib-495476", version.ref = "puzzlesLib" }
 smartBrainLib             = { module = "curse.maven:smartbrainlib-661293", version.ref = "smartBrainLib" }
+modernFix                 = { module = "curse.maven:modernfix-790626", version.ref = "modernFix" }
 
 [bundles]
 jei = ["jei-common-api", "jei-forge-api", "jei-forge-impl"]

gradle/libs.versions.toml

@@ -1,12 +1,11 @@
 [versions]
 minecraft = "1.20.1"
 forge = "47.3.0"
-minecraftForge = "1.20.1-47.3.0"
+minecraftForge = "1.20.1-47.3.22"
 parchment = "2023.09.03"
 shadow = "8.3.5"
 spotless = "7.0.2"
-modDevGradle = "2.0.64-beta" # TODO: Update to stable MDG when https://github.com/neoforged/ModDevGradle/issues/227 is fixed
-machete = "2.0.1"
+modDevGradle = "2.0.96" # TODO: Update to stable MDG when https://github.com/neoforged/ModDevGradle/issues/227 is fixed
 lombok = "8.11"
 jetbrains-annotations = "26.0.1"
 mixin = "0.8.7"
@@ -21,5 +20,4 @@ mixin                   = { module = "org.spongepowered:mixin", version.ref = "m
 modDevGradle            = { id = "net.neoforged.moddev.legacyforge", version.ref = "modDevGradle" }
 shadow                  = { id = "com.gradleup.shadow", version.ref = "shadow" }
 spotless                = { id = "com.diffplug.spotless", version.ref = "spotless" }
-machete                 = { id = "io.github.p03w.machete", version.ref = "machete" }
 lombok                  = { id = "io.freefair.lombok", version.ref = "lombok" }

gradle/scripts/moddevgradle.gradle

@@ -28,15 +28,26 @@ legacyForge {
             sourceSet = sourceSets.main
             ideName = "Client"
 
+            gameDirectory.set(file("runs/client"))
             systemProperty('forge.enabledGameTestNamespaces', project.mod_id)
         }
 
-        server {
+        client2 {
             client()
             sourceSet = sourceSets.main
+            ideName = "Client (2)"
+
+            programArguments.addAll('--username', 'YoungOnion')
+            gameDirectory.set(file("runs/client2"))
+            systemProperty('forge.enabledGameTestNamespaces', project.mod_id)
+        }
+
+        server {
+            server()
+            sourceSet = sourceSets.main
             ideName = "Server"
 
-            gameDirectory.set(file("run/server"))
+            gameDirectory.set(file("runs/server"))
             programArgument '--nogui'
             systemProperty('forge.enabledGameTestNamespaces', project.mod_id)
         }
@@ -46,12 +57,12 @@ legacyForge {
             sourceSet = sourceSets.main
             ideName = "Data Generation"
 
-            gameDirectory.set(file("run/data"))
+            gameDirectory.set(file("runs/data"))
             programArguments.addAll('--mod', project.mod_id)
             programArguments.addAll('--all')
             programArguments.addAll('--output', file('src/generated/resources/').getAbsolutePath())
             programArguments.addAll('--existing', file('src/main/resources/').getAbsolutePath())
-            programArguments.addAll('--existing-mod', 'gtceu')
+            programArguments.addAll('--existing-mod', 'gtceu', '--existing-mod', 'bloodmagic')
         }
 
         configureEach {

gradle/scripts/repositories.gradle

@@ -1,4 +1,7 @@
 repositories {
+    flatDir {
+        dir("libs")
+    }
     mavenLocal()
     mavenCentral()
     maven {
@@ -32,13 +35,21 @@ repositories {
         name = 'FirstDarkDev'
         url = 'https://maven.firstdarkdev.xyz/snapshots/'
     }
-    maven {
+
+    maven { // saps.dev Maven (KubeJS and Rhino)
         url "https://maven.latvian.dev/releases"
         content {
             includeGroup "dev.latvian.mods"
             includeGroup "dev.latvian.apps"
         }
     }
+
+    maven { // saps.dev Maven (KubeJS and Rhino)
+        url 'https://jitpack.io'
+        content {
+            includeGroup "com.github.rtyley"
+        }
+    }
     maven { // Registrate
         url = "https://maven.tterrag.com/"
         content {

src/generated/resources/assets/cosmiccore/blockstates/arcane_distillery.json

@@ -0,0 +1,76 @@
+{
+  "variants": {
+    "facing=east,upwards_facing=east": {
+      "gtceu:z": 90,
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 90
+    },
+    "facing=east,upwards_facing=north": {
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 90
+    },
+    "facing=east,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 90
+    },
+    "facing=east,upwards_facing=west": {
+      "gtceu:z": 270,
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 90
+    },
+    "facing=north,upwards_facing=east": {
+      "gtceu:z": 90,
+      "model": "cosmiccore:block/machine/arcane_distillery"
+    },
+    "facing=north,upwards_facing=north": {
+      "model": "cosmiccore:block/machine/arcane_distillery"
+    },
+    "facing=north,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "cosmiccore:block/machine/arcane_distillery"
+    },
+    "facing=north,upwards_facing=west": {
+      "gtceu:z": 270,
+      "model": "cosmiccore:block/machine/arcane_distillery"
+    },
+    "facing=south,upwards_facing=east": {
+      "gtceu:z": 90,
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 180
+    },
+    "facing=south,upwards_facing=north": {
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 180
+    },
+    "facing=south,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 180
+    },
+    "facing=south,upwards_facing=west": {
+      "gtceu:z": 270,
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 180
+    },
+    "facing=west,upwards_facing=east": {
+      "gtceu:z": 90,
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 270
+    },
+    "facing=west,upwards_facing=north": {
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 270
+    },
+    "facing=west,upwards_facing=south": {
+      "gtceu:z": 180,
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 270
+    },
+    "facing=west,upwards_facing=west": {
+      "gtceu:z": 270,
+      "model": "cosmiccore:block/machine/arcane_distillery",
+      "y": 270
+    }
+  }
+}