Pre rewrite/fabric/1.19.x Sinicized for the mod

README.md

@@ -1,10 +1,15 @@
 Item Scroller
 ==============
-Item Scroller is a tiny mod for Minecraft 1.8.9+, which adds the functionality of moving items in inventory GUIs
-by scrolling the mouse wheel over slots with items in them.
-This is basically what NEI does/did (and Mouse Tweaks also seems to do), but separated into this tiny mod,
-and probably implemented in a different manner.
-For more information and the downloads (compiled builds), see http://minecraft.curseforge.com/projects/item-scroller
+Item Scroller is a Minecraft mod that adds various convenience features for moving items
+inside inventory GUIs. Examples are scrolling the mouse wheel over slots with items in them
+or Shift/Ctrl + click + dragging over slots to move items from them in various ways etc.
+
+Item scrolling is basically what the old NEI mod did and Mouse Tweaks also does.
+This mod has some different drag features compared to Mouse Tweaks, and also some special
+villager trading related helper features as well as crafting helper features.
+
+For more information and downloads of the already compiled builds,
+see https://www.curseforge.com/minecraft/mc-mods/item-scroller
 
 Compiling
 =========

build.gradle

@@ -1,135 +1,60 @@
-
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = 'sponge'
-            url = 'http://repo.spongepowered.org/maven'
-        }
-    }
-
-    dependencies {
-        classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
-        classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
-    }
-}
-
-repositories {
-    maven {
-        url 'https://masa.dy.fi/maven'
-    }
+plugins {
+	id 'fabric-loom' version '1.1-SNAPSHOT'
 }
 
-apply plugin: 'net.minecraftforge.gradle.liteloader'
-apply plugin: 'org.spongepowered.mixin'
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
-ext.configFile = file "build.properties"
-
-configFile.withReader {
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
+repositories {
+	maven { url 'https://masa.dy.fi/maven' }
+	maven { url 'https://maven.terraformersmc.com/releases/' }
+	// maven { url 'https://maven.quiltmc.org/repository/release/' }
 }
 
-minecraft {
-    version = config.minecraft_version
-    mappings = config.mappings_version
-    runDir = 'minecraft'
-    makeObfSourceJar = false
-
-    ext.mod_version = config.mod_version
-
-    if (mod_version.endsWith('-dev')) {
-        mod_version = mod_version + "." + new Date().format('yyyyMMdd.HHmmss')
-    }
+dependencies {
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.mappings_version}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
+	implementation "com.google.code.findbugs:jsr305:3.0.2"
 
-    replaceIn "Reference.java"
-    replace "@MOD_VERSION@", mod_version
-}
+	modImplementation "fi.dy.masa.malilib:malilib-fabric-${project.minecraft_version_out}:${project.malilib_version}"
 
-dependencies {
-    deobfCompile "fi.dy.masa.malilib:malilib-" + config.minecraft_version_out + ":" + config.malilib_version + ":deobf"
-}
+	// Fabric API. This is technically optional, but you probably want it anyway.
+	//modCompile "net.fabricmc.fabric-api:fabric-api:" + project.fabric_version
 
-sourceSets {
-    main {
-        ext.refMap = 'mixins.' + config.mod_id + '.refmap.json'
-    }
+	modCompileOnly "com.terraformersmc:modmenu:${project.mod_menu_version}"
 }
 
-group = config.group + config.mod_id // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = config.mod_id + '-' + config.minecraft_version_out
-version = project.minecraft.mod_version
+group = project.group + "." + project.mod_id
+archivesBaseName = project.mod_file_name + '-' + project.minecraft_version_out
+version = project.mod_version
 
-/**
- * This section allows you to customise the generated litemod.json file
- */
-litemod {
-    json {
-        name = config.mod_id
-        displayName = config.mod_name
-        mcversion = config.minecraft_version
-        version = config.mod_version
-        author = config.author
-
-        // Uncomment any of the following lines and fill in your own details as required
-        //requiredAPIs = [ 'someapi' ]
-        //tweakClass = 'name.of.tweaker.here'
-        dependsOn = [ 'malilib' ]
-        mixinConfigs = [ 'mixins.' + config.mod_id + '.json' ]
-    }
+if (version.endsWith('-dev')) {
+	version += "." + new Date().format('yyyyMMdd.HHmmss')
 }
 
-/**
- * This section allows you to customise your generated jar (litemod) file. By
- * default it includes the generated litemod.json file, however if you prefer to
- * include your own file from resources, simply remove the line below.
- */
-jar {
-    // Remove the "-mc1.12" suffix from the file name
-    classifier = ""
-
-    // Don't append a 'mod-' filename prefix >_>
-    baseName = archivesBaseName
+processResources {
+	// Exclude the GIMP image files
+	exclude '**/*.xcf'
+	exclude '**/xcf'
 
-    from litemod.outputs
+	// this will ensure that this task is redone when the versions change.
+	//inputs.property "minecraft_version", project.project.minecraft_version
 
-    /*
-    manifest.mainAttributes (
-        'Built-By': System.properties['user.name'],
-        'Created-By': System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")",
-        'Implementation-Title': config.mod_id,
-        'Implementation-Version': project.version
-    )
-    */
-}
+	inputs.property "mod_version", project.mod_version
 
-mixin {
-    defaultObfuscationEnv notch
+	filesMatching("fabric.mod.json") {
+		expand "mod_version": project.mod_version
+	}
 }
 
-//tasks.withType(Jar)*.baseName = archivesBaseName
-
-processResources
-{
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "mod_version", project.minecraft.mod_version
-    inputs.property "minecraft_version", project.config.minecraft_version
+tasks.withType(JavaCompile).configureEach {
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
 
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-
-        // replace version and mcversion
-        expand 'mod_version': project.minecraft.mod_version, 'minecraft_version': project.config.minecraft_version
-    }
-
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
+	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+	it.options.release = 17
 }

gradle.properties

@@ -0,0 +1,23 @@
+org.gradle.jvmargs = -Xmx3G
+org.gradle.daemon = false
+org.gradle.cache.cleanup = false
+
+group = fi.dy.masa
+mod_id = itemscroller
+mod_name = Item Scroller
+author = masa
+mod_file_name = itemscroller-fabric
+
+# Current mod version
+mod_version = 0.19.2
+
+# Required malilib version
+malilib_version = 0.15.2
+
+# Minecraft, Fabric and mappings versions
+minecraft_version_out = 1.19.4
+minecraft_version = 1.19.4
+mappings_version = 1.19.4+build.1
+
+fabric_loader_version = 0.14.17
+mod_menu_version = 6.1.0-rc.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jan 05 21:33:17 EET 2017
+#Mon Aug 22 17:36:22 EDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

settings.gradle

@@ -0,0 +1,9 @@
+pluginManagement {
+	repositories {
+		maven {
+			name = 'Fabric'
+			url = 'https://maven.fabricmc.net/'
+		}
+		gradlePluginPortal()
+	}
+}

src/main/java/fi/dy/masa/itemscroller/InitHandler.java

@@ -6,6 +6,7 @@
 import fi.dy.masa.itemscroller.event.WorldLoadListener;
 import fi.dy.masa.malilib.config.ConfigManager;
 import fi.dy.masa.malilib.event.InputEventHandler;
+import fi.dy.masa.malilib.event.TickHandler;
 import fi.dy.masa.malilib.event.WorldLoadHandler;
 import fi.dy.masa.malilib.interfaces.IInitializationHandler;
 
@@ -25,6 +26,8 @@ public void registerModHandlers()
         WorldLoadHandler.getInstance().registerWorldLoadPreHandler(listener);
         WorldLoadHandler.getInstance().registerWorldLoadPostHandler(listener);
 
+        TickHandler.getInstance().registerClientTickHandler(KeybindCallbacks.getInstance());
+
         KeybindCallbacks.getInstance().setCallbacks();
     }
 }

src/main/java/fi/dy/masa/itemscroller/ItemScroller.java

@@ -0,0 +1,17 @@
+package fi.dy.masa.itemscroller;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import fi.dy.masa.malilib.event.InitializationHandler;
+import net.fabricmc.api.ModInitializer;
+
+public class ItemScroller implements ModInitializer
+{
+    public static final Logger logger = LogManager.getLogger(Reference.MOD_ID);
+
+    @Override
+    public void onInitialize()
+    {
+        InitializationHandler.getInstance().registerInitializationHandler(new InitHandler());
+    }
+}