Update to 1.20.4 (#1)

* Make gradlew executable

* Port to 1.20.4

* Update loom/gradle

* Added changelog, tweaked version number and switched to mixin extras from loader

---------

Co-authored-by: MattiDragon <[email protected]>

Author: TheEpicBlock

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-    id 'fabric-loom' version '1.3-SNAPSHOT'
+    id 'fabric-loom' version '1.4-SNAPSHOT'
     id 'io.github.juuxel.loom-quiltflower' version '1.10.0'
     id 'maven-publish'
 }
 
-version = project.mod_version
+version = project.mod_version + "+mc.$minecraft_version"
 group = project.maven_group
 base.archivesName = project.archives_base_name
 
@@ -25,8 +25,6 @@ dependencies {
 
     modImplementation(include('me.lucko:fabric-permissions-api:0.2-SNAPSHOT'))
     modImplementation(include("xyz.nucleoid:plasmid:$plasmid_version"))
-    modImplementation(include("com.github.llamalad7.mixinextras:mixinextras-fabric:$mixinextras_version"))
-    annotationProcessor(clientAnnotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:$mixinextras_version"))
 }
 
 loom {

changelog/1.0.0+1.20.4.md

@@ -0,0 +1 @@
+Updated to 1.20.4

changelog/1.0.0-beta.1+1.20.1.md

@@ -1,14 +1,14 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.9
-loader_version=0.14.21
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.2
 
-mod_version=1.0.0-beta.3
+mod_version=1.0.0
 maven_group=io.github.mattidragon.demobox
 archives_base_name=DemoBox
 
-fabric_version=0.84.0+1.20.1
-plasmid_version=0.5+1.20.1-SNAPSHOT
+fabric_version=0.91.2+1.20.4
+plasmid_version=0.5.102-SNAPSHOT+1.20.4
 mixinextras_version=0.2.0-beta.9

changelog/1.0.0-beta.2+1.20.1.md

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

changelog/1.0.0-beta.3+1.20.1.md

@@ -74,10 +74,10 @@ private static int leaveGame(CommandContext<ServerCommandSource> context) throws
         return Command.SINGLE_SUCCESS;
     }
 
-    private static int execute(ServerCommandSource source, Identifier structure, Vec3d pos, Collection<CommandFunction> functions) throws CommandSyntaxException {
+    private static int execute(ServerCommandSource source, Identifier structure, Vec3d pos, Collection<CommandFunction<ServerCommandSource>> functions) throws CommandSyntaxException {
         var player = source.getPlayerOrThrow();
 
-        DemoBoxGame.open(new DemoBoxGame.Settings(structure, pos, functions.stream().map(CommandFunction::getId).toList()))
+        DemoBoxGame.open(new DemoBoxGame.Settings(structure, pos, functions.stream().map(CommandFunction::id).toList()))
                 .thenAcceptAsync(gameSpace -> {
                     var space = GameSpaceManager.get().byPlayer(player);
                     if (space != null) space.getPlayers().kick(player);

gradle.properties

@@ -26,8 +26,8 @@
     "demobox.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.21",
-    "fabric": "*",
-    "minecraft": "~1.20.1"
+    "fabricloader": ">=0.15.2",
+    "fabric-api": "*",
+    "minecraft": "~1.20.4"
   }
 }