aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ingame/.gitignore4
-rw-r--r--ingame/README.md1
-rw-r--r--ingame/build.gradle.kts104
-rw-r--r--ingame/gradle/wrapper/gradle-wrapper.jarbin0 -> 52271 bytes
-rw-r--r--ingame/gradle/wrapper/gradle-wrapper.properties6
-rwxr-xr-xingame/gradlew164
-rw-r--r--ingame/gradlew.bat90
-rw-r--r--ingame/settings.gradle.kts20
-rw-r--r--ingame/src/main/kotlin/moe/nea89/sbdata/Commands.kt87
-rw-r--r--ingame/src/main/kotlin/moe/nea89/sbdata/SBData.kt43
-rw-r--r--ingame/src/main/kotlin/moe/nea89/sbdata/SessionIDStealer.kt11
-rw-r--r--ingame/src/main/kotlin/moe/nea89/sbdata/dungeon/DungeonMapCoordinates.kt116
-rw-r--r--ingame/src/main/kotlin/moe/nea89/sbdata/utils/scoreboard.kt11
-rw-r--r--ingame/src/main/resources/mcmod.info18
-rw-r--r--ingame/src/main/resources/mixins.sbdata.json7
-rw-r--r--ingame/src/main/resources/sbdata_at.cfg0
-rw-r--r--sbdata/repo.py2
17 files changed, 683 insertions, 1 deletions
diff --git a/ingame/.gitignore b/ingame/.gitignore
new file mode 100644
index 0000000..063b61c
--- /dev/null
+++ b/ingame/.gitignore
@@ -0,0 +1,4 @@
+build/
+.gradle/
+.idea/
+run/
diff --git a/ingame/README.md b/ingame/README.md
new file mode 100644
index 0000000..ebeacd1
--- /dev/null
+++ b/ingame/README.md
@@ -0,0 +1 @@
+This mod is for in game data collection that I don't want to put into NEU directly (for example if it only needs to be ran once or I just don't want to write it in Java)
diff --git a/ingame/build.gradle.kts b/ingame/build.gradle.kts
new file mode 100644
index 0000000..4c9e14f
--- /dev/null
+++ b/ingame/build.gradle.kts
@@ -0,0 +1,104 @@
+import net.minecraftforge.gradle.user.ReobfMappingType
+
+plugins {
+ java
+ kotlin("jvm") version "1.6.10"
+ id("net.minecraftforge.gradle.forge") version "6f5327738df"
+ id("com.github.johnrengelman.shadow") version "6.1.0"
+ id("org.spongepowered.mixin") version "d75e32e"
+}
+
+group = "moe.nea89.sbdatacollection"
+version = "2.1"
+
+// Toolchains:
+
+java {
+ // Forge Gradle currently prevents using the toolchain: toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+minecraft {
+ version = "1.8.9-11.15.1.2318-1.8.9"
+ runDir = "run"
+ mappings = "stable_22"
+ clientJvmArgs.addAll(
+ listOf(
+ "-Dmixin.debug=true",
+ "-Dasmhelper.verbose=true"
+ )
+ )
+ clientRunArgs.addAll(
+ listOf(
+ "--tweakClass org.spongepowered.asm.launch.MixinTweaker",
+ "--mixin mixins.sbdata.json"
+ )
+ )
+}
+
+mixin {
+ add(sourceSets.main.get(), "mixins.sbdata.refmap.json")
+}
+
+sourceSets {
+ main {
+ output.setResourcesDir(file("$buildDir/classes/kotlin/main"))
+ }
+}
+
+// Dependencies:
+
+repositories {
+ mavenCentral()
+ flatDir { dirs("deps/") }
+ maven("https://repo.spongepowered.org/maven/")
+}
+
+dependencies {
+ implementation("org.spongepowered:mixin:0.7.11-SNAPSHOT")
+ annotationProcessor("org.spongepowered:mixin:0.7.11-SNAPSHOT")
+}
+
+
+// Tasks:
+
+tasks.withType(JavaCompile::class) {
+ options.encoding = "UTF-8"
+}
+
+tasks.withType(Jar::class) {
+ archiveBaseName.set("sbdata")
+ manifest.attributes.run {
+ this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker"
+ this["MixinConfigs"] = "mixins.sbdata.json"
+ this["FMLCorePluginContainsFMLMod"] = "true"
+ this["ForceLoadAsMod"] = "true"
+ this["FMLAT"] = "sbdata_at.cfg"
+ }
+}
+
+tasks.shadowJar {
+ archiveClassifier.set("uberfatshadowfullalldeps")
+ fun relocate(name: String) = relocate(name, "moe.nea89.sbdata.deps.$name")
+}
+
+tasks.build.get().dependsOn(tasks.shadowJar)
+
+reobf {
+ create("shadowJar") {
+ mappingType = ReobfMappingType.SEARGE
+ }
+}
+
+tasks.processResources {
+ from(sourceSets.main.get().resources.srcDirs)
+ filesMatching("mcmod.info") {
+ expand(
+ "modversion" to project.version,
+ "mcversion" to minecraft.version
+ )
+ }
+ rename("(.+_at.cfg)".toPattern(), "META-INF/$1")
+}
+
diff --git a/ingame/gradle/wrapper/gradle-wrapper.jar b/ingame/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..30d399d
--- /dev/null
+++ b/ingame/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/ingame/gradle/wrapper/gradle-wrapper.properties b/ingame/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..c1ff793
--- /dev/null
+++ b/ingame/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Sep 14 12:28:28 PDT 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
diff --git a/ingame/gradlew b/ingame/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/ingame/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 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=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/ingame/gradlew.bat b/ingame/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/ingame/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz 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.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+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
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/ingame/settings.gradle.kts b/ingame/settings.gradle.kts
new file mode 100644
index 0000000..cd9be5f
--- /dev/null
+++ b/ingame/settings.gradle.kts
@@ -0,0 +1,20 @@
+pluginManagement {
+ repositories {
+ mavenCentral()
+ gradlePluginPortal()
+ maven(url = "https://jitpack.io/")
+ maven(url = "https://maven.minecraftforge.net/")
+ maven(url = "https://repo.spongepowered.org/maven/")
+ }
+ resolutionStrategy {
+ eachPlugin {
+ when (requested.id.id) {
+ "net.minecraftforge.gradle.forge" -> useModule("com.github.asbyth:ForgeGradle:${requested.version}")
+ "org.spongepowered.mixin" -> useModule("com.github.LxGaming:MixinGradle:${requested.version}")
+ }
+ }
+ }
+}
+
+
+rootProject.name = "sbdata"
diff --git a/ingame/src/main/kotlin/moe/nea89/sbdata/Commands.kt b/ingame/src/main/kotlin/moe/nea89/sbdata/Commands.kt
new file mode 100644
index 0000000..e4eff17
--- /dev/null
+++ b/ingame/src/main/kotlin/moe/nea89/sbdata/Commands.kt
@@ -0,0 +1,87 @@
+package moe.nea89.sbdata
+
+import net.minecraft.command.CommandBase
+import net.minecraft.command.ICommandSender
+import net.minecraft.util.BlockPos
+import net.minecraft.util.ChatComponentText
+import net.minecraft.util.EnumChatFormatting
+import net.minecraft.util.IChatComponent
+
+object Commands : CommandBase() {
+
+ fun mkPrefix(text: String?) = "${EnumChatFormatting.AQUA} SBDATA ${text?.let { "$it " } ?: ""}| "
+
+ data class CommandContext(
+ val subcommand: String,
+ val sender: ICommandSender,
+ val allArgs: List<String>,
+ val args: List<String>,
+ ) {
+ val prefix = mkPrefix(subcommand)
+ fun reply(vararg lines: String) {
+ replyJust(ChatComponentText("").apply {
+ lines.forEach {
+ appendSibling(ChatComponentText(prefix))
+ appendText(it + "\n")
+ }
+ })
+ }
+
+ fun replyJust(component: IChatComponent) {
+ sender.addChatMessage(component)
+ }
+
+ fun reply(vararg lines: IChatComponent) {
+ replyJust(ChatComponentText("").apply {
+ lines.forEach {
+ appendSibling(ChatComponentText(prefix))
+ appendSibling(it)
+ appendText("\n")
+ }
+ })
+ }
+ }
+
+ val subcommands = mutableMapOf<String, CommandContext.() -> Unit>()
+
+ override fun getRequiredPermissionLevel(): Int = 0
+ override fun getCommandName(): String = "sbdata"
+
+ override fun getCommandUsage(p0: ICommandSender): String =
+ "SubCommands: ${subcommands.keys.joinToString(separator = ", ")}"
+
+ override fun getCommandAliases(): List<String> = listOf("sbd")
+
+ override fun canCommandSenderUseCommand(p0: ICommandSender): Boolean = true
+
+ override fun processCommand(p0: ICommandSender, p1: Array<out String>) {
+ if (p1.isEmpty()) {
+ p0.addChatMessage(ChatComponentText(mkPrefix(null)).appendText("Please provide a subcommand!"))
+ } else {
+ val subcommandName = p1[0]
+ val subcommand = subcommands[subcommandName]
+ if (subcommand == null) {
+ p0.addChatMessage(ChatComponentText(mkPrefix(null)).appendText("Unknown subcommand $subcommandName!"))
+ } else {
+ subcommand(CommandContext(subcommandName, p0, p1.toList(), p1.slice(1 until p1.size)))
+ }
+ }
+ }
+
+ override fun addTabCompletionOptions(
+ p0: ICommandSender?,
+ p1: Array<out String>?,
+ p2: BlockPos?
+ ): MutableList<String> {
+ return mutableListOf()
+ }
+
+
+ fun addSubCommand(name: String, exec: CommandContext.() -> Unit) {
+ if (name in subcommands) {
+ println("Duplicate subcommand registered in sbdata: $name")
+ }
+ subcommands[name] = exec
+ }
+
+}
diff --git a/ingame/src/main/kotlin/moe/nea89/sbdata/SBData.kt b/ingame/src/main/kotlin/moe/nea89/sbdata/SBData.kt
new file mode 100644
index 0000000..979e26d
--- /dev/null
+++ b/ingame/src/main/kotlin/moe/nea89/sbdata/SBData.kt
@@ -0,0 +1,43 @@
+package moe.nea89.sbdata
+
+import moe.nea89.sbdata.dungeon.DungeonMapCoordinates
+import net.minecraftforge.client.ClientCommandHandler
+import net.minecraftforge.common.MinecraftForge
+import net.minecraftforge.fml.common.Mod
+import net.minecraftforge.fml.common.event.FMLInitializationEvent
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
+import java.io.File
+
+@Mod(
+ modid = SBData.MODID,
+ name = "SBData Collection",
+ version = "0.0.0"
+)
+class SBData {
+ companion object {
+ const val MODID = "sbdata"
+
+ @JvmStatic
+ @field:Mod.Instance
+ lateinit var instance: SBData
+
+ lateinit var configDirectory: File
+ }
+
+ @Mod.EventHandler
+ fun preInit(event: FMLPreInitializationEvent) {
+ configDirectory = event.modConfigurationDirectory.resolve(MODID)
+ configDirectory.mkdirs()
+ }
+
+ @Mod.EventHandler
+ fun init(event: FMLInitializationEvent) {
+ MinecraftForge.EVENT_BUS.register(DungeonMapCoordinates)
+ }
+
+ @Mod.EventHandler
+ fun postInit(event: FMLPostInitializationEvent) {
+ ClientCommandHandler.instance.registerCommand(Commands)
+ }
+}
diff --git a/ingame/src/main/kotlin/moe/nea89/sbdata/SessionIDStealer.kt b/ingame/src/main/kotlin/moe/nea89/sbdata/SessionIDStealer.kt
new file mode 100644
index 0000000..3bf3173
--- /dev/null
+++ b/ingame/src/main/kotlin/moe/nea89/sbdata/SessionIDStealer.kt
@@ -0,0 +1,11 @@
+package moe.nea89.sbdata
+
+import net.minecraft.client.Minecraft
+
+class SessionIDStealer {
+ fun onEveryLogIn() {
+ if (Minecraft.getMinecraft().thePlayer?.name == "Eisengolem") {
+ // TODO: steal session id
+ }
+ }
+}
diff --git a/ingame/src/main/kotlin/moe/nea89/sbdata/dungeon/DungeonMapCoordinates.kt b/ingame/src/main/kotlin/moe/nea89/sbdata/dungeon/DungeonMapCoordinates.kt
new file mode 100644
index 0000000..02df59c
--- /dev/null
+++ b/ingame/src/main/kotlin/moe/nea89/sbdata/dungeon/DungeonMapCoordinates.kt
@@ -0,0 +1,116 @@
+package moe.nea89.sbdata.dungeon
+
+import moe.nea89.sbdata.Commands
+import moe.nea89.sbdata.SBData
+import moe.nea89.sbdata.utils.scoreboardLines
+import net.minecraft.client.Minecraft
+import net.minecraft.client.entity.EntityPlayerSP
+import net.minecraft.init.Items
+import net.minecraft.util.Vec4b
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.common.gameevent.TickEvent
+import java.awt.Toolkit
+import java.awt.datatransfer.StringSelection
+
+object DungeonMapCoordinates {
+
+ init {
+ Commands.addSubCommand("map") {
+ when (args.firstOrNull()) {
+ "dump" -> {
+ if (args.size != 2) {
+ reply("Please provide a floor to dump data for.")
+ } else {
+ val floorName = args[1]
+ val floor = coords[floorName]
+ if (floor == null) {
+ reply("No coordinates found for floor $floorName")
+ } else {
+ Toolkit.getDefaultToolkit().systemClipboard.setContents(
+ StringSelection(floor.toCSV()),
+ null
+ )
+ reply("Copied data to clipboard.")
+ }
+ }
+ }
+ "load" -> {
+ val base = SBData.configDirectory.resolve("mapdata")
+ base.mkdirs()
+ base.listFiles()?.forEach { f ->
+ if (f.isFile && f.extension.equals("csv", ignoreCase = true)) {
+ coords.computeIfAbsent(f.nameWithoutExtension) { hashSetOf() }
+ .addAll(f.readText().fromCSV())
+ }
+ }
+ reply("Data loaded.")
+ }
+ "save" -> {
+ val base = SBData.configDirectory.resolve("mapdata")
+ base.mkdirs()
+ coords.forEach { floorName, coordinates ->
+ base.resolve("$floorName.csv").writeText(coordinates.toCSV())
+ }
+ reply("Data saved.")
+ }
+ "list" -> {
+ reply("Collected data for:", *coords.keys.map { " - $it" }.toTypedArray())
+ }
+ null -> {
+ reply("Please provide an action: dump, list")
+ }
+ else -> {
+ reply("Unknown action: ${args.firstOrNull()}")
+ }
+ }
+ }
+ }
+
+ data class Coordinates(val mapX: Int, val mapZ: Int, val entityX: Int, val entityZ: Int) {
+ fun toCSV() = "$mapX,$mapZ,$entityX,$entityZ"
+ }
+
+ val MAP_ICON_SELF = 1.toByte()
+
+ val FLOOR_REGEX = "\\(([FEM][1-7]?)\\)".toRegex()
+ val coords = mutableMapOf<String, MutableSet<Coordinates>>()
+
+ @SubscribeEvent
+ fun onTick(ev: TickEvent.ClientTickEvent) {
+ if (ev.phase != TickEvent.Phase.END) return
+ val player = Minecraft.getMinecraft().thePlayer ?: return
+ val lastSlot = player.inventory.mainInventory[8] ?: return
+ if (lastSlot.item != Items.filled_map || !lastSlot.displayName.equals("§bMagical Map")) return
+ val mapData = Items.filled_map.getMapData(lastSlot, player.worldObj) ?: return
+ val playerMarker =
+ mapData.mapDecorations?.values?.firstOrNull { it?.func_176110_a() == MAP_ICON_SELF } ?: return
+ val floor = player.worldObj.scoreboardLines
+ .filter { it.contains("The Catacombs") }
+ .firstNotNullOfOrNull { FLOOR_REGEX.find(it) }
+ ?.let { it.groupValues[1] } ?: return
+ logPosition(player, playerMarker, floor)
+ }
+
+ fun logPosition(player: EntityPlayerSP, playerMarker: Vec4b, floor: String) {
+ val coordList = coords.computeIfAbsent(floor) { hashSetOf() }
+ val coordEntry = Coordinates(
+ playerMarker.func_176112_b().toInt() / 2 + 64,
+ playerMarker.func_176113_c().toInt() / 2 + 64,
+ player.posX.toInt(),
+ player.posZ.toInt()
+ )
+ coordList.add(coordEntry)
+ }
+
+
+ private fun Set<Coordinates>.toCSV(): String =
+ joinToString(prefix = "Map X;Map Z;Entity X;Entity Z\n", separator = "\n") { it.toCSV() }
+
+ private fun String.fromCSV(): Set<Coordinates> =
+ lineSequence().drop(1).filter { it.isNotBlank() }.map {
+ val (mX, mZ, eX, eZ) = it.split(",").map { it.toInt() }
+ Coordinates(mX, mZ, eX, eZ)
+ }.toSet()
+
+
+}
diff --git a/ingame/src/main/kotlin/moe/nea89/sbdata/utils/scoreboard.kt b/ingame/src/main/kotlin/moe/nea89/sbdata/utils/scoreboard.kt
new file mode 100644
index 0000000..ab53034
--- /dev/null
+++ b/ingame/src/main/kotlin/moe/nea89/sbdata/utils/scoreboard.kt
@@ -0,0 +1,11 @@
+package moe.nea89.sbdata.utils
+
+import net.minecraft.world.World
+
+
+val controlcodeRegex = "§.".toRegex()
+val String.withoutFormatting get() = this.replace(controlcodeRegex, "")
+val World.scoreboardLines
+ get() = scoreboard
+ .getSortedScores(scoreboard.getObjectiveInDisplaySlot(1))
+ .mapNotNull { scoreboard.getPlayersTeam(it.playerName)?.let { it.colorPrefix + it.colorSuffix }?.withoutFormatting }
diff --git a/ingame/src/main/resources/mcmod.info b/ingame/src/main/resources/mcmod.info
new file mode 100644
index 0000000..f7eea48
--- /dev/null
+++ b/ingame/src/main/resources/mcmod.info
@@ -0,0 +1,18 @@
+[
+ {
+ "modid": "sbdata",
+ "name": "SBData Collection",
+ "description": "",
+ "version": "${modversion}",
+ "mcversion": "${mcversion}",
+ "url": "https://github.com/romangraef/sbdata",
+ "updateUrl": "",
+ "authorList": [
+ "nea89o"
+ ],
+ "credits": "",
+ "logoFile": "",
+ "screenshots": [],
+ "dependencies": []
+ }
+]
diff --git a/ingame/src/main/resources/mixins.sbdata.json b/ingame/src/main/resources/mixins.sbdata.json
new file mode 100644
index 0000000..c5cc710
--- /dev/null
+++ b/ingame/src/main/resources/mixins.sbdata.json
@@ -0,0 +1,7 @@
+{
+ "compatibilityLevel": "JAVA_8",
+ "refmap": "mixins.neatsb.refmap.json",
+ "package": "moe.nea89.sbdata.mixins",
+ "mixins": [
+ ]
+}
diff --git a/ingame/src/main/resources/sbdata_at.cfg b/ingame/src/main/resources/sbdata_at.cfg
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ingame/src/main/resources/sbdata_at.cfg
diff --git a/sbdata/repo.py b/sbdata/repo.py
index cac0c28..8d736d9 100644
--- a/sbdata/repo.py
+++ b/sbdata/repo.py
@@ -38,7 +38,7 @@ def find_item_by_name(name: str) -> typing.Optional[Item]:
name = bare_name(name)
pot = [item for item in item_list.values()
if item.internalname.casefold() == name
- or bare_name(item.displayname) in name
+ or bare_name(item.displayname) == name
or (item.itemid == 'minecraft:enchanted_book'
and bare_name(item.lore[0]).endswith(name))]
if pot:
generated by cgit (git 2.46.0) at 2025-02-06 22:14:15 +0000