From 15bd4ea79ff9043f2570e9d4cb7189b5780f3858 Mon Sep 17 00:00:00 2001 From: Patbox <39821509+Patbox@users.noreply.github.com> Date: Mon, 30 Sep 2024 12:20:39 +0200 Subject: [PATCH] Initial commit --- .github/FUNDING.yml | 1 + .github/workflows/build.yml | 40 +++ .github/workflows/release.yml | 36 +++ .gitignore | 40 +++ LICENSE | 165 ++++++++++++ README.md | 9 + build.gradle | 126 +++++++++ gradle.properties | 17 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 ++++++++++++++++++ gradlew.bat | 92 +++++++ settings.gradle | 10 + .../extdrawpatch/impl/BaseFactoryBlock.java | 17 ++ .../impl/ExtendedDrawersPolymerPatch.java | 34 +++ .../impl/model/BaseDrawerModel.java | 230 ++++++++++++++++ .../impl/model/CompactingDrawerModel.java | 57 ++++ .../extdrawpatch/impl/model/DrawerModel.java | 47 ++++ .../impl/model/ShadowDrawerModel.java | 37 +++ .../impl/model/SimpleBlockModel.java | 17 ++ .../impl/ui/CapacityLimiterGui.java | 109 ++++++++ .../mixin/mod/ExtendedDrawersMixin.java | 19 ++ .../mod/block/AccessPointBlockMixin.java | 27 ++ .../mod/block/CompactingDrawerBlockMixin.java | 28 ++ .../mixin/mod/block/ConnectorBlockMixin.java | 27 ++ .../mixin/mod/block/DrawerBlockMixin.java | 28 ++ .../mixin/mod/block/ModBlocksMixin.java | 15 ++ .../mod/block/ShadowDrawerBlockMixin.java | 27 ++ .../be/CompactingDrawerBlockEntityMixin.java | 58 ++++ .../mod/block/be/DrawerBlockEntityMixin.java | 53 ++++ .../be/ShadowDrawerBlockEntityMixin.java | 51 ++++ .../mod/item/CopyLimiterRecipeMixin.java | 9 + .../mixin/mod/item/DrawerItemMixin.java | 46 ++++ .../mixin/mod/item/LimiterItemMixin.java | 39 +++ .../mixin/mod/item/ModItemsMixin.java | 26 ++ .../mixin/mod/item/UpgradeItemMixin.java | 20 ++ .../assets/extdraw-patch/font/gui.json | 22 ++ .../resources/assets/extdraw-patch/icon.png | Bin 0 -> 2697 bytes .../extdraw-patch/models/sgui/button_32.json | 10 + .../extdraw-patch/models/sgui/close.json | 6 + .../extdraw-patch/models/sgui/done.json | 6 + .../models/sgui/done_blocked.json | 6 + .../extdraw-patch/models/sgui/empty.json | 6 + .../textures/sgui/elements/base.png | Bin 0 -> 4513 bytes .../textures/sgui/elements/base_blocked.png | Bin 0 -> 4346 bytes .../textures/sgui/elements/close.png | Bin 0 -> 4878 bytes .../textures/sgui/elements/done.png | Bin 0 -> 4880 bytes .../textures/sgui/elements/done_blocked.png | Bin 0 -> 4798 bytes .../textures/sgui/elements/empty.png | Bin 0 -> 4559 bytes .../extdraw-patch/textures/sgui/limiter.png | Bin 0 -> 5240 bytes .../assets/minecraft/atlases/blocks.json | 9 + ...extended-drawers-polymer-patch.mixins.json | 25 ++ src/main/resources/fabric.mod.json | 32 +++ 53 files changed, 1935 insertions(+) create mode 100644 .github/FUNDING.yml create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/release.yml create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md create mode 100644 build.gradle create mode 100644 gradle.properties 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/eu/pb4/extdrawpatch/impl/BaseFactoryBlock.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/impl/ExtendedDrawersPolymerPatch.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/impl/model/BaseDrawerModel.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/impl/model/CompactingDrawerModel.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/impl/model/DrawerModel.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/impl/model/ShadowDrawerModel.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/impl/model/SimpleBlockModel.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/impl/ui/CapacityLimiterGui.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/ExtendedDrawersMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/AccessPointBlockMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/CompactingDrawerBlockMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ConnectorBlockMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/DrawerBlockMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ModBlocksMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ShadowDrawerBlockMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/CompactingDrawerBlockEntityMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/DrawerBlockEntityMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/ShadowDrawerBlockEntityMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/CopyLimiterRecipeMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/DrawerItemMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/LimiterItemMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/ModItemsMixin.java create mode 100644 src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/UpgradeItemMixin.java create mode 100644 src/main/resources/assets/extdraw-patch/font/gui.json create mode 100644 src/main/resources/assets/extdraw-patch/icon.png create mode 100644 src/main/resources/assets/extdraw-patch/models/sgui/button_32.json create mode 100644 src/main/resources/assets/extdraw-patch/models/sgui/close.json create mode 100644 src/main/resources/assets/extdraw-patch/models/sgui/done.json create mode 100644 src/main/resources/assets/extdraw-patch/models/sgui/done_blocked.json create mode 100644 src/main/resources/assets/extdraw-patch/models/sgui/empty.json create mode 100644 src/main/resources/assets/extdraw-patch/textures/sgui/elements/base.png create mode 100644 src/main/resources/assets/extdraw-patch/textures/sgui/elements/base_blocked.png create mode 100644 src/main/resources/assets/extdraw-patch/textures/sgui/elements/close.png create mode 100644 src/main/resources/assets/extdraw-patch/textures/sgui/elements/done.png create mode 100644 src/main/resources/assets/extdraw-patch/textures/sgui/elements/done_blocked.png create mode 100644 src/main/resources/assets/extdraw-patch/textures/sgui/elements/empty.png create mode 100644 src/main/resources/assets/extdraw-patch/textures/sgui/limiter.png create mode 100644 src/main/resources/assets/minecraft/atlases/blocks.json create mode 100644 src/main/resources/extended-drawers-polymer-patch.mixins.json create mode 100644 src/main/resources/fabric.mod.json diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..b86584a --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +ko_fi: Patbox diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..aa35820 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,40 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: + pull_request: + push: + paths-ignore: [ '.github/', 'docs/', 'mkdocs.yml' ] + +jobs: + build: + strategy: + matrix: + # Use these Java versions + java: [ + 21 # Latest version + ] + # and run on both Linux and Windows + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + steps: + - name: checkout repository + uses: actions/checkout@v2 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: make gradle wrapper executable + if: ${{ runner.os != 'Windows' }} + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from LTS java on one OS + uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..4009354 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,36 @@ +name: Release + +on: + release: + types: + - published + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/loom-cache + ~/.gradle/caches + ~/.gradle/wrapper + key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + gradle- + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: 21 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build and publish with Gradle + run: ./gradlew build publish + env: + MODRINTH: ${{ secrets.MODRINTH }} + CHANGELOG: ${{ github.event.release.body }} + RELEASE: true \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..153d416 --- /dev/null +++ b/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..73ae388 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# Polymer Patch for Extended Drawers +This is a patch for [Extended Drawers by MattiDragon](https://modrinth.com/mod/extended-drawers), +making it work fully server side, without all of its functionality intact. + +Extended Drawers is required and not included within this mod. + +This mod requires server resource pack, about which setup you can read here: https://polymer.pb4.eu/latest/user/resource-pack-hosting/ + +[You can read more about [Extended Drawers on it's Modrinth page!](https://modrinth.com/mod/extended-drawers) diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e10e286 --- /dev/null +++ b/build.gradle @@ -0,0 +1,126 @@ +plugins { + id 'fabric-loom' version '1.7.+' + id 'maven-publish' + id "com.modrinth.minotaur" version "2.+" +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. + maven { url "https://api.modrinth.com/maven/" } + maven { url 'https://maven.nucleoid.xyz' } + maven { url "https://kneelawk.com/maven/" } + maven { url "https://maven.isxander.dev/releases" } + maven { url "https://jitpack.io" } + + repositories { + maven { + url "https://maven.theepicblock.nl" + content { includeGroup("nl.theepicblock") } + } + } +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + modImplementation "maven.modrinth:extended-drawers:3.0.4+mc.1.21.1" + modImplementation "com.kneelawk.graphlib:graphlib-core-fabric:2.0.0+1.21" + modImplementation "com.github.mattidragon:ConfigToolkit:1.1.1" + modImplementation "dev.isxander:yet-another-config-lib:3.5.0+1.21-fabric" + + modImplementation include('eu.pb4:factorytools:0.3.2+1.21') + modImplementation include('eu.pb4:sgui:1.6.1+1.21.1') + modImplementation 'eu.pb4:polymer-core:0.9.16+1.21.1' + modImplementation 'eu.pb4:polymer-resource-pack:0.9.16+1.21.1' + modImplementation 'eu.pb4:polymer-autohost:0.9.16+1.21.1' + modImplementation 'eu.pb4:polymer-virtual-entity:0.9.16+1.21.1' + + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. + + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 21 +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} + +if (System.getenv("MODRINTH")) { + modrinth { + token = System.getenv("MODRINTH") + projectId = 'TIgnE8wT'// The ID of your modrinth project, slugs will not work. + versionNumber = "" + version // The version of the mod to upload. + versionType = "beta" + uploadFile = remapJar // This links to a task that builds your mod jar and sets "uploadFile" to the mod jar. + gameVersions = [((String) project.minecraft_version)] + changelog = System.getenv("CHANGELOG") + loaders = ["fabric"/*, "quilt"*/] + + dependencies { + required.project "extended-drawers" + required.project "polymer" + } + } + + remapJar { + finalizedBy project.tasks.modrinth + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5f178f4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.21.1 +yarn_mappings=1.21.1+build.1 +loader_version=0.15.11 + +# Mod Properties +mod_version=3.0.4.0+1.21.1 +maven_group=eu.pb4 +archives_base_name=extended-drawers-polymer-patch + +# Dependencies +fabric_version=0.100.1+1.21 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a441313 --- /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.8-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..75c4d72 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/eu/pb4/extdrawpatch/impl/BaseFactoryBlock.java b/src/main/java/eu/pb4/extdrawpatch/impl/BaseFactoryBlock.java new file mode 100644 index 0000000..c101840 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/impl/BaseFactoryBlock.java @@ -0,0 +1,17 @@ +package eu.pb4.extdrawpatch.impl; + +import eu.pb4.factorytools.api.block.FactoryBlock; +import eu.pb4.polymer.virtualentity.api.ElementHolder; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import org.jetbrains.annotations.Nullable; + +public interface BaseFactoryBlock extends FactoryBlock { + + @Override + default BlockState getPolymerBlockState(BlockState state) { + return Blocks.BARRIER.getDefaultState(); + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/impl/ExtendedDrawersPolymerPatch.java b/src/main/java/eu/pb4/extdrawpatch/impl/ExtendedDrawersPolymerPatch.java new file mode 100644 index 0000000..0e371d2 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/impl/ExtendedDrawersPolymerPatch.java @@ -0,0 +1,34 @@ +package eu.pb4.extdrawpatch.impl; + +import eu.pb4.extdrawpatch.impl.ui.CapacityLimiterGui; +import eu.pb4.polymer.core.api.block.PolymerBlockUtils; +import eu.pb4.polymer.core.api.other.PolymerComponent; +import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; +import eu.pb4.polymer.rsm.api.RegistrySyncUtils; +import io.github.mattidragon.extendeddrawers.ExtendedDrawers; +import io.github.mattidragon.extendeddrawers.registry.ModBlocks; +import io.github.mattidragon.extendeddrawers.registry.ModDataComponents; +import io.github.mattidragon.extendeddrawers.registry.ModRecipes; +import net.fabricmc.api.ModInitializer; +import net.minecraft.registry.Registries; +import net.minecraft.server.MinecraftServer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ExtendedDrawersPolymerPatch implements ModInitializer { + public static final String MOD_ID = "extended-drawers-polymer-patch"; + public static final Logger LOGGER = LoggerFactory.getLogger("extended-drawers-polymer-patch"); + @Override + public void onInitialize() { + PolymerResourcePackUtils.addModAssets("extended_drawers"); + PolymerResourcePackUtils.addModAssets(MOD_ID); + + CapacityLimiterGui.register(); + + PolymerComponent.registerDataComponent(ModDataComponents.COMPACTING_DRAWER_CONTENTS, ModDataComponents.DRAWER_CONTENTS, ModDataComponents.LIMITER_LIMIT); + PolymerBlockUtils.registerBlockEntity(ModBlocks.COMPACTING_DRAWER_BLOCK_ENTITY, ModBlocks.DRAWER_BLOCK_ENTITY, ModBlocks.SHADOW_DRAWER_BLOCK_ENTITY); + RegistrySyncUtils.setServerEntry(Registries.RECIPE_SERIALIZER, ModRecipes.COPY_LIMITER_SERIALIZER); + + ExtendedDrawers.SHIFT_ACCESS = () -> true; + } +} \ No newline at end of file diff --git a/src/main/java/eu/pb4/extdrawpatch/impl/model/BaseDrawerModel.java b/src/main/java/eu/pb4/extdrawpatch/impl/model/BaseDrawerModel.java new file mode 100644 index 0000000..b8c37bc --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/impl/model/BaseDrawerModel.java @@ -0,0 +1,230 @@ +package eu.pb4.extdrawpatch.impl.model; + +import eu.pb4.factorytools.api.virtualentity.BlockModel; +import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil; +import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; +import eu.pb4.polymer.virtualentity.api.attachment.HolderAttachment; +import eu.pb4.polymer.virtualentity.api.elements.ItemDisplayElement; +import eu.pb4.polymer.virtualentity.api.elements.TextDisplayElement; +import io.github.mattidragon.extendeddrawers.ExtendedDrawers; +import io.github.mattidragon.extendeddrawers.config.category.ClientCategory; +import io.github.mattidragon.extendeddrawers.storage.DrawerStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.minecraft.block.BlockState; +import net.minecraft.block.enums.BlockFace; +import net.minecraft.client.render.model.json.ModelTransformationMode; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.registry.Registries; +import net.minecraft.state.property.DirectionProperty; +import net.minecraft.state.property.EnumProperty; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec2f; +import org.joml.Matrix4f; +import org.joml.Vector2f; +import org.joml.Vector3f; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class BaseDrawerModel extends BlockModel { + private final ItemDisplayElement main; + private final DirectionProperty property; + private final EnumProperty blockFace; + + public BaseDrawerModel(BlockState state, DirectionProperty directionProperty, EnumProperty blockFaceProperty) { + this.property = directionProperty; + this.blockFace = blockFaceProperty; + this.main = ItemDisplayElementUtil.createSimple(state.getBlock().asItem()); + this.main.setScale(new Vector3f(2)); + this.addElement(this.main); + } + + @Override + public void notifyUpdate(HolderAttachment.UpdateType updateType) { + super.notifyUpdate(updateType); + if (updateType == BlockAwareAttachment.BLOCK_STATE_UPDATE) { + updateState(blockState()); + } + } + + protected void updateState(BlockState state) { + var yaw = state.get(this.property).asRotation(); + var pitch = switch (state.get(this.blockFace)) { + case FLOOR -> -90; + case CEILING -> 90; + case WALL -> 0; + }; + + this.setRotation(pitch, yaw); + if (this.getAttachment() != null) { + this.tick(); + } + } + + protected void setRotation(float pitch, float yaw) { + this.main.setYaw(yaw); + this.main.setPitch(pitch); + } + + + public record DrawerIcon(boolean isSmall, Vec2f offset, Vector2f rot, ItemDisplayElement mainItem, List topIcons, TextDisplayElement count) { + private static final Map ICONS = new HashMap<>(); + + public static DrawerIcon create(BaseDrawerModel model, boolean isSmall, Vec2f offset, Matrix4f mat) { + var icon = new DrawerIcon(isSmall, offset, new Vector2f(), ItemDisplayElementUtil.createSimple(), new ArrayList<>(), + new TextDisplayElement(Text.literal("0"))); + var conf = ExtendedDrawers.CONFIG.get().client().layout(); + + icon.mainItem.setViewRange(0.4f); + icon.mainItem.setModelTransformation(ModelTransformationMode.GUI); + icon.count.setViewRange(0.4f); + icon.count.setBackground(0); + icon.count.setInvisible(true); + mat.identity(); + mat.translate(offset.x, offset.y, 0.51f); + mat.scale(conf.textScale(isSmall)); + mat.translate(0, -conf.textOffset() / 2, 0); + mat.scale(0.5f); + icon.count.setTransformation(mat); + mat.identity(); + mat.translate(offset.x, offset.y, 0.505f); + mat.rotateY(MathHelper.PI); + mat.scale(conf.itemScale(isSmall)); + mat.scale(0.5f, 0.5f, 0.008f); + icon.mainItem.setTransformation(mat); + + model.addElement(icon.mainItem); + model.addElement(icon.count); + + return icon; + } + + public void updateSettingsPos(BaseDrawerModel model, List icons, Matrix4f mat) { + if (icons.isEmpty() && this.topIcons.isEmpty()) { + return; + } + + var reposition = false; + while (this.topIcons.size() > icons.size()) { + reposition = true; + model.removeElement(this.topIcons.removeLast()); + } + + while (this.topIcons.size() < icons.size()) { + reposition = true; + var e = ItemDisplayElementUtil.createSimple(); + e.setModelTransformation(ModelTransformationMode.GUI); + e.setViewRange(0.4f); + e.setPitch(this.rot.x); + e.setYaw(this.rot.y); + model.addElement(e); + this.topIcons.add(e); + } + + for (int i = 0; i < icons.size(); i++) { + this.topIcons.get(i).setItem(icons.get(i)); + } + + if (reposition) { + var conf = ExtendedDrawers.CONFIG.get().client().layout(); + + var size = this.topIcons.size(); + mat.identity(); + mat.translate(offset.x, offset.y, 0.505f); + mat.rotateY(MathHelper.PI); + mat.scale(conf.textScale(isSmall)); + mat.translate(0, 0.40f, 0); + mat.scale(0.15f, 0.15f, 0.01f); + mat.translate(size / 2f - 0.5f, 0, 0); + + for (var e : this.topIcons) { + e.setTransformation(mat); + mat.translate(-1, 0, 0); + } + } + } + + public void setRotation(float pitch, float yaw) { + this.mainItem.setPitch(pitch); + this.mainItem.setYaw(yaw); + this.count.setPitch(pitch); + this.count.setYaw(yaw); + this.rot.set(pitch, yaw); + for (var e : this.topIcons) { + e.setPitch(pitch); + e.setYaw(yaw); + } + } + + public void updateStorage(BaseDrawerModel model, ItemVariant resource, long amount, DrawerStorage storage, Matrix4f mat) { + if (storage.isHidden()) { + update(model, resource.toStack(), "", List.of(), mat); + return; + } + + ClientCategory.IconGroup config = ExtendedDrawers.CONFIG.get().client().icons(); + + var icons = new ArrayList(); + + if (storage.isLocked()) { + addIcon(icons, config.lockedIcon()); + } + + if (storage.isVoiding()) { + addIcon(icons, config.voidingIcon()); + } + + if (storage.isHidden()) { + addIcon(icons, config.hiddenIcon()); + } + + if (storage.isDuping()) { + addIcon(icons, config.dupingIcon()); + } + + if (storage.getUpgrade() != null) { + addIcon(icons, storage.getUpgrade().sprite); + } + + if (storage.hasLimiter()) { + addIcon(icons, ExtendedDrawers.id("item/limiter")); + } + + update(model, resource.toStack(), storage.isDuping() ? "∞" + : ((amount != 0 || ExtendedDrawers.CONFIG.get().client().displayEmptyCount()) ? String.valueOf(amount) : ""), icons, mat); + } + + public void update(BaseDrawerModel model, ItemStack itemStack, String count, List icons, Matrix4f mat) { + this.mainItem.setItem(itemStack); + this.count.setText(Text.literal(count)); + this.updateSettingsPos(model, icons, mat); + } + + + private void addIcon(ArrayList icons, Identifier id) { + var val = ICONS.get(id); + if (val == null) { + var itemId = id; + if (itemId.getPath().startsWith("item/")) { + itemId = itemId.withPath(x -> x.substring("item/".length())); + } else if (itemId.getPath().startsWith("block/")) { + itemId = itemId.withPath(x -> x.substring("block/".length())); + } + + var item = Registries.ITEM.get(itemId); + if (item == Items.AIR) { + item = Items.BARRIER; + } + val = item.getDefaultStack(); + ICONS.put(id, val); + } + + icons.add(val); + } + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/impl/model/CompactingDrawerModel.java b/src/main/java/eu/pb4/extdrawpatch/impl/model/CompactingDrawerModel.java new file mode 100644 index 0000000..f00c210 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/impl/model/CompactingDrawerModel.java @@ -0,0 +1,57 @@ +package eu.pb4.extdrawpatch.impl.model; + +import io.github.mattidragon.extendeddrawers.block.CompactingDrawerBlock; +import io.github.mattidragon.extendeddrawers.storage.CompactingDrawerStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.minecraft.block.BlockState; +import net.minecraft.util.math.Vec2f; + +public class CompactingDrawerModel extends BaseDrawerModel { + private final DrawerIcon top; + private final DrawerIcon left; + private final DrawerIcon right; + public CompactingDrawerModel(BlockState state) { + super(state, CompactingDrawerBlock.FACING, CompactingDrawerBlock.FACE); + var mat = mat(); + this.top = DrawerIcon.create(this, true, new Vec2f(0, 0.25f), mat); + this.left = DrawerIcon.create(this, true, new Vec2f(-0.25f, -0.25f), mat); + this.right = DrawerIcon.create(this, true, new Vec2f(0.25f, -0.25f), mat); + + updateState(state); + } + + @Override + protected void setRotation(float pitch, float yaw) { + super.setRotation(pitch, yaw); + this.top.setRotation(pitch, yaw); + this.left.setRotation(pitch, yaw); + this.right.setRotation(pitch, yaw); + } + + public void update(CompactingDrawerStorage storage) { + var arr = storage.getSlotArray(); + var mat = mat(); + + if (arr.length >= 1) { + var x = arr[0]; + this.left.updateStorage(this, x.getResource(), x.getAmount(), storage, mat); + } else { + this.left.updateStorage(this, ItemVariant.blank(), 0, storage, mat); + } + + if (arr.length >= 2) { + var x = arr[1]; + this.top.updateStorage(this, x.getResource(), x.getAmount(), storage, mat); + } else { + this.top.updateStorage(this, ItemVariant.blank(), 0, storage, mat); + } + + if (arr.length >= 3) { + var x = arr[2]; + this.right.updateStorage(this, x.getResource(), x.getAmount(), storage, mat); + } else { + this.right.updateStorage(this, ItemVariant.blank(), 0, storage, mat); + } + this.tick(); + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/impl/model/DrawerModel.java b/src/main/java/eu/pb4/extdrawpatch/impl/model/DrawerModel.java new file mode 100644 index 0000000..571d295 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/impl/model/DrawerModel.java @@ -0,0 +1,47 @@ +package eu.pb4.extdrawpatch.impl.model; + +import io.github.mattidragon.extendeddrawers.block.DrawerBlock; +import io.github.mattidragon.extendeddrawers.storage.DrawerSlot; +import net.minecraft.block.BlockState; +import net.minecraft.util.math.Vec2f; + +public class DrawerModel extends BaseDrawerModel { + private final DrawerIcon[] icons; + public DrawerModel(BlockState state) { + super(state, DrawerBlock.FACING, DrawerBlock.FACE); + this.icons = switch (((DrawerBlock) state.getBlock()).slots) { + case 1 -> new DrawerIcon[] { DrawerIcon.create(this, false, Vec2f.ZERO, mat()) }; + case 2 -> new DrawerIcon[] { + DrawerIcon.create(this, true, new Vec2f(-0.25f, 0), mat()), + DrawerIcon.create(this, true, new Vec2f(0.25f, 0), mat()), + }; + case 4 -> new DrawerIcon[] { + DrawerIcon.create(this, true, new Vec2f(-0.25f, 0.25f), mat()), + DrawerIcon.create(this, true, new Vec2f(0.25f, 0.25f), mat()), + DrawerIcon.create(this, true, new Vec2f(-0.25f, -0.25f), mat()), + DrawerIcon.create(this, true, new Vec2f(0.25f, -0.25f), mat()), + }; + default -> new DrawerIcon[0]; + }; + + updateState(state); + } + + @Override + protected void setRotation(float pitch, float yaw) { + super.setRotation(pitch, yaw); + for (var i : icons) { + i.setRotation(pitch, yaw); + } + } + + public void update(DrawerSlot[] storages) { + var mat = mat(); + for (var i = 0; i < this.icons.length; i++) { + var storage = storages[i]; + var icon = icons[i]; + icon.updateStorage(this, storage.getResource(), storage.getAmount(), storage, mat); + } + this.tick(); + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/impl/model/ShadowDrawerModel.java b/src/main/java/eu/pb4/extdrawpatch/impl/model/ShadowDrawerModel.java new file mode 100644 index 0000000..65287ae --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/impl/model/ShadowDrawerModel.java @@ -0,0 +1,37 @@ +package eu.pb4.extdrawpatch.impl.model; + +import io.github.mattidragon.extendeddrawers.ExtendedDrawers; +import io.github.mattidragon.extendeddrawers.block.ShadowDrawerBlock; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.state.property.DirectionProperty; +import net.minecraft.util.math.Vec2f; + +import java.util.List; + +public class ShadowDrawerModel extends BaseDrawerModel { + private final DrawerIcon icon; + + public ShadowDrawerModel(BlockState state) { + super(state, ShadowDrawerBlock.FACING, ShadowDrawerBlock.FACE); + this.icon = DrawerIcon.create(this, false, Vec2f.ZERO, mat()); + updateState(state); + } + + @Override + protected void setRotation(float pitch, float yaw) { + super.setRotation(pitch, yaw); + this.icon.setRotation(pitch, yaw); + } + + public void update(ItemVariant item, long count, boolean hidden) { + if (hidden || count == -1 || item.isBlank()) { + this.icon.update(this, ItemStack.EMPTY, "", List.of(), mat()); + } else { + this.icon.update(this, item.toStack(), count == -2 ? "∞" + : ((count != 0 || ExtendedDrawers.CONFIG.get().client().displayEmptyCount()) ? String.valueOf(count) : ""), List.of(), mat()); + } + this.tick(); + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/impl/model/SimpleBlockModel.java b/src/main/java/eu/pb4/extdrawpatch/impl/model/SimpleBlockModel.java new file mode 100644 index 0000000..f192b2e --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/impl/model/SimpleBlockModel.java @@ -0,0 +1,17 @@ +package eu.pb4.extdrawpatch.impl.model; + +import eu.pb4.factorytools.api.virtualentity.BlockModel; +import eu.pb4.factorytools.api.virtualentity.ItemDisplayElementUtil; +import eu.pb4.polymer.virtualentity.api.elements.ItemDisplayElement; +import net.minecraft.block.BlockState; +import org.joml.Vector3f; + +public class SimpleBlockModel extends BlockModel { + private final ItemDisplayElement main; + + public SimpleBlockModel(BlockState state) { + this.main = ItemDisplayElementUtil.createSimple(state.getBlock().asItem()); + this.main.setScale(new Vector3f(2)); + this.addElement(this.main); + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/impl/ui/CapacityLimiterGui.java b/src/main/java/eu/pb4/extdrawpatch/impl/ui/CapacityLimiterGui.java new file mode 100644 index 0000000..1aed309 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/impl/ui/CapacityLimiterGui.java @@ -0,0 +1,109 @@ +package eu.pb4.extdrawpatch.impl.ui; + +import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; +import eu.pb4.polymer.resourcepack.api.PolymerModelData; +import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; +import eu.pb4.sgui.api.GuiHelpers; +import eu.pb4.sgui.api.elements.GuiElementBuilder; +import eu.pb4.sgui.api.gui.AnvilInputGui; +import io.github.mattidragon.extendeddrawers.registry.ModDataComponents; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.screen.ScreenTexts; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; +import net.minecraft.util.Unit; + +import java.util.Objects; + +public class CapacityLimiterGui extends AnvilInputGui { + private final Hand hand; + private final ItemStack stack; + private static final Text TEXTURE = Text.literal("-0.").setStyle(Style.EMPTY.withColor(0xFFFFFF).withFont(Identifier.of("extdraw-patch:gui"))); + private static final ItemStack EMPTY = BaseItemProvider.requestModel(Identifier.of("extdraw-patch:sgui/empty")); + private static final ItemStack CLOSE = BaseItemProvider.requestModel(Identifier.of("extdraw-patch:sgui/close")); + private static final ItemStack DONE = BaseItemProvider.requestModel(Identifier.of("extdraw-patch:sgui/done")); + private static final ItemStack DONE_BLOCKED = BaseItemProvider.requestModel(Identifier.of("extdraw-patch:sgui/done_blocked")); + + private long value = -1; + + public CapacityLimiterGui(ServerPlayerEntity player, ItemStack stack, Hand hand) { + super(player, false); + this.stack = stack; + this.hand = hand; + this.value = stack.getOrDefault(ModDataComponents.LIMITER_LIMIT, -1L); + this.setTitle(Text.empty().append(TEXTURE).append(stack.getName())); + var val = value >= 0 ? String.valueOf(this.value) : ""; + this.setDefaultInputValue(val); + this.updateDoneButton(value >= 0); + this.updateDefault(val); + var close = GuiElementBuilder.from(CLOSE); + close.setName(ScreenTexts.BACK); + close.setCallback(x -> { + player.playSoundToPlayer(SoundEvents.UI_BUTTON_CLICK.value(), SoundCategory.MASTER, 0.5f, 1); + this.close(); + }); + this.setSlot(2, close); + this.open(); + } + + public static void register() { + } + + private void updateDefault(String current) { + ItemStack itemStack = EMPTY.copy(); + itemStack.set(DataComponentTypes.CUSTOM_NAME, Text.literal(current)); + itemStack.set(DataComponentTypes.ITEM_NAME, Text.literal("")); + itemStack.set(DataComponentTypes.HIDE_TOOLTIP, Unit.INSTANCE); + this.setSlot(0, itemStack, (a, b, c, d) -> { + this.screenHandler.setPreviousTrackedSlot(2, ItemStack.EMPTY); + }); + } + + private void updateDoneButton(boolean success) { + if (!success) { + var b = GuiElementBuilder.from(DONE_BLOCKED); + b.setName(Text.empty().append(ScreenTexts.DONE).formatted(Formatting.GRAY)); + this.setSlot(1, b); + return; + } + + var b = GuiElementBuilder.from(DONE); + b.setName(ScreenTexts.DONE); + b.setCallback(x -> { + player.playSoundToPlayer(SoundEvents.UI_BUTTON_CLICK.value(), SoundCategory.MASTER, 0.5f, 1); + this.stack.set(ModDataComponents.LIMITER_LIMIT, this.value); + this.close(); + }); + this.setSlot(1, b); + } + + + @Override + public void onInput(String input) { + super.onInput(input); + updateDefault(input); + try { + this.value = Long.parseLong(input); + this.updateDoneButton(true); + } catch (Throwable ignored) { + this.updateDoneButton(false); + } + this.screenHandler.setPreviousTrackedSlot(2, ItemStack.EMPTY); + } + + @Override + public void onTick() { + super.onTick(); + if (this.player.getStackInHand(this.hand) != this.stack) { + this.close(); + } + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/ExtendedDrawersMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/ExtendedDrawersMixin.java new file mode 100644 index 0000000..1ed6294 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/ExtendedDrawersMixin.java @@ -0,0 +1,19 @@ +package eu.pb4.extdrawpatch.mixin.mod; + +import eu.pb4.polymer.core.api.item.PolymerItemGroupUtils; +import io.github.mattidragon.extendeddrawers.ExtendedDrawers; +import net.minecraft.item.ItemGroup; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(ExtendedDrawers.class) +public class ExtendedDrawersMixin { + @Redirect(method = "registerItemGroup", at = @At(value = "INVOKE", target = "Lnet/minecraft/registry/Registry;register(Lnet/minecraft/registry/Registry;Lnet/minecraft/util/Identifier;Ljava/lang/Object;)Ljava/lang/Object;")) + private Object registerGroup(Registry registry, Identifier id, Object entry) { + PolymerItemGroupUtils.registerPolymerItemGroup(id, (ItemGroup) entry); + return entry; + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/AccessPointBlockMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/AccessPointBlockMixin.java new file mode 100644 index 0000000..6509ce8 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/AccessPointBlockMixin.java @@ -0,0 +1,27 @@ +package eu.pb4.extdrawpatch.mixin.mod.block; + +import eu.pb4.extdrawpatch.impl.BaseFactoryBlock; +import eu.pb4.extdrawpatch.impl.model.SimpleBlockModel; +import eu.pb4.polymer.virtualentity.api.ElementHolder; +import io.github.mattidragon.extendeddrawers.block.AccessPointBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(AccessPointBlock.class) +public class AccessPointBlockMixin implements BaseFactoryBlock { + + @Override + public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { + return Blocks.IRON_BLOCK.getDefaultState(); + } + + @Override + public @Nullable ElementHolder createElementHolder(ServerWorld world, BlockPos pos, BlockState initialBlockState) { + return new SimpleBlockModel(initialBlockState); + } +} \ No newline at end of file diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/CompactingDrawerBlockMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/CompactingDrawerBlockMixin.java new file mode 100644 index 0000000..23a752f --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/CompactingDrawerBlockMixin.java @@ -0,0 +1,28 @@ +package eu.pb4.extdrawpatch.mixin.mod.block; + +import eu.pb4.extdrawpatch.impl.BaseFactoryBlock; +import eu.pb4.extdrawpatch.impl.model.CompactingDrawerModel; +import eu.pb4.factorytools.api.block.FactoryBlock; +import eu.pb4.polymer.virtualentity.api.ElementHolder; +import io.github.mattidragon.extendeddrawers.block.CompactingDrawerBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(CompactingDrawerBlock.class) +public class CompactingDrawerBlockMixin implements BaseFactoryBlock { + + @Override + public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { + return Blocks.IRON_BLOCK.getDefaultState(); + } + + @Override + public @Nullable ElementHolder createElementHolder(ServerWorld world, BlockPos pos, BlockState initialBlockState) { + return new CompactingDrawerModel(initialBlockState); + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ConnectorBlockMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ConnectorBlockMixin.java new file mode 100644 index 0000000..c740e17 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ConnectorBlockMixin.java @@ -0,0 +1,27 @@ +package eu.pb4.extdrawpatch.mixin.mod.block; + +import eu.pb4.extdrawpatch.impl.BaseFactoryBlock; +import eu.pb4.extdrawpatch.impl.model.SimpleBlockModel; +import eu.pb4.polymer.virtualentity.api.ElementHolder; +import io.github.mattidragon.extendeddrawers.block.ConnectorBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(ConnectorBlock.class) +public class ConnectorBlockMixin implements BaseFactoryBlock { + + @Override + public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { + return Blocks.SPRUCE_PLANKS.getDefaultState(); + } + + @Override + public @Nullable ElementHolder createElementHolder(ServerWorld world, BlockPos pos, BlockState initialBlockState) { + return new SimpleBlockModel(initialBlockState); + } +} \ No newline at end of file diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/DrawerBlockMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/DrawerBlockMixin.java new file mode 100644 index 0000000..17468ec --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/DrawerBlockMixin.java @@ -0,0 +1,28 @@ +package eu.pb4.extdrawpatch.mixin.mod.block; + +import eu.pb4.extdrawpatch.impl.BaseFactoryBlock; +import eu.pb4.extdrawpatch.impl.model.DrawerModel; +import eu.pb4.factorytools.api.block.ItemUseLimiter; +import eu.pb4.polymer.virtualentity.api.ElementHolder; +import io.github.mattidragon.extendeddrawers.block.DrawerBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(DrawerBlock.class) +public class DrawerBlockMixin implements BaseFactoryBlock, ItemUseLimiter.All { + + @Override + public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { + return Blocks.BARREL.getDefaultState(); + } + + @Override + public @Nullable ElementHolder createElementHolder(ServerWorld world, BlockPos pos, BlockState initialBlockState) { + return new DrawerModel(initialBlockState); + } +} \ No newline at end of file diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ModBlocksMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ModBlocksMixin.java new file mode 100644 index 0000000..97e0fad --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ModBlocksMixin.java @@ -0,0 +1,15 @@ +package eu.pb4.extdrawpatch.mixin.mod.block; + +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import io.github.mattidragon.extendeddrawers.registry.ModBlocks; +import net.minecraft.block.AbstractBlock; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(ModBlocks.class) +public class ModBlocksMixin { + @ModifyExpressionValue(method = "", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/AbstractBlock$Settings;create()Lnet/minecraft/block/AbstractBlock$Settings;")) + private static AbstractBlock.Settings replaceBlockItemType(AbstractBlock.Settings settings) { + return settings.nonOpaque(); + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ShadowDrawerBlockMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ShadowDrawerBlockMixin.java new file mode 100644 index 0000000..7b0d4ff --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/ShadowDrawerBlockMixin.java @@ -0,0 +1,27 @@ +package eu.pb4.extdrawpatch.mixin.mod.block; + +import eu.pb4.extdrawpatch.impl.BaseFactoryBlock; +import eu.pb4.extdrawpatch.impl.model.ShadowDrawerModel; +import eu.pb4.polymer.virtualentity.api.ElementHolder; +import io.github.mattidragon.extendeddrawers.block.ShadowDrawerBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(ShadowDrawerBlock.class) +public class ShadowDrawerBlockMixin implements BaseFactoryBlock { + + @Override + public BlockState getPolymerBreakEventBlockState(BlockState state, ServerPlayerEntity player) { + return Blocks.END_STONE_BRICKS.getDefaultState(); + } + + @Override + public @Nullable ElementHolder createElementHolder(ServerWorld world, BlockPos pos, BlockState initialBlockState) { + return new ShadowDrawerModel(initialBlockState); + } +} \ No newline at end of file diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/CompactingDrawerBlockEntityMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/CompactingDrawerBlockEntityMixin.java new file mode 100644 index 0000000..c39a1c0 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/CompactingDrawerBlockEntityMixin.java @@ -0,0 +1,58 @@ +package eu.pb4.extdrawpatch.mixin.mod.block.be; + +import eu.pb4.extdrawpatch.impl.model.CompactingDrawerModel; +import eu.pb4.extdrawpatch.impl.model.ShadowDrawerModel; +import eu.pb4.factorytools.api.block.BlockEntityExtraListener; +import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; +import io.github.mattidragon.extendeddrawers.block.entity.CompactingDrawerBlockEntity; +import io.github.mattidragon.extendeddrawers.block.entity.ShadowDrawerBlockEntity; +import io.github.mattidragon.extendeddrawers.block.entity.StorageDrawerBlockEntity; +import io.github.mattidragon.extendeddrawers.storage.CompactingDrawerStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.chunk.WorldChunk; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +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; + +@Mixin(CompactingDrawerBlockEntity.class) +public abstract class CompactingDrawerBlockEntityMixin extends StorageDrawerBlockEntity implements BlockEntityExtraListener { + @Shadow @Final public CompactingDrawerStorage storage; + @Unique + private CompactingDrawerModel model; + + public CompactingDrawerBlockEntityMixin(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } + + @Override + public void onSlotChanged(boolean sortingChanged) { + super.onSlotChanged(sortingChanged); + if (this.model != null) { + this.model.update(this.storage); + } + } + + @Inject(method = "readComponents", at = @At("TAIL")) + private void onReadComponents(ComponentsAccess components, CallbackInfo ci) { + if (this.model != null) { + this.model.update(this.storage); + } + } + + @Override + public void onListenerUpdate(WorldChunk chunk) { + var x = BlockAwareAttachment.get(chunk, this.pos); + if (x != null && x.holder() instanceof CompactingDrawerModel model) { + this.model = model; + model.update(this.storage); + } + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/DrawerBlockEntityMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/DrawerBlockEntityMixin.java new file mode 100644 index 0000000..f1945bf --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/DrawerBlockEntityMixin.java @@ -0,0 +1,53 @@ +package eu.pb4.extdrawpatch.mixin.mod.block.be; + +import eu.pb4.extdrawpatch.impl.model.DrawerModel; +import eu.pb4.factorytools.api.block.BlockEntityExtraListener; +import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; +import io.github.mattidragon.extendeddrawers.block.entity.DrawerBlockEntity; +import io.github.mattidragon.extendeddrawers.storage.DrawerSlot; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.chunk.WorldChunk; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +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; + +@Mixin(DrawerBlockEntity.class) +public class DrawerBlockEntityMixin extends BlockEntity implements BlockEntityExtraListener { + @Shadow @Final public DrawerSlot[] storages; + @Unique + private DrawerModel model; + + public DrawerBlockEntityMixin(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } + + @Inject(method = "onSlotChanged", at = @At("RETURN"), remap = false) + private void updateModel(boolean sortingChanged, CallbackInfo ci) { + if (this.model != null) { + this.model.update(this.storages); + } + } + + @Override + public void onListenerUpdate(WorldChunk chunk) { + var x = BlockAwareAttachment.get(chunk, this.pos); + if (x != null && x.holder() instanceof DrawerModel model) { + this.model = model; + model.update(this.storages); + } + } + + @Inject(method = "readComponents", at = @At("TAIL")) + private void onReadComponents(ComponentsAccess components, CallbackInfo ci) { + if (this.model != null) { + this.model.update(this.storages); + } + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/ShadowDrawerBlockEntityMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/ShadowDrawerBlockEntityMixin.java new file mode 100644 index 0000000..6a85fd2 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/block/be/ShadowDrawerBlockEntityMixin.java @@ -0,0 +1,51 @@ +package eu.pb4.extdrawpatch.mixin.mod.block.be; + +import eu.pb4.extdrawpatch.impl.model.DrawerModel; +import eu.pb4.extdrawpatch.impl.model.ShadowDrawerModel; +import eu.pb4.factorytools.api.block.BlockEntityExtraListener; +import eu.pb4.polymer.virtualentity.api.attachment.BlockAwareAttachment; +import io.github.mattidragon.extendeddrawers.block.entity.DrawerBlockEntity; +import io.github.mattidragon.extendeddrawers.block.entity.ShadowDrawerBlockEntity; +import io.github.mattidragon.extendeddrawers.storage.DrawerSlot; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.chunk.WorldChunk; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +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; + +@Mixin(ShadowDrawerBlockEntity.class) +public class ShadowDrawerBlockEntityMixin extends BlockEntity implements BlockEntityExtraListener { + @Shadow public ItemVariant item; + @Shadow public long countCache; + @Shadow private boolean hidden; + @Unique + private ShadowDrawerModel model; + + public ShadowDrawerBlockEntityMixin(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } + + @Inject(method = "recalculateContents", at = @At("RETURN"), remap = false) + private void updateModel(CallbackInfo ci) { + if (this.model != null) { + this.model.update(this.item, this.countCache, this.hidden); + } + } + + @Override + public void onListenerUpdate(WorldChunk chunk) { + var x = BlockAwareAttachment.get(chunk, this.pos); + if (x != null && x.holder() instanceof ShadowDrawerModel model) { + this.model = model; + model.update(this.item, this.countCache, this.hidden); + } + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/CopyLimiterRecipeMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/CopyLimiterRecipeMixin.java new file mode 100644 index 0000000..860fbde --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/CopyLimiterRecipeMixin.java @@ -0,0 +1,9 @@ +package eu.pb4.extdrawpatch.mixin.mod.item; + +import eu.pb4.polymer.core.api.item.PolymerRecipe; +import io.github.mattidragon.extendeddrawers.recipe.CopyLimiterRecipe; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(CopyLimiterRecipe.class) +public class CopyLimiterRecipeMixin implements PolymerRecipe { +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/DrawerItemMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/DrawerItemMixin.java new file mode 100644 index 0000000..259d5f4 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/DrawerItemMixin.java @@ -0,0 +1,46 @@ +package eu.pb4.extdrawpatch.mixin.mod.item; + +import eu.pb4.factorytools.api.item.AutoModeledPolymerItem; +import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; +import io.github.mattidragon.extendeddrawers.item.DrawerItem; +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket; +import net.minecraft.registry.Registries; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundCategory; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Vec3d; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(DrawerItem.class) +public class DrawerItemMixin extends BlockItem implements AutoModeledPolymerItem { + @Unique + private final Item polymerItem = BaseItemProvider.requestItem(); + + public DrawerItemMixin(Block block, Settings settings) { + super(block, settings); + } + + @Override + public Item getPolymerItem() { + return polymerItem; + } + + @Override + public ActionResult useOnBlock(ItemUsageContext context) { + var x = super.useOnBlock(context); + if (x == ActionResult.CONSUME) { + if (context.getPlayer() instanceof ServerPlayerEntity player) { + var pos = Vec3d.ofCenter(context.getBlockPos().offset(context.getSide())); + var blockSoundGroup = this.getBlock().getDefaultState().getSoundGroup(); + player.networkHandler.sendPacket(new PlaySoundS2CPacket(Registries.SOUND_EVENT.getEntry(this.getPlaceSound(this.getBlock().getDefaultState())), SoundCategory.BLOCKS, pos.x, pos.y, pos.z, (blockSoundGroup.getVolume() + 1.0F) / 2.0F, blockSoundGroup.getPitch() * 0.8F, context.getPlayer().getRandom().nextLong())); + } + return ActionResult.SUCCESS; + } + return x; + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/LimiterItemMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/LimiterItemMixin.java new file mode 100644 index 0000000..289a89d --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/LimiterItemMixin.java @@ -0,0 +1,39 @@ +package eu.pb4.extdrawpatch.mixin.mod.item; + +import eu.pb4.extdrawpatch.impl.ui.CapacityLimiterGui; +import eu.pb4.factorytools.api.item.AutoModeledPolymerItem; +import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; +import io.github.mattidragon.extendeddrawers.item.LimiterItem; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.Hand; +import net.minecraft.world.World; +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.Redirect; + +@Mixin(LimiterItem.class) +public class LimiterItemMixin implements AutoModeledPolymerItem { + @Unique + private final Item polymerItem = BaseItemProvider.requestItem(); + + @Override + public Item getPolymerItem() { + return polymerItem; + } + + @Redirect(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;useBook(Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/Hand;)V")) + private void openUi(PlayerEntity instance, ItemStack book, Hand hand) { + if (instance instanceof ServerPlayerEntity player) { + new CapacityLimiterGui(player, book, hand); + } + } + + @Redirect(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;isClient()Z")) + private boolean alwaysClient(World instance) { + return true; + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/ModItemsMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/ModItemsMixin.java new file mode 100644 index 0000000..8dcfad3 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/ModItemsMixin.java @@ -0,0 +1,26 @@ +package eu.pb4.extdrawpatch.mixin.mod.item; + +import eu.pb4.factorytools.api.item.FactoryBlockItem; +import eu.pb4.factorytools.api.item.ModeledItem; +import eu.pb4.polymer.core.api.block.PolymerBlock; +import io.github.mattidragon.extendeddrawers.registry.ModItems; +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(ModItems.class) +public class ModItemsMixin { + @Redirect(method = "", at = @At(value = "NEW", target = "(Lnet/minecraft/block/Block;Lnet/minecraft/item/Item$Settings;)Lnet/minecraft/item/BlockItem;")) + private static BlockItem replaceBlockItemType(Block block, Item.Settings settings) { + return new FactoryBlockItem((Block & PolymerBlock) block, settings); + } + + + @Redirect(method = "", at = @At(value = "NEW", target = "(Lnet/minecraft/item/Item$Settings;)Lnet/minecraft/item/Item;")) + private static Item replaceItemType(Item.Settings settings) { + return new ModeledItem(settings); + } +} diff --git a/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/UpgradeItemMixin.java b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/UpgradeItemMixin.java new file mode 100644 index 0000000..db30428 --- /dev/null +++ b/src/main/java/eu/pb4/extdrawpatch/mixin/mod/item/UpgradeItemMixin.java @@ -0,0 +1,20 @@ +package eu.pb4.extdrawpatch.mixin.mod.item; + +import eu.pb4.factorytools.api.item.AutoModeledPolymerItem; +import eu.pb4.factorytools.api.resourcepack.BaseItemProvider; +import io.github.mattidragon.extendeddrawers.item.LimiterItem; +import io.github.mattidragon.extendeddrawers.item.UpgradeItem; +import net.minecraft.item.Item; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(UpgradeItem.class) +public class UpgradeItemMixin implements AutoModeledPolymerItem { + @Unique + private final Item polymerItem = BaseItemProvider.requestItem(); + + @Override + public Item getPolymerItem() { + return polymerItem; + } +} diff --git a/src/main/resources/assets/extdraw-patch/font/gui.json b/src/main/resources/assets/extdraw-patch/font/gui.json new file mode 100644 index 0000000..962dbe3 --- /dev/null +++ b/src/main/resources/assets/extdraw-patch/font/gui.json @@ -0,0 +1,22 @@ +{ + "providers": [ + { + "type": "space", + "advances": { + ".": -130, + "-": -60, + ",": -170, + "_": -8 + } + }, + { + "type": "bitmap", + "file": "extdraw-patch:sgui/limiter.png", + "ascent": 13, + "height": 256, + "chars": [ + "0" + ] + } + ] +} diff --git a/src/main/resources/assets/extdraw-patch/icon.png b/src/main/resources/assets/extdraw-patch/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b2a6c28cffc0550ae6b9ac7b29bb5b42d1439716 GIT binary patch literal 2697 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 K9AC5L#eW0;(*{id literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extdraw-patch/textures/sgui/elements/base_blocked.png b/src/main/resources/assets/extdraw-patch/textures/sgui/elements/base_blocked.png new file mode 100644 index 0000000000000000000000000000000000000000..eae6ca15200329a2c895b1ce0c34907095b66512 GIT binary patch literal 4346 zcmeHKeQXnD7{890edu%$jRp;#$It=0-d(S2duI!q?aGSls9TjGB>47vx1DQyXM5W^ zR6v|V2t?yY0%JOyfRPy(pox)X1Thko55KmE_<^Vq&F}*>Iu+-0*RC6CVwUKCyXNit zywCeQzxR26@AE$GtqW8yD9E3lk6~DWuhLTkJ+8OhZ1_Hr*t-h4x5YZ2YO zzZ06gHnmni$oi9Oe14yeVM}2&+Ar|=1GvS^&}P;F{ z4OR7g)Vuztll`lTR~DYUt)t@fO+QpW;cY*m^sL-x@pm{GHEE?VJDVH`w6QX!w;IdM^AHEnur%=a1W0 znx?G_v|hGq2na7o%E3CV&R@j~O4N+PN=P&(qpD6P=A55Yk$az$LMT~QqrRx}D+n3z8=-uBHgw zFwq)aL>-*6TZxOf)oeA>WJOYLwh;63ac4X%@iiWA8UjWxqCwMCo}yY>TFfo1S&7$E z499U4ZJ{g{5-i9>YfM8)GM1RBL!>Y~VnT?^swOKjT*pKqrAc!U1kB^3@kLd?KLa02 zq*(wys3cM;#!OSuC^g(RX% z#$e_5^BzTL(!=w4T!g+pA65i8%p0QBVt3Gtz>yp)Fr+mkIY`9N0x3$I-6Ankh-0ne zpnS1}hGK%KLjky11{^CRat=p`BWqPPrMi6Y~p z(xJitB`}DSY+Q&$p;9|(MN%n=Sc{dEBo47QtKDG>g$$^$zhkKo28VY9V|O$bcYyE zKql&#MrAW*^kd;+Ge9iT^ArFKJ?w>d$3>(m@t~qaTtucOW~Tjcox(^%9;Ar?nyHe( z(JDEYw(xW+d>ziOgk`Dq->mh^gFC?Sg9$Y0mbS?s2=Hb9o5VKkP4hbKz1Q)B^?}%^i-fpheWd^ve^(M2`jQf ziq;HzLXor<6c@|ufk)s9($o0;z>AH8nr(2Fv2JM)^-}=CNSY&A`mcmh=?znQ%^2OW zllmJcPQzeakpaJy4vH7lLMl@X)0{yB|L2oFi~n;89G_fdLi|qBHA&Zm7?_apWOhx` zH6aEjWIUN&{~2BRW3N+U4E_bRz{^tUMspNiw6a3CF7RL@Yacms07iLg<&p%3nP=+F zl-xeQ8I(Di&tH*qCT~XW^sJM!_J0hj3qDVIu=4QPC(C1PbYXT+ec2n!&y93_QEEE= z#VONNa(~^2?rj6{GW^8$=9dZ9HSL>*`>G%9-Tlf^ z)pqu5IPbZ<>08fzTU9o<_mNq2_s${5l4sI&J zN<5{7FF00q4}FVjP84puYE#4S%dX!+mj66&z&zxQ9C=`8$)Q`f47Bg9ea*kdQF3r$ z&%=8e>;v5USjoWJJz1weAH03uaQQpG9X^-8db#pUFxlVU*$YHqzKUwku3PR}^Cug0 B+#LV_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extdraw-patch/textures/sgui/elements/close.png b/src/main/resources/assets/extdraw-patch/textures/sgui/elements/close.png new file mode 100644 index 0000000000000000000000000000000000000000..36592c7fab2651c33582adebc8dafde224891da7 GIT binary patch literal 4878 zcmeHLYfuzd7H+@?LKHL@i~;R5Mg{4a?w(gq%P3@KkWmLkQHfEppU^eTgXxADSP^rhG&yY7&i+Wp``0vXr_i_*@i_TD0QouBGu2brWCFm@0JH+s(U@sx52Rf6UaK zd+xpGeD|F1o_l6`*3HeFF+5^y1O!3D9T~QHpof(fJ_LM9rKOKS*UINO1cxID3I_wA z88Qe8QFK5H=_7}Rgh63oZY^k|fUM{!ZEVP3wXXv58(s2;K%U&CquAgfq0n&9SA#|X zIR^CmK@)%7xz`aOE3a_%{VWlJ-UXxXeul$27bY|~rqPkW9wYP=W~Ou)jAN9Jpl}n| zKV(<0M+(x&d*M9ruUxcR=ZY)~LBZ@jsTYzHMsHZR{oDN)pS*9+n%Q*zn@x>_QcizmDJwg?{z3A6 zsp9=*Z{-p7lSa+h?#Vgv#)-BaTUttXk|*BV^mbWhil=q(y731zhn}4}aP<%MI%_&* zm=lM*7U@o|!>5c*dKgoflVvy)OK7H4*O4_hlU!FeAH}w{E!=V-QyNp4%nWl>evoA! z#^+SF?%&8D_I5m~_FjwD9D@{dr9%j0b>ubu{pcasXk;^IQt!Dp5|4F+}{uB$kwZ*LE2De<4(7*=x+ zf=0Y6X6MK`&e;^}b!%wO%kY|@+ozlqlrlZ&qgfX(!wjD%dMwEOLq`!<os}}hT4N-F@a2rfK&XOK+UtIcR_%W1<99XAEng>0s&1xr}6spw7A)9)?$Q~ zAW)!zN+lkd4x%0@L4oMRu<;V>7k#qm^}q@y&3KDs3xa@kxZ6Ls&*|)e_efnV06w%q z+NZ@enAYvq_O*~?docj%a_DC*r0fzOubszB-XcHC+lzURoX{77V|(m#)5lq%{>IHnUY6KXaY^r+s*Feqa*(WuTS;3nRPW4M{_1Lg2Y zGVNh`1qy&`M1X@E^#ZUVQ8SI}P`!!4Q4%vUD2I~*&XamU&*=L=%<+pLE9rv1UMWx< zfHLYaTxT}oDCh)KPXH7%D;Q9LVKCBQFf%xdt56(ErF;Eu8XTwSrt^5M&y%MvD1=jK za~&3h&|tkYa|>u$00tIhw&*De_AX?LZhpQ@D{SH>!ek^3xXy&>Ny0$(DlO#w639da zQ!Se6igGLz2nG;KD|re4)OipKW%cv4?Dc1Ry#*Ger`+}|JHd70XqmRrG7ms|3UGFJ z0iJ>p6xQj!0_XH{qEPbRw3W*PrvQC$s|3U9rJ!iG zGX#k)<~h|*fYrIg=F^@$9#oI6bnTuOeBg;0mOt`qczaRu3w%zjh#>S55&ChGJ$^hbe>+21<{25vG0l zA#yZF&^XPYgpM|Y3xkm;P3rV0X*8Jxf)sdx=leVTzlW%PDfbUCMXQv>?n6z{{^Zy@ z75dasKuzZysL!C>YkTT_7iUUkeTlEGbbEQLUh4u8HG%nb8oydy!7CP8T- z!9CN9!Q@cc;j|CEJ#1V!JhGISPzwGjIOnjXW#=6KZeg1LYb^TPjogl}>!)ufFBbd| zADO)-ZqxV&Q9FY}a(6|nzOnr@KFqjx$J01u?HHzV{D^~(mKzjQ}Jt&1zDI&p0B*0Xb5vm>7E6*X-Mp+fo=-q-R3a@Sq1an-~?Na+3Y zNvE4y7h7HNr=e8aU;miAZuf*C+sqm&HyMJ87Bq|r6YibYWXg-$61TmM_@{==d@}2` zj@xINd@V(O+v-myBd?l59$c~7U}RrS(yflBZ${SN{SLil{f(sg=*dLr)VBA(uV@zH zCoWr56YN;BWn(ci^U_YoL{6Bzr@o1d8?kS1+p^~STVwNU-$e2+8^36u@am|nbJw<( zT|2zt($K&E_RBh5^y8@YuG;G!(j?rTma!=2WcdX6lZ#ncZtJrH$y4FtL-Buk`rt|~ zcXt+~aUXqWsns z{%L#l>T7TP>EPPR`s&%SE7!P|E{GntsK#jPD-W+fjQv;eM#Au8wN2o(A%{KF K_Pe*2|MEYbbDfX? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extdraw-patch/textures/sgui/elements/done.png b/src/main/resources/assets/extdraw-patch/textures/sgui/elements/done.png new file mode 100644 index 0000000000000000000000000000000000000000..1a1af8b3827a9a4328120a9267b4f1e9728f7c2b GIT binary patch literal 4880 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extdraw-patch/textures/sgui/elements/empty.png b/src/main/resources/assets/extdraw-patch/textures/sgui/elements/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..8994a83ae652c0d201ac1ed41f177805b14f1dd0 GIT binary patch literal 4559 zcmeHLYiu0V6`r+Y#dexUQBp_2q06KtiR0OM?0fL$<=xl|S$pH%*qcBN^SHa7?9R;Y z&g{cco~=q9Y88@JX+tdmQj=J=fc~nLMj@mPP$;BULj_VR6p2z0LJf~1A_WTP&aPhq z30Wflyw=@&?!D)H=iKj}d)70@qFo(J8`m@v1hF*S8SH_61#b1V@V$Xr9)oTYCBn&Y zxP_>P0chG55jLy?%{EJ}vDFgT>LF;ifsA!sCE-?9}^XZ+!BwHf%p~=#_h3dF`DOFD+_&@%6xg z0~db&LF;wn@Gts*nBtyWe_O{XEphqw%U6GU^2*@jzRM4v*nXg^O`EJc_Wg5?^PjzN z?%MC4bGGl`-QCUP_m-%w6YQonEg!DTC3d-AZsHu9MkajYZ?~l1{N+XFH&=U4p6fDJ z=UT;v@X({XLJcS}G&y!$BttjZvdjw%F<0_1>cW_g+}l}e71 z)1l{6H0$^KX@;XYjsgwJ7}QLmOlihC3{k-dB16h6SyRz9JH`}5ybXmyKtb?Idm7Z;3n4uzoR0H~23nM<5MRX4`^g>=jp(4`Eb+aL4Y1%$p z$Y-qW$P$e*NCi~`ys~p#;;S}ofhkBSYSyv>vgc@;N^*v*IkDjtYdf<80rP3xIoeZu zx0FFE65)foRKVedg8>rz=Ve_|WZn{;UY2nt887Acx?PmZBZ`#h@d}jFlVrWf!!oR2 zm<1Kq3{%h~grNZ3p#Y8`F#e<{dMTezbW<*;Bv7K{1Ig!fdR&r66nyL~i0-@sSt(>@ zM}?tefbzH)*6H`K6m&_-#d$=^FD2a+z%xF#+b^^*L zV_HSiTEWM{!)Ab30p}?ISo5$KzCDiwQ_shBJrf|O%kA`X1g?`Tm_kr65r9q?;P_Ml z-o$V`Qwbl#MRZw74t|q1zC89e(1#=MR1EMxXiZgaR1D=RqslO&SXaqzw=M-QNR=%Z zLJ`SUoPbqXk_H4Vg`j#=({*ZI`I=N<+)0rI@+is6LN@u_K1c<@3rXP<87~r%)9aaw zZs_@l#F)6UMoD7h5HazV%y_1WrgM zC603Y;LGLa1WJ%3nexbp@yk9hl7(-5i`I|w+%2}zxGYW`Y8(BPW3MR8s-r+nWe(~y zlzV!*-d8!pmGu^Ws_AwMJplBAlX>yGK-U6Y^I~9L$_v@GK-at&n3wWGc71DfHO@RS zA`Sl0E5Y-iw<*0Jo+b6@&Unars)TnJ`0d2l*jOf$(KJm})q#oax~^xl*+QX^%jHbd zOe7M$y}f((?CI<4>+bGW6eS*y$6~SFyLb2W^b8CP?A^P!zrQ~kjUt5h?c0}5r_Y=@ zbN1}nVzFo##^~ti`1trIM|~0SWHWoZV#L<}yphBM@!pOgF;us<69x_0&OHV}IM(52 zE1%v{gvrHbI1*a?Zo?h*ci!>w$$I=YWNA3KEx!7y^x*2czW~Gv!uI~J-@>~h!lAC< J)7u~X@t1K&@g@KO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extdraw-patch/textures/sgui/limiter.png b/src/main/resources/assets/extdraw-patch/textures/sgui/limiter.png new file mode 100644 index 0000000000000000000000000000000000000000..6be79e65996def1e11679e61a938b4081b058ff0 GIT binary patch literal 5240 zcmeHLdsGu=7M}zxuLYF%B4~^c6rE)9CNWVIqC^RxvKXx`PLdg%k{3xJ0THpSik3>N zJ)BjsrQKDm0^+tSs~jFGS`i;8R;+@hTC1y8R#z+X+;4_=bV<haoMR*-!Zdua#x!rkZ>mk9&?yate|A&v?9E@ufW1>AP;b ztu5ub$JqPWzFomf!oQz2**9;?&W8uCJ=lO=K& zOqJ7c;8QhI-pTRo{p5D+_QlhdyW|GB?GNAhbNlh$R$DoqWj>*FJ)M2Q|3**1m}6-h z7Mwp)ou{uzp|^jrVP?slLsvHJjJ=!;!A-#yO3_Ke-eFc6(~YG z5wEhUl+hB6QO`oPMm5H=>rG_FAn9DY3DqQHR)!i&A`CKSTSYaKL1<;naYfmNPsMFnthrg!RDM zDPv%zR7xU^np848MWl>L`j=>p8bT|fL=ld1gs4UUhaq7&%vTFJuow|=U{o#Oi?{+2 z%GZj9K`9ItD{9bSBoqK=5da5QBO-*y$6<^wL}0!c(ZFGRt{BGEIL_q?w0w0KJ`5t( zOn|CHb;F|~p|k*s!^e3TAJhbbpnRAw(uiO&F5SWBpwmUei z1lviATG2?HWxvFUlrk9BWWc;W9cW&l7qSPNVLxYN+j)&ge=c65 z2LS!X$*A~!L)RO+M#aFWjNeq(8@fitz^IJhRM-EFF4v*QDa-)=1=+yEQYDem1|GED zQZHT@3H6en!pfo@K;vSHT48}8H*fN!LAwe9fYQmTP|BU|xlC~O4mK z6m87u$<7+5@o`LzJDgLv*nXxMIrUyeWv5>S{_Wp+9nvEI79YIX^G91y5uex}66f)C zM8i#o6^EKCduP;n>UV7o-(CFgUy5{3q@u$|zys4Mdd9B0SG)02+08C(Xz|30g6g%FeV0|9*xC~r?U&t?oTEwm zQ_b{RP4ARjfD!s-pF3H$1}sSW5eBUOqNq!jk#vpReu6gQ2+nF0DN$>&oV2Jc?{Q+}nAi zr>ykp(@oEAHE%BaT-FlMwvd&mKNcKd7v9lrpj>?Oc6P}}>woKbF}d?(#_g7(k7H{e zoTrTbG=NdieAeX}d}3bPue||z&o5o8=65rTtK}m4y5Qul=i0Wpdef#FN5EQK0UX{1 zT~uXy_MZ9Rt}^kPp88CcF`y#g>i0hdU-DZ$skr=M%Rk9Dr`I~h342O|t_Nhd*GV6H zue}xWV$}~#H*O`0dhOERsz1IOa;U|6q{fdTtqEGGce>fKTi4Oi-sXI3{MK6syH95! zG>{>mG`EKLW|w&-6*y7%zfav@4hMwcc^%LVW%^Z`u8Hr|ujAJL?aHLD8lOlH&32sz zg_G}=96@X^3$N0>Y&9xPKjhV%(mQi@-c4_rM5QJhf)4fuhUa5nM?@AK^~31@B_PTb z&E(wgQspi64WLSZ4$1#ik`Vl%Fwr5ZkzaB*{ZZ?Qz&+6AS@l8gi~f>uaH?XvUDuu1 q@eDe4KX%3XH1ciQYdKc?w$r{XEiwFK?7n!?fkGY=Svr69`~Lyo`rxbp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json new file mode 100644 index 0000000..bb0aa0f --- /dev/null +++ b/src/main/resources/assets/minecraft/atlases/blocks.json @@ -0,0 +1,9 @@ +{ + "sources": [ + { + "type": "directory", + "source": "sgui/elements", + "prefix": "sgui/elements/" + } + ] +} diff --git a/src/main/resources/extended-drawers-polymer-patch.mixins.json b/src/main/resources/extended-drawers-polymer-patch.mixins.json new file mode 100644 index 0000000..7652ae2 --- /dev/null +++ b/src/main/resources/extended-drawers-polymer-patch.mixins.json @@ -0,0 +1,25 @@ +{ + "required": true, + "package": "eu.pb4.extdrawpatch.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "mod.ExtendedDrawersMixin", + "mod.block.AccessPointBlockMixin", + "mod.block.CompactingDrawerBlockMixin", + "mod.block.ConnectorBlockMixin", + "mod.block.DrawerBlockMixin", + "mod.block.ModBlocksMixin", + "mod.block.ShadowDrawerBlockMixin", + "mod.block.be.CompactingDrawerBlockEntityMixin", + "mod.block.be.DrawerBlockEntityMixin", + "mod.block.be.ShadowDrawerBlockEntityMixin", + "mod.item.CopyLimiterRecipeMixin", + "mod.item.DrawerItemMixin", + "mod.item.LimiterItemMixin", + "mod.item.ModItemsMixin", + "mod.item.UpgradeItemMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..84e31c3 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,32 @@ +{ + "schemaVersion": 1, + "id": "extended-drawers-polymer-patch", + "version": "${version}", + "name": "Polymer Patch for Extended Drawers", + "description": "Polymer Patch for Extended Drawers", + "authors": [ + "Patbox" + ], + "contact": { + "homepage": "https://pb4.eu", + "sources": "https://github.com/PolymerPorts/extended-drawers-patch" + }, + "license": "LGPLv3", + "icon": "assets/extdraw-patch/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "eu.pb4.extdrawpatch.impl.ExtendedDrawersPolymerPatch" + ] + }, + "mixins": [ + "extended-drawers-polymer-patch.mixins.json" + ], + "depends": { + "fabricloader": ">=0.15.10", + "extended_drawers": ">=3.0.0", + "minecraft": ">=1.21-", + "java": ">=21", + "fabric-api": "*" + } +} \ No newline at end of file