From edd04f08c5d0a0b05b2054aca18ad58d96d7cea3 Mon Sep 17 00:00:00 2001 From: FirstMegaGame4 <84094287+FirstMegaGame4@users.noreply.github.com> Date: Wed, 1 Nov 2023 01:59:30 +0100 Subject: [PATCH] Add All Files --- .github/workflows/build.yml | 40 +++ .gitignore | 40 +++ LICENSE | 172 +++++++++++ build.gradle | 77 +++++ gradle.properties | 18 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 +++++++++++++++ gradlew.bat | 92 ++++++ settings.gradle | 10 + .../multisignals/MultiSignals.java | 30 ++ .../multisignals/SignalColors.java | 37 +++ .../block/AbstractBasedWireBlock.java | 148 +++++++++ .../multisignals/block/CitrineBlock.java | 81 +++++ .../multisignals/block/CitrineWireBlock.java | 98 ++++++ .../client/MultiSignalsClient.java | 17 + .../client/init/MultiSignalsBlockColors.java | 19 ++ .../client/init/MultiSignalsRenderLayers.java | 16 + .../multisignals/init/MultiSignalsBlocks.java | 32 ++ .../multisignals/init/MultiSignalsItems.java | 37 +++ .../multisignals/injected/CitrineImpl.java | 44 +++ .../injected/world/CitrineView.java | 113 +++++++ .../mixin/AbstractBlockMixin.java | 65 ++++ .../multisignals/mixin/BlockMixin.java | 16 + .../mixin/RedstoneWireBlockAccessor.java | 47 +++ .../mixin/RedstoneWireBlockMixin.java | 165 ++++++++++ .../multisignals/mixin/StateMixin.java | 32 ++ .../multisignals/mixin/WorldViewMixin.java | 8 + .../optimization/OptimizedWireSystem.java | 292 ++++++++++++++++++ .../blockstates/citrine_block.json | 7 + .../multisignals/blockstates/citrine_ore.json | 7 + .../blockstates/citrine_wire.json | 104 +++++++ .../concentrated_citrine_block.json | 7 + .../blockstates/deepslate_citrine_ore.json | 7 + .../blockstates/depleted_citrine_block.json | 7 + .../multisignals/blockstates/support.json | 7 + .../resources/assets/multisignals/icon.png | Bin 0 -> 453 bytes .../models/block/carbonated_tuff_block.json | 6 + .../models/block/citrine_block.json | 6 + .../models/block/citrine_dust_dot.json | 26 ++ .../models/block/citrine_dust_side0.json | 6 + .../models/block/citrine_dust_side1.json | 6 + .../models/block/citrine_dust_side_alt0.json | 6 + .../models/block/citrine_dust_side_alt1.json | 6 + .../models/block/citrine_dust_up.json | 26 ++ .../models/block/citrine_ore.json | 6 + .../block/concentrated_citrine_block.json | 6 + .../models/block/deepslate_citrine_ore.json | 6 + .../models/block/depleted_citrine_block.json | 6 + .../multisignals/models/block/support.json | 6 + .../models/item/carbonated_tuff.json | 6 + .../multisignals/models/item/citrine.json | 6 + .../models/item/citrine_block.json | 3 + .../models/item/citrine_dust.json | 6 + .../item/concentrated_citrine_block.json | 3 + .../models/item/depleted_citrine_block.json | 3 + .../textures/block/carbonated_tuff_block.png | Bin 0 -> 370 bytes .../textures/block/citrine_block.png | Bin 0 -> 430 bytes .../textures/block/citrine_comparator_0.png | Bin 0 -> 503 bytes .../textures/block/citrine_comparator_3.png | Bin 0 -> 552 bytes .../citrine_comparator_off_monochrome.png | Bin 0 -> 121 bytes .../citrine_comparator_on_monochrome.png | Bin 0 -> 140 bytes .../textures/block/citrine_computor_0.png | Bin 0 -> 440 bytes .../block/citrine_computor_0_powered.png | Bin 0 -> 455 bytes .../textures/block/citrine_computor_1.png | Bin 0 -> 494 bytes .../block/citrine_computor_1_powered.png | Bin 0 -> 503 bytes .../textures/block/citrine_computor_2.png | Bin 0 -> 488 bytes .../block/citrine_computor_2_powered.png | Bin 0 -> 501 bytes .../textures/block/citrine_computor_3.png | Bin 0 -> 484 bytes .../block/citrine_computor_3_powered.png | Bin 0 -> 493 bytes .../textures/block/citrine_ore.png | Bin 0 -> 525 bytes .../textures/block/citrine_repeater_0.png | Bin 0 -> 467 bytes .../textures/block/citrine_repeater_3.png | Bin 0 -> 486 bytes .../block/citrine_repeater_off_monochrome.png | Bin 0 -> 123 bytes .../block/citrine_repeater_on_monochrome.png | Bin 0 -> 117 bytes .../textures/block/citrine_torch_0.png | Bin 0 -> 186 bytes .../textures/block/citrine_torch_3.png | Bin 0 -> 220 bytes .../block/citrine_torch_off_monochrome.png | Bin 0 -> 112 bytes .../block/citrine_torch_on_monochrome.png | Bin 0 -> 114 bytes .../block/concentrated_citrine_block.png | Bin 0 -> 459 bytes .../textures/block/deepslate_citrine_ore.png | Bin 0 -> 650 bytes .../textures/block/depleted_citrine_block.png | Bin 0 -> 380 bytes .../multisignals/textures/block/support.png | Bin 0 -> 482 bytes .../textures/item/carbonated_tuff.png | Bin 0 -> 325 bytes .../multisignals/textures/item/citrine.png | Bin 0 -> 355 bytes .../textures/item/citrine_comparator.png | Bin 0 -> 335 bytes .../textures/item/citrine_dust.png | Bin 0 -> 312 bytes .../textures/item/citrine_repeater.png | Bin 0 -> 307 bytes src/main/resources/fabric.mod.json | 47 +++ src/main/resources/multisignals.mixins.json | 17 + 90 files changed, 2357 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .gitignore create mode 100644 LICENSE 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/fr/firstmegagame4/multisignals/MultiSignals.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/SignalColors.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/block/AbstractBasedWireBlock.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/block/CitrineBlock.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/block/CitrineWireBlock.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/client/MultiSignalsClient.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/client/init/MultiSignalsBlockColors.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/client/init/MultiSignalsRenderLayers.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/init/MultiSignalsBlocks.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/init/MultiSignalsItems.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/injected/CitrineImpl.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/injected/world/CitrineView.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/mixin/AbstractBlockMixin.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/mixin/BlockMixin.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/mixin/RedstoneWireBlockAccessor.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/mixin/RedstoneWireBlockMixin.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/mixin/StateMixin.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/mixin/WorldViewMixin.java create mode 100644 src/main/java/fr/firstmegagame4/multisignals/optimization/OptimizedWireSystem.java create mode 100644 src/main/resources/assets/multisignals/blockstates/citrine_block.json create mode 100644 src/main/resources/assets/multisignals/blockstates/citrine_ore.json create mode 100644 src/main/resources/assets/multisignals/blockstates/citrine_wire.json create mode 100644 src/main/resources/assets/multisignals/blockstates/concentrated_citrine_block.json create mode 100644 src/main/resources/assets/multisignals/blockstates/deepslate_citrine_ore.json create mode 100644 src/main/resources/assets/multisignals/blockstates/depleted_citrine_block.json create mode 100644 src/main/resources/assets/multisignals/blockstates/support.json create mode 100644 src/main/resources/assets/multisignals/icon.png create mode 100644 src/main/resources/assets/multisignals/models/block/carbonated_tuff_block.json create mode 100644 src/main/resources/assets/multisignals/models/block/citrine_block.json create mode 100644 src/main/resources/assets/multisignals/models/block/citrine_dust_dot.json create mode 100644 src/main/resources/assets/multisignals/models/block/citrine_dust_side0.json create mode 100644 src/main/resources/assets/multisignals/models/block/citrine_dust_side1.json create mode 100644 src/main/resources/assets/multisignals/models/block/citrine_dust_side_alt0.json create mode 100644 src/main/resources/assets/multisignals/models/block/citrine_dust_side_alt1.json create mode 100644 src/main/resources/assets/multisignals/models/block/citrine_dust_up.json create mode 100644 src/main/resources/assets/multisignals/models/block/citrine_ore.json create mode 100644 src/main/resources/assets/multisignals/models/block/concentrated_citrine_block.json create mode 100644 src/main/resources/assets/multisignals/models/block/deepslate_citrine_ore.json create mode 100644 src/main/resources/assets/multisignals/models/block/depleted_citrine_block.json create mode 100644 src/main/resources/assets/multisignals/models/block/support.json create mode 100644 src/main/resources/assets/multisignals/models/item/carbonated_tuff.json create mode 100644 src/main/resources/assets/multisignals/models/item/citrine.json create mode 100644 src/main/resources/assets/multisignals/models/item/citrine_block.json create mode 100644 src/main/resources/assets/multisignals/models/item/citrine_dust.json create mode 100644 src/main/resources/assets/multisignals/models/item/concentrated_citrine_block.json create mode 100644 src/main/resources/assets/multisignals/models/item/depleted_citrine_block.json create mode 100644 src/main/resources/assets/multisignals/textures/block/carbonated_tuff_block.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_block.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_comparator_0.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_comparator_3.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_comparator_off_monochrome.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_comparator_on_monochrome.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_computor_0.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_computor_0_powered.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_computor_1.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_computor_1_powered.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_computor_2.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_computor_2_powered.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_computor_3.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_computor_3_powered.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_ore.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_repeater_0.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_repeater_3.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_repeater_off_monochrome.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_repeater_on_monochrome.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_torch_0.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_torch_3.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_torch_off_monochrome.png create mode 100644 src/main/resources/assets/multisignals/textures/block/citrine_torch_on_monochrome.png create mode 100644 src/main/resources/assets/multisignals/textures/block/concentrated_citrine_block.png create mode 100644 src/main/resources/assets/multisignals/textures/block/deepslate_citrine_ore.png create mode 100644 src/main/resources/assets/multisignals/textures/block/depleted_citrine_block.png create mode 100644 src/main/resources/assets/multisignals/textures/block/support.png create mode 100644 src/main/resources/assets/multisignals/textures/item/carbonated_tuff.png create mode 100644 src/main/resources/assets/multisignals/textures/item/citrine.png create mode 100644 src/main/resources/assets/multisignals/textures/item/citrine_comparator.png create mode 100644 src/main/resources/assets/multisignals/textures/item/citrine_dust.png create mode 100644 src/main/resources/assets/multisignals/textures/item/citrine_repeater.png create mode 100644 src/main/resources/fabric.mod.json create mode 100644 src/main/resources/multisignals.mixins.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..2ca3795 --- /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] + +jobs: + build: + strategy: + matrix: + # Use these Java versions + java: [ + 17, # Current Java LTS & minimum supported by Minecraft + ] + # and run on both Linux and Windows + os: [ubuntu-22.04, windows-2022] + runs-on: ${{ matrix.os }} + steps: + - name: checkout repository + uses: actions/checkout@v3 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - 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 == '17' }} # Only upload artifacts built from latest java on one OS + uses: actions/upload-artifact@v3 + with: + name: Artifacts + path: build/libs/ \ 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..5a1351a --- /dev/null +++ b/LICENSE @@ -0,0 +1,172 @@ +License for MultiSignals Past, Actual and Future Assets : + +Copyright (c) 2023 MModding Team +All rights reserved. + +License for Code : + + 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. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..d768e77 --- /dev/null +++ b/build.gradle @@ -0,0 +1,77 @@ +plugins { + id 'fabric-loom' version '1.4-SNAPSHOT' + id 'maven-publish' +} + +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. +} + +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}" + + // MixinExtras + include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}"))) +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 +} + +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_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +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. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..ce745ef --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +# 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=23w43b +yarn_mappings=23w43b+build.1 +loader_version=0.14.24 + +# Mod Properties +mod_version=0.0.1-alpha +maven_group=fr.firstmegagame4 +archives_base_name=multisignals + +# Dependencies +fabric_version=0.90.5+1.20.3 +mixinextras_version=0.2.0 \ 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..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..ac72c34 --- /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.3-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..0adc8e1 --- /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=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=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, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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/fr/firstmegagame4/multisignals/MultiSignals.java b/src/main/java/fr/firstmegagame4/multisignals/MultiSignals.java new file mode 100644 index 0000000..db21f15 --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/MultiSignals.java @@ -0,0 +1,30 @@ +package fr.firstmegagame4.multisignals; + +import fr.firstmegagame4.multisignals.init.MultiSignalsBlocks; +import fr.firstmegagame4.multisignals.init.MultiSignalsItems; +import net.fabricmc.api.ModInitializer; + +import net.minecraft.util.Identifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class MultiSignals implements ModInitializer { + + public static final Logger LOGGER = LoggerFactory.getLogger("multisignals"); + + @Override + public void onInitialize() { + MultiSignals.LOGGER.info("MultiSignals Initialization..."); + + MultiSignalsBlocks.register(); + MultiSignalsItems.register(); + } + + public static String id() { + return "multisignals"; + } + + public static Identifier createId(String path) { + return new Identifier(MultiSignals.id(), path); + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/SignalColors.java b/src/main/java/fr/firstmegagame4/multisignals/SignalColors.java new file mode 100644 index 0000000..becb505 --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/SignalColors.java @@ -0,0 +1,37 @@ +package fr.firstmegagame4.multisignals; + +import net.minecraft.util.Util; +import net.minecraft.util.math.ColorHelper; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; + +public class SignalColors { + + public static final Vec3d[][] COLORS = Util.make( + new Vec3d[16][], signals -> { + for (int i = 0; i < 16; i++) { + int finalI = i; + signals[i] = Util.make( + new Vec3d[16], powers -> { + for (int j = 0; j < 16; j++) { + float h = 225f / 15 * finalI; + float s = 100; + float v = 30 + MathHelper.floor((80 - 30) / 15f * j); + powers[j] = new Vec3d(h, s, v); + } + } + ); + } + } + ); + + public static int getWireColor(int signal, int power) { + Vec3d vec3d = SignalColors.COLORS[signal][power]; + return MathHelper.hsvToRgb((float) vec3d.getX() / 360f, (float) vec3d.getY() / 100f, (float) vec3d.getZ() / 100f); + } + + public static Vec3d getWireColorRgb(int signal, int power) { + int rgb = SignalColors.getWireColor(signal, power); + return new Vec3d(ColorHelper.Argb.getRed(rgb), ColorHelper.Argb.getGreen(rgb), ColorHelper.Argb.getBlue(rgb)); + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/block/AbstractBasedWireBlock.java b/src/main/java/fr/firstmegagame4/multisignals/block/AbstractBasedWireBlock.java new file mode 100644 index 0000000..7f4f6f6 --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/block/AbstractBasedWireBlock.java @@ -0,0 +1,148 @@ +package fr.firstmegagame4.multisignals.block; + +import fr.firstmegagame4.multisignals.SignalColors; +import fr.firstmegagame4.multisignals.mixin.RedstoneWireBlockAccessor; +import fr.firstmegagame4.multisignals.optimization.OptimizedWireSystem; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.enums.WireConnection; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.IntProperty; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; + +import java.util.Objects; + +public abstract class AbstractBasedWireBlock extends RedstoneWireBlock implements OptimizedWireSystem { + + public static IntProperty createSignalProperty(String name, int limit) { + return IntProperty.of(name, 0, limit); + } + + public static IntProperty createPowerProperty(String name) { + return IntProperty.of(name, 0, 15); + } + + public AbstractBasedWireBlock(Settings settings) { + super(settings); + this.setDefaultState(this.getDefaultState().with(this.getSignalProperty(), 0).with(this.getPowerProperty(), 0)); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return RedstoneWireBlockAccessor.getShapes().get(state.with(this.getPowerProperty(), 0)); + } + + public boolean connectsToState(BlockState state) { + return this.connectsToState(state, null); + } + + public abstract boolean connectsToState(BlockState state, Direction direction); + + protected boolean emitsTypedPower(BlockState state) { + return super.emitsRedstonePower(state); + } + + protected int getWeakTypedPower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return super.getWeakRedstonePower(state, world, pos, direction); + } + + protected int getStrongTypedPower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return super.getStrongRedstonePower(state, world, pos, direction); + } + + abstract public int getReceivedTypedSignalOfWorld(World world, BlockPos pos); + + abstract public int getReceivedTypedPowerOfWorld(World world, BlockPos pos); + + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + return Objects.requireNonNull(super.getPlacementState(ctx)).with(this.getSignalProperty(), ((RedstoneWireBlockAccessor) this).getDotState().get(this.getSignalProperty())); + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos).with(this.getSignalProperty(), state.get(this.getSignalProperty())); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(WIRE_CONNECTION_NORTH); + builder.add(WIRE_CONNECTION_EAST); + builder.add(WIRE_CONNECTION_SOUTH); + builder.add(WIRE_CONNECTION_WEST); + builder.add(this.getSignalProperty()); + builder.add(this.getPowerProperty()); + } + + @Override + public boolean emitsRedstonePower(BlockState state) { + return false; + } + + @Override + public int getWeakRedstonePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return 0; + } + + @Override + public int getStrongRedstonePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return 0; + } + + @Override + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { + int signal = state.get(this.getSignalProperty()); + int power = state.get(this.getPowerProperty()); + if (signal == 0 || power == 0) { + return; + } + for (Direction direction : Direction.Type.HORIZONTAL) { + WireConnection wireConnection = state.get(DIRECTION_TO_WIRE_CONNECTION_PROPERTY.get(direction)); + switch (wireConnection) { + case UP: { + ((RedstoneWireBlockAccessor) this).invokeAddPoweredParticles(world, random, pos, SignalColors.getWireColorRgb(signal, power), direction, Direction.UP, -0.5f, 0.5f); + } + case SIDE: { + ((RedstoneWireBlockAccessor) this).invokeAddPoweredParticles(world, random, pos, SignalColors.getWireColorRgb(signal, power), Direction.DOWN, direction, 0.0f, 0.5f); + continue; + } + } + ((RedstoneWireBlockAccessor) this).invokeAddPoweredParticles(world, random, pos, SignalColors.getWireColorRgb(signal, power), Direction.DOWN, direction, 0.0f, 0.3f); + } + } + + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (!player.getAbilities().allowModifyWorld) { + return ActionResult.PASS; + } + if (RedstoneWireBlockAccessor.invokeIsFullyConnected(state) || RedstoneWireBlockAccessor.invokeIsNotConnected(state)) { + BlockState placeholderState = RedstoneWireBlockAccessor.invokeIsFullyConnected(state) ? this.getDefaultState() : ((RedstoneWireBlockAccessor) this).getDotState(); + BlockState blockState = ((RedstoneWireBlockAccessor) this).invokeGetPlacementState(world, placeholderState.with(this.getPowerProperty(), state.get(this.getPowerProperty())), pos); + if (blockState != state) { + world.setBlockState(pos, blockState, Block.NOTIFY_ALL); + ((RedstoneWireBlockAccessor) this).invokeUpdateForNewState(world, pos, state, blockState); + return ActionResult.SUCCESS; + } + } + return ActionResult.PASS; + } + + @Override + public RedstoneWireBlock getObject() { + return this; + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/block/CitrineBlock.java b/src/main/java/fr/firstmegagame4/multisignals/block/CitrineBlock.java new file mode 100644 index 0000000..897eb1f --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/block/CitrineBlock.java @@ -0,0 +1,81 @@ +package fr.firstmegagame4.multisignals.block; + +import fr.firstmegagame4.multisignals.MultiSignals; +import fr.firstmegagame4.multisignals.init.MultiSignalsItems; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.PickaxeItem; +import net.minecraft.registry.Registries; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; + +public class CitrineBlock extends Block { + + private final Type type; + + public CitrineBlock(Type type, Settings settings) { + super(settings); + this.type = type; + } + + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (player.getStackInHand(hand).isOf(MultiSignalsItems.CITRINE) && this.type.ordinal() < Type.values().length - 1) { + ItemStack stack = player.getStackInHand(hand); + stack.setCount(stack.getCount() - 1); + player.setStackInHand(hand, stack); + world.setBlockState(pos, Type.values()[this.type.ordinal() + 1].getBlock().getDefaultState()); + return ActionResult.SUCCESS; + } + else if (player.getStackInHand(hand).getItem() instanceof PickaxeItem && this.type.ordinal() > 0) { + world.setBlockState(pos, Type.values()[this.type.ordinal() - 1].getBlock().getDefaultState()); + player.giveItemStack(new ItemStack(MultiSignalsItems.CITRINE)); + return ActionResult.SUCCESS; + } + else { + return super.onUse(state, world, pos, player, hand, hit); + } + } + + @Override + public boolean emitsCitrinePower(BlockState state) { + return true; + } + + @Override + public int getCitrineSignal(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return switch (this.type) { + case DEPLETED -> 1; + case NORMAL -> 2; + case CONCENTRATED -> 3; + }; + } + + @Override + public int getWeakCitrinePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return 15; + } + + public enum Type { + DEPLETED("depleted_citrine_block"), + NORMAL("citrine_block"), + CONCENTRATED("concentrated_citrine_block"); + + private final String path; + + Type(String path) { + this.path = path; + } + + public Block getBlock() { + return Registries.BLOCK.get(MultiSignals.createId(this.path)); + } + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/block/CitrineWireBlock.java b/src/main/java/fr/firstmegagame4/multisignals/block/CitrineWireBlock.java new file mode 100644 index 0000000..4041bf1 --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/block/CitrineWireBlock.java @@ -0,0 +1,98 @@ +package fr.firstmegagame4.multisignals.block; + +import fr.firstmegagame4.multisignals.init.MultiSignalsBlocks; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.BlockState; +import net.minecraft.state.property.IntProperty; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; + +public class CitrineWireBlock extends AbstractBasedWireBlock { + + public static final IntProperty QUATERNARY = AbstractBasedWireBlock.createSignalProperty("quaternary", 3); + public static final IntProperty POWER = AbstractBasedWireBlock.createPowerProperty("quat_power"); + + public CitrineWireBlock(AbstractBlock.Settings settings) { + super(settings); + } + + @Override + public int getMinSignalValue() { + return 0; + } + + @Override + public int getMaxSignalValue() { + return 3; + } + + @Override + public IntProperty getSignalProperty() { + return CitrineWireBlock.QUATERNARY; + } + + @Override + public IntProperty getPowerProperty() { + return CitrineWireBlock.POWER; + } + + @Override + public boolean emitsTypedPowerOfState(BlockState state) { + return state.emitsCitrinePower(); + } + + @Override + public int getTypedSignalOfState(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return state.getCitrineSignal(world, pos, direction); + } + + @Override + public int getWeakTypedPowerOfState(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return state.getWeakCitrinePower(world, pos, direction); + } + + @Override + public int getStrongTypedPowerOfState(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return state.getStrongCitrinePower(world, pos, direction); + } + + @Override + public boolean connectsToState(BlockState state, Direction direction) { + if (state.isOf(MultiSignalsBlocks.CITRINE_WIRE)) { + return true; + } + return state.emitsCitrinePower() && direction != null; + } + + @Override + public int getReceivedTypedSignalOfWorld(World world, BlockPos pos) { + return world.getReceivedCitrineSignal(pos); + } + + @Override + public int getReceivedTypedPowerOfWorld(World world, BlockPos pos) { + return world.getReceivedCitrinePower(pos); + } + + @Override + public boolean emitsCitrinePower(BlockState state) { + return this.emitsTypedPower(state); + } + + @Override + public int getCitrineSignal(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return state.get(CitrineWireBlock.QUATERNARY); + } + + @Override + public int getWeakCitrinePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return this.getWeakTypedPower(state, world, pos, direction); + } + + @Override + public int getStrongCitrinePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return this.getStrongTypedPower(state, world, pos, direction); + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/client/MultiSignalsClient.java b/src/main/java/fr/firstmegagame4/multisignals/client/MultiSignalsClient.java new file mode 100644 index 0000000..813d91b --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/client/MultiSignalsClient.java @@ -0,0 +1,17 @@ +package fr.firstmegagame4.multisignals.client; + +import fr.firstmegagame4.multisignals.client.init.MultiSignalsBlockColors; +import fr.firstmegagame4.multisignals.client.init.MultiSignalsRenderLayers; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public class MultiSignalsClient implements ClientModInitializer { + + @Override + public void onInitializeClient() { + MultiSignalsRenderLayers.register(); + MultiSignalsBlockColors.register(); + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/client/init/MultiSignalsBlockColors.java b/src/main/java/fr/firstmegagame4/multisignals/client/init/MultiSignalsBlockColors.java new file mode 100644 index 0000000..a2dd11c --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/client/init/MultiSignalsBlockColors.java @@ -0,0 +1,19 @@ +package fr.firstmegagame4.multisignals.client.init; + +import fr.firstmegagame4.multisignals.SignalColors; +import fr.firstmegagame4.multisignals.block.CitrineWireBlock; +import fr.firstmegagame4.multisignals.init.MultiSignalsBlocks; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; + +@Environment(EnvType.CLIENT) +public class MultiSignalsBlockColors { + + public static void register() { + ColorProviderRegistry.BLOCK.register( + ((state, world, pos, tintIndex) -> SignalColors.getWireColor(state.get(CitrineWireBlock.QUATERNARY), state.get(CitrineWireBlock.POWER))), + MultiSignalsBlocks.CITRINE_WIRE + ); + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/client/init/MultiSignalsRenderLayers.java b/src/main/java/fr/firstmegagame4/multisignals/client/init/MultiSignalsRenderLayers.java new file mode 100644 index 0000000..fbe13fe --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/client/init/MultiSignalsRenderLayers.java @@ -0,0 +1,16 @@ +package fr.firstmegagame4.multisignals.client.init; + +import fr.firstmegagame4.multisignals.init.MultiSignalsBlocks; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; +import net.minecraft.client.render.RenderLayer; + +@Environment(EnvType.CLIENT) +public class MultiSignalsRenderLayers { + + public static void register() { + BlockRenderLayerMap.INSTANCE.putBlock(MultiSignalsBlocks.CITRINE_WIRE, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(MultiSignalsBlocks.SUPPORT, RenderLayer.getTranslucent()); + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/init/MultiSignalsBlocks.java b/src/main/java/fr/firstmegagame4/multisignals/init/MultiSignalsBlocks.java new file mode 100644 index 0000000..9cca593 --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/init/MultiSignalsBlocks.java @@ -0,0 +1,32 @@ +package fr.firstmegagame4.multisignals.init; + +import fr.firstmegagame4.multisignals.MultiSignals; +import fr.firstmegagame4.multisignals.block.CitrineBlock; +import fr.firstmegagame4.multisignals.block.CitrineWireBlock; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; + +public class MultiSignalsBlocks { + + public static final CitrineBlock DEPLETED_CITRINE_BLOCK = new CitrineBlock(CitrineBlock.Type.DEPLETED, FabricBlockSettings.copyOf(Blocks.REDSTONE_BLOCK)); + public static final CitrineBlock CITRINE_BLOCK = new CitrineBlock(CitrineBlock.Type.NORMAL, FabricBlockSettings.copyOf(Blocks.REDSTONE_BLOCK)); + public static final CitrineBlock CONCENTRATED_CITRINE_BLOCK = new CitrineBlock(CitrineBlock.Type.CONCENTRATED, FabricBlockSettings.copyOf(Blocks.REDSTONE_BLOCK)); + + public static final CitrineWireBlock CITRINE_WIRE = new CitrineWireBlock(FabricBlockSettings.copyOf(Blocks.REDSTONE_WIRE)); + + public static final Block CARBONATED_TUFF_BLOCK = new Block(FabricBlockSettings.copyOf(Blocks.TUFF)); + + public static final Block SUPPORT = new Block(FabricBlockSettings.create().noCollision()); + + public static void register() { + Registry.register(Registries.BLOCK, MultiSignals.createId("depleted_citrine_block"), DEPLETED_CITRINE_BLOCK); + Registry.register(Registries.BLOCK, MultiSignals.createId("citrine_block"), CITRINE_BLOCK); + Registry.register(Registries.BLOCK, MultiSignals.createId("concentrated_citrine_block"), CONCENTRATED_CITRINE_BLOCK); + Registry.register(Registries.BLOCK, MultiSignals.createId("citrine_wire"), CITRINE_WIRE); + Registry.register(Registries.BLOCK, MultiSignals.createId("carbonated_tuff_block"), CARBONATED_TUFF_BLOCK); + Registry.register(Registries.BLOCK, MultiSignals.createId("support"), SUPPORT); + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/init/MultiSignalsItems.java b/src/main/java/fr/firstmegagame4/multisignals/init/MultiSignalsItems.java new file mode 100644 index 0000000..30a0f16 --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/init/MultiSignalsItems.java @@ -0,0 +1,37 @@ +package fr.firstmegagame4.multisignals.init; + +import fr.firstmegagame4.multisignals.MultiSignals; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.AliasedBlockItem; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; + +public class MultiSignalsItems { + + public static final BlockItem DEPLETED_CITRINE_BLOCK = new BlockItem(MultiSignalsBlocks.DEPLETED_CITRINE_BLOCK, new FabricItemSettings()); + public static final BlockItem CITRINE_BLOCK = new BlockItem(MultiSignalsBlocks.CITRINE_BLOCK, new FabricItemSettings()); + public static final BlockItem CONCENTRATED_CITRINE_BLOCK = new BlockItem(MultiSignalsBlocks.CONCENTRATED_CITRINE_BLOCK, new FabricItemSettings()); + + public static final Item CITRINE = new Item(new FabricItemSettings()); + + public static final AliasedBlockItem CITRINE_DUST = new AliasedBlockItem(MultiSignalsBlocks.CITRINE_WIRE, new FabricItemSettings()); + + public static final Item CARBONATED_TUFF_BLOCK = new BlockItem(MultiSignalsBlocks.CARBONATED_TUFF_BLOCK, new FabricItemSettings()); + + public static final Item CARBONATED_TUFF = new Item(new FabricItemSettings()); + + public static final BlockItem SUPPORT = new BlockItem(MultiSignalsBlocks.SUPPORT, new FabricItemSettings()); + + public static void register() { + Registry.register(Registries.ITEM, MultiSignals.createId("depleted_citrine_block"), DEPLETED_CITRINE_BLOCK); + Registry.register(Registries.ITEM, MultiSignals.createId("citrine_block"), CITRINE_BLOCK); + Registry.register(Registries.ITEM, MultiSignals.createId("concentrated_citrine_block"), CONCENTRATED_CITRINE_BLOCK); + Registry.register(Registries.ITEM, MultiSignals.createId("citrine"), CITRINE); + Registry.register(Registries.ITEM, MultiSignals.createId("citrine_dust"), CITRINE_DUST); + Registry.register(Registries.ITEM, MultiSignals.createId("carbonated_tuff_block"), CARBONATED_TUFF_BLOCK); + Registry.register(Registries.ITEM, MultiSignals.createId("carbonated_tuff"), CARBONATED_TUFF); + Registry.register(Registries.ITEM, MultiSignals.createId("support"), SUPPORT); + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/injected/CitrineImpl.java b/src/main/java/fr/firstmegagame4/multisignals/injected/CitrineImpl.java new file mode 100644 index 0000000..2057eec --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/injected/CitrineImpl.java @@ -0,0 +1,44 @@ +package fr.firstmegagame4.multisignals.injected; + +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; + +public interface CitrineImpl { + + default boolean emitsCitrinePower(BlockState state) { + throw new AssertionError(); + } + + default int getCitrineSignal(BlockState state, BlockView world, BlockPos pos, Direction direction) { + throw new AssertionError(); + } + + default int getWeakCitrinePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + throw new AssertionError(); + } + + default int getStrongCitrinePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + throw new AssertionError(); + } + + interface State { + + default boolean emitsCitrinePower() { + throw new AssertionError(); + } + + default int getCitrineSignal(BlockView world, BlockPos pos, Direction direction) { + throw new AssertionError(); + } + + default int getWeakCitrinePower(BlockView world, BlockPos pos, Direction direction) { + throw new AssertionError(); + } + + default int getStrongCitrinePower(BlockView world, BlockPos pos, Direction direction) { + throw new AssertionError(); + } + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/injected/world/CitrineView.java b/src/main/java/fr/firstmegagame4/multisignals/injected/world/CitrineView.java new file mode 100644 index 0000000..9f5d61d --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/injected/world/CitrineView.java @@ -0,0 +1,113 @@ +package fr.firstmegagame4.multisignals.injected.world; + +import fr.firstmegagame4.multisignals.block.CitrineBlock; +import fr.firstmegagame4.multisignals.block.CitrineWireBlock; +import fr.firstmegagame4.multisignals.init.MultiSignalsBlocks; +import net.minecraft.block.AbstractRedstoneGateBlock; +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; + +public interface CitrineView extends BlockView { + + default int getReceivedCitrineSignal(BlockPos pos) { + int i = 0; + for (Direction direction : Direction.values()) { + int j = this.getBlockState(pos.offset(direction)).getCitrineSignal(this, pos.offset(direction), direction); + if (j >= 3) { + return 3; + } + if (j <= i) continue; + i = j; + } + return i; + } + + default int getStrongCitrinePower(BlockPos pos, Direction direction) { + return this.getBlockState(pos).getStrongCitrinePower(this, pos, direction); + } + + default int getReceivedStrongCitrinePower(BlockPos pos) { + int i = 0; + if ((i = Math.max(i, this.getStrongCitrinePower(pos.down(), Direction.DOWN))) >= 15) { + return i; + } + if ((i = Math.max(i, this.getStrongCitrinePower(pos.up(), Direction.UP))) >= 15) { + return i; + } + if ((i = Math.max(i, this.getStrongCitrinePower(pos.north(), Direction.NORTH))) >= 15) { + return i; + } + if ((i = Math.max(i, this.getStrongCitrinePower(pos.south(), Direction.SOUTH))) >= 15) { + return i; + } + if ((i = Math.max(i, this.getStrongCitrinePower(pos.west(), Direction.WEST))) >= 15) { + return i; + } + i = Math.max(i, this.getStrongCitrinePower(pos.east(), Direction.EAST)); + return i; + } + + default int getEmittedCitrinePower(BlockPos pos, Direction direction, boolean onlyFromGate) { + BlockState blockState = this.getBlockState(pos); + if (onlyFromGate) { + return AbstractRedstoneGateBlock.isRedstoneGate(blockState) ? this.getStrongCitrinePower(pos, direction) : 0; + } + if (blockState.getBlock() instanceof CitrineBlock) { + return 15; + } + if (blockState.isOf(MultiSignalsBlocks.CITRINE_WIRE)) { + return blockState.get(CitrineWireBlock.POWER); + } + if (blockState.emitsCitrinePower()) { + return this.getStrongCitrinePower(pos, direction); + } + return 0; + } + + default boolean isEmittingCitrinePower(BlockPos pos, Direction direction) { + return this.getEmittedCitrinePower(pos, direction) > 0; + } + + default int getEmittedCitrinePower(BlockPos pos, Direction direction) { + BlockState blockState = this.getBlockState(pos); + int i = blockState.getWeakCitrinePower(this, pos, direction); + if (blockState.isSolidBlock(this, pos)) { + return Math.max(i, this.getReceivedStrongCitrinePower(pos)); + } + return i; + } + + default boolean isReceivingCitrinePower(BlockPos pos) { + if (this.getEmittedCitrinePower(pos.down(), Direction.DOWN) > 0) { + return true; + } + if (this.getEmittedCitrinePower(pos.up(), Direction.UP) > 0) { + return true; + } + if (this.getEmittedCitrinePower(pos.north(), Direction.NORTH) > 0) { + return true; + } + if (this.getEmittedCitrinePower(pos.south(), Direction.SOUTH) > 0) { + return true; + } + if (this.getEmittedCitrinePower(pos.west(), Direction.WEST) > 0) { + return true; + } + return this.getEmittedCitrinePower(pos.east(), Direction.EAST) > 0; + } + + default int getReceivedCitrinePower(BlockPos pos) { + int i = 0; + for (Direction direction : Direction.values()) { + int j = this.getEmittedCitrinePower(pos.offset(direction), direction); + if (j >= 15) { + return 15; + } + if (j <= i) continue; + i = j; + } + return i; + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/mixin/AbstractBlockMixin.java b/src/main/java/fr/firstmegagame4/multisignals/mixin/AbstractBlockMixin.java new file mode 100644 index 0000000..8620145 --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/mixin/AbstractBlockMixin.java @@ -0,0 +1,65 @@ +package fr.firstmegagame4.multisignals.mixin; + +import fr.firstmegagame4.multisignals.injected.CitrineImpl; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(AbstractBlock.class) +public class AbstractBlockMixin implements CitrineImpl { + + @Override + public boolean emitsCitrinePower(BlockState state) { + return false; + } + + @Override + public int getCitrineSignal(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return 0; + } + + @Override + public int getWeakCitrinePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return 0; + } + + @Override + public int getStrongCitrinePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return 0; + } + + @Mixin(AbstractBlock.AbstractBlockState.class) + public static abstract class AbstractBlockStateMixin implements CitrineImpl.State { + + @Shadow + public abstract Block getBlock(); + + @Shadow + protected abstract BlockState asBlockState(); + + @Override + public boolean emitsCitrinePower() { + return this.getBlock().emitsCitrinePower(this.asBlockState()); + } + + @Override + public int getCitrineSignal(BlockView world, BlockPos pos, Direction direction) { + return this.getBlock().getCitrineSignal(this.asBlockState(), world, pos, direction); + } + + @Override + public int getWeakCitrinePower(BlockView world, BlockPos pos, Direction direction) { + return this.getBlock().getWeakCitrinePower(this.asBlockState(), world, pos, direction); + } + + @Override + public int getStrongCitrinePower(BlockView world, BlockPos pos, Direction direction) { + return this.getBlock().getStrongCitrinePower(this.asBlockState(), world, pos, direction); + } + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/mixin/BlockMixin.java b/src/main/java/fr/firstmegagame4/multisignals/mixin/BlockMixin.java new file mode 100644 index 0000000..aa9d45e --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/mixin/BlockMixin.java @@ -0,0 +1,16 @@ +package fr.firstmegagame4.multisignals.mixin; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(Block.class) +public abstract class BlockMixin { + + @Shadow + protected abstract void setDefaultState(BlockState state); + + @Shadow + public abstract BlockState getDefaultState(); +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/mixin/RedstoneWireBlockAccessor.java b/src/main/java/fr/firstmegagame4/multisignals/mixin/RedstoneWireBlockAccessor.java new file mode 100644 index 0000000..cc3f735 --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/mixin/RedstoneWireBlockAccessor.java @@ -0,0 +1,47 @@ +package fr.firstmegagame4.multisignals.mixin; + +import net.minecraft.block.BlockState; +import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.random.Random; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.gen.Invoker; + +import java.util.Map; + +@Mixin(RedstoneWireBlock.class) +public interface RedstoneWireBlockAccessor { + + @Accessor("SHAPES") + static Map getShapes() { + throw new AssertionError(); + } + + @Accessor + BlockState getDotState(); + + @Invoker("getPlacementState") + BlockState invokeGetPlacementState(BlockView world, BlockState state, BlockPos pos); + + @Invoker("isFullyConnected") + static boolean invokeIsFullyConnected(BlockState state) { + throw new AssertionError(); + } + + @Invoker("isNotConnected") + static boolean invokeIsNotConnected(BlockState state) { + throw new AssertionError(); + } + + @Invoker("addPoweredParticles") + void invokeAddPoweredParticles(World world, Random random, BlockPos pos, Vec3d color, Direction direction, Direction direction2, float f, float g); + + @Invoker("updateForNewState") + void invokeUpdateForNewState(World world, BlockPos pos, BlockState oldState, BlockState newState); +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/mixin/RedstoneWireBlockMixin.java b/src/main/java/fr/firstmegagame4/multisignals/mixin/RedstoneWireBlockMixin.java new file mode 100644 index 0000000..95ba172 --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/mixin/RedstoneWireBlockMixin.java @@ -0,0 +1,165 @@ +package fr.firstmegagame4.multisignals.mixin; + +import com.google.common.collect.Sets; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import com.llamalad7.mixinextras.sugar.Local; +import fr.firstmegagame4.multisignals.block.AbstractBasedWireBlock; +import fr.firstmegagame4.multisignals.init.MultiSignalsBlocks; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.state.property.Property; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import org.objectweb.asm.Opcodes; +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.Slice; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.HashSet; + +@Mixin(RedstoneWireBlock.class) +public abstract class RedstoneWireBlockMixin extends BlockMixin { + + @WrapOperation( + method = "", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/block/BlockState;with(Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;)Ljava/lang/Object;", + ordinal = 0 + ), + slice = @Slice( + from = @At( + value = "FIELD", + opcode = Opcodes.GETSTATIC, + target = "Lnet/minecraft/block/RedstoneWireBlock;POWER:Lnet/minecraft/state/property/IntProperty;" + ) + ) + ) + private Object wrapDefaultStates(BlockState blockState, Property vanillaPowerProperty, Comparable vanillaPower, Operation original) { + return this.getObject() instanceof AbstractBasedWireBlock ? blockState : original.call(blockState, vanillaPowerProperty, vanillaPower); + } + + @WrapOperation(method = "", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;get(Lnet/minecraft/state/property/Property;)Ljava/lang/Comparable;")) + private Comparable wrapConstructorPowerGetter(BlockState blockState, Property vanillaPowerProperty, Operation> original) { + return this.getObject() instanceof AbstractBasedWireBlock based ? blockState.get(based.getPowerProperty()) : original.call(blockState, vanillaPowerProperty); + } + + @WrapOperation(method = "getPlacementState(Lnet/minecraft/world/BlockView;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;get(Lnet/minecraft/state/property/Property;)Ljava/lang/Comparable;", ordinal = 0)) + private Comparable wrapGetPlacementStatePowerGetter(BlockState blockState, Property vanillaPowerProperty, Operation> original) { + return this.getObject() instanceof AbstractBasedWireBlock based ? blockState.get(based.getPowerProperty()) : original.call(blockState, vanillaPowerProperty); + } + + @WrapOperation(method = "getPlacementState(Lnet/minecraft/world/BlockView;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;with(Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;)Ljava/lang/Object;", ordinal = 0)) + private Object wrapGetPlacementStatePowerSetter(BlockState blockState, Property vanillaPowerProperty, Comparable vanillaPower, Operation original, @Local(ordinal = 0) BlockState state) { + if (this.getObject() instanceof AbstractBasedWireBlock based) { + return blockState.with(based.getPowerProperty(), state.get(based.getPowerProperty())); + } + else { + return original.call(blockState, vanillaPowerProperty, vanillaPower); + } + } + + @WrapOperation(method = "getStateForNeighborUpdate", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;get(Lnet/minecraft/state/property/Property;)Ljava/lang/Comparable;", ordinal = 1)) + private Comparable wrapGetStateForNeighborUpdatePowerGetter(BlockState blockState, Property vanillaPowerProperty, Operation> original) { + return this.getObject() instanceof AbstractBasedWireBlock based ? blockState.get(based.getPowerProperty()) : original.call(blockState, vanillaPowerProperty); + } + + @WrapOperation(method = "getStateForNeighborUpdate", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;with(Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;)Ljava/lang/Object;", ordinal = 1)) + private Object wrapGetStateForNeighborUpdatePowerSetter(BlockState blockState, Property vanillaPowerProperty, Comparable vanillaPower, Operation original, @Local(ordinal = 0) BlockState state) { + if (this.getObject() instanceof AbstractBasedWireBlock based) { + return blockState.with(based.getPowerProperty(), state.get(based.getPowerProperty())); + } + else { + return original.call(blockState, vanillaPowerProperty, vanillaPower); + } + } + + @ModifyExpressionValue(method = "getRenderConnectionType(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;Z)Lnet/minecraft/block/enums/WireConnection;", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/RedstoneWireBlock;connectsTo(Lnet/minecraft/block/BlockState;)Z", ordinal = 0)) + private boolean firstRenderConnectionTypeModification(boolean original, BlockView world, BlockPos pos, Direction direction) { + return this.isConnected(world.getBlockState(pos.offset(direction).up()), original); + } + + @ModifyExpressionValue(method = "getRenderConnectionType(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;Z)Lnet/minecraft/block/enums/WireConnection;", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/RedstoneWireBlock;connectsTo(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Direction;)Z")) + private boolean secondRenderConnectionTypeModification(boolean original, BlockView world, BlockPos pos, Direction direction) { + return this.isConnected(world.getBlockState(pos.offset(direction)), direction, original); + } + + @ModifyExpressionValue(method = "getRenderConnectionType(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;Z)Lnet/minecraft/block/enums/WireConnection;", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/RedstoneWireBlock;connectsTo(Lnet/minecraft/block/BlockState;)Z", ordinal = 1)) + private boolean thirdRenderConnectionTypeModification(boolean original, BlockView world, BlockPos pos, Direction direction) { + return this.isConnected(world.getBlockState(pos.offset(direction).down()), original); + } + + @Unique + private boolean isConnected(BlockState state, boolean otherwise) { + return this.getObject() instanceof AbstractBasedWireBlock based ? based.connectsToState(state) : otherwise; + } + + @Unique + private boolean isConnected(BlockState state, Direction direction, boolean otherwise) { + return this.getObject() instanceof AbstractBasedWireBlock based ? based.connectsToState(state, direction) : otherwise; + } + + @Inject(method = "canRunOnTop", at = @At("HEAD"), cancellable = true) + private void canRunOnTop(BlockView world, BlockPos pos, BlockState floor, CallbackInfoReturnable cir) { + if (floor.isOf(MultiSignalsBlocks.SUPPORT)) { + cir.setReturnValue(true); + } + } + + @Inject(method = "update", at = @At("HEAD"), cancellable = true) + private void update(World world, BlockPos pos, BlockState state, CallbackInfo ci) { + if (this.getObject() instanceof AbstractBasedWireBlock based) { + int lastSignal; + int lastPower; + int i = based.getReceivedTypedSignal(world, pos); + if ((lastSignal = state.get(based.getSignalProperty())) != i) { + if (world.getBlockState(pos) == state) { + world.setBlockState(pos, state.with(based.getSignalProperty(), i), Block.NOTIFY_LISTENERS); + } + } + int j = based.getReceivedTypedPower(world, pos); + if ((lastPower = state.get(based.getPowerProperty())) != j) { + if (world.getBlockState(pos) == state) { + world.setBlockState(pos, state.with(based.getPowerProperty(), j), Block.NOTIFY_LISTENERS); + } + } + if (lastSignal != i || lastPower != j) { + HashSet set = Sets.newHashSet(); + set.add(pos); + for (Direction direction : Direction.values()) { + set.add(pos.offset(direction)); + } + for (BlockPos blockPos : set) { + world.updateNeighborsAlways(blockPos, this.getObject()); + } + } + ci.cancel(); + } + } + + @Inject(method = "increasePower", at = @At("HEAD"), cancellable = true) + private void increasePower(BlockState state, CallbackInfoReturnable cir) { + if (this.getObject() instanceof AbstractBasedWireBlock based) { + cir.setReturnValue(state.isOf(this.getObject()) ? state.get(based.getPowerProperty()) : 0); + } + } + + @WrapOperation(method = "getWeakRedstonePower", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;get(Lnet/minecraft/state/property/Property;)Ljava/lang/Comparable;", ordinal = 0)) + private Comparable wrapGetWeakPowerGetter(BlockState blockState, Property vanillaPowerProperty, Operation> original) { + return this.getObject() instanceof AbstractBasedWireBlock based ? blockState.get(based.getPowerProperty()) : original.call(blockState, vanillaPowerProperty); + } + + @Unique + private RedstoneWireBlock getObject() { + return (RedstoneWireBlock) (Object) this; + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/mixin/StateMixin.java b/src/main/java/fr/firstmegagame4/multisignals/mixin/StateMixin.java new file mode 100644 index 0000000..42a0823 --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/mixin/StateMixin.java @@ -0,0 +1,32 @@ +package fr.firstmegagame4.multisignals.mixin; + +import fr.firstmegagame4.multisignals.block.AbstractBasedWireBlock; +import net.minecraft.block.BlockState; +import net.minecraft.state.State; +import net.minecraft.state.property.Property; +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.CallbackInfoReturnable; + +@Mixin(State.class) +public class StateMixin { + + @Inject(method = "with", at = @At("TAIL")) + private , V extends T> void with(Property property, V value, CallbackInfoReturnable cir) { + if (this.getObject() instanceof BlockState state) { + if (state.getBlock() instanceof AbstractBasedWireBlock based) { + if (property.equals(based.getPowerProperty())) { + state.with(based.getSignalProperty(), 0); + } + } + } + } + + @Unique + @SuppressWarnings("unchecked") + public State getObject() { + return (State) (Object) this; + } +} diff --git a/src/main/java/fr/firstmegagame4/multisignals/mixin/WorldViewMixin.java b/src/main/java/fr/firstmegagame4/multisignals/mixin/WorldViewMixin.java new file mode 100644 index 0000000..25fffca --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/mixin/WorldViewMixin.java @@ -0,0 +1,8 @@ +package fr.firstmegagame4.multisignals.mixin; + +import fr.firstmegagame4.multisignals.injected.world.CitrineView; +import net.minecraft.world.WorldView; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(WorldView.class) +public interface WorldViewMixin extends CitrineView {} diff --git a/src/main/java/fr/firstmegagame4/multisignals/optimization/OptimizedWireSystem.java b/src/main/java/fr/firstmegagame4/multisignals/optimization/OptimizedWireSystem.java new file mode 100644 index 0000000..a76a30e --- /dev/null +++ b/src/main/java/fr/firstmegagame4/multisignals/optimization/OptimizedWireSystem.java @@ -0,0 +1,292 @@ +package fr.firstmegagame4.multisignals.optimization; + +import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.state.property.IntProperty; +import net.minecraft.world.BlockView; + +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; +import net.minecraft.world.chunk.WorldChunk; + +/** Modified class from the Lithium Source Code + * Since Lithium optimizes only the vanilla RedstoneWire system, we have to apply it to our derived systems too + */ +public interface OptimizedWireSystem { + + int MIN_POWER_VALUE = 0; + int MAX_POWER_VALUE = 15; + int MAX_POWER_VALUE_FROM_WIRE = MAX_POWER_VALUE - 1; + + RedstoneWireBlock getObject(); + + int getMinSignalValue(); + int getMaxSignalValue(); + + default int getMaxSignalValueFromWire() { + return this.getMaxSignalValue(); + } + + IntProperty getSignalProperty(); + + IntProperty getPowerProperty(); + + boolean emitsTypedPowerOfState(BlockState state); + + int getTypedSignalOfState(BlockState state, BlockView world, BlockPos pos, Direction direction); + int getWeakTypedPowerOfState(BlockState state, BlockView world, BlockPos pos, Direction direction); + int getStrongTypedPowerOfState(BlockState state, BlockView world, BlockPos pos, Direction direction); + + /** + * Calculate the typed signal a wire at the given location receives from the + * surrounding blocks. + */ + default int getReceivedTypedSignal(World world, BlockPos pos) { + WorldChunk chunk = world.getWorldChunk(pos); + int signal = this.getMinSignalValue(); + + for (Direction dir : Direction.Type.VERTICAL) { + BlockPos side = pos.offset(dir); + BlockState neighbor = chunk.getBlockState(side); + + // Wires do not accept signal from other wires directly above or below them, + // so those can be ignored. Similarly, if there is air directly above or + // below a wire, it does not receive any signal from that direction. + if (!neighbor.isAir() && !neighbor.isOf(this.getObject())) { + signal = Math.max(signal, this.getTypedSignalFromVertical(world, side, neighbor, dir)); + + if (signal >= this.getMaxSignalValue()) { + return this.getMaxSignalValue(); + } + } + } + + // In vanilla this check is done up to 4 times. + BlockPos up = pos.up(); + boolean checkWiresAbove = !chunk.getBlockState(up).isSolidBlock(world, up); + + for (Direction dir : Direction.Type.HORIZONTAL) { + signal = Math.max(signal, this.getTypedSignalFromSide(world, pos.offset(dir), dir, checkWiresAbove)); + + if (signal >= this.getMaxSignalValue()) { + return this.getMaxSignalValue(); + } + } + + return signal; + } + + /** + * Calculate the typed signal an abstract based wire receives from a block above or below it. + * We do these positions separately because there are no wire connections + * vertically. This simplifies the calculations a little. + */ + default int getTypedSignalFromVertical(World world, BlockPos pos, BlockState state, Direction toDir) { + int signal = this.getTypedSignalOfState(state, world, pos, toDir); + + if (signal >= this.getMaxSignalValue()) { + return this.getMaxSignalValue(); + } + + if (state.isSolidBlock(world, pos)) { + return Math.max(signal, this.getStrongTypedSignalTo(world, pos, toDir.getOpposite())); + } + + return signal; + } + + /** + * Calculate the typed signal an abstract based wire receives from blocks next to it. + */ + default int getTypedSignalFromSide(World world, BlockPos pos, Direction toDir, boolean checkWiresAbove) { + WorldChunk chunk = world.getWorldChunk(pos); + BlockState state = chunk.getBlockState(pos); + + if (state.isOf(this.getObject())) { + return state.get(this.getSignalProperty()); + } + + int signal = this.getTypedSignalOfState(state, world, pos, toDir); + + if (signal >= this.getMaxSignalValue()) { + return this.getMaxSignalValue(); + } + + if (state.isSolidBlock(world, pos)) { + signal = Math.max(signal, this.getStrongTypedSignalTo(world, pos, toDir.getOpposite())); + + if (signal >= this.getMaxSignalValue()) { + return this.getMaxSignalValue(); + } + + if (checkWiresAbove && signal < this.getMaxSignalValueFromWire()) { + BlockPos up = pos.up(); + BlockState aboveState = chunk.getBlockState(up); + + if (aboveState.isOf(this.getObject())) { + signal = Math.max(signal, aboveState.get(this.getSignalProperty())); + } + } + } else if (signal < this.getMaxSignalValueFromWire()) { + BlockPos down = pos.down(); + BlockState belowState = chunk.getBlockState(down); + + if (belowState.isOf(this.getObject())) { + signal = Math.max(signal, belowState.get(this.getSignalProperty())); + } + } + + return signal; + } + + /** + * Calculate the typed signal a block receives from the surrounding blocks. + */ + default int getStrongTypedSignalTo(World world, BlockPos pos, Direction ignore) { + int signal = this.getMinSignalValue(); + + for (Direction dir : Direction.values()) { + if (dir != ignore) { + BlockPos side = pos.offset(dir); + BlockState neighbor = world.getBlockState(side); + + if (!neighbor.isAir() && !neighbor.isOf(this.getObject())) { + signal = Math.max(signal, this.getTypedSignalOfState(neighbor, world, side, dir)); + + if (signal >= this.getMaxSignalValue()) { + return this.getMaxSignalValue(); + } + } + } + } + + return signal; + } + + /** + * Calculate the styled power a wire at the given location receives from the + * surrounding blocks. + */ + default int getReceivedTypedPower(World world, BlockPos pos) { + WorldChunk chunk = world.getWorldChunk(pos); + int power = MIN_POWER_VALUE; + + for (Direction dir : Direction.Type.VERTICAL) { + BlockPos side = pos.offset(dir); + BlockState neighbor = chunk.getBlockState(side); + + // Wires do not accept power from other wires directly above or below them, + // so those can be ignored. Similarly, if there is air directly above or + // below a wire, it does not receive any power from that direction. + if (!neighbor.isAir() && !neighbor.isOf(this.getObject())) { + power = Math.max(power, this.getTypedPowerFromVertical(world, side, neighbor, dir)); + + if (power >= MAX_POWER_VALUE) { + return MAX_POWER_VALUE; + } + } + } + + // In vanilla this check is done up to 4 times. + BlockPos up = pos.up(); + boolean checkWiresAbove = !chunk.getBlockState(up).isSolidBlock(world, up); + + for (Direction dir : Direction.Type.HORIZONTAL) { + power = Math.max(power, this.getTypedPowerFromSide(world, pos.offset(dir), dir, checkWiresAbove)); + + if (power >= MAX_POWER_VALUE) { + return MAX_POWER_VALUE; + } + } + + return power; + } + + /** + * Calculate the styled power a wire receives from a block above or below it. + * We do these positions separately because there are no wire connections + * vertically. This simplifies the calculations a little. + */ + default int getTypedPowerFromVertical(World world, BlockPos pos, BlockState state, Direction toDir) { + int power = this.getWeakTypedPowerOfState(state, world, pos, toDir); + + if (power >= MAX_POWER_VALUE) { + return MAX_POWER_VALUE; + } + + if (state.isSolidBlock(world, pos)) { + return Math.max(power, this.getStrongTypedPowerTo(world, pos, toDir.getOpposite())); + } + + return power; + } + + /** + * Calculate the styled power a wire receives from blocks next to it. + */ + default int getTypedPowerFromSide(World world, BlockPos pos, Direction toDir, boolean checkWiresAbove) { + WorldChunk chunk = world.getWorldChunk(pos); + BlockState state = chunk.getBlockState(pos); + + if (state.isOf(this.getObject())) { + return state.get(this.getPowerProperty()) - 1; + } + + int power = this.getWeakTypedPowerOfState(state, world, pos, toDir); + + if (power >= MAX_POWER_VALUE) { + return MAX_POWER_VALUE; + } + + if (state.isSolidBlock(world, pos)) { + power = Math.max(power, this.getStrongTypedPowerTo(world, pos, toDir.getOpposite())); + + if (power >= MAX_POWER_VALUE) { + return MAX_POWER_VALUE; + } + + if (checkWiresAbove && power < MAX_POWER_VALUE_FROM_WIRE) { + BlockPos up = pos.up(); + BlockState aboveState = chunk.getBlockState(up); + + if (aboveState.isOf(this.getObject())) { + power = Math.max(power, aboveState.get(this.getPowerProperty()) - 1); + } + } + } else if (power < MAX_POWER_VALUE_FROM_WIRE) { + BlockPos down = pos.down(); + BlockState belowState = chunk.getBlockState(down); + + if (belowState.isOf(this.getObject())) { + power = Math.max(power, belowState.get(this.getPowerProperty()) - 1); + } + } + + return power; + } + + /** + * Calculate the strong power a block receives from the surrounding blocks. + */ + default int getStrongTypedPowerTo(World world, BlockPos pos, Direction ignore) { + int power = MIN_POWER_VALUE; + + for (Direction dir : Direction.values()) { + if (dir != ignore) { + BlockPos side = pos.offset(dir); + BlockState neighbor = world.getBlockState(side); + + if (!neighbor.isAir() && !neighbor.isOf(this.getObject())) { + power = Math.max(power, this.getStrongTypedPowerOfState(neighbor, world, side, dir)); + + if (power >= MAX_POWER_VALUE) { + return MAX_POWER_VALUE; + } + } + } + } + + return power; + } +} diff --git a/src/main/resources/assets/multisignals/blockstates/citrine_block.json b/src/main/resources/assets/multisignals/blockstates/citrine_block.json new file mode 100644 index 0000000..edf9d66 --- /dev/null +++ b/src/main/resources/assets/multisignals/blockstates/citrine_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "multisignals:block/citrine_block" + } + } +} diff --git a/src/main/resources/assets/multisignals/blockstates/citrine_ore.json b/src/main/resources/assets/multisignals/blockstates/citrine_ore.json new file mode 100644 index 0000000..c3a5d8c --- /dev/null +++ b/src/main/resources/assets/multisignals/blockstates/citrine_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "multisignals:block/citrine_ore" + } + } +} diff --git a/src/main/resources/assets/multisignals/blockstates/citrine_wire.json b/src/main/resources/assets/multisignals/blockstates/citrine_wire.json new file mode 100644 index 0000000..f89a5c7 --- /dev/null +++ b/src/main/resources/assets/multisignals/blockstates/citrine_wire.json @@ -0,0 +1,104 @@ +{ + "multipart": [ + { + "apply": { + "model": "multisignals:block/citrine_dust_dot" + }, + "when": { + "OR": [ + { + "east": "none", + "north": "none", + "south": "none", + "west": "none" + }, + { + "east": "side|up", + "north": "side|up" + }, + { + "east": "side|up", + "south": "side|up" + }, + { + "south": "side|up", + "west": "side|up" + }, + { + "north": "side|up", + "west": "side|up" + } + ] + } + }, + { + "apply": { + "model": "multisignals:block/citrine_dust_side0" + }, + "when": { + "north": "side|up" + } + }, + { + "apply": { + "model": "multisignals:block/citrine_dust_side_alt0" + }, + "when": { + "south": "side|up" + } + }, + { + "apply": { + "model": "multisignals:block/citrine_dust_side_alt1", + "y": 270 + }, + "when": { + "east": "side|up" + } + }, + { + "apply": { + "model": "multisignals:block/citrine_dust_side1", + "y": 270 + }, + "when": { + "west": "side|up" + } + }, + { + "apply": { + "model": "multisignals:block/citrine_dust_up" + }, + "when": { + "north": "up" + } + }, + { + "apply": { + "model": "multisignals:block/citrine_dust_up", + "y": 90 + }, + "when": { + "east": "up" + } + }, + { + "apply": { + "model": "multisignals:block/citrine_dust_up", + "y": 180 + }, + "when": { + "south": "up" + } + }, + { + "apply": { + "model": "multisignals:block/citrine_dust_up", + "y": 270 + }, + "when": { + "west": "up" + } + } + ] +} diff --git a/src/main/resources/assets/multisignals/blockstates/concentrated_citrine_block.json b/src/main/resources/assets/multisignals/blockstates/concentrated_citrine_block.json new file mode 100644 index 0000000..07ab6f2 --- /dev/null +++ b/src/main/resources/assets/multisignals/blockstates/concentrated_citrine_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "multisignals:block/concentrated_citrine_block" + } + } +} diff --git a/src/main/resources/assets/multisignals/blockstates/deepslate_citrine_ore.json b/src/main/resources/assets/multisignals/blockstates/deepslate_citrine_ore.json new file mode 100644 index 0000000..f16c8d6 --- /dev/null +++ b/src/main/resources/assets/multisignals/blockstates/deepslate_citrine_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + }, + "model": "multisignals:block/deepslate_citrine_ore" + } +} diff --git a/src/main/resources/assets/multisignals/blockstates/depleted_citrine_block.json b/src/main/resources/assets/multisignals/blockstates/depleted_citrine_block.json new file mode 100644 index 0000000..2351d37 --- /dev/null +++ b/src/main/resources/assets/multisignals/blockstates/depleted_citrine_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "multisignals:block/depleted_citrine_block" + } + } +} diff --git a/src/main/resources/assets/multisignals/blockstates/support.json b/src/main/resources/assets/multisignals/blockstates/support.json new file mode 100644 index 0000000..76bb447 --- /dev/null +++ b/src/main/resources/assets/multisignals/blockstates/support.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "multisignals:block/support" + } + } +} diff --git a/src/main/resources/assets/multisignals/icon.png b/src/main/resources/assets/multisignals/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..047b91f2347de5cf95f23284476fddbe21ba23fe GIT binary patch literal 453 zcmV;$0XqJPP)QAFYGys`80vegN0XDFh0OXKz&i8?Le#x7{1X)R+00000NkvXXu0mjf73i~T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/models/block/carbonated_tuff_block.json b/src/main/resources/assets/multisignals/models/block/carbonated_tuff_block.json new file mode 100644 index 0000000..e8cba13 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/carbonated_tuff_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "multisignals:block/carbonated_tuff_block" + } +} diff --git a/src/main/resources/assets/multisignals/models/block/citrine_block.json b/src/main/resources/assets/multisignals/models/block/citrine_block.json new file mode 100644 index 0000000..b44dece --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/citrine_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "multisignals:block/citrine_block" + } +} diff --git a/src/main/resources/assets/multisignals/models/block/citrine_dust_dot.json b/src/main/resources/assets/multisignals/models/block/citrine_dust_dot.json new file mode 100644 index 0000000..a154986 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/citrine_dust_dot.json @@ -0,0 +1,26 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "minecraft:block/redstone_dust_dot", + "line": "minecraft:block/redstone_dust_dot", + "overlay": "minecraft:block/redstone_dust_overlay" + }, + "elements": [ + { "from": [ 0, 0.25, 0 ], + "to": [ 16, 0.25, 16 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#line", "tintindex": 0 }, + "down": { "uv": [ 0, 16, 16, 0 ], "texture": "#line", "tintindex": 0 } + } + }, + { "from": [ 0, 0.25, 0 ], + "to": [ 16, 0.25, 16 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay" }, + "down": { "uv": [ 0, 16, 16, 0 ], "texture": "#overlay" } + } + } + ] +} diff --git a/src/main/resources/assets/multisignals/models/block/citrine_dust_side0.json b/src/main/resources/assets/multisignals/models/block/citrine_dust_side0.json new file mode 100644 index 0000000..a00acc2 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/citrine_dust_side0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/redstone_dust_side", + "textures": { + "line": "minecraft:block/redstone_dust_line0" + } +} diff --git a/src/main/resources/assets/multisignals/models/block/citrine_dust_side1.json b/src/main/resources/assets/multisignals/models/block/citrine_dust_side1.json new file mode 100644 index 0000000..465eddc --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/citrine_dust_side1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/redstone_dust_side", + "textures": { + "line": "minecraft:block/redstone_dust_line1" + } +} diff --git a/src/main/resources/assets/multisignals/models/block/citrine_dust_side_alt0.json b/src/main/resources/assets/multisignals/models/block/citrine_dust_side_alt0.json new file mode 100644 index 0000000..c54400d --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/citrine_dust_side_alt0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/redstone_dust_side_alt", + "textures": { + "line": "minecraft:block/redstone_dust_line0" + } +} diff --git a/src/main/resources/assets/multisignals/models/block/citrine_dust_side_alt1.json b/src/main/resources/assets/multisignals/models/block/citrine_dust_side_alt1.json new file mode 100644 index 0000000..2cbb133 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/citrine_dust_side_alt1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/redstone_dust_side_alt", + "textures": { + "line": "minecraft:block/redstone_dust_line1" + } +} diff --git a/src/main/resources/assets/multisignals/models/block/citrine_dust_up.json b/src/main/resources/assets/multisignals/models/block/citrine_dust_up.json new file mode 100644 index 0000000..ad04d42 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/citrine_dust_up.json @@ -0,0 +1,26 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "minecraft:block/redstone_dust_dot", + "line": "minecraft:block/redstone_dust_line0", + "overlay": "minecraft:block/redstone_dust_overlay" + }, + "elements": [ + { "from": [ 0, 0, 0.25 ], + "to": [ 16, 16, 0.25 ], + "shade": false, + "faces": { + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#line", "tintindex": 0 }, + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#line", "tintindex": 0 } + } + }, + { "from": [ 0, 0, 0.25 ], + "to": [ 16, 16, 0.25 ], + "shade": false, + "faces": { + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay" }, + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#overlay" } + } + } + ] +} diff --git a/src/main/resources/assets/multisignals/models/block/citrine_ore.json b/src/main/resources/assets/multisignals/models/block/citrine_ore.json new file mode 100644 index 0000000..98d1f16 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/citrine_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "multisignals:block/citrine_ore" + } +} diff --git a/src/main/resources/assets/multisignals/models/block/concentrated_citrine_block.json b/src/main/resources/assets/multisignals/models/block/concentrated_citrine_block.json new file mode 100644 index 0000000..2ca4807 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/concentrated_citrine_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "multisignals:block/concentrated_citrine_block" + } +} diff --git a/src/main/resources/assets/multisignals/models/block/deepslate_citrine_ore.json b/src/main/resources/assets/multisignals/models/block/deepslate_citrine_ore.json new file mode 100644 index 0000000..9c7a970 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/deepslate_citrine_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "multisignals:block/deepslate_citrine_ore" + } +} diff --git a/src/main/resources/assets/multisignals/models/block/depleted_citrine_block.json b/src/main/resources/assets/multisignals/models/block/depleted_citrine_block.json new file mode 100644 index 0000000..a4add45 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/depleted_citrine_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "multisignals:block/depleted_citrine_block" + } +} diff --git a/src/main/resources/assets/multisignals/models/block/support.json b/src/main/resources/assets/multisignals/models/block/support.json new file mode 100644 index 0000000..6394c76 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/block/support.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "multisignals:block/support" + } +} diff --git a/src/main/resources/assets/multisignals/models/item/carbonated_tuff.json b/src/main/resources/assets/multisignals/models/item/carbonated_tuff.json new file mode 100644 index 0000000..9be6271 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/item/carbonated_tuff.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "multisignals:item/carbonated_tuff" + } +} diff --git a/src/main/resources/assets/multisignals/models/item/citrine.json b/src/main/resources/assets/multisignals/models/item/citrine.json new file mode 100644 index 0000000..97a65e7 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/item/citrine.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "multisignals:item/citrine" + } +} diff --git a/src/main/resources/assets/multisignals/models/item/citrine_block.json b/src/main/resources/assets/multisignals/models/item/citrine_block.json new file mode 100644 index 0000000..d59b097 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/item/citrine_block.json @@ -0,0 +1,3 @@ +{ + "parent": "multisignals:block/citrine_block" +} diff --git a/src/main/resources/assets/multisignals/models/item/citrine_dust.json b/src/main/resources/assets/multisignals/models/item/citrine_dust.json new file mode 100644 index 0000000..9eab924 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/item/citrine_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "multisignals:item/citrine_dust" + } +} diff --git a/src/main/resources/assets/multisignals/models/item/concentrated_citrine_block.json b/src/main/resources/assets/multisignals/models/item/concentrated_citrine_block.json new file mode 100644 index 0000000..e03f972 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/item/concentrated_citrine_block.json @@ -0,0 +1,3 @@ +{ + "parent": "multisignals:block/concentrated_citrine_block" +} diff --git a/src/main/resources/assets/multisignals/models/item/depleted_citrine_block.json b/src/main/resources/assets/multisignals/models/item/depleted_citrine_block.json new file mode 100644 index 0000000..fdc2be3 --- /dev/null +++ b/src/main/resources/assets/multisignals/models/item/depleted_citrine_block.json @@ -0,0 +1,3 @@ +{ + "parent": "multisignals:block/depleted_citrine_block" +} diff --git a/src/main/resources/assets/multisignals/textures/block/carbonated_tuff_block.png b/src/main/resources/assets/multisignals/textures/block/carbonated_tuff_block.png new file mode 100644 index 0000000000000000000000000000000000000000..993c35dd92b8991a0a376e89772693264d650936 GIT binary patch literal 370 zcmV-&0ge8NP)Px$EJ;K`R5*=&QN3!zFcAJ4v=}NX@KR8_WXhHo^YdlvYZT!j)Yyg)kdZlq$98b< zdQ#oqbUNw2KRq-}^J%Sx_a1vSj-&KMB>gl^003jH1rZ^HAVUC1X_el&Y8O1E6^0Mj z>&8UO{Ocjl?BkOFrnG{V8OD2$5CQ<;d_HAXSbiy8t25e<_a2wa+pcV0Ivzdx;a$|2 z(yv}lX@zqY`r)P&RERMF0Afryh|F)F<#I}^u_(lB=Iu1l670& zzS7V#!?{Wp`GTu$+g%Hi0W&*S36N&2YbT&}?J{-&_~<&IL-ttv-0Qi%05mq*tju+g Q^#A|>07*qoM6N<$f^$ltk~_toMsa0 zSoeT6Np+8(OH-3V#EPe%eJ$F{kDWg9{b0fK=jUvnpZj4Yw(;Lw3qdPsxA^Hj53+yX zIWy1T4BcJSiS zOeu%ypKD+1EC|23=^Nt|9gFbyN+yPlDm*doF8^q;T%QE*W1z^0tXMs@CG*FWpJ z^T{fBmMvYg{^;XHFMd2}$ac}56*a*qc8`us-Lt>%rd4aKy7yV4L@;1)p_1s@^Xu4T zEUWuD0z&>OMG4x-T+8ZYUBKqOC4bV}>09Uiy#Ca;~6@vd$@?2>_%itnmN< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/citrine_comparator_0.png b/src/main/resources/assets/multisignals/textures/block/citrine_comparator_0.png new file mode 100644 index 0000000000000000000000000000000000000000..5027e8c48bcb18e23df72cacbe35b76158e54288 GIT binary patch literal 503 zcmVPx$u}MThR5*=wlfg?HK@`S+%Jh(u$qo#S0W0f8vP9?xZwe~Ln*=;~^5Q?>pHupW zw206{4}u=NC5M9Kl%)-n(9y{%cuWtQnan2kU1sNf@B6-)w{KQj+dETcp|v6mW9)1l zGq0(mwepzITCwr5Q6gIV3V^IeC{+OxpDXqSHq0_aNO*pkl!Rn8;@9s#rQGw&1X+#z z$%F%xs-RS5$tlc*A})lxOQ;Oc>pztG;;=;{5rR%+m}PX1_BikE18{ZI10c(?QjfH* z7Xrf>ptbVHJMZpOiwgJdVVkR)o+r9`fYo-I&`uMyR>*3EF_zBJ9srHCb>542-u>j{ z*c&Ty?V?JFWp698`S?imaQ9Cr@r9=2)d57cy> z+>B|gt&>kI&1MsT>+2t+X+j)>`1-P3002ovPDHLkV1n>#?eYKs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/citrine_comparator_3.png b/src/main/resources/assets/multisignals/textures/block/citrine_comparator_3.png new file mode 100644 index 0000000000000000000000000000000000000000..d3f7b8cdd03ad1e54a8b63d2fc56ae5935382b43 GIT binary patch literal 552 zcmV+@0@wYCP)Px$;z>k7R5*=wlR<0LP!xr~mPi@NOP;*8mZGMJFvAqgFv~(MogzXRaW~M73%4%) z4gQU8+;t;rElBO6&?4Q<6ar-^GEt{kZH9~)ETT{snfIEsdN)b#Irp6VZtfc?&sNVE zhEkGjL{U6^e&d`oiBi&FmQs?NH>PrhaeNAZuwA4q040-4zf-IehFIBxWYEtE3ESoK zm#?{8GUy|0*K}rSK*|DA7A`qub6F7`mOe{X8KBuZ$jwD#7mches6{$qNNsVBmHIpY z>)TBL!Z6IuNU6zGpfd!NlBT_t`aF)Cy4M#ftZz3>q2>dOR{Rnbzl2f}VY@_8Ol@%v zfNRl9u3A@&`||RVG17ITTGhW>KA*l20Q|b%VC;Ae$CW&N{K(*%8^@IhBT0}J2Kxiv97%)_reo`0 z?n%%i33>$k1Cu-a@I8I;@_Y-@|3Bk-2qAd!b{d#YQ76NE0NrjE0km2NW_QdHv=HPM q>tbZL)m$b`jH39zS2vr_;(r14deUO3zQ&*c0000*J;Px$a!Eu%R5*=wl0i$uKoo>Oo3xlVOP4J45+OZ$^bdK^bN`th{1JK(QRpqF(x3$q zwxn#T(o*ygcDspjPMh~OGxKKO$!s?J5kiorDP35tR_<(!0bsGHYs;b_6hdH(A$SUFmS65HWz?uYzdQk;)P&GBZf@^79r#dc!Zgd=_cY50(=;W|a{x|9LjZ(K0QlTi z3`cQozg)BZu8=a~`sxyZ`8=;3_|}8|pz)(63i<;M`yBxH508j=jHx#C{CTaiRXpr> znDR(2WI~c8XkB8e4O*A<{FDKPqu41~9QHfsNC?sBg>X#yb6fozV7n*cFPx$fk{L`R5*=wlCe(1Fcd`(ZCcSbR;^fK38;)9G4K_9O?SS8Z|DF6pTGbDMh2t| z2oazX0y#?M6i}-QhRCiH!kw)5?0fIKejDTQ_(upq9LF?aI-R<+F$RFg$Fla6rUXI= zj4>ohLY8Ija-M&=vy{C`eR8soxz9K{P6=$|^z6LRfe)p&*d2|ynLP7w{lV^NL=eX@ zNs<7tIp_l*WCXzHyr4e_OZ$1o{JTKP9v5Z@4tC%!DINIM+nsLZp(Sc}x~!H904}d? z5#bP1%xL-ZT4k%aS}rj8nq0_;D2mWJ#}qTP&T0861M~->Q?ghs7tWCoqS6aso$}|r z_&30MPlQ9X&I#<_T6Jr`4%@5mOUn%t``V zP-+XP2IkwZ2Wy?UO;k#9xV;BJ6qTwraer?6Yg*?31g4lFWe*V!d3k+vjiz~<5J0&| xQuZ8?Kc`aCkt!uC>W<(kO(CUnxyeD3n_pyl!FZ!+A|3z$002ovPDHLkV1g}!#>M~u literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/citrine_computor_1.png b/src/main/resources/assets/multisignals/textures/block/citrine_computor_1.png new file mode 100644 index 0000000000000000000000000000000000000000..85bbc9d1c66d80dd8796d2f6b3afb3dfbae72f2b GIT binary patch literal 494 zcmVPx$s7XXYR5*=wlCg^uK@`S+p4)`Wu)_`n!W6kmA`-53+f-sFwr8P*Rs19TH&WVI zDCGWvRFNQ}a)iiKN0u|_9n7*}0u~Bdj5{~W?S0jI-@N(edvD&I$z<|Z2!Ym`Hf*=s z5Ig4pI6wE?rYJ~+5IE;B#!!}JD6XnsA(pb!;6H!)1b|XKlKSA?`_onjF_h|YG#G^Z zXfPnrT4Rg>;O+gp0Q5&G09ig}J)HqyRt_#VERKh~c>WB4voqrz#MbMJ0EhVr{pH-} z)0r0m79Tz$x+!kI;~?(0KT3J<^2rVB<#HbQEX%OA!tHlhTam<5jv*hvz9BLk2`+?a z@CjT`Im^c!<|nP~l*@U87v0o5sQ(sVJ)O~y3bTAnxt#N3wFCSh_0#6Q9Nad*8ujHE z)?Qr;#0z6qj`eibYWwtSiTU$8dK;|0iUlN#<43-Y zEaMv>gn);jwdUUcy873wt-J%b-yvlO(M`Gd{xcl3_1lI7{31!&2|{t7O35Iqlx(~n k1U5wh1&!i12W@Wt0WliF+`udz>i_@%07*qoM6N<$f+fM^#sB~S literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/citrine_computor_1_powered.png b/src/main/resources/assets/multisignals/textures/block/citrine_computor_1_powered.png new file mode 100644 index 0000000000000000000000000000000000000000..33d81bc0997653847dc50295f224032f30a8c7a4 GIT binary patch literal 503 zcmVPx$u}MThR5*=wlCg^uK^Vno$=ajQHh5<+0DMQcq_6u!7DfBChPtr|amb%`nf=ODCR zT?E+8j_J&&Za#wq608ZX+hb5Q*)z;ZO96BH)dfMP!7$6^DxMyhA^ zdD*$GffcIDA&j}Y76=DMFD%Q^q|x^2rvm-wx8K{X6ZV6Yrh9O?LN6@(`D=Q8;YDwQ zF;}60WOnq}#Yhsq073|O2udmL{jaNj&6v_Tu-gq%wh--@^Y0h_peb(?B5;EwWy=eN tInz{n(KMB{*S)|h&mpH)+~lCi%|H5L%KFG5ZOs4x002ovPDHLkV1fV->1O}{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/citrine_computor_2.png b/src/main/resources/assets/multisignals/textures/block/citrine_computor_2.png new file mode 100644 index 0000000000000000000000000000000000000000..7eef07a60376cfe300f9a4bec8700c2486eb5bdd GIT binary patch literal 488 zcmVP)Px$qDe$SR5*=wlCf*sKorJ*HR@o;hYt&c;RaDas zJCv@T3XP$Z1_Bz?3?ZU62*VkPbII5aXPr(|`KG&f@4olF@4Y9B#p16J0;LpP*lxG( zY>WZm?#{;U^PE5kfiZ?G%h>PtF1aip+*!(gEB^EP2LNFh5!4SKKYi|0;3EtpPUG0! zPve+CDMglL0DO790U(;5*viR_+vN&?A_drRDWCK1{4D@CHuJ&+j*yp78AK<$u!4bnW8f@ffX3%%MW-lAiCfkI{<{JdIwpNG1sg zAzFC>G%m|z#vq<|wo|6-R$L56Xk8N2vjwlOT}8WMA;8V|rO32Z1*DBiD_Bn|0f(0b<+NG{bIz>W%z zj?X|T#o(A%PfhF6Dlmr%Df@`wh~JySJ#_Wkg#hd#N!fQqexG3|9cdWKR&_^kpXZR% eO72q7rRE<`1h_TYP>gB-0000Px$uSrBfR5*=wlCg^uK@`S+hP6m8LxwCY2g9*fiNaO^oAlaRNE(a#3({QU{U!Gg z1mQTe5Zg2gUerbqR#*=?ZtoIUA`^C*h@}>rot?$KubO%D=6m1!-n%!QPX7uaP)gB; z)oNwW#uxyuuFBYTn&Jr|FvgH137gHvCg=GddzP}>h@YK4!hGNG^d!Zr9$vqB+p55Y z?*|-)A)n7~`1$D+ zE4}&%&chB_1QAF?qaT z{q?ssQcars(z(mP3e{&9TCZyYcVV))RM95;!v*{(Y7(<8Y7d}X5?GSOkiDFPx$o=HSOR5*=wl0R?LKp4h#J~Ue27por1a;!$r}I_?K9o9OI2bs8I2aIU ztx1vufDdOc0f6Xk9vz|1d^#xK((r0zd;BAFP@{d z=J2tu-kLFarNEX2Qg#qwkDJ>+F45L+8v>{fNy?5R^7~XuI#Q)%<9A1Jou-h|C~i~G arse^AV!xeatljbe0000Px$r%6OXR5*=wlD%%*FcgKq23ib=HX$KhSpOi%QYi48Y@OO?=sOr)`viT2zCafZ z&5*HMJJhfXWN87R8Vn`JIOa_It)GBAXygWQS_vhJcHoF%>pp>Eu+wIoH z#uxzB>pFLpWq3jej4`BXN}lJAToiv@EM>2ik3YV|Bss6&XL$DF^Z7-mgC@f8Ig|02 zWxQdv*fAN8@sv`eX$runcdr15rak~73RuP)09K0~0CUmfn;F8%5Pqh$gQj)+5THLg zBAVvzY(>7$e<1t;rYbpT)*DTIPT!9Hvu={y<%1wV>jG1iXkFknyWB*7^5HSMbRx%R zhuj#^;(4&|vWNouqodApO!7~e{-AbXXA7{5H$+oQyhKC+Cdo;DRjvo>&1p;M;Hd^$ z*vCz1eYY2AF3f7NV;OHcZGZi;=DOUwHC4Iq0n|%kMOKR)$7hG`{1mjlYYIr_A_VGD z{k{bu1e^>}O7Y^6XQ!rhQ9CeIiIhErKj8Z2kGtrqw+kNBizH>w2{r2sL+M1rP_}+| j0#{iE87*>`gDy7@M7hViXG8sF00000NkvXXu0mjf^Qzmy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/citrine_ore.png b/src/main/resources/assets/multisignals/textures/block/citrine_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..5e130b6ca2022fb429d22db0e65d6de658eb1e4a GIT binary patch literal 525 zcmV+o0`mQdP)Px#1ZP1_K>z@;j|==^1poj6ok>JNR5(vvlf6y?Q4ocP4UqyUh(Az?1`CyFjFsA8 zV=tW#LTAAX(D^u2G}@S$V2IJM@h351(MZ8=frYr=z%0w2|&E2eHLsQ7wf$&x;7Ksb;e|H5LF9erg_P zOC_}+$qpQTjKz}co4#CM<#Z8S@i?#8MYIsB~U^Sb$0 zyO93fm-MVVCy!e}0eyp0OlV9t<45pe&J zR;vYYg76TS&Yvs!Y$V$muu-X~O>=;!sfSlXJJ-IQ%s!elr_+|5({-tyFM8AKy3+nB zEt+VJLo={sFg!kq_93v|K(2ET*Nrxc#^)lbA9S83YPEoRA&>%Wh=6G|*v*()d>tfh zP`D00Uzdi6C$o14XBk)OyM6T`<8>UWl*4i5n#nm(o#8j@6Y+z$s)nP(n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/citrine_repeater_0.png b/src/main/resources/assets/multisignals/textures/block/citrine_repeater_0.png new file mode 100644 index 0000000000000000000000000000000000000000..4781028ee48fafd45146a35527381f5ed4cb1fe5 GIT binary patch literal 467 zcmV;^0WAKBP)Px$jY&j7R5*=wlfO$GK@`V7F54XJxWf)e59(c$rm&XkgbR@bgO?|6yXK`Gf| zsZx^ty*E*!b4vh3mLuf=D0^RfZ?UXiWcQtuiT2FC?d?q zI=3V-rbKJa&tJc}zPaMl#}BNV5CVYNY{q1A!tHH^)*53<(u>Ql8wwOcuvjc!B?9>N z{RegJNPvF!v(qm$O#?tt6#e|e;V|mLm=b7(l&n|x3k$1-{&h>CegARCT9)luRne{{fbwhuMKLbuDxzEI_oe2N{002ov JPDHLkV1g2I)1&|Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/citrine_repeater_3.png b/src/main/resources/assets/multisignals/textures/block/citrine_repeater_3.png new file mode 100644 index 0000000000000000000000000000000000000000..38fe95954b4be8ffe38b8ab3723e59ab5a754568 GIT binary patch literal 486 zcmV@P)Px$ph-kQR5*=wlh11tK@`V7UG@^#afb|qLevpYYYI-t(VON_$U*-C5ADsr!N0@5 z!L#1HYeb}l22ye;VaGNgl?_`r&|^GoW;2uEyFB*$eee5z%-e(B(O}KSl#=*X6y?U> zvW@AWlx(aTdE-eC6C)u;E@Dw_7OoNnhlN)x;Ez5f%V=}bXTud%GJO9a>*T+Hdbh1JS0l;iFV>B8vpD)l_V@yW;>GPMp z3lu`ITrTg%PY1_@;?RJAMjLCrdkfPn{ZecFr>ieGn z-?bR(_wR31v#j=u#e(T%6$Ja7yO)FB(O~V4#@&EO(&ov08;{4qS?AW)0&a|=DF6HG c`nb>k1M#=QbnN$sW&i*H07*qoM6N<$f}a@blK=n! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/citrine_repeater_off_monochrome.png b/src/main/resources/assets/multisignals/textures/block/citrine_repeater_off_monochrome.png new file mode 100644 index 0000000000000000000000000000000000000000..71f0f736a954e06d65a3bef03f5c05548df91a52 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Og&v3Lo9le z6C_xhWn5fb{`7Zr{OI@R6;^bhXkNpaBe?u6{1-oD!M#o*sGX1~*;D`V9_J{wgM;jGL9cuA@ba`<#56`R1k`i41jAQnG zY1MHzc$3rp)Bfsp+4bTPA3X0>{_lEtpkKT~_uxxbHXzW`(`(x<|G`>*JtGeg9AdJ0 zBK_g*ZF8q*kIf$(Tg=a+AGcrqK7%r^W?TLLe-rZ$?36w)@$b*i=Iaa$n~E*2+o~=W Q2fC2K)78&qol`;+0B?d>0RR91 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/citrine_torch_off_monochrome.png b/src/main/resources/assets/multisignals/textures/block/citrine_torch_off_monochrome.png new file mode 100644 index 0000000000000000000000000000000000000000..a8541e099bb74e8c2afb330df6be65c8abd742fe GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|v^-rLLo9le z6C_xhWm;NW|9=1Q;YYteudv-o|M_-?HZ?yc>{=(qdRT~oK_Q1TB<78V2T&J-r>mdK II;Vst05@Px#1ZP1_K>z@;j|==^1poj6TS-JgR5(w4k|9V1K@f)bPO;u;F=|pUJ&R%zj3NjI z4HlCi7_BD3WVG5W3W65FBA7&rFNmPUXB5Ocqk^pa|9Af~?|i%umYLbTnfYh9#DARm za$v!U{P((YzMd)@D4#pE7p~g{ZTsbiHYtk2=bwiRNH$eFh91RG2t{Inx044xShCh| z>}b(F3ZzkTAlo|P8QWZEtmJsVHqAJn9H#{-dBkl8wdLrYwL*NW-l5 zQF3+P>#a)xE_HwwhxqvFo2NvUoNp|7b?S$b1d;&@&}*O% z`s3Umv2@pmM&_oZ0000EWmrjOO-%qQ00008000000002eQPx#1ZP1_K>z@;j|==^1poj78c9S!R5(v%Q_pJ?Q4s#Nn;){#U`%2o;(}V~f?_Cw zB6Lscp(n{f&`S>`SO0*3ha9~4AN1nMqX&<@h@c<{1(BwO4S@<>v`u$obsG~4#x>u> zSyKEUnfKnjZ{Ex|vqq!Qh=U+Nuh+vg!Y~p$KYvjyp?ByjmGZJS%jI&@_q*8J>*3(w z5Tj9y!Qe=ogkk)FWm(6_gk@!AZPe@amzXzDRT~5fv*2W~0m)j?j2N;lK zmSC=|EH`cY{CE@MN4bKmw~J9GjkB{EA-AF&-hDBJaBtxP9$d@f)dyd6Vj$CX-6qpg zp|)qz$et=-a|hTz%HVx_AH(5LUTgc`P?)X2vCqhw0w*GBdJ3&uYwosMVt0N`#MCyX z_(!q|$F!fW?MgN(+(OsK-2E&6X|uZi6EpwziIX*JbRDqQDGQsCC1)h^$Gyx!tyYWK zLZ@WP1=g(4q0yOGUaE>ELZc`)(LmcWjm5>A@H|h>nU(svb{t1C6b+R8@O0|f9Bgg) z2*%kF^s7#fpLY{+&0Ma~)Y-p$;}Q-(eof}!O(#8WS14qbQL$}l@7whb`u)N9;qQ>I zkz|diS`aVRK1s`1iV8|lGlE@8x8&HQ&kK( z4jb$fXZyrdQn)e9-_L%=aRnYv_B(0Wo*7!bS*un&v}LP^V)OXGn6vHst(nKy-P+d1 z+p6c+(;07^R9hSBw&1)Z`{jp$lXMpRT2U|X`kEcbw#j)t%-^5I zFZ*A)XeuKc+u=C%Yt=&0ISZvF71W*Q-L0SVo1ypj(TBRJX;XmV#FrZ3nda-upao=e V05J$$3Z4w2JYD@<);T3K0RWiglO_NF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/block/support.png b/src/main/resources/assets/multisignals/textures/block/support.png new file mode 100644 index 0000000000000000000000000000000000000000..928e6a8aceb5d12d1d5b059909ec17ac90c48835 GIT binary patch literal 482 zcmV<80UiE{P)ee_kDNY-AgKIn*IP7V*qenms!Z!pxd+Zan#2F_;~2~_12Ppx(|H_36rEC zHI*u2$zNP->UKN!z5R-Ij4{+(OIiroWNdW_I{AC8x=K?iPFqI|zCZBxD;mfh+}%9; zfF%||xii3UIApDU;IC~T@ZN1}$93J3O=Xb*_8N-4hT=0y2$Q5ZZz@G?<%&S zHgJqFg%IHC?7VQWXtde9BONbKj^_kIE{`VhZZHR0E8%za7Yru}CPm zJUK30e#H?ct@`ddx^jDc^E1Z=zT#+6dJez63eHAcI<%w!000hUSV?A0O#mtY000O8 Y00000007cclK=n!07*qoM6N<$f;3Roa{vGU literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/item/carbonated_tuff.png b/src/main/resources/assets/multisignals/textures/item/carbonated_tuff.png new file mode 100644 index 0000000000000000000000000000000000000000..2c7df913fcee15f14f15dcf4f3b54645d3ab0d2c GIT binary patch literal 325 zcmV-L0lNN)P)Px#|4BqaR5*>*lCes}KoEw%h>dW=g-s)@l2)`h@D=RR+2$qf(rKY*VW(Z%B`H=R z%N{wnG8XERy-Te1?`C$se`c0}f3IZjp(t*Laa>h*leGuQvMdJxr4%9pfH4N|cauiR zZy-S5_W(HO0BBkZz|-SH0&qNb%kw;%<_8uLL?pzoZ*{0S8UtEuwALXO5u9@vV*;#{ zikgH8n$}WP_W%^d4FGjrM=PzLU)Wc)LYkfc1f$jJA_8Txq~C7l4aP>^?=Z&Dv=&(` zzy4$ojtsia({-LKO9L=gzukP-d_?(!JGi{M9ssf|<^1fFrnM3HZrkZQm@}FK|BgNZ XOp|T#3XJ?o00000NkvXXu0mjfD?f>p literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/item/citrine.png b/src/main/resources/assets/multisignals/textures/item/citrine.png new file mode 100644 index 0000000000000000000000000000000000000000..64b6c97549197bd66255d9011108228038e493c7 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij+d%8G=SokMP+<9|5w4raaPx$2}wjjR5*>zkv~hrKpcjjlkRELm0F+$Tskmkjy^ zG6=djIqBF%3gV_k4!Nm?+Ct`Y>XAzmXdR00c7J})Jue6APNyZz$$>EQ^~PTy`p3?% z4rtZ`cB;F@fV|!^Sun`z73FO>B2Cj`K(iju*xO%4fJ%Pj<9oVrsnZf>GJ~gABW@oC zB70^H;yAYMQc5GGbh?yPa}4JFzWO~2QcBVA#%ykncpnbR0a|Nn?MrHHxVi4)Z3*c2 zn9Kk#D69tH^a;bz0QkNSz~fy6z}49?_b;Cu9$gScku&2|NRmWkL8s>u0HvRuuPZgk hCvT*bvXA_q`~pfSVbMzX?|T3M002ovPDHLkV1f+^kk|kK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/item/citrine_dust.png b/src/main/resources/assets/multisignals/textures/item/citrine_dust.png new file mode 100644 index 0000000000000000000000000000000000000000..5d16b7dca6c3cf069e62450d21d8f1c702ed0336 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik1c)B=-SokMPJbQ3*TF-w4o~KEyJ^@n94JMzmxD6XVoZBWbr!B#hVcAT7 zKhB=5Un>fvni3f{rAaV+bZqnaT6)}o@HfS(1h6g_%+|8zT>M0)y?A zi>7>H2M#bWGzn6zC_u)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4fhK6f1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/multisignals/textures/item/citrine_repeater.png b/src/main/resources/assets/multisignals/textures/item/citrine_repeater.png new file mode 100644 index 0000000000000000000000000000000000000000..8e94c3d36f40e4a19aa0c498aadbf879bbcee87f GIT binary patch literal 307 zcmV-30nGl1P)Px#?MXyIR5*>*kRfgYK@^6+A=M>ZpjT+11Va!AT7@NuqA(Z)jy=H=^m>wtIY3=| zfXy1X0HU3cCz=Xilhso}X0sb0rPRQ$W|H~7H}8k5OSh@)(}S|^UN}c0o0R{%piym6 zzb~IJ09dZJ{}W_$;||@Xvg;V$=2m4Nc%Ekgj4^1fmHCQEl4M^1`Ene%c%J}Jc^m^U zeTi}dQbD8IqFDN7FzQ=0.14.24", + "minecraft": "~1.20.2", + "java": ">=17", + "fabric-api": "*" + } +} diff --git a/src/main/resources/multisignals.mixins.json b/src/main/resources/multisignals.mixins.json new file mode 100644 index 0000000..ff9d4cf --- /dev/null +++ b/src/main/resources/multisignals.mixins.json @@ -0,0 +1,17 @@ +{ + "required": true, + "package": "fr.firstmegagame4.multisignals.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "AbstractBlockMixin", + "AbstractBlockMixin$AbstractBlockStateMixin", + "BlockMixin", + "RedstoneWireBlockAccessor", + "RedstoneWireBlockMixin", + "StateMixin", + "WorldViewMixin" + ], + "injectors": { + "defaultRequire": 1 + } +}