Merge pull request #46 from MoSadie/1.20.6

Minecraft 1.20.6

.github/workflows/ci.yml

@@ -146,6 +146,54 @@ jobs:
           name: ${{ matrix.mod-loader }} ${{ matrix.mc-version }}
           path: ./MinecraftMod/${{ matrix.mod-loader }}/${{ matrix.mc-version }}/build/libs/*.jar
 
+  buildJava21:
+    name: Build ${{ matrix.mod-loader }} ${{ matrix.mc-version }}
+    runs-on: ubuntu-latest
+    needs: buildCore
+
+    # Matrix of jobs to run
+    strategy:
+      fail-fast: false
+      matrix:
+        mod-loader: ['fabric', 'forge']
+        mc-version: ["1.20.6"]
+        #exclude:
+        #  - mod-loader: 'forge'
+        #    mc-version: '1.17'
+
+    steps:
+      # Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it
+      - uses: actions/checkout@v4
+
+      # Setup JDK
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: 21
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      # Download Core
+      - name: Download Core Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: maven
+          path: ~/.m2/repository
+
+      # Build Minecraft Mod
+      - name: Build Mod
+        working-directory: ./MinecraftMod/${{ matrix.mod-loader }}/${{ matrix.mc-version }}
+        run: './gradlew build --no-daemon'
+
+      # Upload Artifact
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.mod-loader }} ${{ matrix.mc-version }}
+          path: ./MinecraftMod/${{ matrix.mod-loader }}/${{ matrix.mc-version }}/build/libs/*.jar
+
   buildPlugin:
     name: Build Stream Deck Plugin
     runs-on: windows-latest

MinecraftMod/fabric/1.20.6/.gitignore

@@ -0,0 +1,33 @@
+# gradle
+
+.gradle/
+build/
+out/
+classes/
+
+# eclipse
+
+*.launch
+
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# vscode
+
+.settings/
+.vscode/
+bin/
+.classpath
+.project
+
+# macos
+
+*.DS_Store
+
+# fabric
+
+run/

MinecraftMod/fabric/1.20.6/build.gradle

@@ -0,0 +1,95 @@
+plugins {
+	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'maven-publish'
+}
+
+version = project.mod_version
+group = project.maven_group
+
+base {
+	archivesName = project.archives_base_name
+}
+
+repositories {
+	// Add repositories to retrieve artifacts from in here.
+	// You should only use this when depending on other mods because
+	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
+	// for more information about repositories.
+
+	mavenLocal()
+}
+
+loom {
+	splitEnvironmentSourceSets()
+
+	mods {
+		"effectmc" {
+			sourceSet sourceSets.main
+			sourceSet sourceSets.client
+		}
+	}
+
+}
+
+dependencies {
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+	// Uncomment the following line to enable the deprecated Fabric API modules.
+	// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
+
+	// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
+
+	implementation "com.mosadie.effectmc:core:${project.effectmc_core_version}"
+	include "com.mosadie.effectmc:core:${project.effectmc_core_version}"
+}
+processResources {
+	inputs.property "version", project.version
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 17
+}
+
+java {
+	// 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()
+
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
+}
+
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.base.archivesName.get()}"}
+	}
+}
+
+// configure the maven publication
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			from components.java
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
+	}
+}

MinecraftMod/fabric/1.20.6/gradle.properties

@@ -0,0 +1,18 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+
+# Fabric Properties
+	# check these on https://fabricmc.net/develop
+	minecraft_version=1.20.6
+	yarn_mappings=1.20.6+build.3
+	loader_version=0.15.11
+
+# Mod Properties
+	mod_version = 2.3.0
+	maven_group = com.mosadie.effectmc
+	archives_base_name = effectmc-fabric-1.20.6
+
+# Dependencies
+	fabric_version=0.100.0+1.20.6
+
+	effectmc_core_version=2.3

MinecraftMod/fabric/1.20.6/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists