From 8fcb9f3acc4d2f3a7f0ce62e558a6eabb0ce69ca Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Wed, 13 Mar 2024 23:09:55 -0600 Subject: [PATCH] Initial source import --- .editorconfig | 33 ++ .gitattributes | 30 ++ .gitignore | 34 ++ LICENSE | 21 ++ build.gradle | 83 +++++ gradle.properties | 10 + gradle/libs.versions.toml | 28 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 +++++++++++++ gradlew.bat | 92 +++++ settings.gradle | 14 + src/main/java/pm/c7/scout/Scout.java | 22 ++ src/main/java/pm/c7/scout/ScoutMixin.java | 53 +++ .../java/pm/c7/scout/ScoutNetworking.java | 7 + .../java/pm/c7/scout/ScoutScreenHandler.java | 10 + src/main/java/pm/c7/scout/ScoutUtil.java | 151 ++++++++ .../java/pm/c7/scout/client/ScoutClient.java | 204 +++++++++++ .../scout/client/compat/ScoutEmiPlugin.java | 45 +++ .../scout/client/gui/BagTooltipComponent.java | 60 ++++ .../c7/scout/client/model/SatchelModel.java | 45 +++ .../client/render/PouchFeatureRenderer.java | 50 +++ .../client/render/SatchelFeatureRenderer.java | 53 +++ .../java/pm/c7/scout/config/ScoutConfig.java | 12 + .../c7/scout/config/ScoutConfigHandler.java | 17 + .../java/pm/c7/scout/item/BagTooltipData.java | 23 ++ .../java/pm/c7/scout/item/BaseBagItem.java | 226 ++++++++++++ .../java/pm/c7/scout/mixin/BowItemMixin.java | 85 +++++ .../pm/c7/scout/mixin/ItemStackMixin.java | 23 ++ .../pm/c7/scout/mixin/PlayerEntityMixin.java | 61 ++++ .../scout/mixin/PlayerScreenHandlerMixin.java | 99 ++++++ .../pm/c7/scout/mixin/ScreenHandlerMixin.java | 68 ++++ .../scout/mixin/ScreenHandlerTransformer.java | 155 +++++++++ .../scout/mixin/ServerPlayerEntityMixin.java | 94 +++++ .../c7/scout/mixin/ShulkerBoxSlotMixin.java | 19 + .../client/AbstractFurnaceScreenMixin.java | 63 ++++ .../mixin/client/CraftingScreenMixin.java | 63 ++++ .../mixin/client/HandledScreenAccessor.java | 20 ++ .../mixin/client/HandledScreenMixin.java | 328 ++++++++++++++++++ .../client/HandledScreenTransformer.java | 84 +++++ .../mixin/client/InventoryScreenMixin.java | 66 ++++ .../mixin/client/RecipeBookWidgetMixin.java | 54 +++ .../mixinsupport/ClassNodeTransformer.java | 8 + .../java/pm/c7/scout/registry/ScoutItems.java | 22 ++ src/main/java/pm/c7/scout/screen/BagSlot.java | 107 ++++++ .../assets/emi/recipe/defaults/scout.json | 10 + src/main/resources/assets/scout/icon.png | Bin 0 -> 678 bytes .../resources/assets/scout/lang/en_us.json | 14 + .../assets/scout/models/item/pouch.json | 6 + .../assets/scout/models/item/satchel.json | 6 + .../scout/models/item/satchel_strap.json | 6 + .../scout/models/item/tanned_leather.json | 6 + .../scout/models/item/upgraded_pouch.json | 6 + .../scout/models/item/upgraded_satchel.json | 6 + .../assets/scout/textures/entity/satchel.png | Bin 0 -> 279 bytes .../textures/entity/upgraded_satchel.png | Bin 0 -> 5449 bytes .../assets/scout/textures/gui/pouch_slot.png | Bin 0 -> 229 bytes .../assets/scout/textures/gui/slots.png | Bin 0 -> 1400 bytes .../assets/scout/textures/item/pouch.png | Bin 0 -> 479 bytes .../assets/scout/textures/item/satchel.png | Bin 0 -> 326 bytes .../scout/textures/item/satchel_strap.png | Bin 0 -> 193 bytes .../scout/textures/item/tanned_leather.png | Bin 0 -> 377 bytes .../scout/textures/item/upgraded_pouch.png | Bin 0 -> 473 bytes .../scout/textures/item/upgraded_satchel.png | Bin 0 -> 323 bytes .../resources/data/c/tags/items/leather.json | 6 + .../resources/data/c/tags/items/string.json | 6 + .../resources/data/scout/recipes/pouch.json | 19 + .../resources/data/scout/recipes/satchel.json | 22 ++ .../data/scout/recipes/satchel_strap.json | 18 + .../data/scout/recipes/tanned_leather.json | 10 + .../data/scout/recipes/upgraded_pouch.json | 13 + .../data/scout/recipes/upgraded_satchel.json | 13 + .../data/trinkets/entities/scout.json | 7 + .../data/trinkets/slots/legs/pouch.json | 5 + .../data/trinkets/tags/items/chest/back.json | 7 + .../data/trinkets/tags/items/legs/pouch.json | 7 + src/main/resources/quilt.mod.json | 91 +++++ src/main/resources/scout.mixins.json | 10 + 78 files changed, 3292 insertions(+) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/pm/c7/scout/Scout.java create mode 100644 src/main/java/pm/c7/scout/ScoutMixin.java create mode 100644 src/main/java/pm/c7/scout/ScoutNetworking.java create mode 100644 src/main/java/pm/c7/scout/ScoutScreenHandler.java create mode 100644 src/main/java/pm/c7/scout/ScoutUtil.java create mode 100644 src/main/java/pm/c7/scout/client/ScoutClient.java create mode 100644 src/main/java/pm/c7/scout/client/compat/ScoutEmiPlugin.java create mode 100644 src/main/java/pm/c7/scout/client/gui/BagTooltipComponent.java create mode 100644 src/main/java/pm/c7/scout/client/model/SatchelModel.java create mode 100644 src/main/java/pm/c7/scout/client/render/PouchFeatureRenderer.java create mode 100644 src/main/java/pm/c7/scout/client/render/SatchelFeatureRenderer.java create mode 100644 src/main/java/pm/c7/scout/config/ScoutConfig.java create mode 100644 src/main/java/pm/c7/scout/config/ScoutConfigHandler.java create mode 100644 src/main/java/pm/c7/scout/item/BagTooltipData.java create mode 100644 src/main/java/pm/c7/scout/item/BaseBagItem.java create mode 100644 src/main/java/pm/c7/scout/mixin/BowItemMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/ItemStackMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/PlayerEntityMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/PlayerScreenHandlerMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/ScreenHandlerMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/ScreenHandlerTransformer.java create mode 100644 src/main/java/pm/c7/scout/mixin/ServerPlayerEntityMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/ShulkerBoxSlotMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/client/AbstractFurnaceScreenMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/client/CraftingScreenMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/client/HandledScreenAccessor.java create mode 100644 src/main/java/pm/c7/scout/mixin/client/HandledScreenMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/client/HandledScreenTransformer.java create mode 100644 src/main/java/pm/c7/scout/mixin/client/InventoryScreenMixin.java create mode 100644 src/main/java/pm/c7/scout/mixin/client/RecipeBookWidgetMixin.java create mode 100644 src/main/java/pm/c7/scout/mixinsupport/ClassNodeTransformer.java create mode 100644 src/main/java/pm/c7/scout/registry/ScoutItems.java create mode 100644 src/main/java/pm/c7/scout/screen/BagSlot.java create mode 100644 src/main/resources/assets/emi/recipe/defaults/scout.json create mode 100644 src/main/resources/assets/scout/icon.png create mode 100644 src/main/resources/assets/scout/lang/en_us.json create mode 100644 src/main/resources/assets/scout/models/item/pouch.json create mode 100644 src/main/resources/assets/scout/models/item/satchel.json create mode 100644 src/main/resources/assets/scout/models/item/satchel_strap.json create mode 100644 src/main/resources/assets/scout/models/item/tanned_leather.json create mode 100644 src/main/resources/assets/scout/models/item/upgraded_pouch.json create mode 100644 src/main/resources/assets/scout/models/item/upgraded_satchel.json create mode 100644 src/main/resources/assets/scout/textures/entity/satchel.png create mode 100644 src/main/resources/assets/scout/textures/entity/upgraded_satchel.png create mode 100644 src/main/resources/assets/scout/textures/gui/pouch_slot.png create mode 100644 src/main/resources/assets/scout/textures/gui/slots.png create mode 100644 src/main/resources/assets/scout/textures/item/pouch.png create mode 100644 src/main/resources/assets/scout/textures/item/satchel.png create mode 100644 src/main/resources/assets/scout/textures/item/satchel_strap.png create mode 100644 src/main/resources/assets/scout/textures/item/tanned_leather.png create mode 100644 src/main/resources/assets/scout/textures/item/upgraded_pouch.png create mode 100644 src/main/resources/assets/scout/textures/item/upgraded_satchel.png create mode 100644 src/main/resources/data/c/tags/items/leather.json create mode 100644 src/main/resources/data/c/tags/items/string.json create mode 100644 src/main/resources/data/scout/recipes/pouch.json create mode 100644 src/main/resources/data/scout/recipes/satchel.json create mode 100644 src/main/resources/data/scout/recipes/satchel_strap.json create mode 100644 src/main/resources/data/scout/recipes/tanned_leather.json create mode 100644 src/main/resources/data/scout/recipes/upgraded_pouch.json create mode 100644 src/main/resources/data/scout/recipes/upgraded_satchel.json create mode 100644 src/main/resources/data/trinkets/entities/scout.json create mode 100644 src/main/resources/data/trinkets/slots/legs/pouch.json create mode 100644 src/main/resources/data/trinkets/tags/items/chest/back.json create mode 100644 src/main/resources/data/trinkets/tags/items/legs/pouch.json create mode 100644 src/main/resources/quilt.mod.json create mode 100644 src/main/resources/scout.mixins.json diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..73cec8a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,33 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +tab_width = 4 +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.gradle] +indent_style = tab + +[*.java] +indent_style = tab + +[*.json] +indent_style = space +indent_size = 2 + +[quilt.mod.json] +indent_style = tab +tab_width = 2 + +[*.toml] +indent_style = tab +tab_width = 2 + +[*.properties] +indent_style = space +indent_size = 2 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..99d0367 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,30 @@ +*.java text eol=lf diff=java +*.gradle text eol=lf diff=java +*.kt text eol=lf diff=kotlin +*.kts text eol=lf diff=kotlin +gradlew text eol=lf +*.bat text eol=crlf + +*.md text eol=lf diff=markdown + +.editorconfig text eol=lf + +*.json text eol=lf +*.json5 text eol=lf +*.properties text eol=lf +*.toml text eol=lf +*.xml text eol=lf diff=html + +# Modding specific +*.accesswidener text eol=lf + +# These files are binary and should be left untouched +# (binary is a macro for -text -diff) +*.class binary +*.dll binary +*.ear binary +*.jar binary +*.jks binary +*.png binary +*.so binary +*.war binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..de6cdcf --- /dev/null +++ b/.gitignore @@ -0,0 +1,34 @@ +# Gradle +.gradle/ +build/ +out/ +classes/ + +# Quilt Loom +remappedSrc/ +run/ + +# Eclipse +*.launch + +# IntelliJ Idea +.idea/ +*.iml +*.ipr +*.iws + +# Fleet +.fleet/ + +# Visual Studio Code +.settings/ +.vscode/ +bin/ +.classpath +.project + +# Eclipse JDT LS +workspace/ + +# macOS +*.DS_Store diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..eeed246 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022-2024 Cynthia Foxwell + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..d315d6f --- /dev/null +++ b/build.gradle @@ -0,0 +1,83 @@ +plugins { + alias libs.plugins.quilt.loom +} + +base { + archivesName = project.archives_base_name +} + +version = "$project.version+${libs.versions.minecraft.get()}" +group = project.maven_group + +repositories { + maven { + name = "TerraformersMC" + url = "https://maven.terraformersmc.com/" + } + maven { + name = "Ladysnake Libs" + url = "https://maven.ladysnake.org/releases" + } + maven { + name = "Sleeping Town" + url = "https://repo.sleeping.town" + content { + includeGroup "com.unascribed" + } + } +} + +loom { + // Loom and Loader both use this block in order to gather more information about your mod. + mods { + // This should match your mod id. + "scout" { + // Tell Loom about each source set used by your mod here. This ensures that your mod's classes are properly transformed by Loader. + sourceSet("main") + // If you shade (directly include classes, not JiJ) a dependency into your mod, include it here using one of these methods: + // dependency("com.example.shadowedmod:1.2.3") + // configuration("exampleShadedConfigurationName") + } + } +} + +dependencies { + minecraft libs.minecraft + mappings variantOf(libs.quilt.mappings) { classifier 'intermediary-v2' } + modImplementation libs.quilt.loader + + modImplementation libs.quilted.fabric.api + + modApi include("dev.emi:trinkets:${libs.versions.trinkets.get()}") + modApi include("com.unascribed:lib39-core:${libs.versions.lib39.get()}+${libs.versions.minecraft.get()}") + modApi include("com.unascribed:lib39-dessicant:${libs.versions.lib39.get()}+${libs.versions.minecraft.get()}") + + modCompileOnly "dev.emi:emi-fabric:${libs.versions.emi.get()}+${libs.versions.minecraft.get()}:api" + modLocalRuntime "dev.emi:emi-fabric:${libs.versions.emi.get()}+${libs.versions.minecraft.get()}" +} + +processResources { + inputs.properties 'version': version, 'group': project.group + + filesMatching('quilt.mod.json') { + expand 'version': version, 'group': project.group + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' + // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. + it.options.release = 17 +} + +java { + // Still required by IDEs such as Eclipse and Visual Studio Code + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +jar { + from('LICENSE') { + rename { "${it}_${base.archivesName.get()}" } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..59af25e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,10 @@ +# Gradle Properties +org.gradle.jvmargs = -Xmx1G +org.gradle.parallel = true + +# Mod Properties +version = 2.0.0 +maven_group = pm.c7.scout +archives_base_name = Scout + +# Dependencies are managed at gradle/libs.versions.toml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..593eda4 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,28 @@ +[versions] +# The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html +minecraft = "1.20.1" +loom = "1.4.1" + +quilt_mappings = "1.20.1+build.23" +quilt_loader = "0.21.0" + +quilted_fabric_api = "7.4.0+0.90.0-1.20.1" + +trinkets = "3.7.2" +lib39 = "1.5.0-experimental6.1" +emi = "1.1.3" + +[libraries] +minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } +quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_mappings" } +quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" } + +quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" } +quilted_fabric_api_deprecated = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated", version.ref = "quilted_fabric_api" } + +# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example". +[bundles] +quilted_fabric_api = ["quilted_fabric_api", "quilted_fabric_api_deprecated"] + +[plugins] +quilt_loom = { id = "org.quiltmc.loom", version.ref = "loom" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7f93135c49b765f8051ef9d0a6055ff8e46073d8 GIT binary patch literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3fa8f86 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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 + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +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 execute + +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 + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d969e34 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + maven { + name = 'Quilt' + url = 'https://maven.quiltmc.org/repository/release' + } + // Currently needed for Intermediary and other temporary dependencies + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/pm/c7/scout/Scout.java b/src/main/java/pm/c7/scout/Scout.java new file mode 100644 index 0000000..550485f --- /dev/null +++ b/src/main/java/pm/c7/scout/Scout.java @@ -0,0 +1,22 @@ +package pm.c7.scout; + +import com.unascribed.lib39.core.api.AutoRegistry; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Identifier; +import org.quiltmc.loader.api.ModContainer; +import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; +import org.quiltmc.qsl.item.group.api.QuiltItemGroup; +import pm.c7.scout.config.ScoutConfigHandler; +import pm.c7.scout.registry.ScoutItems; + +public class Scout implements ModInitializer { + public static final AutoRegistry AUTOREGISTRY = AutoRegistry.of(ScoutUtil.MOD_ID); + public static final ItemGroup ITEM_GROUP = QuiltItemGroup.createWithIcon(new Identifier("scout", "itemgroup"), () -> new ItemStack(ScoutItems.SATCHEL)); + + @Override + public void onInitialize(ModContainer mod) { + new ScoutConfigHandler(); + ScoutItems.init(); + } +} diff --git a/src/main/java/pm/c7/scout/ScoutMixin.java b/src/main/java/pm/c7/scout/ScoutMixin.java new file mode 100644 index 0000000..40de953 --- /dev/null +++ b/src/main/java/pm/c7/scout/ScoutMixin.java @@ -0,0 +1,53 @@ +package pm.c7.scout; + +import com.unascribed.lib39.core.api.AutoMixin; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AnnotationNode; +import org.objectweb.asm.tree.ClassNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; +import pm.c7.scout.mixinsupport.ClassNodeTransformer; + +import java.util.HashMap; +import java.util.Map; + +// "you could also embrace chaos" --Una +// https://git.sleeping.town/unascribed/Yttr/src/branch/1.19.2/src/main/java/com/unascribed/yttr/YttrMixin.java +public class ScoutMixin extends AutoMixin { + private static final Logger LOGGER = LoggerFactory.getLogger("Scout:MixinPlugin"); + + public @interface Transformer { + Class value(); + } + + private final Map transformers = new HashMap<>(); + + @Override + protected boolean shouldMixinBeSkipped(String name, ClassNode node) { + if (name.endsWith("Transformer")) { + return true; + } + return super.shouldMixinBeSkipped(name, node); + } + + @Override + protected boolean shouldAnnotationSkipMixin(String name, AnnotationNode an) { + if (an.desc.equals("Lpm/c7/scout/ScoutMixin$Transformer;")) { + var params = decodeAnnotationParams(an); + Type type = (Type)params.get("value"); + try { + transformers.put(name, (ClassNodeTransformer) Class.forName(type.getClassName()).newInstance()); + } catch (Exception e) { + LOGGER.error("Transformer class for mixin {} not found", name, e); + } + } + return super.shouldAnnotationSkipMixin(name, an); + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + transformers.getOrDefault(mixinClassName, (s, cn) -> {}).transform(targetClassName, targetClass); + super.postApply(targetClassName, targetClass, mixinClassName, mixinInfo); + } +} diff --git a/src/main/java/pm/c7/scout/ScoutNetworking.java b/src/main/java/pm/c7/scout/ScoutNetworking.java new file mode 100644 index 0000000..5c5bdfe --- /dev/null +++ b/src/main/java/pm/c7/scout/ScoutNetworking.java @@ -0,0 +1,7 @@ +package pm.c7.scout; + +import net.minecraft.util.Identifier; + +public class ScoutNetworking { + public static final Identifier ENABLE_SLOTS = new Identifier(ScoutUtil.MOD_ID, "enable_slots"); +} diff --git a/src/main/java/pm/c7/scout/ScoutScreenHandler.java b/src/main/java/pm/c7/scout/ScoutScreenHandler.java new file mode 100644 index 0000000..ad994a8 --- /dev/null +++ b/src/main/java/pm/c7/scout/ScoutScreenHandler.java @@ -0,0 +1,10 @@ +package pm.c7.scout; + +import net.minecraft.util.collection.DefaultedList; +import pm.c7.scout.screen.BagSlot; + +public interface ScoutScreenHandler { + DefaultedList scout$getSatchelSlots(); + DefaultedList scout$getLeftPouchSlots(); + DefaultedList scout$getRightPouchSlots(); +} diff --git a/src/main/java/pm/c7/scout/ScoutUtil.java b/src/main/java/pm/c7/scout/ScoutUtil.java new file mode 100644 index 0000000..27aa7a0 --- /dev/null +++ b/src/main/java/pm/c7/scout/ScoutUtil.java @@ -0,0 +1,151 @@ +package pm.c7.scout; + +import dev.emi.trinkets.api.SlotReference; +import dev.emi.trinkets.api.TrinketComponent; +import dev.emi.trinkets.api.TrinketsApi; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.BeaconScreen; +import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.ingame.MerchantScreen; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtList; +import net.minecraft.screen.PlayerScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.minecraft.util.Identifier; +import net.minecraft.util.Pair; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.util.math.MathHelper; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import pm.c7.scout.item.BaseBagItem; +import pm.c7.scout.item.BaseBagItem.BagType; +import pm.c7.scout.screen.BagSlot; + +import java.util.Optional; + +public class ScoutUtil { + public static final Logger LOGGER = LoggerFactory.getLogger("Scout"); + public static final String MOD_ID = "scout"; + public static final Identifier SLOT_TEXTURE = new Identifier("scout", "textures/gui/slots.png"); + + public static final int MAX_SATCHEL_SLOTS = 18; + public static final int MAX_POUCH_SLOTS = 6; + public static final int TOTAL_SLOTS = MAX_SATCHEL_SLOTS + MAX_POUCH_SLOTS + MAX_POUCH_SLOTS; + + public static final int SATCHEL_SLOT_START = -1100; + public static final int LEFT_POUCH_SLOT_START = SATCHEL_SLOT_START - MAX_SATCHEL_SLOTS; + public static final int RIGHT_POUCH_SLOT_START = LEFT_POUCH_SLOT_START - MAX_POUCH_SLOTS; + public static final int BAG_SLOTS_END = RIGHT_POUCH_SLOT_START - MAX_POUCH_SLOTS; + + public static ItemStack findBagItem(PlayerEntity player, BaseBagItem.BagType type, boolean right) { + ItemStack targetStack = ItemStack.EMPTY; + + boolean hasFirstPouch = false; + Optional _component = TrinketsApi.getTrinketComponent(player); + if (_component.isPresent()) { + TrinketComponent component = _component.get(); + for (Pair pair : component.getAllEquipped()) { + ItemStack slotStack = pair.getRight(); + + if (slotStack.getItem() instanceof BaseBagItem bagItem) { + if (bagItem.getType() == type) { + if (type == BagType.POUCH) { + if (right && !hasFirstPouch) { + hasFirstPouch = true; + } else { + targetStack = slotStack; + break; + } + } else { + targetStack = slotStack; + break; + } + } + } + } + } + + return targetStack; + } + + public static NbtList inventoryToTag(Inventory inventory) { + NbtList tag = new NbtList(); + + for(int i = 0; i < inventory.size(); i++) { + NbtCompound stackTag = new NbtCompound(); + stackTag.putInt("Slot", i); + stackTag.put("Stack", inventory.getStack(i).writeNbt(new NbtCompound())); + tag.add(stackTag); + } + + return tag; + } + + public static void inventoryFromTag(NbtList tag, Inventory inventory) { + inventory.clear(); + + tag.forEach(element -> { + NbtCompound stackTag = (NbtCompound) element; + int slot = stackTag.getInt("Slot"); + ItemStack stack = ItemStack.fromNbt(stackTag.getCompound("Stack")); + inventory.setStack(slot, stack); + }); + } + + public static boolean isBagSlot(int slot) { + return slot <= SATCHEL_SLOT_START && slot > BAG_SLOTS_END; + } + + public static @Nullable Slot getBagSlot(int slot, PlayerScreenHandler playerScreenHandler) { + var scoutScreenHandler = (ScoutScreenHandler) playerScreenHandler; + if (slot <= SATCHEL_SLOT_START && slot > LEFT_POUCH_SLOT_START) { + int realSlot = MathHelper.abs(slot - SATCHEL_SLOT_START); + var slots = scoutScreenHandler.scout$getSatchelSlots(); + + return slots.get(realSlot); + } else if (slot <= LEFT_POUCH_SLOT_START && slot > RIGHT_POUCH_SLOT_START) { + int realSlot = MathHelper.abs(slot - LEFT_POUCH_SLOT_START); + var slots = scoutScreenHandler.scout$getLeftPouchSlots(); + + return slots.get(realSlot); + } else if (slot <= RIGHT_POUCH_SLOT_START && slot > BAG_SLOTS_END) { + int realSlot = MathHelper.abs(slot - RIGHT_POUCH_SLOT_START); + var slots = scoutScreenHandler.scout$getRightPouchSlots(); + + return slots.get(realSlot); + } else { + return null; + } + } + + public static DefaultedList getAllBagSlots(PlayerScreenHandler playerScreenHandler) { + var scoutScreenHandler = (ScoutScreenHandler) playerScreenHandler; + DefaultedList out = DefaultedList.ofSize(TOTAL_SLOTS); + out.addAll(scoutScreenHandler.scout$getSatchelSlots()); + out.addAll(scoutScreenHandler.scout$getLeftPouchSlots()); + out.addAll(scoutScreenHandler.scout$getRightPouchSlots()); + return out; + } + + public static @Nullable PlayerScreenHandler getPlayerScreenHandler() { + var client = MinecraftClient.getInstance(); + if (client != null && client.player != null) { + return client.player.playerScreenHandler; + } + + return null; + } + + // FIXME: registry system for mods to register their own blacklisted screens + public static boolean isScreenBlacklisted(Screen screen) { + return screen instanceof CreativeInventoryScreen + || screen instanceof MerchantScreen // FIXME: needs repositioning + || screen instanceof BeaconScreen; // FIXME: needs repositioning + } +} diff --git a/src/main/java/pm/c7/scout/client/ScoutClient.java b/src/main/java/pm/c7/scout/client/ScoutClient.java new file mode 100644 index 0000000..dc95f8f --- /dev/null +++ b/src/main/java/pm/c7/scout/client/ScoutClient.java @@ -0,0 +1,204 @@ +package pm.c7.scout.client; + +import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback; +import net.minecraft.client.gui.screen.ingame.GenericContainerScreen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.ingame.ShulkerBoxScreen; +import net.minecraft.entity.EntityType; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; +import net.minecraft.util.collection.DefaultedList; +import org.quiltmc.loader.api.ModContainer; +import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer; +import org.quiltmc.qsl.networking.api.client.ClientPlayNetworking; +import org.quiltmc.qsl.screen.api.client.ScreenEvents; +import org.quiltmc.qsl.tooltip.api.client.TooltipComponentCallback; +import pm.c7.scout.ScoutNetworking; +import pm.c7.scout.ScoutScreenHandler; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.client.gui.BagTooltipComponent; +import pm.c7.scout.client.render.SatchelFeatureRenderer; +import pm.c7.scout.item.BagTooltipData; +import pm.c7.scout.item.BaseBagItem; +import pm.c7.scout.item.BaseBagItem.BagType; +import pm.c7.scout.client.render.PouchFeatureRenderer; +import pm.c7.scout.mixin.client.HandledScreenAccessor; +import pm.c7.scout.screen.BagSlot; + +public class ScoutClient implements ClientModInitializer { + @Override + public void onInitializeClient(ModContainer mod) { + ClientPlayNetworking.registerGlobalReceiver(ScoutNetworking.ENABLE_SLOTS, (client, handler, packet, sender) -> { + client.execute(() -> { + assert client.player != null; + ScoutScreenHandler screenHandler = (ScoutScreenHandler) client.player.playerScreenHandler; + + ItemStack satchelStack = ScoutUtil.findBagItem(client.player, BagType.SATCHEL, false); + DefaultedList satchelSlots = screenHandler.scout$getSatchelSlots(); + + for (int i = 0; i < ScoutUtil.MAX_SATCHEL_SLOTS; i++) { + BagSlot slot = satchelSlots.get(i); + slot.setInventory(null); + slot.setEnabled(false); + } + if (!satchelStack.isEmpty()) { + BaseBagItem satchelItem = (BaseBagItem) satchelStack.getItem(); + Inventory satchelInv = satchelItem.getInventory(satchelStack); + + for (int i = 0; i < satchelItem.getSlotCount(); i++) { + BagSlot slot = satchelSlots.get(i); + slot.setInventory(satchelInv); + slot.setEnabled(true); + } + } + + ItemStack leftPouchStack = ScoutUtil.findBagItem(client.player, BagType.POUCH, false); + DefaultedList leftPouchSlots = screenHandler.scout$getLeftPouchSlots(); + + for (int i = 0; i < ScoutUtil.MAX_POUCH_SLOTS; i++) { + BagSlot slot = leftPouchSlots.get(i); + slot.setInventory(null); + slot.setEnabled(false); + } + if (!leftPouchStack.isEmpty()) { + BaseBagItem leftPouchItem = (BaseBagItem) leftPouchStack.getItem(); + Inventory leftPouchInv = leftPouchItem.getInventory(leftPouchStack); + + for (int i = 0; i < leftPouchItem.getSlotCount(); i++) { + BagSlot slot = leftPouchSlots.get(i); + slot.setInventory(leftPouchInv); + slot.setEnabled(true); + } + } + + ItemStack rightPouchStack = ScoutUtil.findBagItem(client.player, BagType.POUCH, true); + DefaultedList rightPouchSlots = screenHandler.scout$getRightPouchSlots(); + + for (int i = 0; i < ScoutUtil.MAX_POUCH_SLOTS; i++) { + BagSlot slot = rightPouchSlots.get(i); + slot.setInventory(null); + slot.setEnabled(false); + } + if (!rightPouchStack.isEmpty()) { + BaseBagItem rightPouchItem = (BaseBagItem) rightPouchStack.getItem(); + Inventory rightPouchInv = rightPouchItem.getInventory(rightPouchStack); + + for (int i = 0; i < rightPouchItem.getSlotCount(); i++) { + BagSlot slot = rightPouchSlots.get(i); + slot.setInventory(rightPouchInv); + slot.setEnabled(true); + } + } + }); + }); + + TooltipComponentCallback.EVENT.register(data -> { + if (data instanceof BagTooltipData d) { + return new BagTooltipComponent(d); + } + + return null; + }); + + LivingEntityFeatureRendererRegistrationCallback.EVENT.register((entityType, entityRenderer, registrationHelper, context) -> { + if (entityType == EntityType.PLAYER) { + registrationHelper.register(new PouchFeatureRenderer<>(entityRenderer, context.getHeldItemRenderer())); + registrationHelper.register(new SatchelFeatureRenderer<>(entityRenderer)); + } + }); + + ScreenEvents.AFTER_INIT.register((screen, client, scaledWidth, scaledHeight) -> { + if (screen instanceof HandledScreen handledScreen && client.player != null) { + if (ScoutUtil.isScreenBlacklisted(screen)) { + // realistically no one is going to have a screen bigger than 2147483647 pixels + for (Slot slot : ScoutUtil.getAllBagSlots(client.player.playerScreenHandler)) { + BagSlot bagSlot = (BagSlot) slot; + bagSlot.setX(Integer.MAX_VALUE); + bagSlot.setY(Integer.MAX_VALUE); + } + return; + } + + var handledScreenAccessor = (HandledScreenAccessor) handledScreen; + + var sx = handledScreenAccessor.getX(); + var sy = handledScreenAccessor.getY(); + var sw = handledScreenAccessor.getBackgroundWidth(); + var sh = handledScreenAccessor.getBackgroundHeight(); + + // satchel + int x = sx; + int y = sy + sh + 2; + + if (screen instanceof GenericContainerScreen || screen instanceof ShulkerBoxScreen) { + y -= 1; + } + + for (int i = 0; i < ScoutUtil.MAX_SATCHEL_SLOTS; i++) { + if (i % 9 == 0) { + x = sx + 8; + } + + BagSlot slot = (BagSlot) ScoutUtil.getBagSlot(ScoutUtil.SATCHEL_SLOT_START - i, client.player.playerScreenHandler); + if (slot != null) { + slot.setX(x - sx); + slot.setY(y - sy); + } + + x += 18; + + if ((i + 1) % 9 == 0) { + y += 18; + } + } + + // left pouch + x = sx + 8; + y = (sy + sh) - 100; + + if (screen instanceof GenericContainerScreen || screen instanceof ShulkerBoxScreen) { + y -= 1; + } + + for (int i = 0; i < ScoutUtil.MAX_POUCH_SLOTS; i++) { + if (i % 3 == 0) { + x -= 18; + y += 54; + } + + BagSlot slot = (BagSlot) ScoutUtil.getBagSlot(ScoutUtil.LEFT_POUCH_SLOT_START - i, client.player.playerScreenHandler); + if (slot != null) { + slot.setX(x - sx); + slot.setY(y - sy); + } + + y -= 18; + } + + // right pouch + x = sx + sw - 24; + y = (sy + sh) - 100; + + if (screen instanceof GenericContainerScreen || screen instanceof ShulkerBoxScreen) { + y -= 1; + } + + for (int i = 0; i < ScoutUtil.MAX_POUCH_SLOTS; i++) { + if (i % 3 == 0) { + x += 18; + y += 54; + } + + BagSlot slot = (BagSlot) ScoutUtil.getBagSlot(ScoutUtil.RIGHT_POUCH_SLOT_START - i, client.player.playerScreenHandler); + if (slot != null) { + slot.setX(x - sx); + slot.setY(y - sy); + } + + y -= 18; + } + } + }); + } +} diff --git a/src/main/java/pm/c7/scout/client/compat/ScoutEmiPlugin.java b/src/main/java/pm/c7/scout/client/compat/ScoutEmiPlugin.java new file mode 100644 index 0000000..c7a7263 --- /dev/null +++ b/src/main/java/pm/c7/scout/client/compat/ScoutEmiPlugin.java @@ -0,0 +1,45 @@ +package pm.c7.scout.client.compat; + +import dev.emi.emi.api.EmiPlugin; +import dev.emi.emi.api.EmiRegistry; +import dev.emi.emi.api.widget.Bounds; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.ingame.InventoryScreen; +import net.minecraft.item.ItemStack; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.item.BaseBagItem; +import pm.c7.scout.item.BaseBagItem.BagType; +import pm.c7.scout.mixin.client.HandledScreenAccessor; + +public class ScoutEmiPlugin implements EmiPlugin { + @Override + public void register(EmiRegistry registry) { + registry.addExclusionArea(InventoryScreen.class, (screen, consumer) -> { + MinecraftClient client = MinecraftClient.getInstance(); + ItemStack leftPouchStack = ScoutUtil.findBagItem(client.player, BagType.POUCH, false); + if (!leftPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) leftPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + int x = ((HandledScreenAccessor) screen).getX() - (columns * 18); + int y = ((HandledScreenAccessor) screen).getY() + 76; + + consumer.accept(new Bounds(x, y, columns * 18, 68)); + } + + ItemStack rightPouchStack = ScoutUtil.findBagItem(client.player, BagType.POUCH, true); + if (!rightPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) rightPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + int x = ((HandledScreenAccessor) screen).getX() + 176; + int y = ((HandledScreenAccessor) screen).getY() + 76; + + consumer.accept(new Bounds(x, y, columns * 18, 68)); + } + }); + } + +} diff --git a/src/main/java/pm/c7/scout/client/gui/BagTooltipComponent.java b/src/main/java/pm/c7/scout/client/gui/BagTooltipComponent.java new file mode 100644 index 0000000..838b8b9 --- /dev/null +++ b/src/main/java/pm/c7/scout/client/gui/BagTooltipComponent.java @@ -0,0 +1,60 @@ +package pm.c7.scout.client.gui; + +import com.google.common.math.IntMath; +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.tooltip.TooltipComponent; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.ItemStack; +import net.minecraft.util.collection.DefaultedList; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.item.BagTooltipData; + +import java.math.RoundingMode; + +public class BagTooltipComponent implements TooltipComponent { + private final DefaultedList inventory; + private final int slotCount; + + public BagTooltipComponent(BagTooltipData data) { + this.inventory = data.getInventory(); + this.slotCount = data.getSlotCount(); + } + + @Override + public int getHeight() { + return (18 * IntMath.divide(slotCount, 6, RoundingMode.UP)) + 2; + } + + @Override + public int getWidth(TextRenderer textRenderer) { + return 18 * (Math.min(slotCount, 6)); + } + + @Override + public void drawItems(TextRenderer textRenderer, int x, int y, MatrixStack matrices, ItemRenderer itemRenderer, int z) { + int originalX = x; + + for (int i = 0; i < slotCount; i++) { + ItemStack itemStack = this.inventory.get(i); + this.drawSlot(matrices, x, y, z); + itemRenderer.renderInGuiWithOverrides(itemStack, x + 1, y + 1, i); + itemRenderer.renderGuiItemOverlay(textRenderer, itemStack, x + 1, y + 1); + + x += 18; + if ((i + 1) % 6 == 0) { + y += 18; + x = originalX; + } + } + } + + private void drawSlot(MatrixStack matrices, int x, int y, int z) { + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.setShaderTexture(0, ScoutUtil.SLOT_TEXTURE); + DrawableHelper.drawTexture(matrices, x, y, z, 46, 7, 18, 18, 256, 256); + } + +} diff --git a/src/main/java/pm/c7/scout/client/model/SatchelModel.java b/src/main/java/pm/c7/scout/client/model/SatchelModel.java new file mode 100644 index 0000000..a98a4a6 --- /dev/null +++ b/src/main/java/pm/c7/scout/client/model/SatchelModel.java @@ -0,0 +1,45 @@ +package pm.c7.scout.client.model; + +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.model.*; +import net.minecraft.client.render.entity.model.SinglePartEntityModel; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; + +public class SatchelModel extends SinglePartEntityModel { + private final ModelPart root; + private final ModelPart satchel; + private final ModelPart strap; + + public SatchelModel(ModelPart root) { + super(); + this.root = root; + this.satchel = root.getChild("satchel"); + this.strap = this.satchel.getChild("strap"); + } + + public static TexturedModelData getTexturedModelData() { + ModelData modelData = new ModelData(); + ModelPartData root = modelData.getRoot(); + + ModelPartData satchel = root.addChild("satchel", ModelPartBuilder.create().uv(10, 0).cuboid(-6.0F, -12.0F, -2.5F, 2.0F, 3.0F, 5.0F, new Dilation(0.275F)), ModelTransform.pivot(0.0F, 24.0F, 0.0F)); + ModelPartData strap = satchel.addChild("strap", ModelPartBuilder.create().uv(0, 0).cuboid(-1.0F, -13.0F, -2.0F, 1.0F, 14.0F, 4.0F, new Dilation(0.275F)), ModelTransform.of(-3.0F, -13.0F, 0.0F, 0.0F, 0.0F, 0.5672F)); + + return TexturedModelData.of(modelData, 32, 32); + } + + @Override + public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) { + satchel.render(matrices, vertices, light, overlay, red, green, blue, alpha); + } + + @Override + public ModelPart getPart() { + return this.root; + } + + @Override + public void setAngles(T entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { + + } +} diff --git a/src/main/java/pm/c7/scout/client/render/PouchFeatureRenderer.java b/src/main/java/pm/c7/scout/client/render/PouchFeatureRenderer.java new file mode 100644 index 0000000..5f82cc6 --- /dev/null +++ b/src/main/java/pm/c7/scout/client/render/PouchFeatureRenderer.java @@ -0,0 +1,50 @@ +package pm.c7.scout.client.render; + +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.entity.feature.FeatureRenderer; +import net.minecraft.client.render.entity.feature.FeatureRendererContext; +import net.minecraft.client.render.entity.model.EntityModel; +import net.minecraft.client.render.entity.model.PlayerEntityModel; +import net.minecraft.client.render.item.HeldItemRenderer; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.Vec3f; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.item.BaseBagItem; + +public class PouchFeatureRenderer> extends FeatureRenderer { + private final HeldItemRenderer heldItemRenderer; + + public PouchFeatureRenderer(FeatureRendererContext context, HeldItemRenderer heldItemRenderer) { + super(context); + this.heldItemRenderer = heldItemRenderer; + } + @Override + public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, T entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) { + var leftPouch = ScoutUtil.findBagItem((PlayerEntity) entity, BaseBagItem.BagType.POUCH, false); + var rightPouch = ScoutUtil.findBagItem((PlayerEntity) entity, BaseBagItem.BagType.POUCH, true); + + if (!leftPouch.isEmpty()) { + matrices.push(); + ((PlayerEntityModel) this.getContextModel()).leftLeg.rotate(matrices); + matrices.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(180.0F)); + matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(-90.0F)); + matrices.scale(0.325F, 0.325F, 0.325F); + matrices.translate(0F, -0.325F, -0.475F); + this.heldItemRenderer.renderItem(entity, leftPouch, ModelTransformation.Mode.FIXED, false, matrices, vertexConsumers, light); + matrices.pop(); + } + if (!rightPouch.isEmpty()) { + matrices.push(); + ((PlayerEntityModel) this.getContextModel()).rightLeg.rotate(matrices); + matrices.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(180.0F)); + matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(-90.0F)); + matrices.scale(0.325F, 0.325F, 0.325F); + matrices.translate(0F, -0.325F, 0.475F); + this.heldItemRenderer.renderItem(entity, rightPouch, ModelTransformation.Mode.FIXED, false, matrices, vertexConsumers, light); + matrices.pop(); + } + } +} diff --git a/src/main/java/pm/c7/scout/client/render/SatchelFeatureRenderer.java b/src/main/java/pm/c7/scout/client/render/SatchelFeatureRenderer.java new file mode 100644 index 0000000..24e143b --- /dev/null +++ b/src/main/java/pm/c7/scout/client/render/SatchelFeatureRenderer.java @@ -0,0 +1,53 @@ +package pm.c7.scout.client.render; + +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.model.TexturedModelData; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.entity.feature.FeatureRenderer; +import net.minecraft.client.render.entity.feature.FeatureRendererContext; +import net.minecraft.client.render.entity.model.EntityModel; +import net.minecraft.client.render.entity.model.PlayerEntityModel; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.Identifier; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.client.model.SatchelModel; +import pm.c7.scout.item.BaseBagItem; + +public class SatchelFeatureRenderer> extends FeatureRenderer { + private static final Identifier SATCHEL_TEXTURE = new Identifier(ScoutUtil.MOD_ID, "textures/entity/satchel.png"); + private static final Identifier UPGRADED_SATCHEL_TEXTURE = new Identifier(ScoutUtil.MOD_ID, "textures/entity/upgraded_satchel.png"); + + private final SatchelModel satchel; + + public SatchelFeatureRenderer(FeatureRendererContext context) { + super(context); + TexturedModelData modelData = SatchelModel.getTexturedModelData(); + this.satchel = new SatchelModel<>(modelData.createModel()); + } + + @Override + public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, T entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) { + var satchel = ScoutUtil.findBagItem((PlayerEntity) entity, BaseBagItem.BagType.SATCHEL, false); + + if (!satchel.isEmpty()) { + BaseBagItem satchelItem = (BaseBagItem) satchel.getItem(); + var texture = SATCHEL_TEXTURE; + if (satchelItem.getSlotCount() == ScoutUtil.MAX_SATCHEL_SLOTS) + texture = UPGRADED_SATCHEL_TEXTURE; + + matrices.push(); + ((PlayerEntityModel) this.getContextModel()).body.rotate(matrices); + this.getContextModel().copyStateTo(this.satchel); + VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer( + vertexConsumers, RenderLayer.getArmorCutoutNoCull(texture), false, satchel.hasGlint() + ); + this.satchel.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); + matrices.pop(); + } + } +} diff --git a/src/main/java/pm/c7/scout/config/ScoutConfig.java b/src/main/java/pm/c7/scout/config/ScoutConfig.java new file mode 100644 index 0000000..ed8d5a5 --- /dev/null +++ b/src/main/java/pm/c7/scout/config/ScoutConfig.java @@ -0,0 +1,12 @@ +package pm.c7.scout.config; + +import org.quiltmc.config.api.WrappedConfig; +import org.quiltmc.config.api.annotations.Comment; + +public class ScoutConfig extends WrappedConfig { + @Comment("Allow shulker boxes to be placed in bags. Bags are already blacklisted from shulker boxes with no toggle.") + public final boolean allowShulkers = true; + + @Comment("Allow bags to act as a quiver and pull arrows.") + public final boolean useArrows = true; +} diff --git a/src/main/java/pm/c7/scout/config/ScoutConfigHandler.java b/src/main/java/pm/c7/scout/config/ScoutConfigHandler.java new file mode 100644 index 0000000..2e30566 --- /dev/null +++ b/src/main/java/pm/c7/scout/config/ScoutConfigHandler.java @@ -0,0 +1,17 @@ +package pm.c7.scout.config; + +import org.quiltmc.config.api.values.TrackedValue; +import org.quiltmc.loader.api.config.QuiltConfig; +import pm.c7.scout.ScoutUtil; + +import java.util.List; + +public class ScoutConfigHandler { + public static final ScoutConfig CONFIG = QuiltConfig.create("", ScoutUtil.MOD_ID, ScoutConfig.class); + + public ScoutConfigHandler() {} + + public static TrackedValue getConfigValue(String key) { + return CONFIG.getValue(List.of(key)); + } +} diff --git a/src/main/java/pm/c7/scout/item/BagTooltipData.java b/src/main/java/pm/c7/scout/item/BagTooltipData.java new file mode 100644 index 0000000..0f39535 --- /dev/null +++ b/src/main/java/pm/c7/scout/item/BagTooltipData.java @@ -0,0 +1,23 @@ +package pm.c7.scout.item; + +import net.minecraft.client.item.TooltipData; +import net.minecraft.item.ItemStack; +import net.minecraft.util.collection.DefaultedList; + +public class BagTooltipData implements TooltipData { + private final DefaultedList inventory; + private final int slotCount; + + public BagTooltipData(DefaultedList inventory, int slots) { + this.inventory = inventory; + this.slotCount = slots; + } + + public DefaultedList getInventory() { + return this.inventory; + } + + public int getSlotCount() { + return this.slotCount; + } +} diff --git a/src/main/java/pm/c7/scout/item/BaseBagItem.java b/src/main/java/pm/c7/scout/item/BaseBagItem.java new file mode 100644 index 0000000..c7a7230 --- /dev/null +++ b/src/main/java/pm/c7/scout/item/BaseBagItem.java @@ -0,0 +1,226 @@ +package pm.c7.scout.item; + +import dev.emi.trinkets.api.SlotReference; +import dev.emi.trinkets.api.TrinketItem; +import io.netty.buffer.Unpooled; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.client.item.TooltipData; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.inventory.SimpleInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtList; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; +import org.quiltmc.qsl.networking.api.ServerPlayNetworking; +import pm.c7.scout.ScoutNetworking; +import pm.c7.scout.ScoutScreenHandler; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.screen.BagSlot; + +import java.util.List; +import java.util.Optional; + +public class BaseBagItem extends TrinketItem { + private static final String ITEMS_KEY = "Items"; + + private final int slots; + private final BagType type; + + public BaseBagItem(Settings settings, int slots, BagType type) { + super(settings); + + if (type == BagType.SATCHEL && slots > ScoutUtil.MAX_SATCHEL_SLOTS) { + throw new IllegalArgumentException("Satchel has too many slots."); + } + if (type == BagType.POUCH && slots > ScoutUtil.MAX_POUCH_SLOTS) { + throw new IllegalArgumentException("Pouch has too many slots."); + } + + this.slots = slots; + this.type = type; + } + + public int getSlotCount() { + return this.slots; + } + + public BagType getType() { + return this.type; + } + + @Override + public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { + super.appendTooltip(stack, world, tooltip, context); + tooltip.add(Text.translatable("tooltip.scout.slots", Text.literal(String.valueOf(this.slots)).formatted(Formatting.BLUE)).formatted(Formatting.GRAY)); + } + + public Inventory getInventory(ItemStack stack) { + SimpleInventory inventory = new SimpleInventory(this.slots) { + @Override + public void markDirty() { + stack.getOrCreateNbt().put(ITEMS_KEY, ScoutUtil.inventoryToTag(this)); + super.markDirty(); + } + }; + + NbtCompound compound = stack.getOrCreateNbt(); + if (!compound.contains(ITEMS_KEY)) { + compound.put(ITEMS_KEY, new NbtList()); + } + + NbtList items = compound.getList(ITEMS_KEY, 10); + + ScoutUtil.inventoryFromTag(items, inventory); + + return inventory; + } + + @Override + public Optional getTooltipData(ItemStack stack) { + DefaultedList stacks = DefaultedList.of(); + Inventory inventory = getInventory(stack); + + for (int i = 0; i < slots; i++) { + stacks.add(inventory.getStack(i)); + } + + if (stacks.stream().allMatch(ItemStack::isEmpty)) return Optional.empty(); + + return Optional.of(new BagTooltipData(stacks, slots)); + } + + @Override + public void onEquip(ItemStack stack, SlotReference slotRef, LivingEntity entity) { + if (entity instanceof PlayerEntity player) + updateSlots(player); + } + + @Override + public void onUnequip(ItemStack stack, SlotReference slotRef, LivingEntity entity) { + if (entity instanceof PlayerEntity player) + updateSlots(player); + } + + private void updateSlots(PlayerEntity player) { + ScoutScreenHandler handler = (ScoutScreenHandler) player.playerScreenHandler; + + ItemStack satchelStack = ScoutUtil.findBagItem(player, BagType.SATCHEL, false); + DefaultedList satchelSlots = handler.scout$getSatchelSlots(); + + for (int i = 0; i < ScoutUtil.MAX_SATCHEL_SLOTS; i++) { + BagSlot slot = satchelSlots.get(i); + slot.setInventory(null); + slot.setEnabled(false); + } + if (!satchelStack.isEmpty()) { + BaseBagItem satchelItem = (BaseBagItem) satchelStack.getItem(); + Inventory satchelInv = satchelItem.getInventory(satchelStack); + + for (int i = 0; i < satchelItem.getSlotCount(); i++) { + BagSlot slot = satchelSlots.get(i); + slot.setInventory(satchelInv); + slot.setEnabled(true); + } + } + + ItemStack leftPouchStack = ScoutUtil.findBagItem(player, BagType.POUCH, false); + DefaultedList leftPouchSlots = handler.scout$getLeftPouchSlots(); + + for (int i = 0; i < ScoutUtil.MAX_POUCH_SLOTS; i++) { + BagSlot slot = leftPouchSlots.get(i); + slot.setInventory(null); + slot.setEnabled(false); + } + if (!leftPouchStack.isEmpty()) { + BaseBagItem leftPouchItem = (BaseBagItem) leftPouchStack.getItem(); + Inventory leftPouchInv = leftPouchItem.getInventory(leftPouchStack); + + for (int i = 0; i < leftPouchItem.getSlotCount(); i++) { + BagSlot slot = leftPouchSlots.get(i); + slot.setInventory(leftPouchInv); + slot.setEnabled(true); + } + } + + ItemStack rightPouchStack = ScoutUtil.findBagItem(player, BagType.POUCH, true); + DefaultedList rightPouchSlots = handler.scout$getRightPouchSlots(); + + for (int i = 0; i < ScoutUtil.MAX_POUCH_SLOTS; i++) { + BagSlot slot = rightPouchSlots.get(i); + slot.setInventory(null); + slot.setEnabled(false); + } + if (!rightPouchStack.isEmpty()) { + BaseBagItem rightPouchItem = (BaseBagItem) rightPouchStack.getItem(); + Inventory rightPouchInv = rightPouchItem.getInventory(rightPouchStack); + + for (int i = 0; i < rightPouchItem.getSlotCount(); i++) { + BagSlot slot = rightPouchSlots.get(i); + slot.setInventory(rightPouchInv); + slot.setEnabled(true); + } + } + + PacketByteBuf packet = new PacketByteBuf(Unpooled.buffer()); + if (player instanceof ServerPlayerEntity serverPlayer) { + ServerPlayNetworking.send(serverPlayer, ScoutNetworking.ENABLE_SLOTS, packet); + } + } + + @Override + public boolean canEquip(ItemStack stack, SlotReference slot, LivingEntity entity) { + Item item = stack.getItem(); + + ItemStack slotStack = slot.inventory().getStack(slot.index()); + Item slotItem = slotStack.getItem(); + + if (slotItem instanceof BaseBagItem) { + if (((BaseBagItem) item).getType() == BagType.SATCHEL) { + if (((BaseBagItem) slotItem).getType() == BagType.SATCHEL) { + return true; + } else { + return ScoutUtil.findBagItem((PlayerEntity) entity, BagType.SATCHEL, false).isEmpty(); + } + } else if (((BaseBagItem) item).getType() == BagType.POUCH) { + if (((BaseBagItem) slotItem).getType() == BagType.POUCH) { + return true; + } else { + return ScoutUtil.findBagItem((PlayerEntity) entity, BagType.POUCH, true).isEmpty(); + } + } + } else { + if (((BaseBagItem) item).getType() == BagType.SATCHEL) { + return ScoutUtil.findBagItem((PlayerEntity) entity, BagType.SATCHEL, false).isEmpty(); + } else if (((BaseBagItem) item).getType() == BagType.POUCH) { + return ScoutUtil.findBagItem((PlayerEntity) entity, BagType.POUCH, true).isEmpty(); + } + } + + return false; + } + + @Override + public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) { + var inv = getInventory(stack); + + for (int i = 0; i < inv.size(); i++) { + var invStack = inv.getStack(i); + invStack.inventoryTick(world, entity, i, false); + } + } + + public enum BagType { + SATCHEL, + POUCH + } +} diff --git a/src/main/java/pm/c7/scout/mixin/BowItemMixin.java b/src/main/java/pm/c7/scout/mixin/BowItemMixin.java new file mode 100644 index 0000000..49570bb --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/BowItemMixin.java @@ -0,0 +1,85 @@ +package pm.c7.scout.mixin; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BowItem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.config.ScoutConfigHandler; +import pm.c7.scout.item.BaseBagItem; + +@Mixin(BowItem.class) +public class BowItemMixin { + @Inject(method = "onStoppedUsing", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;playSound(Lnet/minecraft/entity/player/PlayerEntity;DDDLnet/minecraft/sound/SoundEvent;Lnet/minecraft/sound/SoundCategory;FF)V"), locals = LocalCapture.CAPTURE_FAILHARD) + public void scout$arrowsFromBags(ItemStack stack, World world, LivingEntity user, int remainingUseTicks, CallbackInfo ci, PlayerEntity playerEntity, boolean bl, ItemStack itemStack, int maxTime, float f) { + if ((boolean) ScoutConfigHandler.getConfigValue("useArrows").value()) { + boolean infinity = bl && itemStack.isOf(Items.ARROW); + boolean hasRan = false; + + if (!infinity && !playerEntity.getAbilities().creativeMode) { + var leftPouch = ScoutUtil.findBagItem(playerEntity, BaseBagItem.BagType.POUCH, false); + var rightPouch = ScoutUtil.findBagItem(playerEntity, BaseBagItem.BagType.POUCH, true); + var satchel = ScoutUtil.findBagItem(playerEntity, BaseBagItem.BagType.SATCHEL, false); + + if (!leftPouch.isEmpty()) { + BaseBagItem item = (BaseBagItem) leftPouch.getItem(); + var inv = item.getInventory(leftPouch); + + for(int i = 0; i < inv.size(); ++i) { + ItemStack invStack = inv.getStack(i); + if (ItemStack.areEqual(invStack, itemStack)) { + invStack.decrement(1); + if (invStack.isEmpty()) { + inv.setStack(i, ItemStack.EMPTY); + } + inv.markDirty(); + hasRan = true; + break; + } + } + } + if (!rightPouch.isEmpty() && !hasRan) { + BaseBagItem item = (BaseBagItem) rightPouch.getItem(); + var inv = item.getInventory(rightPouch); + + for(int i = 0; i < inv.size(); ++i) { + ItemStack invStack = inv.getStack(i); + if (ItemStack.areEqual(invStack, itemStack)) { + invStack.decrement(1); + if (invStack.isEmpty()) { + inv.setStack(i, ItemStack.EMPTY); + } + inv.markDirty(); + hasRan = true; + break; + } + } + } + if (!satchel.isEmpty() && !hasRan) { + BaseBagItem item = (BaseBagItem) satchel.getItem(); + var inv = item.getInventory(satchel); + + for(int i = 0; i < inv.size(); ++i) { + ItemStack invStack = inv.getStack(i); + if (ItemStack.areEqual(invStack, itemStack)) { + invStack.decrement(1); + if (invStack.isEmpty()) { + inv.setStack(i, ItemStack.EMPTY); + } + inv.markDirty(); + hasRan = true; + break; + } + } + } + } + } + } +} diff --git a/src/main/java/pm/c7/scout/mixin/ItemStackMixin.java b/src/main/java/pm/c7/scout/mixin/ItemStackMixin.java new file mode 100644 index 0000000..bb533ca --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/ItemStackMixin.java @@ -0,0 +1,23 @@ +package pm.c7.scout.mixin; + +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import pm.c7.scout.item.BaseBagItem; + +@Mixin(ItemStack.class) +public class ItemStackMixin { + + // Trinkets calls isItemEqual to check whether it should unequip old and equip new (https://github.com/emilyploszaj/trinkets/blob/37ee13d6/src/main/java/dev/emi/trinkets/mixin/LivingEntityMixin.java#L196-L199) + // Excluding ourselves from this check to force unequip/equip when switching bag items fixes a duplication bug (GH-12) + // Gross and hacky but oh well, can't mixin mixins. + @Inject(method = "isItemEqual", at = @At("HEAD"), cancellable = true) + private void scout$grossTrinketsEquipFix(ItemStack newStack, CallbackInfoReturnable callbackInfo) { + ItemStack self = (ItemStack) (Object) this; + if (self.getItem() instanceof BaseBagItem && newStack.getItem() instanceof BaseBagItem) { + callbackInfo.setReturnValue(false); + } + } +} diff --git a/src/main/java/pm/c7/scout/mixin/PlayerEntityMixin.java b/src/main/java/pm/c7/scout/mixin/PlayerEntityMixin.java new file mode 100644 index 0000000..900b2b2 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/PlayerEntityMixin.java @@ -0,0 +1,61 @@ +package pm.c7.scout.mixin; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.config.ScoutConfigHandler; +import pm.c7.scout.item.BaseBagItem; + +import java.util.function.Predicate; + +@Mixin(PlayerEntity.class) +public class PlayerEntityMixin { + @Inject(method = "getArrowType", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/item/RangedWeaponItem;getProjectiles()Ljava/util/function/Predicate;"), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true) + public void scout$arrowsFromBags(ItemStack stack, CallbackInfoReturnable cir, Predicate predicate, ItemStack itemStack) { + if ((boolean) ScoutConfigHandler.getConfigValue("useArrows").value()) { + var self = (PlayerEntity) (Object) this; + var leftPouch = ScoutUtil.findBagItem(self, BaseBagItem.BagType.POUCH, false); + var rightPouch = ScoutUtil.findBagItem(self, BaseBagItem.BagType.POUCH, true); + var satchel = ScoutUtil.findBagItem(self, BaseBagItem.BagType.SATCHEL, false); + + if (!leftPouch.isEmpty()) { + BaseBagItem item = (BaseBagItem) leftPouch.getItem(); + var inv = item.getInventory(leftPouch); + + for(int i = 0; i < inv.size(); ++i) { + ItemStack invStack = inv.getStack(i); + if (predicate.test(invStack)) { + cir.setReturnValue(invStack); + } + } + } + if (!rightPouch.isEmpty()) { + BaseBagItem item = (BaseBagItem) rightPouch.getItem(); + var inv = item.getInventory(rightPouch); + + for(int i = 0; i < inv.size(); ++i) { + ItemStack invStack = inv.getStack(i); + if (predicate.test(invStack)) { + cir.setReturnValue(invStack); + } + } + } + if (!satchel.isEmpty()) { + BaseBagItem item = (BaseBagItem) satchel.getItem(); + var inv = item.getInventory(satchel); + + for(int i = 0; i < inv.size(); ++i) { + ItemStack invStack = inv.getStack(i); + if (predicate.test(invStack)) { + cir.setReturnValue(invStack); + } + } + } + } + } +} diff --git a/src/main/java/pm/c7/scout/mixin/PlayerScreenHandlerMixin.java b/src/main/java/pm/c7/scout/mixin/PlayerScreenHandlerMixin.java new file mode 100644 index 0000000..2e65f38 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/PlayerScreenHandlerMixin.java @@ -0,0 +1,99 @@ +package pm.c7.scout.mixin; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.PlayerScreenHandler; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.util.collection.DefaultedList; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import pm.c7.scout.ScoutScreenHandler; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.screen.BagSlot; + +@Mixin(value = PlayerScreenHandler.class, priority = 950) +public abstract class PlayerScreenHandlerMixin extends ScreenHandler implements ScoutScreenHandler { + protected PlayerScreenHandlerMixin() { + super(null, 0); + } + + @Unique + public final DefaultedList scout$satchelSlots = DefaultedList.ofSize(ScoutUtil.MAX_SATCHEL_SLOTS); + @Unique + public final DefaultedList scout$leftPouchSlots = DefaultedList.ofSize(ScoutUtil.MAX_POUCH_SLOTS); + @Unique + public final DefaultedList scout$rightPouchSlots = DefaultedList.ofSize(ScoutUtil.MAX_POUCH_SLOTS); + + @Inject(method = "", at = @At("RETURN")) + private void scout$addSlots(PlayerInventory inventory, boolean onServer, PlayerEntity owner, CallbackInfo callbackInfo) { + // satchel + int x = 8; + int y = 168; + + for (int i = 0; i < ScoutUtil.MAX_SATCHEL_SLOTS; i++) { + if (i % 9 == 0) { + x = 8; + } + + BagSlot slot = new BagSlot(i, x, y); + slot.id = ScoutUtil.SATCHEL_SLOT_START - i; + scout$satchelSlots.add(slot); + + x += 18; + + if ((i + 1) % 9 == 0) { + y += 18; + } + } + + // left pouch + x = 8; + y = 66; + + for (int i = 0; i < ScoutUtil.MAX_POUCH_SLOTS; i++) { + if (i % 3 == 0) { + x -= 18; + y += 54; + } + + BagSlot slot = new BagSlot(i, x, y); + slot.id = ScoutUtil.LEFT_POUCH_SLOT_START - i; + scout$leftPouchSlots.add(slot); + + y -= 18; + } + + // right pouch + x = 152; + y = 66; + + for (int i = 0; i < ScoutUtil.MAX_POUCH_SLOTS; i++) { + if (i % 3 == 0) { + x += 18; + y += 54; + } + + BagSlot slot = new BagSlot(i, x, y); + slot.id = ScoutUtil.RIGHT_POUCH_SLOT_START - i; + scout$rightPouchSlots.add(slot); + + y -= 18; + } + } + + @Override + public final DefaultedList scout$getSatchelSlots() { + return scout$satchelSlots; + } + @Override + public final DefaultedList scout$getLeftPouchSlots() { + return scout$leftPouchSlots; + } + @Override + public final DefaultedList scout$getRightPouchSlots() { + return scout$rightPouchSlots; + } +} diff --git a/src/main/java/pm/c7/scout/mixin/ScreenHandlerMixin.java b/src/main/java/pm/c7/scout/mixin/ScreenHandlerMixin.java new file mode 100644 index 0000000..3411e88 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/ScreenHandlerMixin.java @@ -0,0 +1,68 @@ +package pm.c7.scout.mixin; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.minecraft.screen.slot.SlotActionType; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import pm.c7.scout.ScoutMixin.Transformer; +import pm.c7.scout.ScoutUtil; + +@Mixin(ScreenHandler.class) +@Transformer(ScreenHandlerTransformer.class) +public abstract class ScreenHandlerMixin { + @Inject(method = "getSlot", at = @At("HEAD"), cancellable = true) + public void scout$fixGetSlot(int index, CallbackInfoReturnable cir) { + var playerScreenHandler = ScoutUtil.getPlayerScreenHandler(); + if (ScoutUtil.isBagSlot(index)) { + if (playerScreenHandler != null) { + cir.setReturnValue(ScoutUtil.getBagSlot(index, playerScreenHandler)); + } else { + cir.setReturnValue(null); + } + } + } + + @Inject(method = "internalOnSlotClick", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/screen/ScreenHandler;getCursorStack()Lnet/minecraft/item/ItemStack;", ordinal = 11), locals = LocalCapture.CAPTURE_FAILEXCEPTION) + public void scout$fixDoubleClick(int slotIndex, int button, SlotActionType actionType, PlayerEntity player, CallbackInfo ci, PlayerInventory playerInventory, Slot slot3) { + var cursorStack = this.getCursorStack(); + if (!cursorStack.isEmpty() && (!slot3.hasStack() || !slot3.canTakeItems(player))) { + var slots = ScoutUtil.getAllBagSlots(player.playerScreenHandler); + var k = button == 0 ? 0 : ScoutUtil.TOTAL_SLOTS - 1; + var o = button == 0 ? 1 : -1; + + for (int n = 0; n < 2; ++n) { + for (int p = k; p >= 0 && p < slots.size() && cursorStack.getCount() < cursorStack.getMaxCount(); p += o) { + Slot slot4 = slots.get(p); + if (slot4.hasStack() && canInsertItemIntoSlot(slot4, cursorStack, true) && slot4.canTakeItems(player) && this.canInsertIntoSlot(cursorStack, slot4)) { + ItemStack itemStack6 = slot4.getStack(); + if (n != 0 || itemStack6.getCount() != itemStack6.getMaxCount()) { + ItemStack itemStack7 = slot4.takeStackRange(itemStack6.getCount(), cursorStack.getMaxCount() - cursorStack.getCount(), player); + cursorStack.increment(itemStack7.getCount()); + } + } + } + } + } + } + + @Shadow + public static boolean canInsertItemIntoSlot(@Nullable Slot slot, ItemStack stack, boolean allowOverflow) { + return false; + } + @Shadow + public boolean canInsertIntoSlot(ItemStack stack, Slot slot) { + return true; + } + @Shadow + public abstract ItemStack getCursorStack(); +} diff --git a/src/main/java/pm/c7/scout/mixin/ScreenHandlerTransformer.java b/src/main/java/pm/c7/scout/mixin/ScreenHandlerTransformer.java new file mode 100644 index 0000000..7cba273 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/ScreenHandlerTransformer.java @@ -0,0 +1,155 @@ +package pm.c7.scout.mixin; + +import org.objectweb.asm.tree.*; +import org.quiltmc.loader.api.QuiltLoader; +import pm.c7.scout.mixinsupport.ClassNodeTransformer; + +import static org.objectweb.asm.Opcodes.*; + +public class ScreenHandlerTransformer implements ClassNodeTransformer { + @Override + public void transform(String name, ClassNode node) { + var internalOnSlotClick = "m_nqfgpzfl"; + var insertItem = "m_jpjdgbxy"; + + var PlayerEntity = "net/minecraft/unmapped/C_jzrpycqo"; + var playerScreenHandler = "f_xvlfpipb"; + + var PlayerScreenHandler = "net/minecraft/unmapped/C_wgehrbdx"; + var Slot = "net/minecraft/unmapped/C_nhvqfffd"; + var DefaultedList = "net/minecraft/unmapped/C_rnrfftze"; + + if (QuiltLoader.isDevelopmentEnvironment()) { + internalOnSlotClick = "internalOnSlotClick"; + insertItem = "insertItem"; + + PlayerEntity = "net/minecraft/entity/player/PlayerEntity"; + playerScreenHandler = "playerScreenHandler"; + + PlayerScreenHandler = "net/minecraft/screen/PlayerScreenHandler"; + Slot = "net/minecraft/screen/slot/Slot"; + DefaultedList = "net/minecraft/util/collection/DefaultedList"; + } + + var LPlayerScreenHandler = L(PlayerScreenHandler); + var LSlot = L(Slot); + + for (var mn : node.methods) { + if (mn.name.equals(internalOnSlotClick)) { + for (var insn : mn.instructions) { + if (insn instanceof VarInsnNode vin) { + if (vin.getOpcode() == ILOAD && vin.var == 1) { + if (insn.getNext() instanceof JumpInsnNode nextInsn && nextInsn.getOpcode() == IFGE) { + var jumpTo = nextInsn.label; + mn.instructions.insert(nextInsn, insns( + ILOAD(1), + INVOKESTATIC("pm/c7/scout/ScoutUtil", "isBagSlot", "(I)Z"), + IFNE(jumpTo) + )); + } + } else if (vin.getOpcode() == ASTORE && (vin.var == 6 || vin.var == 7)) { + if (vin.getPrevious() instanceof TypeInsnNode prevInsn && prevInsn.getOpcode() == CHECKCAST && prevInsn.desc.equals(Slot)) { + if (prevInsn.getPrevious() instanceof MethodInsnNode prevPrevInsn && prevPrevInsn.getOpcode() == INVOKEVIRTUAL) { + if(prevPrevInsn.owner.equals(DefaultedList)) { + LabelNode LnotBag = new LabelNode(); + LabelNode Lend = new LabelNode(); + mn.instructions.insertBefore(prevPrevInsn.getPrevious().getPrevious().getPrevious(), insns( + ILOAD(1), + INVOKESTATIC("pm/c7/scout/ScoutUtil", "isBagSlot", "(I)Z"), + IFEQ(LnotBag), + ILOAD(1), + ALOAD(4), + GETFIELD(PlayerEntity, playerScreenHandler, LPlayerScreenHandler), + INVOKESTATIC("pm/c7/scout/ScoutUtil", "getBagSlot", "(I" + LPlayerScreenHandler + ")" + LSlot), + CHECKCAST(Slot), + ASTORE(vin.var), + GOTO(Lend), + LnotBag + )); + mn.instructions.insert(vin, insns( + Lend + )); + } + } + } + } + } + } + }/* else if (mn.name.equals(insertItem)) { + for (var insn : mn.instructions) { + if (insn instanceof VarInsnNode vin && vin.getOpcode() == ASTORE && vin.var == 7) { + if (vin.getPrevious() instanceof TypeInsnNode prevInsn && prevInsn.getOpcode() == CHECKCAST && prevInsn.desc.equals(Slot)) { + if (prevInsn.getPrevious() instanceof MethodInsnNode prevPrevInsn && prevPrevInsn.getOpcode() == INVOKEVIRTUAL) { + if(prevPrevInsn.owner.equals(DefaultedList)) { + LabelNode LnotBag = new LabelNode(); + LabelNode LpastSlot = new LabelNode(); + mn.instructions.insertBefore(prevPrevInsn.getPrevious().getPrevious().getPrevious(), insns( + INVOKESTATIC("pm/c7/scout/ScoutUtil", "getPlayerScreenHandler", "()" + LPlayerScreenHandler), + ASTORE(20), + ALOAD(20), + IFNULL(LpastSlot), + ILOAD(6), + INVOKESTATIC("pm/c7/scout/ScoutUtil", "isBagSlot", "(I)Z"), + IFEQ(LnotBag), + ILOAD(6), + ALOAD(20), + INVOKESTATIC("pm/c7/scout/ScoutUtil", "getBagSlot", "(I" + LPlayerScreenHandler + ")" + LSlot), + CHECKCAST(Slot), + ASTORE(vin.var), + LnotBag, + ILOAD(6), + INVOKESTATIC("pm/c7/scout/ScoutUtil", "isBagSlot", "(I)Z"), + IFNE(LpastSlot) + )); + mn.instructions.insert(vin, insns( + LpastSlot + )); + } + } + } + } + } + }*/ + } + } + + private String L(String clazz) { + return "L" + clazz + ";"; + } + + private InsnList insns(AbstractInsnNode... insns) { + var li = new InsnList(); + for (var i : insns) li.add(i); + return li; + } + private static VarInsnNode ILOAD(int var) { + return new VarInsnNode(ILOAD, var); + } + private static MethodInsnNode INVOKESTATIC(String owner, String name, String desc) { + return new MethodInsnNode(INVOKESTATIC, owner, name, desc); + } + private static JumpInsnNode IFNE(LabelNode var) { + return new JumpInsnNode(IFNE, var); + } + private static JumpInsnNode IFEQ(LabelNode var) { + return new JumpInsnNode(IFEQ, var); + } + private static VarInsnNode ALOAD(int var) { + return new VarInsnNode(ALOAD, var); + } + private static VarInsnNode ASTORE(int var) { + return new VarInsnNode(ASTORE, var); + } + private static FieldInsnNode GETFIELD(String owner, String name, String desc) { + return new FieldInsnNode(GETFIELD, owner, name, desc); + } + private static JumpInsnNode IFNULL(LabelNode var) { + return new JumpInsnNode(IFNULL, var); + } + private static TypeInsnNode CHECKCAST(String desc) { + return new TypeInsnNode(CHECKCAST, desc); + } + private static JumpInsnNode GOTO(LabelNode var) { + return new JumpInsnNode(GOTO, var); + } +} diff --git a/src/main/java/pm/c7/scout/mixin/ServerPlayerEntityMixin.java b/src/main/java/pm/c7/scout/mixin/ServerPlayerEntityMixin.java new file mode 100644 index 0000000..eec5513 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/ServerPlayerEntityMixin.java @@ -0,0 +1,94 @@ +package pm.c7.scout.mixin; + +import io.netty.buffer.Unpooled; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.world.GameRules; +import org.quiltmc.qsl.networking.api.ServerPlayNetworking; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import pm.c7.scout.ScoutNetworking; +import pm.c7.scout.ScoutScreenHandler; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.item.BaseBagItem; +import pm.c7.scout.item.BaseBagItem.BagType; +import pm.c7.scout.screen.BagSlot; + +@Mixin(ServerPlayerEntity.class) +public class ServerPlayerEntityMixin { + @Inject(method = "onDeath", at = @At("HEAD")) + private void scout$attemptFixGraveMods(DamageSource source, CallbackInfo callbackInfo) { + ServerPlayerEntity player = (ServerPlayerEntity) (Object) this; + ScoutScreenHandler handler = (ScoutScreenHandler) player.playerScreenHandler; + + if (!player.world.getGameRules().getBoolean(GameRules.KEEP_INVENTORY)) { + ItemStack backStack = ScoutUtil.findBagItem(player, BagType.SATCHEL, false); + if (!backStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) backStack.getItem(); + int slots = bagItem.getSlotCount(); + + DefaultedList bagSlots = handler.scout$getSatchelSlots(); + + for (int i = 0; i < slots; i++) { + BagSlot slot = bagSlots.get(i); + slot.setInventory(null); + slot.setEnabled(false); + } + + PacketByteBuf packet = new PacketByteBuf(Unpooled.buffer()); + packet.writeBoolean(false); + packet.writeInt(0); + packet.writeItemStack(backStack); + + ServerPlayNetworking.send(player, ScoutNetworking.ENABLE_SLOTS, packet); + } + + ItemStack leftPouchStack = ScoutUtil.findBagItem(player, BagType.POUCH, false); + if (!leftPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) leftPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + + DefaultedList bagSlots = handler.scout$getLeftPouchSlots(); + + for (int i = 0; i < slots; i++) { + BagSlot slot = bagSlots.get(i); + slot.setInventory(null); + slot.setEnabled(false); + } + + PacketByteBuf packet = new PacketByteBuf(Unpooled.buffer()); + packet.writeBoolean(false); + packet.writeInt(0); + packet.writeItemStack(leftPouchStack); + + ServerPlayNetworking.send(player, ScoutNetworking.ENABLE_SLOTS, packet); + } + + ItemStack rightPouchStack = ScoutUtil.findBagItem(player, BagType.POUCH, true); + if (!rightPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) rightPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + + DefaultedList bagSlots = handler.scout$getRightPouchSlots(); + + for (int i = 0; i < slots; i++) { + BagSlot slot = bagSlots.get(i); + slot.setInventory(null); + slot.setEnabled(false); + } + + PacketByteBuf packet = new PacketByteBuf(Unpooled.buffer()); + packet.writeBoolean(false); + packet.writeInt(1); + packet.writeItemStack(rightPouchStack); + + ServerPlayNetworking.send(player, ScoutNetworking.ENABLE_SLOTS, packet); + } + } + } +} diff --git a/src/main/java/pm/c7/scout/mixin/ShulkerBoxSlotMixin.java b/src/main/java/pm/c7/scout/mixin/ShulkerBoxSlotMixin.java new file mode 100644 index 0000000..5b8c750 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/ShulkerBoxSlotMixin.java @@ -0,0 +1,19 @@ +package pm.c7.scout.mixin; + +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.ShulkerBoxSlot; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import pm.c7.scout.item.BaseBagItem; + +@Mixin(ShulkerBoxSlot.class) +public class ShulkerBoxSlotMixin { + @Inject(method = "canInsert", at = @At("HEAD"), cancellable = true) + public void scout$noNBTOverflow(ItemStack stack, CallbackInfoReturnable cir) { + if (stack.getItem() instanceof BaseBagItem) { + cir.setReturnValue(false); + } + } +} diff --git a/src/main/java/pm/c7/scout/mixin/client/AbstractFurnaceScreenMixin.java b/src/main/java/pm/c7/scout/mixin/client/AbstractFurnaceScreenMixin.java new file mode 100644 index 0000000..b44b278 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/client/AbstractFurnaceScreenMixin.java @@ -0,0 +1,63 @@ +package pm.c7.scout.mixin.client; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.screen.ingame.AbstractFurnaceScreen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.AbstractFurnaceScreenHandler; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.item.BaseBagItem; + +@Environment(EnvType.CLIENT) +@Mixin(AbstractFurnaceScreen.class) +public abstract class AbstractFurnaceScreenMixin extends HandledScreen implements RecipeBookProvider { + public AbstractFurnaceScreenMixin() { + super(null, null, null); + } + + @Inject(method = "isClickOutsideBounds", at = @At("TAIL"), cancellable = true) + private void scout$adjustOutsideBounds(double mouseX, double mouseY, int left, int top, int button, CallbackInfoReturnable callbackInfo) { + if (this.client != null && this.client.player != null) { + ItemStack backStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.SATCHEL, false); + if (!backStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) backStack.getItem(); + int slots = bagItem.getSlotCount(); + int rows = (int) Math.ceil(slots / 9); + + if (mouseY < (top + this.backgroundHeight) + 8 + (18 * rows) && mouseY >= (top + this.backgroundHeight) && mouseX >= left && mouseY < (left + this.backgroundWidth)) { + callbackInfo.setReturnValue(false); + } + } + + ItemStack leftPouchStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.POUCH, false); + if (!leftPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) leftPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + if (mouseX >= left - (columns * 18) && mouseX < left && mouseY >= (top + this.backgroundHeight) - 90 && mouseY < (top + this.backgroundHeight) - 22) { + callbackInfo.setReturnValue(false); + } + } + + ItemStack rightPouchStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.POUCH, true); + if (!rightPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) rightPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + if (mouseX >= (left + this.backgroundWidth) && mouseX < (left + this.backgroundWidth) + (columns * 18) && mouseY >= (top + this.backgroundHeight) - 90 && mouseY < (top + this.backgroundHeight) - 22) { + callbackInfo.setReturnValue(false); + } + } + } + } +} diff --git a/src/main/java/pm/c7/scout/mixin/client/CraftingScreenMixin.java b/src/main/java/pm/c7/scout/mixin/client/CraftingScreenMixin.java new file mode 100644 index 0000000..cd121a4 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/client/CraftingScreenMixin.java @@ -0,0 +1,63 @@ +package pm.c7.scout.mixin.client; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.screen.ingame.CraftingScreen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.CraftingScreenHandler; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.item.BaseBagItem; + +@Environment(EnvType.CLIENT) +@Mixin(CraftingScreen.class) +public abstract class CraftingScreenMixin extends HandledScreen implements RecipeBookProvider { + public CraftingScreenMixin() { + super(null, null, null); + } + + @Inject(method = "isClickOutsideBounds", at = @At("TAIL"), cancellable = true) + private void scout$adjustOutsideBounds(double mouseX, double mouseY, int left, int top, int button, CallbackInfoReturnable callbackInfo) { + if (this.client != null && this.client.player != null) { + ItemStack backStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.SATCHEL, false); + if (!backStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) backStack.getItem(); + int slots = bagItem.getSlotCount(); + int rows = (int) Math.ceil(slots / 9); + + if (mouseY < (top + this.backgroundHeight) + 8 + (18 * rows) && mouseY >= (top + this.backgroundHeight) && mouseX >= left && mouseY < (left + this.backgroundWidth)) { + callbackInfo.setReturnValue(false); + } + } + + ItemStack leftPouchStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.POUCH, false); + if (!leftPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) leftPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + if (mouseX >= left - (columns * 18) && mouseX < left && mouseY >= (top + this.backgroundHeight) - 90 && mouseY < (top + this.backgroundHeight) - 22) { + callbackInfo.setReturnValue(false); + } + } + + ItemStack rightPouchStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.POUCH, true); + if (!rightPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) rightPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + if (mouseX >= (left + this.backgroundWidth) && mouseX < (left + this.backgroundWidth) + (columns * 18) && mouseY >= (top + this.backgroundHeight) - 90 && mouseY < (top + this.backgroundHeight) - 22) { + callbackInfo.setReturnValue(false); + } + } + } + } +} diff --git a/src/main/java/pm/c7/scout/mixin/client/HandledScreenAccessor.java b/src/main/java/pm/c7/scout/mixin/client/HandledScreenAccessor.java new file mode 100644 index 0000000..b2f4ead --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/client/HandledScreenAccessor.java @@ -0,0 +1,20 @@ +package pm.c7.scout.mixin.client; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Environment(EnvType.CLIENT) +@Mixin(HandledScreen.class) +public interface HandledScreenAccessor { + @Accessor("x") + int getX(); + @Accessor("y") + int getY(); + @Accessor("backgroundWidth") + int getBackgroundWidth(); + @Accessor("backgroundHeight") + int getBackgroundHeight(); +} diff --git a/src/main/java/pm/c7/scout/mixin/client/HandledScreenMixin.java b/src/main/java/pm/c7/scout/mixin/client/HandledScreenMixin.java new file mode 100644 index 0000000..45d9181 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/client/HandledScreenMixin.java @@ -0,0 +1,328 @@ +package pm.c7.scout.mixin.client; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.GenericContainerScreen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; +import net.minecraft.client.gui.screen.ingame.ShulkerBoxScreen; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.slot.Slot; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import pm.c7.scout.ScoutMixin; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.item.BaseBagItem; +import pm.c7.scout.screen.BagSlot; + +@Environment(EnvType.CLIENT) +@ScoutMixin.Transformer(HandledScreenTransformer.class) +@Mixin(value = HandledScreen.class, priority = 950) +public abstract class HandledScreenMixin extends Screen implements ScreenHandlerProvider { + protected HandledScreenMixin() { + super(null); + } + + @Shadow + @Nullable + protected Slot focusedSlot; + @Shadow + protected int x; + @Shadow + protected int y; + @Shadow + protected int backgroundWidth; + @Shadow + protected int backgroundHeight; + + @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawBackground(Lnet/minecraft/client/util/math/MatrixStack;FII)V")) + private void scout$drawSatchelRow(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { + if (this.client != null && this.client.player != null && !ScoutUtil.isScreenBlacklisted(this)) { + ItemStack backStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.SATCHEL, false); + if (!backStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) backStack.getItem(); + int slots = bagItem.getSlotCount(); + + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, ScoutUtil.SLOT_TEXTURE); + RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + + int x = this.x; + int y = this.y + this.backgroundHeight - 3; + + if ((Object) this instanceof GenericContainerScreen || (Object) this instanceof ShulkerBoxScreen) { + y -= 1; + } + + this.drawTexture(matrices, x, y, 0, 32, 176, 4); + y += 4; + + int u = 0; + int v = 36; + + for (int slot = 0; slot < slots; slot++) { + if (slot % 9 == 0) { + x = this.x; + u = 0; + this.drawTexture(matrices, x, y, u, v, 7, 18); + x += 7; + u += 7; + } + + this.drawTexture(matrices, x, y, u, v, 18, 18); + + x += 18; + u += 18; + + if ((slot + 1) % 9 == 0) { + this.drawTexture(matrices, x, y, u, v, 7, 18); + y += 18; + } + } + + x = this.x; + this.drawTexture(matrices, x, y, 0, 54, 176, 7); + } + } + } + + @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;disableDepthTest()V")) + private void scout$drawPouchSlots(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { + if (this.client != null && this.client.player != null && !ScoutUtil.isScreenBlacklisted(this)) { + ItemStack leftPouchStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.POUCH, false); + if (!leftPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) leftPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + int x = this.x; + int y = (this.y + this.backgroundHeight) - 29; + + if ((Object) this instanceof GenericContainerScreen || (Object) this instanceof ShulkerBoxScreen) { + y -= 1; + } + + RenderSystem.setShaderTexture(0, ScoutUtil.SLOT_TEXTURE); + RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + + this.drawTexture(matrices, x, y, 18, 25, 7, 7); + for (int i = 0; i < columns; i++) { + x -= 11; + this.drawTexture(matrices, x, y, 7, 25, 11, 7); + } + if (columns > 1) { + for (int i = 0; i < columns - 1; i++) { + x -= 7; + this.drawTexture(matrices, x, y, 7, 25, 7, 7); + } + } + x -= 7; + this.drawTexture(matrices, x, y, 0, 25, 7, 7); + + x = this.x + 7; + y -= 54; + for (int slot = 0; slot < slots; slot++) { + if (slot % 3 == 0) { + x -= 18; + y += 54; + } + y -= 18; + this.drawTexture(matrices, x, y, 7, 7, 18, 18); + } + + x -= 7; + y += 54; + for (int i = 0; i < 3; i++) { + y -= 18; + this.drawTexture(matrices, x, y, 0, 7, 7, 18); + } + + x = this.x; + y -= 7; + this.drawTexture(matrices, x, y, 18, 0, 7, 7); + for (int i = 0; i < columns; i++) { + x -= 11; + this.drawTexture(matrices, x, y, 7, 0, 11, 7); + } + if (columns > 1) { + for (int i = 0; i < columns - 1; i++) { + x -= 7; + this.drawTexture(matrices, x, y, 7, 0, 7, 7); + } + } + x -= 7; + this.drawTexture(matrices, x, y, 0, 0, 7, 7); + + RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + } + + ItemStack rightPouchStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.POUCH, true); + if (!rightPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) rightPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + int x = this.x + this.backgroundWidth - 7; + int y = (this.y + this.backgroundHeight) - 29; + + if ((Object) this instanceof GenericContainerScreen || (Object) this instanceof ShulkerBoxScreen) { + y -= 1; + } + + RenderSystem.setShaderTexture(0, ScoutUtil.SLOT_TEXTURE); + RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + + this.drawTexture(matrices, x, y, 25, 25, 7, 7); + x += 7; + for (int i = 0; i < columns; i++) { + this.drawTexture(matrices, x, y, 7, 25, 11, 7); + x += 11; + } + if (columns > 1) { + for (int i = 0; i < columns - 1; i++) { + this.drawTexture(matrices, x, y, 7, 25, 7, 7); + x += 7; + } + } + this.drawTexture(matrices, x, y, 32, 25, 7, 7); + + x = this.x + this.backgroundWidth - 25; + y -= 54; + for (int slot = 0; slot < slots; slot++) { + if (slot % 3 == 0) { + x += 18; + y += 54; + } + y -= 18; + this.drawTexture(matrices, x, y, 7, 7, 18, 18); + } + + x += 18; + y += 54; + for (int i = 0; i < 3; i++) { + y -= 18; + this.drawTexture(matrices, x, y, 32, 7, 7, 18); + } + + x = this.x + this.backgroundWidth - 7; + y -= 7; + this.drawTexture(matrices, x, y, 25, 0, 7, 7); + x += 7; + for (int i = 0; i < columns; i++) { + this.drawTexture(matrices, x, y, 7, 0, 11, 7); + x += 11; + } + if (columns > 1) { + for (int i = 0; i < columns - 1; i++) { + this.drawTexture(matrices, x, y, 7, 0, 7, 7); + x += 7; + } + } + this.drawTexture(matrices, x, y, 32, 0, 7, 7); + + RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); + } + } + } + + @Inject(method = "isClickOutsideBounds", at = @At("TAIL"), cancellable = true) + private void scout$adjustOutsideBounds(double mouseX, double mouseY, int left, int top, int button, CallbackInfoReturnable callbackInfo) { + if (this.client != null && this.client.player != null && !ScoutUtil.isScreenBlacklisted(this)) { + ItemStack backStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.SATCHEL, false); + if (!backStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) backStack.getItem(); + int slots = bagItem.getSlotCount(); + int rows = (int) Math.ceil(slots / 9); + + if (mouseY < (top + this.backgroundHeight) + 8 + (18 * rows) && mouseY >= (top + this.backgroundHeight) && mouseX >= left && mouseY < (left + this.backgroundWidth)) { + callbackInfo.setReturnValue(false); + } + } + + ItemStack leftPouchStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.POUCH, false); + if (!leftPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) leftPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + if (mouseX >= left - (columns * 18) && mouseX < left && mouseY >= (top + this.backgroundHeight) - 90 && mouseY < (top + this.backgroundHeight) - 22) { + callbackInfo.setReturnValue(false); + } + } + + ItemStack rightPouchStack = ScoutUtil.findBagItem(this.client.player, BaseBagItem.BagType.POUCH, true); + if (!rightPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) rightPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + if (mouseX >= (left + this.backgroundWidth) && mouseX < (left + this.backgroundWidth) + (columns * 18) && mouseY >= (top + this.backgroundHeight) - 90 && mouseY < (top + this.backgroundHeight) - 22) { + callbackInfo.setReturnValue(false); + } + } + } + } + + @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawForeground(Lnet/minecraft/client/util/math/MatrixStack;II)V")) + public void scout$drawOurSlots(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { + if (this.client != null && this.client.player != null && !ScoutUtil.isScreenBlacklisted(this)) { + for (int i = ScoutUtil.SATCHEL_SLOT_START; i > ScoutUtil.BAG_SLOTS_END; i--) { + BagSlot slot = (BagSlot) ScoutUtil.getBagSlot(i, this.client.player.playerScreenHandler); + if (slot != null && slot.isEnabled()) { + RenderSystem.setShader(GameRenderer::getPositionTexShader); + this.drawSlot(matrices, slot); + } + + if (this.isPointOverSlot(slot, mouseX, mouseY) && slot != null && slot.isEnabled()) { + this.focusedSlot = slot; + int slotX = slot.getX(); + int slotY = slot.getY(); + drawSlotHighlight(matrices, slotX, slotY, this.getZOffset()); + } + } + } + } + + @Inject(method = "isPointOverSlot", at = @At("HEAD"), cancellable = true) + public void scout$fixSlotPos(Slot slot, double pointX, double pointY, CallbackInfoReturnable cir) { + if (slot instanceof BagSlot bagSlot) { + cir.setReturnValue(this.isPointWithinBounds(bagSlot.getX(), bagSlot.getY(), 16, 16, pointX, pointY)); + } + } + + @Inject(method = "getSlotAt", at = @At("RETURN"), cancellable = true) + public void scout$addSlots(double x, double y, CallbackInfoReturnable cir) { + if (this.client != null && this.client.player != null && !ScoutUtil.isScreenBlacklisted(this)) { + for (int i = ScoutUtil.SATCHEL_SLOT_START; i > ScoutUtil.BAG_SLOTS_END; i--) { + BagSlot slot = (BagSlot) ScoutUtil.getBagSlot(i, this.client.player.playerScreenHandler); + if (this.isPointOverSlot(slot, x, y) && slot != null && slot.isEnabled()) { + cir.setReturnValue(slot); + } + } + } + } + + @Shadow + private void drawSlot(MatrixStack matrices, Slot slot) {} + @Shadow + public static void drawSlotHighlight(MatrixStack matrices, int x, int y, int z) {} + @Shadow + private boolean isPointOverSlot(Slot slot, double pointX, double pointY) { + return false; + } + @Shadow + protected boolean isPointWithinBounds(int x, int y, int width, int height, double pointX, double pointY) { + return false; + } +} diff --git a/src/main/java/pm/c7/scout/mixin/client/HandledScreenTransformer.java b/src/main/java/pm/c7/scout/mixin/client/HandledScreenTransformer.java new file mode 100644 index 0000000..67b1a12 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/client/HandledScreenTransformer.java @@ -0,0 +1,84 @@ +package pm.c7.scout.mixin.client; + +import org.objectweb.asm.tree.*; +import org.quiltmc.loader.api.QuiltLoader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import pm.c7.scout.mixinsupport.ClassNodeTransformer; + +import static org.objectweb.asm.Opcodes.*; + +public class HandledScreenTransformer implements ClassNodeTransformer { + private static Logger LOGGER = LoggerFactory.getLogger("Scout:HandledScreenTransformer"); + @Override + public void transform(String name, ClassNode node) { + var drawSlot = "m_zioswvnu"; + var Slot = "net/minecraft/unmapped/C_nhvqfffd"; + var y = "f_tttqoodj"; + + if (QuiltLoader.isDevelopmentEnvironment()) { + drawSlot = "drawSlot"; + Slot = "net/minecraft/screen/slot/Slot"; + y = "y"; + } + + for (var mn : node.methods) { + if (mn.name.equals(drawSlot)) { + for (var insn : mn.instructions) { + if (insn instanceof FieldInsnNode fin) { + if (fin.getOpcode() == GETFIELD) { + if(fin.owner.equals(Slot) && fin.name.equals(y)) { + if (fin.getNext() instanceof VarInsnNode vin && vin.getOpcode() == ISTORE) { + LabelNode LnotBag = new LabelNode(); + int SAFE_REGISTER = 20; + mn.instructions.insert(vin, insns( + ALOAD(2), + INSTANCEOF("pm/c7/scout/screen/BagSlot"), + IFEQ(LnotBag), + ALOAD(2), + CHECKCAST("pm/c7/scout/screen/BagSlot"), + ASTORE(SAFE_REGISTER), + ALOAD(SAFE_REGISTER), + INVOKEVIRTUAL("pm/c7/scout/screen/BagSlot", "getX", "()I"), + ISTORE(vin.var - 1), + ALOAD(SAFE_REGISTER), + INVOKEVIRTUAL("pm/c7/scout/screen/BagSlot", "getY", "()I"), + ISTORE(vin.var), + LnotBag + )); + } + } + } + } + } + } + } + } + + private InsnList insns(AbstractInsnNode... insns) { + var li = new InsnList(); + for (var i : insns) li.add(i); + return li; + } + private static JumpInsnNode IFEQ(LabelNode var) { + return new JumpInsnNode(IFEQ, var); + } + private static VarInsnNode ALOAD(int var) { + return new VarInsnNode(ALOAD, var); + } + private static VarInsnNode ASTORE(int var) { + return new VarInsnNode(ASTORE, var); + } + private static TypeInsnNode INSTANCEOF(String desc) { + return new TypeInsnNode(INSTANCEOF, desc); + } + private static TypeInsnNode CHECKCAST(String desc) { + return new TypeInsnNode(CHECKCAST, desc); + } + private static MethodInsnNode INVOKEVIRTUAL(String owner, String name, String desc) { + return new MethodInsnNode(INVOKEVIRTUAL, owner, name, desc); + } + private static VarInsnNode ISTORE(int var) { + return new VarInsnNode(ISTORE, var); + } +} diff --git a/src/main/java/pm/c7/scout/mixin/client/InventoryScreenMixin.java b/src/main/java/pm/c7/scout/mixin/client/InventoryScreenMixin.java new file mode 100644 index 0000000..1520905 --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/client/InventoryScreenMixin.java @@ -0,0 +1,66 @@ +package pm.c7.scout.mixin.client; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen; +import net.minecraft.client.gui.screen.ingame.InventoryScreen; +import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.PlayerScreenHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.item.BaseBagItem; +import pm.c7.scout.item.BaseBagItem.BagType; + +@Environment(EnvType.CLIENT) +@Mixin(InventoryScreen.class) +public abstract class InventoryScreenMixin extends AbstractInventoryScreen implements RecipeBookProvider { + private InventoryScreenMixin() { + super(null, null, null); + } + + @Inject(method = "isClickOutsideBounds", at = @At("TAIL"), cancellable = true) + private void scout$adjustOutsideBounds(double mouseX, double mouseY, int left, int top, int button, CallbackInfoReturnable callbackInfo) { + if (this.client != null && this.client.player != null) { + ItemStack backStack = ScoutUtil.findBagItem(this.client.player, BagType.SATCHEL, false); + if (!backStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) backStack.getItem(); + int slots = bagItem.getSlotCount(); + int rows = (int) Math.ceil(slots / 9); + + if (mouseY < (top + this.backgroundHeight) + 8 + (18 * rows) && mouseY >= (top + this.backgroundHeight) && mouseX >= left && mouseY < (left + this.backgroundWidth)) { + callbackInfo.setReturnValue(false); + } + } + + ItemStack leftPouchStack = ScoutUtil.findBagItem(this.client.player, BagType.POUCH, false); + if (!leftPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) leftPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + if (mouseX >= left - (columns * 18) && mouseX < left && mouseY >= (top + this.backgroundHeight) - 90 && mouseY < (top + this.backgroundHeight) - 22) { + callbackInfo.setReturnValue(false); + } + } + + ItemStack rightPouchStack = ScoutUtil.findBagItem(this.client.player, BagType.POUCH, true); + if (!rightPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) rightPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + int columns = (int) Math.ceil(slots / 3); + + if (mouseX >= (left + this.backgroundWidth) && mouseX < (left + this.backgroundWidth) + (columns * 18) && mouseY >= (top + this.backgroundHeight) - 90 && mouseY < (top + this.backgroundHeight) - 22) { + callbackInfo.setReturnValue(false); + } + } + } + } +} diff --git a/src/main/java/pm/c7/scout/mixin/client/RecipeBookWidgetMixin.java b/src/main/java/pm/c7/scout/mixin/client/RecipeBookWidgetMixin.java new file mode 100644 index 0000000..9e2543b --- /dev/null +++ b/src/main/java/pm/c7/scout/mixin/client/RecipeBookWidgetMixin.java @@ -0,0 +1,54 @@ +package pm.c7.scout.mixin.client; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.item.BaseBagItem; +import pm.c7.scout.item.BaseBagItem.BagType; + +// Lower priority to take priority over Better Recipe Book +@Environment(EnvType.CLIENT) +@Mixin(value = RecipeBookWidget.class, priority = 950) +public class RecipeBookWidgetMixin { + @Shadow + protected MinecraftClient client; + @Shadow + private int leftOffset; + + @Inject(method = "findLeftEdge", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true) + private void scout$modifyRecipeBookPosition(int width, int backgroundWidth, CallbackInfoReturnable callbackInfo, int x) { + if (this.client != null && this.client.player != null && this.isOpen()) { + ItemStack leftPouchStack = ScoutUtil.findBagItem(this.client.player, BagType.POUCH, false); + if (!leftPouchStack.isEmpty()) { + BaseBagItem bagItem = (BaseBagItem) leftPouchStack.getItem(); + int slots = bagItem.getSlotCount(); + + int columns = (int) Math.ceil(slots / 3); + + // Realign as best we can when "Keep crafting screens centered" is enabled in Better Recipe Book + if (this.leftOffset != 86) { + int diff = this.leftOffset - 86; + x -= diff; + } + + x += 18 * columns; + + callbackInfo.setReturnValue(x); + } + } + } + + @Shadow + public boolean isOpen() { + return false; + } +} diff --git a/src/main/java/pm/c7/scout/mixinsupport/ClassNodeTransformer.java b/src/main/java/pm/c7/scout/mixinsupport/ClassNodeTransformer.java new file mode 100644 index 0000000..94f351c --- /dev/null +++ b/src/main/java/pm/c7/scout/mixinsupport/ClassNodeTransformer.java @@ -0,0 +1,8 @@ +package pm.c7.scout.mixinsupport; + +import org.objectweb.asm.tree.ClassNode; + +public interface ClassNodeTransformer { + void transform(String name, ClassNode node); +} + diff --git a/src/main/java/pm/c7/scout/registry/ScoutItems.java b/src/main/java/pm/c7/scout/registry/ScoutItems.java new file mode 100644 index 0000000..497b7c0 --- /dev/null +++ b/src/main/java/pm/c7/scout/registry/ScoutItems.java @@ -0,0 +1,22 @@ +package pm.c7.scout.registry; + +import net.minecraft.item.Item; +import net.minecraft.util.Rarity; +import net.minecraft.util.registry.Registry; +import org.quiltmc.qsl.item.setting.api.QuiltItemSettings; +import pm.c7.scout.Scout; +import pm.c7.scout.ScoutUtil; +import pm.c7.scout.item.BaseBagItem; + +public class ScoutItems { + public static final Item TANNED_LEATHER = new Item(new QuiltItemSettings().group(Scout.ITEM_GROUP)); + public static final Item SATCHEL_STRAP = new Item(new QuiltItemSettings().group(Scout.ITEM_GROUP)); + public static final BaseBagItem SATCHEL = new BaseBagItem(new QuiltItemSettings().group(Scout.ITEM_GROUP).maxCount(1), ScoutUtil.MAX_SATCHEL_SLOTS / 2, BaseBagItem.BagType.SATCHEL); + public static final BaseBagItem UPGRADED_SATCHEL = new BaseBagItem(new QuiltItemSettings().group(Scout.ITEM_GROUP).maxCount(1).rarity(Rarity.RARE), ScoutUtil.MAX_SATCHEL_SLOTS, BaseBagItem.BagType.SATCHEL); + public static final BaseBagItem POUCH = new BaseBagItem(new QuiltItemSettings().group(Scout.ITEM_GROUP).maxCount(1), ScoutUtil.MAX_POUCH_SLOTS / 2, BaseBagItem.BagType.POUCH); + public static final BaseBagItem UPGRADED_POUCH = new BaseBagItem(new QuiltItemSettings().group(Scout.ITEM_GROUP).maxCount(1).rarity(Rarity.RARE), ScoutUtil.MAX_POUCH_SLOTS, BaseBagItem.BagType.POUCH); + + public static void init() { + Scout.AUTOREGISTRY.autoRegister(Registry.ITEM, ScoutItems.class, Item.class); + } +} diff --git a/src/main/java/pm/c7/scout/screen/BagSlot.java b/src/main/java/pm/c7/scout/screen/BagSlot.java new file mode 100644 index 0000000..35fbc4f --- /dev/null +++ b/src/main/java/pm/c7/scout/screen/BagSlot.java @@ -0,0 +1,107 @@ +package pm.c7.scout.screen; + +import net.minecraft.block.ShulkerBoxBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; +import pm.c7.scout.config.ScoutConfigHandler; +import pm.c7.scout.item.BaseBagItem; + +public class BagSlot extends Slot { + private final int index; + public Inventory inventory; + private boolean enabled = false; + private int realX; + private int realY; + + public BagSlot(int index, int x, int y) { + super(null, index, x, y); + this.index = index; + this.realX = x; + this.realY = y; + } + + public void setInventory(Inventory inventory) { + this.inventory = inventory; + } + + public void setEnabled(boolean state) { + enabled = state; + } + + @Override + public boolean canInsert(ItemStack stack) { + if (stack.getItem() instanceof BaseBagItem) + return false; + + if (stack.getItem() instanceof BlockItem blockItem) { + if (blockItem.getBlock() instanceof ShulkerBoxBlock) + return (boolean) ScoutConfigHandler.getConfigValue("allowShulkers").value(); + } + + return enabled && inventory != null; + } + + @Override + public boolean canTakeItems(PlayerEntity playerEntity) { + return enabled && inventory != null; + } + + @Override + public boolean isEnabled() { + return enabled && inventory != null; + } + + @Override + public ItemStack getStack() { + return enabled && this.inventory != null ? this.inventory.getStack(this.index) : ItemStack.EMPTY; + } + + @Override + public void setStack(ItemStack stack) { + if (enabled && this.inventory != null) { + this.inventory.setStack(this.index, stack); + this.markDirty(); + } + } + + @Override + public void m_tfmituvd(ItemStack stack) { + if (enabled && this.inventory != null) { + this.inventory.setStack(this.index, stack); + this.markDirty(); + } + } + + @Override + public void markDirty() { + if (enabled && this.inventory != null) { + this.inventory.markDirty(); + } + } + + @Override + public ItemStack takeStack(int amount) { + return enabled && this.inventory != null ? this.inventory.removeStack(this.index, amount) : ItemStack.EMPTY; + } + + @Override + public int getMaxItemCount() { + return enabled && this.inventory != null ? this.inventory.getMaxCountPerStack() : 0; + } + + public int getX() { + return this.realX; + } + public int getY() { + return this.realY; + } + public void setX(int x) { + this.realX = x; + } + public void setY(int y) { + this.realY = y; + } +} diff --git a/src/main/resources/assets/emi/recipe/defaults/scout.json b/src/main/resources/assets/emi/recipe/defaults/scout.json new file mode 100644 index 0000000..bbfa28f --- /dev/null +++ b/src/main/resources/assets/emi/recipe/defaults/scout.json @@ -0,0 +1,10 @@ +{ + "recipes": [ + "scout:tanned_leather", + "scout:pouch", + "scout:satchel_strap", + "scout:upgraded_pouch", + "scout:upgraded_satchel", + "scout:satchel" + ] +} diff --git a/src/main/resources/assets/scout/icon.png b/src/main/resources/assets/scout/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..05d813e51bbe87ae72629e166dd9a734abe7e67e GIT binary patch literal 678 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-3{2LZE{-7;ac}Q#^kNPaaJZPUHf-4j45Ee%7R(LCaAI{G+qrW;r!RLm z+*GMB5;c$~+ zW`1YrykvXe=0``LyYJ>bH!Rh*eV)FD3CZPPKZwpZ%(lN@Usou4IW0~uFKN|b+lGIp z$SyNx*zu+3=C7asuJ4^Z!|ZcOy>zhbO-uXT^Ao;p>{&Uxnjtimp@5Ac9ZrPT@?ZG1 z@1M`x-~aA1XIwxF1ERSLfQJ0vw|*haKX5ngc$9vA^Z)$$Gv(eLH}Sc7pMA!g_eZX* z{rdU8Qb<4u++H>bCSdju8Wb6cRR69xZ{$ps0nDuUFxzIge+G6l@ L^>bP0l+XkKXEGDq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/scout/lang/en_us.json b/src/main/resources/assets/scout/lang/en_us.json new file mode 100644 index 0000000..c57fc21 --- /dev/null +++ b/src/main/resources/assets/scout/lang/en_us.json @@ -0,0 +1,14 @@ +{ + "lib39:enable_enhanced_lang": true, + "itemGroup.scout.itemgroup": "Scout", + "item.scout": { + "tanned_leather": "Tanned Leather", + "satchel_strap": "Satchel Strap", + "satchel": "Satchel", + "upgraded_satchel": "Upgraded Satchel", + "pouch": "Pouch", + "upgraded_pouch": "Upgraded Pouch" + }, + "trinkets.slot.legs.pouch": "Pouch", + "tooltip.scout.slots": "Holds {} items" +} diff --git a/src/main/resources/assets/scout/models/item/pouch.json b/src/main/resources/assets/scout/models/item/pouch.json new file mode 100644 index 0000000..8c391e8 --- /dev/null +++ b/src/main/resources/assets/scout/models/item/pouch.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "scout:item/pouch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scout/models/item/satchel.json b/src/main/resources/assets/scout/models/item/satchel.json new file mode 100644 index 0000000..023d355 --- /dev/null +++ b/src/main/resources/assets/scout/models/item/satchel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "scout:item/satchel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scout/models/item/satchel_strap.json b/src/main/resources/assets/scout/models/item/satchel_strap.json new file mode 100644 index 0000000..2fa02eb --- /dev/null +++ b/src/main/resources/assets/scout/models/item/satchel_strap.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "scout:item/satchel_strap" + } +} diff --git a/src/main/resources/assets/scout/models/item/tanned_leather.json b/src/main/resources/assets/scout/models/item/tanned_leather.json new file mode 100644 index 0000000..2342e52 --- /dev/null +++ b/src/main/resources/assets/scout/models/item/tanned_leather.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "scout:item/tanned_leather" + } +} diff --git a/src/main/resources/assets/scout/models/item/upgraded_pouch.json b/src/main/resources/assets/scout/models/item/upgraded_pouch.json new file mode 100644 index 0000000..4ca8833 --- /dev/null +++ b/src/main/resources/assets/scout/models/item/upgraded_pouch.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "scout:item/upgraded_pouch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scout/models/item/upgraded_satchel.json b/src/main/resources/assets/scout/models/item/upgraded_satchel.json new file mode 100644 index 0000000..6f83f6f --- /dev/null +++ b/src/main/resources/assets/scout/models/item/upgraded_satchel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "scout:item/upgraded_satchel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/scout/textures/entity/satchel.png b/src/main/resources/assets/scout/textures/entity/satchel.png new file mode 100644 index 0000000000000000000000000000000000000000..a6ffdbd7f6193e5c5c2ce7abec356c7e71696fe9 GIT binary patch literal 279 zcmV+y0qFjTP)5Jf+Z1qG=v1%*W#xd5$Pz&ki&>w!Fgcklw%T)>LL!h%VKg|_7$H17J@SsMGaM*6fTro~y3T7AR zAUIP#J)p@zCb$xusZTR5mcE0T;3`iO^M1WOOdUs|es&~WVfGf#OLzMtF6R?~CWLoc z0|3@BGjr`;QC7WodJBkE1OSjynp!Wi>%N|Q(SQt0!R&v*{|V?syLw*}_%$Rz0<#Mc d1VIo4@dg`VIf;_-#ZUkM002ovPDHLkV1h8hY2^R_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/scout/textures/entity/upgraded_satchel.png b/src/main/resources/assets/scout/textures/entity/upgraded_satchel.png new file mode 100644 index 0000000000000000000000000000000000000000..ff8516822c3f0f5b0f20e6d029fc1428b3344e65 GIT binary patch literal 5449 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 V=YG2YZ=fp}JYD@<);T3K0RUOBNLK&= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/scout/textures/gui/slots.png b/src/main/resources/assets/scout/textures/gui/slots.png new file mode 100644 index 0000000000000000000000000000000000000000..211e5e9d138b872972351c0823a02fd412716183 GIT binary patch literal 1400 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&eBK4*bPWHAE+-$4*&+%YlxEdv89ucwP+NJZS+ySDktt`h78?feeRR$MCU zETmdmN;)1rnWDgGTIT5N=$(4>#EsX-!QJ0-+x771Gk)J-dfT6 zO=~u!Ki&8I?)5ki-@jk4b=mJcld$u>WdHG%neQ7ObS(|v%+2`W=z9LuamMTSf4_Ms z{M4cYn_0h{n{GetE&F|YjoUY?=J=?EuAiB=efNhOT}gHdDcYi)@_+wKaJo^U!gEw#1fSBKy6*lEC#I&Af zI}j?s@MdqUpi^C_wTX9%IEj;>!<4GZ0>*mFJ@c$yZ`f~8t*jhXK8_k#)dai z2VO4!zUtnuytw)`pMU}vNcA5V&pUqn_|@=PhJN!3KRr8tx^92` zy-Pc*>$og&Rz{?V85HU{nepw w!GGS)sAt-{_RzY3KftnQ(1Qc#UYGo1tI|1Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TMYX&9;D6m_6n!#!LMJNwHU}lDB`_IULFaQ~ZYKZ?w z$51ISU}Au9|Nr^RzzA{*G5{%VcF~3M5TJI?WiY+^#!H~R5O6Hs61xjP;Qhx>a17II zD#FiTCo71sk(m*<0Wfgm?N>1Er6dBTkpUwRVl@C{<6+$pxMmpG^6)jop~vsxUikO# zKdJ!>+?2pHC=4Dye$24#-WxE+1z4DvPz~7n=qoq?LH>^VaFU_OR359-Vc-wLKm1_; z@&d>OAVXe%`VAFD0)L1IM0|jm4ap1pBJ`mw;=%vF$X@u*3{E6z8_zP7AGnPY16Z98 z1fb|(fiQtl0;OTmgq&cue0>e3L2`S;^%;PH&)^8mH@|-W#!SkjfMf9%42(x(Eg1f@ zGBGgz{s(pvFmf6G|NFzh3e0i8|Fbgu{reM?Vt@h024w#MN;5M6r5RX2Ig*)?0RV(M VyJL`{BklkI002ovPDHLkV1jTt$gThY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/scout/textures/item/satchel.png b/src/main/resources/assets/scout/textures/item/satchel.png new file mode 100644 index 0000000000000000000000000000000000000000..a9ac5f788315df499cbf7012198f6f20a4dfd50f GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!P}lLjv*HQ$qPgboH9ic7HRyFKgH5){5}5g z)q_ta91URDl_tQ@dC(xF!!dA*_?cq{talk=%o=%i{QqUF+@<1CylAb|6n4hX{P&qI zzhHZ4`rzH_^8tb!6@R`NAO33|e;{Xqqrq7PJK=~a9tq3!IJZk`wHPowE1xjA@+|W~ zi4KspC>YE@HQM`vSn~&Xk}(HXx_kBayEp4hlgR+yDaW! TsuNxVy~*I|>gTe~DWM4f5kYkz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/scout/textures/item/satchel_strap.png b/src/main/resources/assets/scout/textures/item/satchel_strap.png new file mode 100644 index 0000000000000000000000000000000000000000..191b0b179ecd91daf5fd3ce98ebea181e65fb75e GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!7xu3#}Etu1#Qw*n2k(ZrEaqL$c-Z9L kMMgJ?fG7Ev7@3(FLN9A*nSYJS0ouUe>FVdQ&MBb@09yw>jsO4v literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/scout/textures/item/tanned_leather.png b/src/main/resources/assets/scout/textures/item/tanned_leather.png new file mode 100644 index 0000000000000000000000000000000000000000..2ec25e9d6a8e53fd65d7a13455cc073508e9ba91 GIT binary patch literal 377 zcmV-<0fzpGP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0S-w-K~y+TrIJZ& z!cY)^rwd4F0|BGZfMCc$dJlLLf4Wz}dry)=AqN)_VyOj1`5u{&NrGVg;AP%2Yi8tL z9tznYiF)T^>sX}gR^9Sa4Nzns1#dF_2xYm-Wxia=-|Ug_9xHm9qsWE(S^U?{B33rRHjil?mv@;n1N<^(P`^=oocE3(mF%GCJ-R#{S zWun5M>p92S?#D!jMg~B{aojIX*J*V?L?Ei7cXe7F+=6jH7dp>RCbIs0R_MP<)bq@M zH8P-fO}8p{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/scout/textures/item/upgraded_pouch.png b/src/main/resources/assets/scout/textures/item/upgraded_pouch.png new file mode 100644 index 0000000000000000000000000000000000000000..7551bc8c3d388e835c71c3d6a7d0db1492b3ee37 GIT binary patch literal 473 zcmV;~0Ve*5P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TMYX&9;D6m_6n!#!LMJNwHU}lDB`_IV0zz8x48H8$x zqY5B_)i+)OwIIOJI7?ImK$@FfbfG*C`}>D#fx3?VUrU^X(?^6)jop~vsRUikO# zKf-_oZc1Pp76zU-?l5e-_Xf<_~~ z!eIc@4D$c$Prsp}Q1FMyK*R-@*_bFZ;Q!x$s0j%kzd(?vD+OgSfV}{Ue-J>9g%gR^ z2m|(n8!@=7JO^fj0J34o0Hk?uxITmP%8Lw#V$3k}0x95FyafZ}(O3(H|Ex?5jK6{Y z0g19OG5r7chk+HC<9`2VW%&E|Cn&`L1B?yG{sWX|W&lbvuz+$TGa~~4M?1VPNSH{j P00000NkvXXu0mjfD)PZV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/scout/textures/item/upgraded_satchel.png b/src/main/resources/assets/scout/textures/item/upgraded_satchel.png new file mode 100644 index 0000000000000000000000000000000000000000..9f9f70e15d4a8e58184d2b6f3549956b0837ee39 GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!5f|~jv*HQ$qPgboH9ic7HRyFKh@G~{5?K7 zw3~55CL7}f3m)gz0}Mw)VrE^;4HtR(xBmav^bHbijGf!E0_2#^*w=8Ma*|*(W?9Wx z9$(wmwV>&EzP<6C`p>Lq>V7|EXFkE8X3+1Fuw0KbRk4!s?*F9pzJ|;^etrX9W(DyE zo{0Kyb~jjc6dZHv-tQ}9_vv<+%fqa2R$=`Ch8wIcfB2XT{vYPC`22wPXJP}-i+qMn z{~a0RxEHiAF7g#|IZ%_sAi~zAWK;0J`AC3}5XS+YL+lB&Rx(IPFf@KjoBhT!^AgaH N44$rjF6*2UngDx~Z@2&e literal 0 HcmV?d00001 diff --git a/src/main/resources/data/c/tags/items/leather.json b/src/main/resources/data/c/tags/items/leather.json new file mode 100644 index 0000000..8247c9a --- /dev/null +++ b/src/main/resources/data/c/tags/items/leather.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:leather" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/items/string.json b/src/main/resources/data/c/tags/items/string.json new file mode 100644 index 0000000..90efbd8 --- /dev/null +++ b/src/main/resources/data/c/tags/items/string.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:string" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/scout/recipes/pouch.json b/src/main/resources/data/scout/recipes/pouch.json new file mode 100644 index 0000000..b40e078 --- /dev/null +++ b/src/main/resources/data/scout/recipes/pouch.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "lib39:discovered_via": "minecraft:leather", + "pattern": ["sls", "lbl", "sls"], + "key": { + "l": { + "tag": "c:leather" + }, + "s": { + "tag": "c:string" + }, + "b": { + "item": "minecraft:stone_button" + } + }, + "result": { + "item": "scout:pouch" + } +} diff --git a/src/main/resources/data/scout/recipes/satchel.json b/src/main/resources/data/scout/recipes/satchel.json new file mode 100644 index 0000000..62708e8 --- /dev/null +++ b/src/main/resources/data/scout/recipes/satchel.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "lib39:discovered_via": "scout:satchel_strap", + "pattern": ["SlS", "lbl", "sls"], + "key": { + "l": { + "item": "scout:tanned_leather" + }, + "s": { + "tag": "c:string" + }, + "b": { + "item": "minecraft:stone_button" + }, + "S": { + "item": "scout:satchel_strap" + } + }, + "result": { + "item": "scout:satchel" + } +} diff --git a/src/main/resources/data/scout/recipes/satchel_strap.json b/src/main/resources/data/scout/recipes/satchel_strap.json new file mode 100644 index 0000000..55f4684 --- /dev/null +++ b/src/main/resources/data/scout/recipes/satchel_strap.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "lib39:discovered_via": "scout:tanned_leather", + "ingredients": [ + { + "item": "scout:tanned_leather" + }, + { + "tag": "c:string" + }, + { + "item": "scout:tanned_leather" + } + ], + "result": { + "item": "scout:satchel_strap" + } +} diff --git a/src/main/resources/data/scout/recipes/tanned_leather.json b/src/main/resources/data/scout/recipes/tanned_leather.json new file mode 100644 index 0000000..c5d0bbf --- /dev/null +++ b/src/main/resources/data/scout/recipes/tanned_leather.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:campfire_cooking", + "lib39:discovered_via": "minecraft:leather", + "ingredient": { + "tag": "c:leather" + }, + "result": "scout:tanned_leather", + "experience": 0, + "cookingtime": 600 +} diff --git a/src/main/resources/data/scout/recipes/upgraded_pouch.json b/src/main/resources/data/scout/recipes/upgraded_pouch.json new file mode 100644 index 0000000..dad036e --- /dev/null +++ b/src/main/resources/data/scout/recipes/upgraded_pouch.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:smithing", + "lib39:discovered_via": "minecraft:diamond", + "base": { + "item": "scout:pouch" + }, + "addition": { + "item": "minecraft:diamond" + }, + "result": { + "item": "scout:upgraded_pouch" + } +} diff --git a/src/main/resources/data/scout/recipes/upgraded_satchel.json b/src/main/resources/data/scout/recipes/upgraded_satchel.json new file mode 100644 index 0000000..1fdd1f9 --- /dev/null +++ b/src/main/resources/data/scout/recipes/upgraded_satchel.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:smithing", + "lib39:discovered_via": "minecraft:diamond", + "base": { + "item": "scout:satchel" + }, + "addition": { + "item": "minecraft:diamond" + }, + "result": { + "item": "scout:upgraded_satchel" + } +} diff --git a/src/main/resources/data/trinkets/entities/scout.json b/src/main/resources/data/trinkets/entities/scout.json new file mode 100644 index 0000000..9cefa69 --- /dev/null +++ b/src/main/resources/data/trinkets/entities/scout.json @@ -0,0 +1,7 @@ +{ + "entities": ["player"], + "slots": [ + "chest/back", + "legs/pouch" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/trinkets/slots/legs/pouch.json b/src/main/resources/data/trinkets/slots/legs/pouch.json new file mode 100644 index 0000000..916aa05 --- /dev/null +++ b/src/main/resources/data/trinkets/slots/legs/pouch.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "amount": 2, + "icon": "scout:gui/pouch_slot" +} \ No newline at end of file diff --git a/src/main/resources/data/trinkets/tags/items/chest/back.json b/src/main/resources/data/trinkets/tags/items/chest/back.json new file mode 100644 index 0000000..43aa8d1 --- /dev/null +++ b/src/main/resources/data/trinkets/tags/items/chest/back.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "scout:satchel", + "scout:upgraded_satchel" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/trinkets/tags/items/legs/pouch.json b/src/main/resources/data/trinkets/tags/items/legs/pouch.json new file mode 100644 index 0000000..7e0791c --- /dev/null +++ b/src/main/resources/data/trinkets/tags/items/legs/pouch.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "scout:pouch", + "scout:upgraded_pouch" + ] +} \ No newline at end of file diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json new file mode 100644 index 0000000..4f8b66c --- /dev/null +++ b/src/main/resources/quilt.mod.json @@ -0,0 +1,91 @@ +{ + "schema_version": 1, + "quilt_loader": { + "group": "pm.c7.scout", + "id": "scout", + "version": "${version}", + "metadata": { + "name": "Scout", + "description": "A mod focused on \"physically\" extending the inventory (adding slots) through wearing various types of bags.", + "contributors": { + "Cynosphere": "Owner, Developer", + "Kat": "Original pouch texture", + "makamys": "Original idea" + }, + "contact": { + "sources": "https://gitdab.com/Cynosphere-mc/Scout" + }, + "icon": "assets/scout/icon.png" + }, + "intermediate_mappings": "net.fabricmc:intermediary", + "entrypoints": { + "init": "pm.c7.scout.Scout", + "client_init": "pm.c7.scout.client.ScoutClient", + "emi": "pm.c7.scout.client.compat.ScoutEmiPlugin" + }, + "depends": [ + { + "id": "quilt_loader", + "versions": ">=0.17.0-" + }, + { + "id": "quilted_fabric_api", + "versions": ">=4.0.0-" + }, + { + "id": "minecraft", + "versions": ">=${minecraft_version}" + }, + { + "id": "trinkets", + "versions": ">=${trinkets_version}" + }, + { + "id": "lib39-core", + "versions": ">=${lib39_version}" + }, + { + "id": "lib39-dessicant", + "versions": ">=${lib39_version}" + }, + { + "id": "emi", + "versions": ">=${emi_version}", + "optional": true + } + ], + "breaks": [ + { + "id": "roughlyenoughitems", + "versions": "*", + "reason": "API constantly rewritten for no reason, arrogant mod author, features stolen from EMI." + }, + { + "id": "inventoryprofilesnext", + "versions": "*", + "reason": "Crashes with no intent to fix on their end." + }, + { + "id": "infinitory", + "versions": "*", + "reason": "Infinite/Incompatible inventory mod." + }, + { + "id": "biginv", + "versions": "*", + "reason": "Infinite/Incompatible inventory mod." + }, + { + "id": "extrainv", + "versions": "*", + "reason": "Infinite/Incompatible inventory mod." + }, + { + "id": "inventory_backpack", + "versions": "*", + "reason": "Infinite/Incompatible inventory mod." + } + ] + }, + "mixin": "scout.mixins.json" +} diff --git a/src/main/resources/scout.mixins.json b/src/main/resources/scout.mixins.json new file mode 100644 index 0000000..ab9d864 --- /dev/null +++ b/src/main/resources/scout.mixins.json @@ -0,0 +1,10 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "pm.c7.scout.mixin", + "compatibilityLevel": "JAVA_17", + "plugin": "pm.c7.scout.ScoutMixin", + "injectors": { + "defaultRequire": 1 + } +}