Restructured project

Author: magistermaks

.gitignore

@@ -1,118 +1,12 @@
-# User-specific stuff
-.idea/
-
-*.iml
-*.ipr
-*.iws
-
-# IntelliJ
-out/
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-.gradle
+.idea
+RedBits.iml
+/1.19.3/.gradle/
+/1.19.3/build/
+/1.19.3/run/
+/common/.gradle/
+/common/build/
+/common/run/
+.gradle/
 build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Cache of project
-.gradletasknamecache
-
-**/build/
-
-# Common working directory
 run/
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
+versions/*.jar

1.20.2/build.gradle

@@ -0,0 +1,82 @@
+plugins {
+	id 'fabric-loom' version '1.5-SNAPSHOT'
+}
+
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
+
+archivesBaseName = project.archives_base_name + "-" + project.minecraft_version
+version = project.mod_version
+group = project.maven_group
+
+loom {
+	runtimeOnlyLog4j = true
+}
+
+repositories {
+
+    maven {
+        name = 'TerraformersMC'
+        url = 'https://maven.terraformersmc.com/'
+    }
+
+	// interference
+	maven {
+		url = "https://api.modrinth.com/maven"
+	}
+
+    mavenLocal()
+
+}
+
+runClient {
+
+}
+
+loom {
+	runtimeOnlyLog4j = true
+}
+
+dependencies {
+    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
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+    // Interference API
+    modImplementation "maven.modrinth:interference:${project.interference_version}"
+    include "maven.modrinth:interference:${project.interference_version}"
+
+    // JMXL
+    modImplementation "maven.modrinth:JMXL:${project.jmxl_version}" transitive false
+    include "maven.modrinth:JMXL:${project.jmxl_version}" transitive false
+
+	implementation rootProject
+}
+
+processResources {
+	inputs.property "version", project.version
+
+	filesMatching("fabric.mod.json") {
+		expand (
+				"version": project.version,
+				"loader_version": project.loader_version
+		)
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 17
+}
+
+java {
+	withSourcesJar()
+}
+
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
+}

1.20.2/gradle.properties

@@ -0,0 +1,9 @@
+
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.4
+loader_version=0.14.22
+
+# Dependencies
+fabric_version=0.89.3+1.20.2
+interference_version=1.8.0
+jmxl_version=1.4+mc1.20.4

src/main/java/net/darktree/led/LED.java 1.20.2/src/main/java/net/darktree/led/LED.java

@@ -0,0 +1,46 @@
+{
+	"schemaVersion": 1,
+	"id": "led",
+	"version": "${version}",
+
+	"name": "Light Emitting Diode",
+	"description": "A semiconductor that emits light when current flows through it.",
+
+	"icon": "assets/led/icon.png",
+	"license": "MIT",
+	"contact": {
+		"homepage": "http://darktree.net/",
+		"sources": "https://github.com/magistermaks/mod-led",
+		"issues": "https://github.com/magistermaks/mod-led/issues"
+	},
+
+	"environment": "*",
+	"entrypoints": {
+		"main": [
+			"net.darktree.led.LED"
+		],
+		"client": [
+			"net.darktree.led.LED"
+		],
+		"server": [
+			"net.darktree.led.LED"
+		]
+	},
+
+	"mixins": [],
+
+	"depends": {
+		"fabricloader": "*",
+		"fabric": "*",
+		"jmxl": ">=1.4",
+		"interference": "1.8.x",
+		"minecraft": ["1.20.2", "1.20.3", "1.20.4"]
+	},
+
+	"authors": [
+		"magistermaks"
+	],
+
+	"contributors": [
+	]
+}

src/main/java/net/darktree/led/block/DiodeButtonLampBlock.java 1.20.2/src/main/java/net/darktree/led/block/DiodeButtonLampBlock.java

@@ -1,23 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.3-SNAPSHOT'
-    id 'maven-publish'
-}
-
-repositories {
-
-    // interference
-    maven {
-        allowInsecureProtocol = true
-        url 'http://darktree.net/maven'
-    }
-
-    maven {
-        name = 'TerraformersMC'
-        url = 'https://maven.terraformersmc.com/'
-    }
-
-    mavenLocal()
-
+	id 'fabric-loom' version '1.5-SNAPSHOT'
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
@@ -27,32 +9,38 @@ archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
-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
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+loom {
+	runtimeOnlyLog4j = true
+}
 
-    // Interference API
-    modImplementation "net.darktree:interference:${project.interference_version}"
-    include "net.darktree:interference:${project.interference_version}"
+dependencies {
+	minecraft "com.mojang:minecraft:${project.base_minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.base_yarn_mappings}:v2"
 
-    // JMXL
-    modImplementation "net.darktree:JMXL:${project.jmxl_version}" transitive false
-    include "net.darktree:JMXL:${project.jmxl_version}"
+	include project(path: ":1.20.2", configuration: "namedElements")
 }
 
 processResources {
-    inputs.property "version", project.version
+	inputs.property "version", project.version
+
+	filesMatching("fabric.mod.json") {
+		expand (
+				"version": project.version,
+				"loader_version": project.loader_version
+		)
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 17
+}
 
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
+java {
+	withSourcesJar()
 }
 
 jar {
-    from "LICENSE"
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
 }

src/main/java/net/darktree/led/block/DiodeLampBlock.java 1.20.2/src/main/java/net/darktree/led/block/DiodeLampBlock.java

@@ -1,17 +1,10 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx2048M
+org.gradle.jvmargs=-Xmx16G
 
-# Fabric Properties
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.4
-loader_version=0.14.22
+loader_version=0.14.21
+mod_version = 1.8.0
+maven_group = net.darktree
+archives_base_name = redbits
 
-# Mod Properties
-mod_version=1.7.0
-maven_group=net.darktree
-archives_base_name=led
-
-# Dependencies
-interference_version=1.8.0
-fabric_version=0.89.3+1.20.2
-jmxl_version=1.4+mc1.20.2
+base_minecraft_version=1.20.2
+base_yarn_mappings=1.20.2+build.4

src/main/java/net/darktree/led/block/DiodeSwitchLampBlock.java 1.20.2/src/main/java/net/darktree/led/block/DiodeSwitchLampBlock.java

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