Update to 26.1-snapshot-4. Remove clutter

Author: falseresync

.github/workflows/build.yml

@@ -8,29 +8,22 @@ on: [pull_request, push]
 
 jobs:
   build:
-    strategy:
-      matrix:
-        # Use these Java versions
-        java: [
-          21,    # Current Java LTS
-        ]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout repository
         uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
-      - name: setup jdk ${{ matrix.java }}
+        uses: gradle/actions/wrapper-validation@v4
+      - name: setup jdk
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: '21'
           distribution: 'microsoft'
       - name: make gradle wrapper executable
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts

README.md

@@ -25,39 +25,6 @@ To generate power you can use Wind turbines - place a Gearbox (You wouldn't want
 ![Heaters](https://cdn.modrinth.com/data/Z7LQgxZt/images/ac18406cffabcdc478d957f01505e83c61ac4949.png)
 
 
-## Gadget
-
-Use your gadget - it is quite a useful tool
-that allows you to pass energy through focuses to create many desirable effects!
-
-#### Starshooter focus
-
-Have you ever wanted to shoot stars at your enemies? Now you can!
-Stars explode your enemy, but don't explode blocks (a.k.a. building-safe :D)
-
-#### Lightning focus
-
-Now, how about playing a Zeus? You can do that with Lightning focus!
-For some charge you can easily shoot lightning left and right!
-
-#### Comet Warp focus
-
-Everyone has to venture into a crowd of enemies sometimes. Or to just teleport home without hassle.
-Use the nifty Comet Warp focus to setup a recall point and then teleport to it from any location
-or dimension for just some wand charge!
-
-#### Energy Veil focus
-
-Just because you don't have armor, doesn't mean you can't have protection! Use this focus to create a barrier
-made of concentrated energy panels around yourself which will repel projectiles and any nasties coming your way!
-Be careful not to use up all your charge though :)
-
-#### Inspector goggles and Focuses pouch
-
-These are your best friends when dealing with focuses! You can use them to store every focus in just one Trinket slot, as well as see the remaining charge on your Gadget. Maybe even more!
-
-![Energy veil](https://cdn.modrinth.com/data/Z7LQgxZt/images/a2cbf8ddd257e614506310dfd303379cd89e5269.png)
-![Comet Warp beacon](https://cdn.modrinth.com/data/Z7LQgxZt/images/9622554f2c728f8ee0b20d4b073fe15ed60b869e.png)
 
 
 ## Acknowledgements

build.gradle

@@ -1,9 +1,6 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import net.fabricmc.loom.task.RemapJarTask
-
 plugins {
-    id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
-	id 'com.gradleup.shadow' version '9.0.0-beta10'
+	id 'net.fabricmc.fabric-loom' version "${loom_version}"
+    id 'com.gradleup.shadow' version '9.0.0-beta10'
 }
 
 version = project.mod_version
@@ -14,124 +11,91 @@ base {
 }
 
 repositories {
-	mavenCentral()
-	maven { url = 'https://maven.shedaniel.me/' }
-	maven { url = 'https://maven.ladysnake.org/releases' }
 	maven { url = 'https://maven.terraformersmc.com/' }
-	maven { url = 'https://maven.wispforest.io' }
-	maven {
-		url = "https://maven2.bai.lol"
-		content {
-			includeGroup "lol.bai"
-			includeGroup "mcp.mobius.waila"
-		}
-	}
 	maven {
 		url = "https://api.modrinth.com/maven"
 		content {
 			includeGroup "maven.modrinth"
 		}
 	}
-	maven {
-		url = "https://jitpack.io"
-	}
-    maven {
-        // location of the maven that hosts JEI files since January 2023
-        name = "Jared's maven"
-        url = "https://maven.blamejared.com/"
-    }
-    maven {
-        // location of a maven mirror for JEI files, as a fallback
-        name = "ModMaven"
-        url = "https://modmaven.dev"
-    }
 }
 
-fabricApi {
-	configureDataGeneration()
+loom {
+    accessWidenerPath = file("src/main/resources/vivatech.classtweaker")
 }
 
-loom {
-	accessWidenerPath = file("src/main/resources/vivatech.classtweaker")
+fabricApi {
+	configureDataGeneration()
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:$minecraft_version"
-	mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:$loader_version"
-	modImplementation "net.fabricmc.fabric-api:fabric-api:$fabric_version"
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
 	// ------------------------
 	// --- MOD DEPENDENCIES ---
 	// ------------------------
-	modApi "me.shedaniel.cloth:cloth-config-fabric:$cloth_config_version"
-	modApi "dev.emi:trinkets:$trinkets_version"
 
-	// --------------------------
-	// --- OTHER DEPENDENCIES ---
-	// --------------------------
-	implementation 'org.jgrapht:jgrapht-core:1.5.2'
-	shadow 'org.jgrapht:jgrapht-core:1.5.2'
+    // --------------------------
+    // --- OTHER DEPENDENCIES ---
+    // --------------------------
+    implementation 'org.jgrapht:jgrapht-core:1.5.2'
+    shadow 'org.jgrapht:jgrapht-core:1.5.2'
+
+	implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
 	// ---------------------
 	// --- COMPATIBILITY ---
 	// ---------------------
-	modCompileOnly "mcp.mobius.waila:wthit-api:fabric-$wthit_version"
-	modLocalRuntime "mcp.mobius.waila:wthit:fabric-$wthit_version"
-	modLocalRuntime "lol.bai:badpackets:fabric-$badpackets_version"
+//	modCompileOnly "mcp.mobius.waila:wthit-api:fabric-$wthit_version"
+//	modLocalRuntime "mcp.mobius.waila:wthit:fabric-$wthit_version"
+//	modLocalRuntime "lol.bai:badpackets:fabric-$badpackets_version"
 
 //	modCompileOnly "dev.emi:emi-fabric:$emi_version:api"
 //	modLocalRuntime "dev.emi:emi-fabric:$emi_version"
-    modCompileOnly("mezz.jei:jei-$minecraft_version-fabric-api:$jei_version")
-    modRuntimeOnly("mezz.jei:jei-$minecraft_version-fabric:$jei_version")
+//	modCompileOnly("mezz.jei:jei-$minecraft_version-fabric-api:$jei_version")
+//	modRuntimeOnly("mezz.jei:jei-$minecraft_version-fabric:$jei_version")
 
-	modCompileOnly "com.terraformersmc:modmenu:$modmenu_version"
-	modLocalRuntime "com.terraformersmc:modmenu:$modmenu_version"
+	compileOnly "com.terraformersmc:modmenu:$modmenu_version"
+	localRuntime "com.terraformersmc:modmenu:$modmenu_version"
 
-    // -------------------
-    // --- CONVENIENCE ---
-    // -------------------
-    // Comment out / uncomment for testing and convenience
+	// -------------------
+	// --- CONVENIENCE ---
+	// -------------------
+	// Comment out / uncomment for testing and convenience
 //    modLocalRuntime "maven.modrinth:betterf3:11.0.3"
-	modLocalRuntime "maven.modrinth:component-viewer:1.3.2+1.21.11-fabric"
-	modLocalRuntime "maven.modrinth:tooltip-scroll:1.5.1+1.21.10"
+//	modLocalRuntime "maven.modrinth:component-viewer:1.3.2+1.21.11-fabric"
+//	modLocalRuntime "maven.modrinth:tooltip-scroll:1.5.1+1.21.10"
 //	modLocalRuntime "maven.modrinth:dev-tools-unlocker:1.0.0"
 }
 
 processResources {
 	inputs.property "version", project.version
 
 	filesMatching("fabric.mod.json") {
-		expand "version": project.version
+		expand "version": inputs.properties.version
 	}
 }
-tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
-}
-
-tasks.withType(ShadowJar).configureEach {
-	dependsOn('jar')
-
-	configurations = [project.configurations.shadow]
-	enableRelocation = true
-	relocationPrefix = "falseresync.shadowed"
-	minimize()
-	exclude('.cache/**')
 
-	from("LICENSE") {
-		rename { "${it}_${project.base.archivesName.get()}"}
-	}
-}
-
-tasks.withType(RemapJarTask).configureEach {
-	dependsOn('shadowJar')
-	mustRunAfter('shadowJar')
-	inputFile = shadowJar.archiveFile.get()
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 25
 }
 
 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_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
+
+jar {
+	inputs.property "archivesName", project.base.archivesName
+
+	from("LICENSE") {
+		rename { "${it}_${inputs.properties.archivesName}"}
+	}
+}

gradle.properties

@@ -1,22 +1,22 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx4G
+# Done to increase the memory available to Gradle.
+org.gradle.jvmargs=-Xmx6G
 org.gradle.parallel=true
 
-minecraft_version=1.21.11
-yarn_mappings=1.21.11+build.3
+# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349
+org.gradle.configuration-cache=false
+
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=26.1-snapshot-3
 loader_version=0.18.4
 loom_version=1.14-SNAPSHOT
-fabric_version=0.140.2+1.21.11
+fabric_api_version=0.142.0+26.1
 
+# Mod Properties
 mod_version=1.0.0-alpha.27
-maven_group=falseresync.vivatech
+maven_group=falseresync
 archives_base_name=vivatech
 
-cloth_config_version=21.11.153
-trinkets_version=3.10.0
+# Dependencies
+modmenu_version=18.0.0-alpha.5
 
-wthit_version=18.0.4
-badpackets_version=0.11.2
-#emi_version=1.1.10+1.21
-jei_version=27.3.0.14
-modmenu_version=17.0.0-beta.1

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "vivatech:block/contactor"
+  }
+}