From 98d9d1630e3fe172e84ba7aa47a2584b3c068d2b Mon Sep 17 00:00:00 2001 From: xkball <45330674+xkball@users.noreply.github.com> Date: Fri, 26 Jul 2024 21:33:57 +0800 Subject: [PATCH] port to 1.21 Took 11 hours 5 minutes --- .gitignore | 136 ++-------- README.md | 43 ++-- build.gradle | 233 ++++++++++++++---- gradle.properties | 49 +++- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 43504 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 44 +++- gradlew.bat | 37 +-- settings.gradle | 7 +- .../86465dcd1331b21a960f3496f736ce9922bfa9ba | 2 +- .../java/org/teacon/powertool/PowerTool.java | 21 +- .../org/teacon/powertool/PowerToolConfig.java | 32 +-- .../powertool/PowerToolSoundEvents.java | 14 +- .../attachment/PowerToolAttachments.java | 21 ++ .../powertool/block/CosmeticBarrel.java | 13 +- .../powertool/block/CosmeticBeehive.java | 13 +- .../block/CosmeticCampfireBlock.java | 38 +-- .../powertool/block/CosmeticFurnace.java | 26 +- .../powertool/block/CosmeticHopper.java | 40 +-- .../powertool/block/CosmeticSimpleBlock.java | 9 +- .../powertool/block/CosmeticTrapdoor.java | 29 ++- .../powertool/block/HolographicSignBlock.java | 39 ++- .../powertool/block/ItemDisplayBlock.java | 53 ++-- .../powertool/block/ItemSupplierBlock.java | 57 +++-- .../powertool/block/PeriodicCommandBlock.java | 4 +- .../powertool/block/PowerSupplyBlock.java | 37 ++- .../powertool/block/PowerToolBlocks.java | 120 +++++---- .../block/SlimItemSupplierBlock.java | 6 + .../teacon/powertool/block/TrashCanBlock.java | 34 ++- .../entity/HolographicSignBlockEntity.java | 100 +++++--- .../block/entity/ItemDisplayBlockEntity.java | 49 ++-- .../block/entity/ItemSupplierBlockEntity.java | 88 ++++--- .../entity/PeriodicCommandBlockEntity.java | 13 +- .../block/entity/PowerSupplyBlockEntity.java | 45 ++-- .../bridge/PeriodCommandBlockBridge.java | 2 +- .../powertool/client/ButtonWithHighlight.java | 3 + .../teacon/powertool/client/ClientEvents.java | 45 +--- .../powertool/client/FenceKnotRenderer.java | 14 +- .../client/HolographicSignEditingScreen.java | 22 +- .../ItemDisplayBlockEntityRenderer.java | 3 + .../ItemSupplierBlockEntityRenderer.java | 3 + .../PeriodicCommandBlockEditScreen.java | 5 +- .../powertool/client/PowerSupplyScreen.java | 17 +- .../teacon/powertool/command/FlyCommand.java | 4 + .../powertool/command/PowerToolCommands.java | 8 +- .../compat/top/PowerToolTOPProvider.java | 4 +- .../compat/top/TOPCompatibility.java | 12 +- .../powertool/datagen/DataGenerators.java | 10 +- .../datagen/ModBlockModelProvider.java | 15 +- .../powertool/entity/FenceKnotEntity.java | 90 ++++--- .../powertool/entity/PowerToolEntities.java | 41 +-- .../powertool/item/ItemEventHandler.java | 10 +- .../teacon/powertool/item/PowerToolItems.java | 34 ++- .../powertool/item/TransparentBrushItem.java | 9 +- .../powertool/menu/PowerSupplyMenu.java | 5 + .../teacon/powertool/menu/PowerToolMenus.java | 19 +- .../powertool/mixin/CommandBlockMixin.java | 4 +- .../teacon/powertool/mixin/CommandsMixin.java | 2 +- .../client/GameModeSwitcherScreenMixin.java | 9 +- .../mixin/client/KeyboardHandlerMixin.java | 9 +- .../powertool/mixin/client/PlayerMixin.java | 11 +- .../teacon/powertool/motd/MotDHandler.java | 8 +- .../powertool/network/PowerToolNetwork.java | 63 ++--- .../Permission.java | 49 ++-- .../client/OpenHolographicSignEditor.java | 49 ++-- .../client/UpdatePermissionPacket.java | 53 ++-- .../network/server/SetCommandBlockPacket.java | 45 ++-- .../server/UpdateHolographicSignData.java | 184 +++++++------- .../network/server/UpdatePowerSupplyData.java | 80 +++--- .../teacon/powertool/utils/CodecUtils.java | 69 ++++++ .../teacon/powertool/utils/VanillaUtils.java | 38 +++ .../resources/META-INF/accesstransformer.cfg | 2 +- 72 files changed, 1482 insertions(+), 1024 deletions(-) create mode 100644 src/main/java/org/teacon/powertool/attachment/PowerToolAttachments.java rename src/main/java/org/teacon/powertool/network/{capability => attachment}/Permission.java (58%) create mode 100644 src/main/java/org/teacon/powertool/utils/CodecUtils.java create mode 100644 src/main/java/org/teacon/powertool/utils/VanillaUtils.java diff --git a/.gitignore b/.gitignore index ef25fb7..31d2550 100644 --- a/.gitignore +++ b/.gitignore @@ -1,122 +1,26 @@ -# User-specific stuff -.idea/ - -*.iml +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out *.ipr *.iws +*.iml +.idea -# IntelliJ -out/ -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# Windows thumbnail cache files -Thumbs.db -Thumbs.db:encryptable -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - +# gradle +build .gradle -build/ - -# Ignore Gradle GUI config -gradle-app.setting - -# Cache of project -.gradletasknamecache - -**/build/ - -# Common working directory -run/ -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar -*.psd +# other +eclipse +run +runs +run-data -run_* -**\logs +repo \ No newline at end of file diff --git a/README.md b/README.md index c45a1c7..b421122 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,25 @@ -# PowerTool -一堆 Minecraft 内的线上展会可能会用到的小玩意。 +Installation information +======= -Gadgets that online convention organizers may find useful when holding conventions inside Minecraft. +This template repository can be directly cloned to get you started with a new +mod. Simply create a new repository cloned from this one, by following the +instructions provided by [GitHub](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template). -## 特性列表 +Once you have your clone, simply open the repository in the IDE of your choice. The usual recommendation for an IDE is either IntelliJ IDEA or Eclipse. - - 周期循环命令方块儿：按一定频率（周期）循环执行命令的命令方块。 - - 垃圾桶：外观和原版堆肥桶一致，但丢入其中的物品会立即消失。 - - 电源：提供任意数量的 FE 能量输出。 - - 供货箱：创造模式下可设定其中的内容物，非创造模式下可以取出。 - - 漏斗（装饰品）：外观和原版漏斗一致的方块，但没有任何实际功能，也没有方块实体。和原版漏斗一样可以朝四个方向旋转。 - - 营火（装饰品）：外观和营火一致的方块，但没有任何实际功能，也没有方块实体。不能当作烟雾信号源使用。 - - 灵魂营火（装饰品）：外观和灵魂营火一致的方块，但没有任何实际功能，也没有方块实体。不能当作烟雾信号源使用。 - - 全息投影告示牌：和空气类似的方块，但能像告示牌一样显示文字，可以选择一定朝向玩家或者面向垂直于y轴的特定方向。创造模式下右击可打开编辑界面。 - - 看起来没用的木棍：没有任何功能的物品，外观和原版木棍一致，但有附魔的特效。 - - MoTD：玩家进入游戏后会收到一条聊天消息，消息内容可自定义。 - - 栅栏绳结：原版拴绳现在可以将两根栅栏拴在一起。 - - 更多没有方块实体的“装饰”方块 - - 物品展示框和荧光物品展示框（但是方块版本）：可以旋转其中物品，支持红石比较器检测，支持隐藏框体。极难破坏。 - - 透明刷：右键可直接将方块模式的展示框变为透明。 - - 未完待续 To be continued +If at any point you are missing libraries in your IDE, or you've run into problems you can +run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything +{this does not affect your code} and then start the process again. -## 鸣谢 +Mapping Names: +============ +By default, the MDK is configured to use the official mapping names from Mojang for methods and fields +in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this +license. For the latest license text, refer to the mapping file itself, or the reference copy here: +https://github.com/NeoForged/NeoForm/blob/main/Mojang.md - - `src/main/resources/assets/powertool/sound/item/clap.ogg` - 出自 [https://freesound.org/people/mikaelfernstrom/sounds/68727/](https://freesound.org/people/mikaelfernstrom/sounds/68727/)， - 在 CC-BY 4.0 许可证下发布，有修改。 - - 全息投影告示牌的部分代码改编自 [ModFest 团队维护的 GlowCase 模组](https://github.com/ModFest/glowcase)，该模组代码在 CC-1.0 许可证下发布。 +Additional Resources: +========== +Community Documentation: https://docs.neoforged.net/ +NeoForged Discord: https://discord.neoforged.net/ diff --git a/build.gradle b/build.gradle index bed266a..98600c6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,58 +1,121 @@ -buildscript { - repositories { - // These repositories are only for Gradle plugins, put any other repositories in the repository block further below - maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } - maven { url = 'https://maven.minecraftforge.net' } - maven { url = 'https://maven.parchmentmc.org' } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0,6.2)' - classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' - classpath group: 'org.parchmentmc', name: 'librarian', version: '1.+' - } +plugins { + id 'java-library' + id 'eclipse' + id 'idea' + id 'maven-publish' + id 'net.neoforged.moddev' version '1.0.14' } -apply plugin: 'eclipse' -apply plugin: 'maven-publish' -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'org.parchmentmc.librarian.forgegradle' -apply plugin: 'org.spongepowered.mixin' +tasks.named('wrapper', Wrapper).configure { + // Define wrapper values here so as to not have to always do so when updating gradlew.properties. + // Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with + // documentation attached on cursor hover of gradle classes and methods. However, this comes with increased + // file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards. + // (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`) + distributionType = Wrapper.DistributionType.BIN +} -apply from: 'gradle/teacon-forge.gradle' +version = mod_version +group = mod_group_id -java { - toolchain.languageVersion = JavaLanguageVersion.of(17) +repositories { + mavenLocal() } -teacon { - modId = 'powertool' - modVersion = '1.3.6' - modLicense = 'GPL-3.0' - modGitHubRepo = 'teaconmc/PowerTool' - modAuthors = ['IzzelAliz'] - modDescription = 'PowerTool by TeaCon' - platform = 'forge-1.20-46.0.1' - - // uncomment these lines if you need - modName = 'PowerTool' // default to repo name - // modGitHubBranch = 1.18-forge // for referring the license - modifyMemberAccess = true // for access transformer - useDataGeneration = true // for data generation - // publishTask = shadowJar // for shadow jar or other usages - // lazyTokens = ['minecraft_classpath': { project.configurations.shadow.asPath }] // for runtime tokens - - // use './gradlew -q printModMeta > src/main/resources/META-INF/mods.toml' to generate mod meta +base { + archivesName = mod_id } -mixin { - add sourceSets.main, "powertool.refmap.json" +// Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21. +java.toolchain.languageVersion = JavaLanguageVersion.of(21) + +neoForge { + // Specify the version of NeoForge to use. + version = project.neo_version + + accessTransformers { + file('src/main/resources/META-INF/accesstransformer.cfg') + } + + parchment { + mappingsVersion = project.parchment_mappings_version + minecraftVersion = project.parchment_minecraft_version + } + + // This line is optional. Access Transformers are automatically detected + // accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + client() + + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + server { + server() + programArgument '--nogui' + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + type = "gameTestServer" + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + data { + data() + + // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it + // gameDirectory = project.file('run-data') + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + } + + // applies to all the run configs above + configureEach { + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + systemProperty 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + logLevel = org.slf4j.event.Level.DEBUG + } + } - config "powertool.mixins.json" + mods { + // define mod <-> source bindings + // these are used to tell the game which sources are for which mod + // mostly optional in a single mod project + // but multi mod projects should define one per mod + "${mod_id}" { + sourceSet(sourceSets.main) + } + } } -//sourceSets.main.resources { srcDir 'src/generated/resources' } +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } +// Sets up a dependency configuration called 'localRuntime'. +// This configuration should be used instead of 'runtimeOnly' to declare +// a dependency that will be present for runtime testing but that is +// "optional", meaning it will not be pulled by dependents of this mod. +configurations { + runtimeClasspath.extendsFrom localRuntime +} repositories { maven { @@ -62,9 +125,89 @@ repositories { includeGroup "curse.maven" } } + maven { + // location of the maven that hosts JEI files since January 2023 + name = "Jared's maven" + url = "https://maven.blamejared.com/" + } + maven { + // location of a maven mirror for JEI files, as a fallback + name = "ModMaven" + url = "https://modmaven.dev" + } } dependencies { - annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' - implementation fg.deobf("curse.maven:the-one-probe-245211:4579432") + // Example optional mod dependency with JEI + // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime + // compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}" + // compileOnly "mezz.jei:jei-${mc_version}-neoforge-api:${jei_version}" + // We add the full version to localRuntime, not runtimeOnly, so that we do not publish a dependency on it + localRuntime "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}" + + // Example mod dependency using a mod jar from ./libs with a flat dir repository + // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar + // The group id is ignored when searching -- in this case, it is "blank" + // implementation "blank:coolmod-${mc_version}:${coolmod_version}" + implementation "curse.maven:the-one-probe-245211:5502323" + // Example mod dependency using a file as dependency + // implementation files("libs/coolmod-${mc_version}-${coolmod_version}.jar") + + // Example project dependency using a sister or child project: + // implementation project(":myproject") + + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. +// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html +tasks.withType(ProcessResources).configureEach { + var replaceProperties = [ + minecraft_version : minecraft_version, + minecraft_version_range: minecraft_version_range, + neo_version : neo_version, + neo_version_range : neo_version_range, + loader_version_range : loader_version_range, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : mod_version, + mod_authors : mod_authors, + mod_description : mod_description + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/neoforge.mods.toml']) { + expand replaceProperties + } +} + +// Example configuration to allow publishing using the maven-publish plugin +publishing { + publications { + register('mavenJava', MavenPublication) { + from components.java + } + } + repositories { + maven { + url "file://${project.projectDir}/repo" + } + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} + +// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior. +idea { + module { + downloadSources = true + downloadJavadoc = true + } } diff --git a/gradle.properties b/gradle.properties index 29b2ac4..ba27583 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,47 @@ -org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +org.gradle.jvmargs=-Xmx1G +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true + +#read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment +# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started +parchment_minecraft_version=1.21 +parchment_mappings_version=2024.07.07 +# Environment Properties +# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge +# The Minecraft version must agree with the Neo version to get a valid artifact +minecraft_version=1.21 +# The Minecraft version range can use any release version of Minecraft as bounds. +# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly +# as they do not follow standard versioning conventions. +minecraft_version_range=[1.21,1.21.1) +# The Neo version must agree with the Minecraft version to get a valid artifact +neo_version=21.0.139-beta +# The Neo version range can use any version of Neo as bounds +neo_version_range=[21.0.0-beta,) +# The loader version range can only use the major version of FML as bounds +loader_version_range=[4,) + +## Mod Properties + +# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} +# Must match the String constant located in the main mod class annotated with @Mod. +mod_id=powertool +# The human-readable display name for the mod. +mod_name=Power Tool +# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_license=GPL-3.0 +# The mod version. See https://semver.org/ +mod_version=1.3.7 +# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. +# This should match the base package used for the mod sources. +# See https://maven.apache.org/guides/mini/guide-naming-conventions.html +mod_group_id=org.teacon.powertool +# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. +mod_authors=IzzelAliz +# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. +mod_description=PowerTool by TeaCon + +jei_version = 19.5.0.61 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..2c3521197d7c4586c843d1d3e9090525f1898cde 100644 GIT binary patch literal 43504 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 TZiJi*F`$tkWLn) literal 59821 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59bc51a..09523c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# 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. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +217,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..9d21a21 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/settings.gradle b/settings.gradle index 0cb0c7e..ada876e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,8 +1,11 @@ pluginManagement { repositories { + mavenLocal() gradlePluginPortal() - maven { url = 'https://maven.minecraftforge.net/' } + maven { url = 'https://maven.neoforged.net/releases' } } } -rootProject.name = 'powertool' +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} diff --git a/src/generated/resources/.cache/86465dcd1331b21a960f3496f736ce9922bfa9ba b/src/generated/resources/.cache/86465dcd1331b21a960f3496f736ce9922bfa9ba index 72c26b0..0d8b30e 100644 --- a/src/generated/resources/.cache/86465dcd1331b21a960f3496f736ce9922bfa9ba +++ b/src/generated/resources/.cache/86465dcd1331b21a960f3496f736ce9922bfa9ba @@ -1,4 +1,4 @@ -// 1.20 2023-08-28T21:46:30.187848 Block States: powertool +// 1.21 2024-07-26T20:43:32.1114678 Block States: powertool ae6ddabd13bd84907c7fc7fdb01186954fc13502 assets/powertool/blockstates/cosmetic_barrel.json 05b788f1ac0190925f20bbc680cb68c445d80223 assets/powertool/blockstates/cosmetic_beehive.json e771ba4339b87af1e3d3af179b69b99b0221f4f6 assets/powertool/blockstates/cosmetic_blast_furnace.json diff --git a/src/main/java/org/teacon/powertool/PowerTool.java b/src/main/java/org/teacon/powertool/PowerTool.java index b3de94c..74e83c3 100644 --- a/src/main/java/org/teacon/powertool/PowerTool.java +++ b/src/main/java/org/teacon/powertool/PowerTool.java @@ -1,27 +1,26 @@ package org.teacon.powertool; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModLoadingContext; +import net.neoforged.fml.common.Mod; +import org.teacon.powertool.attachment.PowerToolAttachments; import org.teacon.powertool.block.PowerToolBlocks; import org.teacon.powertool.entity.PowerToolEntities; import org.teacon.powertool.item.PowerToolItems; import org.teacon.powertool.menu.PowerToolMenus; -import org.teacon.powertool.network.PowerToolNetwork; @Mod(PowerTool.MODID) public class PowerTool { public static final String MODID = "powertool"; - public PowerTool() { - PowerToolBlocks.register(); - PowerToolItems.register(); - PowerToolNetwork.register(); - PowerToolMenus.register(); - var bus = FMLJavaModLoadingContext.get().getModEventBus(); + public PowerTool(IEventBus bus) { + PowerToolBlocks.register(bus); + PowerToolItems.register(bus); + PowerToolMenus.register(bus); PowerToolSoundEvents.register(bus); PowerToolEntities.register(bus); - PowerToolConfig.init(ModLoadingContext.get()); + PowerToolAttachments.register(bus); + PowerToolConfig.init(ModLoadingContext.get().getActiveContainer()); } } diff --git a/src/main/java/org/teacon/powertool/PowerToolConfig.java b/src/main/java/org/teacon/powertool/PowerToolConfig.java index b5b9598..282ec67 100644 --- a/src/main/java/org/teacon/powertool/PowerToolConfig.java +++ b/src/main/java/org/teacon/powertool/PowerToolConfig.java @@ -1,30 +1,32 @@ package org.teacon.powertool; -import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.config.ModConfig; -import net.minecraftforge.fml.event.config.ModConfigEvent; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.ModContainer; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.fml.config.ModConfig; +import net.neoforged.fml.event.config.ModConfigEvent; +import net.neoforged.neoforge.common.CommonHooks; +import net.neoforged.neoforge.common.ModConfigSpec; import org.teacon.powertool.motd.MotDHandler; -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = PowerTool.MODID) +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = PowerTool.MODID) public class PowerToolConfig { - public static ForgeConfigSpec.ConfigValue motdContent; + public static ModConfigSpec.ConfigValue motdContent; - public static void init(ModLoadingContext context) { - var configSpec = new ForgeConfigSpec.Builder(); - motdContent = configSpec.comment("Message-of-the-day content.").define("motd", ""); - context.registerConfig(ModConfig.Type.SERVER, configSpec.build()); + public static void init(ModContainer container) { + var builder = new ModConfigSpec.Builder(); + motdContent = builder + .comment("Message-of-the-day content.") + .define("motd",""); + container.registerConfig(ModConfig.Type.SERVER, builder.build()); } @SubscribeEvent public static void onConfigReload(ModConfigEvent.Reloading event) { var motdText = motdContent.get(); - if (motdText != null && !motdText.isEmpty()) { - MotDHandler.motd = ForgeHooks.newChatWithLinks(motdContent.get()); + if (!motdText.isEmpty()) { + MotDHandler.motd = CommonHooks.newChatWithLinks(motdContent.get()); } } } diff --git a/src/main/java/org/teacon/powertool/PowerToolSoundEvents.java b/src/main/java/org/teacon/powertool/PowerToolSoundEvents.java index 84f67fb..c08791d 100644 --- a/src/main/java/org/teacon/powertool/PowerToolSoundEvents.java +++ b/src/main/java/org/teacon/powertool/PowerToolSoundEvents.java @@ -1,17 +1,17 @@ package org.teacon.powertool; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.registries.Registries; import net.minecraft.sounds.SoundEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; +import org.teacon.powertool.utils.VanillaUtils; public class PowerToolSoundEvents { - public static final DeferredRegister SOUND_EVENTS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, PowerTool.MODID); + public static final DeferredRegister SOUND_EVENTS = DeferredRegister.create(Registries.SOUND_EVENT, PowerTool.MODID); - public static final RegistryObject CLAP = SOUND_EVENTS.register("clap", () -> SoundEvent.createFixedRangeEvent(new ResourceLocation(PowerTool.MODID, "item.powertool.clap"), 16F)); + public static final DeferredHolder CLAP = SOUND_EVENTS.register("clap", () -> SoundEvent.createFixedRangeEvent(VanillaUtils.resourceLocationOf(PowerTool.MODID, "item.powertool.clap"), 16F)); public static void register(IEventBus bus) { SOUND_EVENTS.register(bus); diff --git a/src/main/java/org/teacon/powertool/attachment/PowerToolAttachments.java b/src/main/java/org/teacon/powertool/attachment/PowerToolAttachments.java new file mode 100644 index 0000000..9977984 --- /dev/null +++ b/src/main/java/org/teacon/powertool/attachment/PowerToolAttachments.java @@ -0,0 +1,21 @@ +package org.teacon.powertool.attachment; + +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.attachment.AttachmentType; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; +import net.neoforged.neoforge.registries.NeoForgeRegistries; +import org.teacon.powertool.PowerTool; +import org.teacon.powertool.network.attachment.Permission; + +public class PowerToolAttachments { + + private static final DeferredRegister> ATTACHMENT_TYPE = DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, PowerTool.MODID); + + public static final DeferredHolder,AttachmentType> PERMISSION = ATTACHMENT_TYPE.register(Permission.KEY.getPath(), + () -> AttachmentType.builder(Permission::new).build()); + + public static void register(IEventBus bus){ + ATTACHMENT_TYPE.register(bus); + } +} diff --git a/src/main/java/org/teacon/powertool/block/CosmeticBarrel.java b/src/main/java/org/teacon/powertool/block/CosmeticBarrel.java index 5cfa3a1..257b84f 100644 --- a/src/main/java/org/teacon/powertool/block/CosmeticBarrel.java +++ b/src/main/java/org/teacon/powertool/block/CosmeticBarrel.java @@ -2,23 +2,24 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.BlockGetter; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +@ParametersAreNonnullByDefault public class CosmeticBarrel extends CosmeticDirectionalBlock{ public CosmeticBarrel(Properties p) { super(p); } - + @Override - public void appendHoverText(@NotNull ItemStack stack, @Nullable BlockGetter pLevel, List tooltip, TooltipFlag flag) { - tooltip.add(Component.translatable("block.powertool.cosmetic_barrel.tooltip").withStyle(ChatFormatting.DARK_GRAY)); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + tooltipComponents.add(Component.translatable("block.powertool.cosmetic_barrel.tooltip").withStyle(ChatFormatting.DARK_GRAY)); } + } diff --git a/src/main/java/org/teacon/powertool/block/CosmeticBeehive.java b/src/main/java/org/teacon/powertool/block/CosmeticBeehive.java index b97430a..ac192f4 100644 --- a/src/main/java/org/teacon/powertool/block/CosmeticBeehive.java +++ b/src/main/java/org/teacon/powertool/block/CosmeticBeehive.java @@ -2,23 +2,24 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.BlockGetter; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +@ParametersAreNonnullByDefault public class CosmeticBeehive extends CosmeticHorizontalDirectionalBlock{ public CosmeticBeehive(Properties p) { super(p); } - + @Override - public void appendHoverText(@NotNull ItemStack stack, @Nullable BlockGetter pLevel, List tooltip, TooltipFlag flag) { - tooltip.add(Component.translatable("block.powertool.cosmetic_beehive.tooltip").withStyle(ChatFormatting.DARK_GRAY)); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + tooltipComponents.add(Component.translatable("block.powertool.cosmetic_beehive.tooltip").withStyle(ChatFormatting.DARK_GRAY)); } + } diff --git a/src/main/java/org/teacon/powertool/block/CosmeticCampfireBlock.java b/src/main/java/org/teacon/powertool/block/CosmeticCampfireBlock.java index 64ee4bd..19f7a3d 100644 --- a/src/main/java/org/teacon/powertool/block/CosmeticCampfireBlock.java +++ b/src/main/java/org/teacon/powertool/block/CosmeticCampfireBlock.java @@ -1,19 +1,22 @@ package org.teacon.powertool.block; import net.minecraft.ChatFormatting; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.tags.ItemTags; import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.projectile.Projectile; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.BlockPlaceContext; @@ -38,11 +41,14 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.registries.ForgeRegistries; import org.jetbrains.annotations.Nullable; +import org.teacon.powertool.utils.VanillaUtils; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class CosmeticCampfireBlock extends Block implements SimpleWaterloggedBlock { protected static final VoxelShape SHAPE = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 7.0D, 16.0D); @@ -59,19 +65,19 @@ public CosmeticCampfireBlock(boolean pSpawnParticles, BlockBehaviour.Properties .setValue(WATERLOGGED, Boolean.FALSE) .setValue(FACING, Direction.NORTH)); } - + @Override - public void appendHoverText(ItemStack stack, @Nullable BlockGetter pLevel, List tooltip, TooltipFlag flag) { - var regName = ForgeRegistries.ITEMS.getKey(stack.getItem()); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + var regName = BuiltInRegistries.ITEM.getKey(stack.getItem()); if (regName != null) { - tooltip.add(Component.translatable("block." + regName.getNamespace() + "." + regName.getPath() + ".tooltip").withStyle(ChatFormatting.DARK_GRAY)); + tooltipComponents.add(Component.translatable("block." + regName.getNamespace() + "." + regName.getPath() + ".tooltip").withStyle(ChatFormatting.DARK_GRAY)); } + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); } - + @Override - public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - var held = player.getItemInHand(hand); - if (held.is(ItemTags.SHOVELS) && state.getValue(LIT)) { + protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) { + if (stack.is(ItemTags.SHOVELS) && state.getValue(LIT)) { if (level.isClientSide()) { for(int i = 0; i < 20; ++i) { CampfireBlock.makeParticles(level, pos, false, true); @@ -80,10 +86,10 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player var newState = state.setValue(LIT, Boolean.FALSE); level.setBlock(pos, newState, Block.UPDATE_ALL_IMMEDIATE); level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(player, newState)); - held.hurtAndBreak(1, player, p -> p.broadcastBreakEvent(hand)); - return InteractionResult.sidedSuccess(level.isClientSide()); + stack.hurtAndBreak(1, player, VanillaUtils.equipmentSlotFromHand(hand)); + return ItemInteractionResult.sidedSuccess(level.isClientSide()); } - return InteractionResult.PASS; + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } @Override @@ -170,11 +176,13 @@ public FluidState getFluidState(BlockState pState) { } @Override + @SuppressWarnings("deprecation") public BlockState rotate(BlockState pState, Rotation pRot) { return pState.setValue(FACING, pRot.rotate(pState.getValue(FACING))); } @Override + @SuppressWarnings("deprecation") public BlockState mirror(BlockState pState, Mirror pMirror) { return pState.rotate(pMirror.getRotation(pState.getValue(FACING))); } @@ -183,9 +191,9 @@ public BlockState mirror(BlockState pState, Mirror pMirror) { protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(LIT, WATERLOGGED, FACING); } - + @Override - public boolean isPathfindable(BlockState pState, BlockGetter pLevel, BlockPos pPos, PathComputationType pType) { + protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) { return false; } diff --git a/src/main/java/org/teacon/powertool/block/CosmeticFurnace.java b/src/main/java/org/teacon/powertool/block/CosmeticFurnace.java index b54a6ee..1f22434 100644 --- a/src/main/java/org/teacon/powertool/block/CosmeticFurnace.java +++ b/src/main/java/org/teacon/powertool/block/CosmeticFurnace.java @@ -1,12 +1,14 @@ package org.teacon.powertool.block; import net.minecraft.ChatFormatting; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.TooltipFlag; @@ -18,12 +20,11 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.phys.BlockHitResult; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +@MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public class CosmeticFurnace extends CosmeticHorizontalDirectionalBlock{ @@ -33,26 +34,25 @@ public CosmeticFurnace(Properties p) { super(p); this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(LIT, false)); } - + @Override - public void appendHoverText(@NotNull ItemStack stack, @Nullable BlockGetter pLevel, List tooltip, TooltipFlag flag) { - tooltip.add(Component.translatable("block.powertool.cosmetic_furnace.tooltip").withStyle(ChatFormatting.DARK_GRAY)); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + tooltipComponents.add(Component.translatable("block.powertool.cosmetic_furnace.tooltip").withStyle(ChatFormatting.DARK_GRAY)); } - + @Override protected void createBlockStateDefinition(StateDefinition.Builder pBuilder) { super.createBlockStateDefinition(pBuilder); pBuilder.add(LIT); } - + @Override - @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult result) { - if (player.getItemInHand(hand).is(Items.FLINT_AND_STEEL) && player.isCreative() && !state.getValue(LIT)){ + protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) { + if (stack.is(Items.FLINT_AND_STEEL) && player.isCreative() && !state.getValue(LIT)){ level.setBlock(pos, state.setValue(LIT, true), Block.UPDATE_NONE); - return InteractionResult.sidedSuccess(level.isClientSide()); + return ItemInteractionResult.sidedSuccess(level.isClientSide()); } - return InteractionResult.PASS; + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } @Override diff --git a/src/main/java/org/teacon/powertool/block/CosmeticHopper.java b/src/main/java/org/teacon/powertool/block/CosmeticHopper.java index d2cfb31..115dd0e 100644 --- a/src/main/java/org/teacon/powertool/block/CosmeticHopper.java +++ b/src/main/java/org/teacon/powertool/block/CosmeticHopper.java @@ -1,9 +1,11 @@ package org.teacon.powertool.block; import net.minecraft.ChatFormatting; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.BlockPlaceContext; @@ -11,7 +13,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Mirror; import net.minecraft.world.level.block.Rotation; -import net.minecraft.world.level.block.entity.Hopper; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -22,8 +23,8 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import org.jetbrains.annotations.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; /** @@ -31,22 +32,25 @@ * a BlockEntity, and thus do not have game logic such as transporting items * or absorbing nearby ItemEntity. */ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class CosmeticHopper extends Block { private static final DirectionProperty FACING = BlockStateProperties.FACING_HOPPER; private static final VoxelShape TOP = Block.box(0.0D, 10.0D, 0.0D, 16.0D, 16.0D, 16.0D); private static final VoxelShape FUNNEL = Block.box(4.0D, 4.0D, 4.0D, 12.0D, 10.0D, 12.0D); private static final VoxelShape CONVEX_BASE = Shapes.or(FUNNEL, TOP); - private static final VoxelShape BASE = Shapes.join(CONVEX_BASE, Hopper.INSIDE, BooleanOp.ONLY_FIRST); + private static final VoxelShape HOPPER_INSIDE = Block.box(2.0D, 11.0D, 2.0D, 14.0D, 16.0D, 14.0D); + private static final VoxelShape BASE = Shapes.join(CONVEX_BASE, HOPPER_INSIDE, BooleanOp.ONLY_FIRST); private static final VoxelShape DOWN_SHAPE = Shapes.or(BASE, Block.box(6.0D, 0.0D, 6.0D, 10.0D, 4.0D, 10.0D)); private static final VoxelShape EAST_SHAPE = Shapes.or(BASE, Block.box(12.0D, 4.0D, 6.0D, 16.0D, 8.0D, 10.0D)); private static final VoxelShape NORTH_SHAPE = Shapes.or(BASE, Block.box(6.0D, 4.0D, 0.0D, 10.0D, 8.0D, 4.0D)); private static final VoxelShape SOUTH_SHAPE = Shapes.or(BASE, Block.box(6.0D, 4.0D, 12.0D, 10.0D, 8.0D, 16.0D)); private static final VoxelShape WEST_SHAPE = Shapes.or(BASE, Block.box(0.0D, 4.0D, 6.0D, 4.0D, 8.0D, 10.0D)); - private static final VoxelShape DOWN_INTERACTION_SHAPE = Hopper.INSIDE; - private static final VoxelShape EAST_INTERACTION_SHAPE = Shapes.or(Hopper.INSIDE, Block.box(12.0D, 8.0D, 6.0D, 16.0D, 10.0D, 10.0D)); - private static final VoxelShape NORTH_INTERACTION_SHAPE = Shapes.or(Hopper.INSIDE, Block.box(6.0D, 8.0D, 0.0D, 10.0D, 10.0D, 4.0D)); - private static final VoxelShape SOUTH_INTERACTION_SHAPE = Shapes.or(Hopper.INSIDE, Block.box(6.0D, 8.0D, 12.0D, 10.0D, 10.0D, 16.0D)); - private static final VoxelShape WEST_INTERACTION_SHAPE = Shapes.or(Hopper.INSIDE, Block.box(0.0D, 8.0D, 6.0D, 4.0D, 10.0D, 10.0D)); + private static final VoxelShape DOWN_INTERACTION_SHAPE = HOPPER_INSIDE; + private static final VoxelShape EAST_INTERACTION_SHAPE = Shapes.or(HOPPER_INSIDE, Block.box(12.0D, 8.0D, 6.0D, 16.0D, 10.0D, 10.0D)); + private static final VoxelShape NORTH_INTERACTION_SHAPE = Shapes.or(HOPPER_INSIDE, Block.box(6.0D, 8.0D, 0.0D, 10.0D, 10.0D, 4.0D)); + private static final VoxelShape SOUTH_INTERACTION_SHAPE = Shapes.or(HOPPER_INSIDE, Block.box(6.0D, 8.0D, 12.0D, 10.0D, 10.0D, 16.0D)); + private static final VoxelShape WEST_INTERACTION_SHAPE = Shapes.or(HOPPER_INSIDE, Block.box(0.0D, 8.0D, 6.0D, 4.0D, 10.0D, 10.0D)); public CosmeticHopper(BlockBehaviour.Properties prop) { super(prop); @@ -57,13 +61,14 @@ public CosmeticHopper(BlockBehaviour.Properties prop) { protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING); } - + @Override - public void appendHoverText(ItemStack pStack, @Nullable BlockGetter pLevel, List tooltip, TooltipFlag pFlag) { - tooltip.add(Component.translatable("block.powertool.cosmetic_hopper.tooltip").withStyle(ChatFormatting.DARK_GRAY)); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + tooltipComponents.add(Component.translatable("block.powertool.cosmetic_hopper.tooltip").withStyle(ChatFormatting.DARK_GRAY)); } - + @Override + @SuppressWarnings("DuplicatedCode") //The "duplicated code" in switch cannot actually extract methods. public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { return switch (state.getValue(FACING)) { case DOWN -> DOWN_SHAPE; @@ -76,6 +81,7 @@ public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, Co } @Override + @SuppressWarnings("DuplicatedCode") //The "duplicated code" in switch cannot actually extract methods. public VoxelShape getInteractionShape(BlockState state, BlockGetter level, BlockPos pos) { return switch (state.getValue(FACING)) { case DOWN -> DOWN_INTERACTION_SHAPE; @@ -83,7 +89,7 @@ public VoxelShape getInteractionShape(BlockState state, BlockGetter level, Block case SOUTH -> SOUTH_INTERACTION_SHAPE; case WEST -> WEST_INTERACTION_SHAPE; case EAST -> EAST_INTERACTION_SHAPE; - default -> Hopper.INSIDE; + default -> HOPPER_INSIDE; }; } @@ -92,19 +98,21 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { Direction dir = context.getClickedFace().getOpposite(); return this.defaultBlockState().setValue(FACING, dir.getAxis() == Direction.Axis.Y ? Direction.DOWN : dir); } - + @Override + @SuppressWarnings("deprecation") public BlockState rotate(BlockState state, Rotation rotation) { return state.setValue(FACING, rotation.rotate(state.getValue(FACING))); } @Override + @SuppressWarnings("deprecation") public BlockState mirror(BlockState state, Mirror mirror) { return state.rotate(mirror.getRotation(state.getValue(FACING))); } - + @Override - public boolean isPathfindable(BlockState state, BlockGetter level, BlockPos pos, PathComputationType type) { + protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) { return false; } } diff --git a/src/main/java/org/teacon/powertool/block/CosmeticSimpleBlock.java b/src/main/java/org/teacon/powertool/block/CosmeticSimpleBlock.java index 4aa9591..cc97a6e 100644 --- a/src/main/java/org/teacon/powertool/block/CosmeticSimpleBlock.java +++ b/src/main/java/org/teacon/powertool/block/CosmeticSimpleBlock.java @@ -2,11 +2,10 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; -import org.jetbrains.annotations.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; @@ -17,10 +16,10 @@ public class CosmeticSimpleBlock extends Block { public CosmeticSimpleBlock(Properties p) { super(p); } - + @Override - public void appendHoverText(ItemStack item, @Nullable BlockGetter blockGetter, List tooltips, TooltipFlag flag) { - tooltips.add(Component.translatable("block.powertool.cosmetic_block.tooltip").withStyle(ChatFormatting.DARK_GRAY)); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + tooltipComponents.add(Component.translatable("block.powertool.cosmetic_block.tooltip").withStyle(ChatFormatting.DARK_GRAY)); } } diff --git a/src/main/java/org/teacon/powertool/block/CosmeticTrapdoor.java b/src/main/java/org/teacon/powertool/block/CosmeticTrapdoor.java index bf5d356..b1de14d 100644 --- a/src/main/java/org/teacon/powertool/block/CosmeticTrapdoor.java +++ b/src/main/java/org/teacon/powertool/block/CosmeticTrapdoor.java @@ -1,9 +1,12 @@ package org.teacon.powertool.block; +import com.mojang.serialization.MapCodec; import net.minecraft.ChatFormatting; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.BlockPlaceContext; @@ -20,11 +23,15 @@ import net.minecraft.world.level.pathfinder.PathComputationType; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import org.jetbrains.annotations.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class CosmeticTrapdoor extends DirectionalBlock implements SimpleWaterloggedBlock { + + public static final MapCodec CODEC = simpleCodec(CosmeticTrapdoor::new); protected static final VoxelShape EAST_OPEN_AABB = Block.box(0.0D, 0.0D, 0.0D, 3.0D, 16.0D, 16.0D); protected static final VoxelShape WEST_OPEN_AABB = Block.box(13.0D, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D); @@ -38,12 +45,18 @@ protected CosmeticTrapdoor(Properties prop) { super(prop); this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.UP).setValue(BlockStateProperties.WATERLOGGED, Boolean.FALSE)); } - + + @Override + protected MapCodec codec() { + return CODEC; + } + protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(FACING, BlockStateProperties.WATERLOGGED); } @Override + @SuppressWarnings("DuplicatedCode") //The "duplicated code" in switch cannot actually extract methods. public VoxelShape getShape(BlockState state, BlockGetter blockGetter, BlockPos pos, CollisionContext collisionContext) { return switch (state.getValue(FACING)) { case UP -> BOTTOM_AABB; @@ -54,10 +67,10 @@ public VoxelShape getShape(BlockState state, BlockGetter blockGetter, BlockPos p case NORTH -> NORTH_OPEN_AABB; }; } - + @Override - public boolean isPathfindable(BlockState state, BlockGetter blockGetter, BlockPos pos, PathComputationType pathType) { - return pathType == PathComputationType.WATER && state.getValue(BlockStateProperties.WATERLOGGED); + protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) { + return pathComputationType == PathComputationType.WATER && state.getValue(BlockStateProperties.WATERLOGGED); } @Override @@ -65,10 +78,10 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { Direction direction = context.getClickedFace(); return this.defaultBlockState().setValue(FACING, direction); } - + @Override - public void appendHoverText(ItemStack item, @Nullable BlockGetter blockGetter, List tooltips, TooltipFlag flag) { - tooltips.add(Component.translatable("block.powertool.cosmetic_trapdoor.tooltip").withStyle(ChatFormatting.DARK_GRAY)); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + tooltipComponents.add(Component.translatable("block.powertool.cosmetic_trapdoor.tooltip").withStyle(ChatFormatting.DARK_GRAY)); } @Override diff --git a/src/main/java/org/teacon/powertool/block/HolographicSignBlock.java b/src/main/java/org/teacon/powertool/block/HolographicSignBlock.java index 18f3163..4b0b930 100644 --- a/src/main/java/org/teacon/powertool/block/HolographicSignBlock.java +++ b/src/main/java/org/teacon/powertool/block/HolographicSignBlock.java @@ -1,11 +1,15 @@ package org.teacon.powertool.block; +import com.mojang.serialization.MapCodec; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.BaseEntityBlock; @@ -20,13 +24,19 @@ import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.BlockHitResult; -import net.minecraftforge.network.PacketDistributor; +import net.neoforged.neoforge.network.PacketDistributor; import org.jetbrains.annotations.Nullable; import org.teacon.powertool.block.entity.HolographicSignBlockEntity; -import org.teacon.powertool.network.PowerToolNetwork; import org.teacon.powertool.network.client.OpenHolographicSignEditor; +import org.teacon.powertool.utils.VanillaUtils; +import javax.annotation.ParametersAreNonnullByDefault; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class HolographicSignBlock extends BaseEntityBlock implements SimpleWaterloggedBlock { + + public static final MapCodec CODEC = simpleCodec(HolographicSignBlock::new); public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; @@ -34,13 +44,19 @@ public HolographicSignBlock(Properties prop) { super(prop); this.registerDefaultState(this.stateDefinition.any().setValue(WATERLOGGED, Boolean.FALSE)); } - + + @Override + protected MapCodec codec() { + return CODEC; + } + @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(WATERLOGGED); } - + @Override + @SuppressWarnings("deprecation") public RenderShape getRenderShape(BlockState state) { return RenderShape.INVISIBLE; } @@ -50,14 +66,23 @@ public RenderShape getRenderShape(BlockState state) { public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { return new HolographicSignBlockEntity(pos, state); } - + + @Override + protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) { + return use(level, pos, player); + } + @Override - public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) { + return VanillaUtils.itemInteractionFrom(use(level,pos,player)); + } + + public InteractionResult use(Level level, BlockPos pos, Player player) { if (player.isCrouching()) { return InteractionResult.PASS; } if (!level.isClientSide() && player instanceof ServerPlayer sp && sp.getAbilities().instabuild) { - PowerToolNetwork.channel().send(PacketDistributor.PLAYER.with(() -> sp), new OpenHolographicSignEditor(pos)); + PacketDistributor.sendToPlayer(sp,new OpenHolographicSignEditor(pos)); } return InteractionResult.SUCCESS; } diff --git a/src/main/java/org/teacon/powertool/block/ItemDisplayBlock.java b/src/main/java/org/teacon/powertool/block/ItemDisplayBlock.java index 998bf7f..2672524 100644 --- a/src/main/java/org/teacon/powertool/block/ItemDisplayBlock.java +++ b/src/main/java/org/teacon/powertool/block/ItemDisplayBlock.java @@ -1,5 +1,6 @@ package org.teacon.powertool.block; +import com.mojang.serialization.MapCodec; import net.minecraft.ChatFormatting; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; @@ -7,7 +8,9 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.BlockPlaceContext; @@ -25,7 +28,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import org.jetbrains.annotations.Nullable; import org.teacon.powertool.block.entity.ItemDisplayBlockEntity; import javax.annotation.ParametersAreNonnullByDefault; @@ -34,6 +36,8 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class ItemDisplayBlock extends BaseEntityBlock { + + public static final MapCodec CODEC = simpleCodec(ItemDisplayBlock::new); protected static final VoxelShape DOWN_AABB = Block.box(2, 15, 2, 14, 16, 14); protected static final VoxelShape UP_AABB = Block.box(2, 0, 2, 14, 1, 14); @@ -51,19 +55,25 @@ public ItemDisplayBlock(Properties prop) { super(prop); this.registerDefaultState(this.defaultBlockState().setValue(INVISIBLE, Boolean.FALSE).setValue(SURVIVAL_AVAILABLE,Boolean.FALSE)); } - + + @Override + protected MapCodec codec() { + return CODEC; + } + @Override - public void appendHoverText(ItemStack stack, @Nullable BlockGetter level, List tooltip, TooltipFlag flag) { - tooltip.add(Component.translatable("block.powertool.item_display.tooltip").withStyle(ChatFormatting.DARK_GRAY)); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + tooltipComponents.add(Component.translatable("block.powertool.item_display.tooltip").withStyle(ChatFormatting.DARK_GRAY)); } @Override + @SuppressWarnings("deprecation") public RenderShape getRenderShape(BlockState pState) { return RenderShape.MODEL; } @Override - @SuppressWarnings("deprecation") + @SuppressWarnings("DuplicatedCode") //The "duplicated code" in switch cannot actually extract methods. public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { return switch (state.getValue(FACING)) { case NORTH -> NORTH_AABB; @@ -90,8 +100,8 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { return new ItemDisplayBlockEntity(pos, state); } + @Override - @SuppressWarnings("deprecation") public void attack(BlockState state, Level level, BlockPos pos, Player player) { if (!level.isClientSide() && player.getAbilities().instabuild && level.getBlockEntity(pos) instanceof ItemDisplayBlockEntity theBE) { theBE.itemToDisplay = ItemStack.EMPTY; @@ -99,26 +109,33 @@ public void attack(BlockState state, Level level, BlockPos pos, Player player) { level.sendBlockUpdated(pos, state, state, Block.UPDATE_CLIENTS); } } + @Override - @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) { if (level.getBlockEntity(pos) instanceof ItemDisplayBlockEntity theBE) { if (player.getAbilities().instabuild || state.getValue(SURVIVAL_AVAILABLE)) { - if (theBE.itemToDisplay.isEmpty()) { - theBE.itemToDisplay = player.getItemInHand(hand).copy(); - if (!level.isClientSide) { - theBE.setChanged(); - level.sendBlockUpdated(pos, state, state, Block.UPDATE_CLIENTS); - } - } else { - theBE.rotation = (theBE.rotation + 45) % 360; + theBE.rotation = (theBE.rotation + 45) % 360; + theBE.setChanged(); + level.sendBlockUpdated(pos, state, state, Block.UPDATE_CLIENTS); + return InteractionResult.SUCCESS; + } + } + return InteractionResult.PASS; + } + + @Override + protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) { + if (level.getBlockEntity(pos) instanceof ItemDisplayBlockEntity theBE) { + if (player.getAbilities().instabuild || state.getValue(SURVIVAL_AVAILABLE)){ + theBE.itemToDisplay = stack.copy(); + if (!level.isClientSide) { theBE.setChanged(); level.sendBlockUpdated(pos, state, state, Block.UPDATE_CLIENTS); } + return ItemInteractionResult.SUCCESS; } - return InteractionResult.SUCCESS; } - return InteractionResult.PASS; + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } @Override diff --git a/src/main/java/org/teacon/powertool/block/ItemSupplierBlock.java b/src/main/java/org/teacon/powertool/block/ItemSupplierBlock.java index cb6fe7c..dac2e48 100644 --- a/src/main/java/org/teacon/powertool/block/ItemSupplierBlock.java +++ b/src/main/java/org/teacon/powertool/block/ItemSupplierBlock.java @@ -1,12 +1,16 @@ package org.teacon.powertool.block; +import com.mojang.serialization.MapCodec; import net.minecraft.ChatFormatting; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.BlockGetter; @@ -17,17 +21,28 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; -import org.jetbrains.annotations.Nullable; import org.teacon.powertool.block.entity.ItemSupplierBlockEntity; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class ItemSupplierBlock extends BaseEntityBlock { + + public static final MapCodec CODEC = simpleCodec(ItemSupplierBlock::new); public ItemSupplierBlock(Properties prop) { super(prop); } - + + @Override + protected MapCodec codec() { + return CODEC; + } + + @Override + @SuppressWarnings("deprecation") public RenderShape getRenderShape(BlockState pState) { return RenderShape.MODEL; } @@ -46,10 +61,10 @@ public float getShadeBrightness(BlockState pState, BlockGetter pLevel, BlockPos public boolean propagatesSkylightDown(BlockState state, BlockGetter level, BlockPos pos) { return true; } - + @Override - public void appendHoverText(ItemStack stack, @Nullable BlockGetter level, List tooltip, TooltipFlag flag) { - tooltip.add(Component.translatable("block.powertool.item_supplier.tooltip").withStyle(ChatFormatting.GRAY)); + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + tooltipComponents.add(Component.translatable("block.powertool.item_supplier.tooltip").withStyle(ChatFormatting.GRAY)); } @Override @@ -65,23 +80,37 @@ public void attack(BlockState state, Level level, BlockPos pos, Player player) { player.getInventory().add(thing); } } - + + protected void giveItemToPlayer(Player player, ItemSupplierBlockEntity theTE) { + ItemStack toGive = theTE.theItem.copy(); + toGive.setCount(player.isCrouching() ? toGive.getMaxStackSize() : 1); + player.getInventory().add(toGive); + } + @Override - public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) { if (level.getBlockEntity(pos) instanceof ItemSupplierBlockEntity theBE) { + giveItemToPlayer(player, theBE); + return InteractionResult.SUCCESS; + } + return InteractionResult.PASS; + } + + @Override + protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) { + if (level.getBlockEntity(pos) instanceof ItemSupplierBlockEntity theBE){ if (theBE.theItem.isEmpty() && player.getAbilities().instabuild) { - theBE.theItem = player.getItemInHand(hand).copy(); + theBE.theItem = stack.copy(); if (!level.isClientSide) { theBE.setChanged(); level.sendBlockUpdated(pos, state, state, Block.UPDATE_CLIENTS); } - } else { - ItemStack toGive = theBE.theItem.copy(); - toGive.setCount(player.isCrouching() ? toGive.getMaxStackSize() : 1); - player.getInventory().add(toGive); } - return InteractionResult.SUCCESS; + else{ + giveItemToPlayer(player, theBE); + } + return ItemInteractionResult.SUCCESS; } - return InteractionResult.PASS; + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } } diff --git a/src/main/java/org/teacon/powertool/block/PeriodicCommandBlock.java b/src/main/java/org/teacon/powertool/block/PeriodicCommandBlock.java index f8c9e25..617ad8d 100644 --- a/src/main/java/org/teacon/powertool/block/PeriodicCommandBlock.java +++ b/src/main/java/org/teacon/powertool/block/PeriodicCommandBlock.java @@ -16,7 +16,7 @@ public class PeriodicCommandBlock extends CommandBlock implements PeriodCommandBlockBridge { public PeriodicCommandBlock(Properties properties, boolean auto) { - super(properties, auto); + super(auto, properties); } @Override @@ -25,7 +25,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { } @Override - public int powerToolPeriod(ServerLevel level, BlockPos pos) { + public int powerTool$Period(ServerLevel level, BlockPos pos) { return level.getBlockEntity(pos) instanceof PeriodicCommandBlockEntity entity ? entity.getPeriod() : 1; } } diff --git a/src/main/java/org/teacon/powertool/block/PowerSupplyBlock.java b/src/main/java/org/teacon/powertool/block/PowerSupplyBlock.java index 1a5c4df..2b48618 100644 --- a/src/main/java/org/teacon/powertool/block/PowerSupplyBlock.java +++ b/src/main/java/org/teacon/powertool/block/PowerSupplyBlock.java @@ -1,38 +1,63 @@ package org.teacon.powertool.block; +import com.mojang.serialization.MapCodec; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.BaseEntityBlock; import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; -import net.minecraftforge.network.NetworkHooks; import org.jetbrains.annotations.Nullable; import org.teacon.powertool.block.entity.PowerSupplyBlockEntity; import org.teacon.powertool.menu.PowerSupplyMenu; +import org.teacon.powertool.utils.VanillaUtils; +import javax.annotation.ParametersAreNonnullByDefault; + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault public class PowerSupplyBlock extends BaseEntityBlock { + + private static final MapCodec CODEC = simpleCodec(PowerSupplyBlock::new); public PowerSupplyBlock(Properties prop) { super(prop); } - + + @Override + protected MapCodec codec() { + return CODEC; + } + @Override + @SuppressWarnings("deprecation") public RenderShape getRenderShape(BlockState pState) { return RenderShape.MODEL; } - + + @Override + protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) { + return use(level, pos, player); + } + @Override - public InteractionResult use(BlockState state, Level level, BlockPos pos, Player p, InteractionHand hand, BlockHitResult hit) { + protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) { + return VanillaUtils.itemInteractionFrom(use(level,pos,player)); + } + + + public InteractionResult use(Level level, BlockPos pos, Player p) { if (level.isClientSide) { return InteractionResult.SUCCESS; } else { if (level.getBlockEntity(pos) instanceof PowerSupplyBlockEntity be) { - NetworkHooks.openScreen((ServerPlayer) p, new PowerSupplyMenu.Provider(be.data), + p.openMenu( new PowerSupplyMenu.Provider(be.data), buf -> buf.writeVarInt(be.data.status).writeVarInt(be.data.power)); } return InteractionResult.CONSUME; diff --git a/src/main/java/org/teacon/powertool/block/PowerToolBlocks.java b/src/main/java/org/teacon/powertool/block/PowerToolBlocks.java index 5263ed6..3aec420 100644 --- a/src/main/java/org/teacon/powertool/block/PowerToolBlocks.java +++ b/src/main/java/org/teacon/powertool/block/PowerToolBlocks.java @@ -1,6 +1,8 @@ package org.teacon.powertool.block; import com.mojang.datafixers.DSL; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.DyeColor; @@ -11,11 +13,13 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.properties.BlockSetType; -import net.minecraftforge.common.util.ForgeSoundType; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.neoforge.capabilities.Capabilities; +import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; +import net.neoforged.neoforge.common.util.DeferredSoundType; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; import org.teacon.powertool.PowerTool; import org.teacon.powertool.block.entity.HolographicSignBlockEntity; import org.teacon.powertool.block.entity.ItemDisplayBlockEntity; @@ -30,7 +34,7 @@ public class PowerToolBlocks { - public static final SoundType ITEM_DISPLAY_SOUND_TYPE = new ForgeSoundType(1.0F, 1.0F, + public static final SoundType ITEM_DISPLAY_SOUND_TYPE = new DeferredSoundType(1.0F, 1.0F, () -> SoundEvents.ITEM_FRAME_BREAK, () -> SoundEvents.MOSS_CARPET_STEP, () -> SoundEvents.ITEM_FRAME_PLACE, @@ -38,7 +42,7 @@ public class PowerToolBlocks { () -> SoundEvents.MOSS_CARPET_FALL ); - public static final SoundType GLOW_ITEM_DISPLAY_SOUND_TYPE = new ForgeSoundType(1.0F, 1.0F, + public static final SoundType GLOW_ITEM_DISPLAY_SOUND_TYPE = new DeferredSoundType(1.0F, 1.0F, () -> SoundEvents.GLOW_ITEM_FRAME_BREAK, () -> SoundEvents.MOSS_CARPET_STEP, () -> SoundEvents.GLOW_ITEM_FRAME_PLACE, @@ -47,51 +51,52 @@ public class PowerToolBlocks { public static final List SIMPLE_BLOCKS = List.of(Blocks.SAND, Blocks.RED_SAND, Blocks.GRAVEL, Blocks.TUBE_CORAL_BLOCK, Blocks.BRAIN_CORAL_BLOCK, Blocks.BUBBLE_CORAL_BLOCK, Blocks.FIRE_CORAL_BLOCK, Blocks.HORN_CORAL_BLOCK, Blocks.REDSTONE_BLOCK); - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, PowerTool.MODID); - public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, PowerTool.MODID); - - public static RegistryObject COMMAND_BLOCK; - public static RegistryObject TRASH_CAN; - public static RegistryObject POWER_SUPPLY; - public static RegistryObject ITEM_DISPLAY; - - public static RegistryObject GLOW_ITEM_DISPLAY; - public static RegistryObject ITEM_SUPPLIER; - - public static RegistryObject SLIM_ITEM_SUPPLIER; - public static RegistryObject COSMETIC_HOPPER; - public static RegistryObject COSMETIC_CAMPFIRE; - public static RegistryObject COSMETIC_SOUL_CAMPFIRE; - public static RegistryObject COSMETIC_BEEHIVE; - public static RegistryObject COSMETIC_FURNACE; - public static RegistryObject COSMETIC_BLAST_FURNACE; - public static RegistryObject COSMETIC_BARREL; - - public static RegistryObject HOLOGRAPHIC_SIGN; - public static RegistryObject> COMMAND_BLOCK_ENTITY; - public static RegistryObject> POWER_SUPPLY_BLOCK_ENTITY; - - public static RegistryObject> ITEM_DISPLAY_BLOCK_ENTITY; - public static RegistryObject> ITEM_SUPPLIER_BLOCK_ENTITY; - public static RegistryObject> HOLOGRAPHIC_SIGN_BLOCK_ENTITY; - - public static void register() { - BLOCKS.register(FMLJavaModLoadingContext.get().getModEventBus()); - BLOCK_ENTITIES.register(FMLJavaModLoadingContext.get().getModEventBus()); + public static final DeferredRegister BLOCKS = DeferredRegister.create(Registries.BLOCK, PowerTool.MODID); + public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(Registries.BLOCK_ENTITY_TYPE, PowerTool.MODID); + + public static DeferredHolder COMMAND_BLOCK; + public static DeferredHolder TRASH_CAN; + public static DeferredHolder POWER_SUPPLY; + public static DeferredHolder ITEM_DISPLAY; + + public static DeferredHolder GLOW_ITEM_DISPLAY; + public static DeferredHolder ITEM_SUPPLIER; + + public static DeferredHolder SLIM_ITEM_SUPPLIER; + public static DeferredHolder COSMETIC_HOPPER; + public static DeferredHolder COSMETIC_CAMPFIRE; + public static DeferredHolder COSMETIC_SOUL_CAMPFIRE; + public static DeferredHolder COSMETIC_BEEHIVE; + public static DeferredHolder COSMETIC_FURNACE; + public static DeferredHolder COSMETIC_BLAST_FURNACE; + public static DeferredHolder COSMETIC_BARREL; + + public static DeferredHolder HOLOGRAPHIC_SIGN; + public static DeferredHolder,BlockEntityType> COMMAND_BLOCK_ENTITY; + public static DeferredHolder,BlockEntityType> POWER_SUPPLY_BLOCK_ENTITY; + + public static DeferredHolder,BlockEntityType> ITEM_DISPLAY_BLOCK_ENTITY; + public static DeferredHolder,BlockEntityType> ITEM_SUPPLIER_BLOCK_ENTITY; + public static DeferredHolder,BlockEntityType> HOLOGRAPHIC_SIGN_BLOCK_ENTITY; + + public static void register(IEventBus bus) { + BLOCKS.register(bus); + BLOCK_ENTITIES.register(bus); COMMAND_BLOCK = BLOCKS.register("command_block", () -> new PeriodicCommandBlock( BlockBehaviour.Properties.of().mapColor(DyeColor.PURPLE).requiresCorrectToolForDrops().strength(-1.0F, 3600000.0F).noLootTable(), false )); TRASH_CAN = BLOCKS.register("trash_can", () -> new TrashCanBlock(BlockBehaviour.Properties.of().strength(1000))); - POWER_SUPPLY = BLOCKS.register("power_supply", () -> new PowerSupplyBlock(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).strength(1000))); - ITEM_DISPLAY = BLOCKS.register("item_display", () -> new ItemDisplayBlock(BlockBehaviour.Properties.copy(Blocks.LADDER).sound(ITEM_DISPLAY_SOUND_TYPE).noOcclusion().strength(10000))); - GLOW_ITEM_DISPLAY = BLOCKS.register("glow_item_display", () -> new ItemDisplayBlock(BlockBehaviour.Properties.copy(Blocks.LADDER).sound(GLOW_ITEM_DISPLAY_SOUND_TYPE).noOcclusion().strength(10000))); + POWER_SUPPLY = BLOCKS.register("power_supply", () -> new PowerSupplyBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK).strength(1000))); + ITEM_DISPLAY = BLOCKS.register("item_display", () -> new ItemDisplayBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.LADDER).sound(ITEM_DISPLAY_SOUND_TYPE).noOcclusion().strength(10000))); + //todo 这玩意是紫黑块 + GLOW_ITEM_DISPLAY = BLOCKS.register("glow_item_display", () -> new ItemDisplayBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.LADDER).sound(GLOW_ITEM_DISPLAY_SOUND_TYPE).noOcclusion().strength(10000))); ITEM_SUPPLIER = BLOCKS.register("item_supplier", () -> new ItemSupplierBlock(BlockBehaviour.Properties.of().strength(1000).noOcclusion())); SLIM_ITEM_SUPPLIER = BLOCKS.register("slim_item_supplier", () -> new SlimItemSupplierBlock(BlockBehaviour.Properties.of().strength(1000).noOcclusion())); - COSMETIC_HOPPER = BLOCKS.register("cosmetic_hopper", () -> new CosmeticHopper(BlockBehaviour.Properties.copy(Blocks.HOPPER))); - COSMETIC_CAMPFIRE = BLOCKS.register("cosmetic_campfire", () -> new CosmeticCampfireBlock(true, BlockBehaviour.Properties.copy(Blocks.CAMPFIRE))); - COSMETIC_SOUL_CAMPFIRE = BLOCKS.register("cosmetic_soul_campfire", () -> new CosmeticCampfireBlock(false, BlockBehaviour.Properties.copy(Blocks.SOUL_CAMPFIRE))); - HOLOGRAPHIC_SIGN = BLOCKS.register("holographic_sign", () -> new HolographicSignBlock(BlockBehaviour.Properties.copy(Blocks.LIGHT).lightLevel(state -> 15).noCollission().noLootTable())); + COSMETIC_HOPPER = BLOCKS.register("cosmetic_hopper", () -> new CosmeticHopper(BlockBehaviour.Properties.ofFullCopy(Blocks.HOPPER))); + COSMETIC_CAMPFIRE = BLOCKS.register("cosmetic_campfire", () -> new CosmeticCampfireBlock(true, BlockBehaviour.Properties.ofFullCopy(Blocks.CAMPFIRE))); + COSMETIC_SOUL_CAMPFIRE = BLOCKS.register("cosmetic_soul_campfire", () -> new CosmeticCampfireBlock(false, BlockBehaviour.Properties.ofFullCopy(Blocks.SOUL_CAMPFIRE))); + HOLOGRAPHIC_SIGN = BLOCKS.register("holographic_sign", () -> new HolographicSignBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.LIGHT).lightLevel(state -> 15).noCollission().noLootTable())); COMMAND_BLOCK_ENTITY = BLOCK_ENTITIES.register("command_block_entity", () -> BlockEntityType.Builder.of( PeriodicCommandBlockEntity::new, COMMAND_BLOCK.get() ).build(DSL.remainderType())); @@ -126,10 +131,10 @@ public static void register() { )); regSimpleCosmetic(SIMPLE_BLOCKS); - COSMETIC_BEEHIVE = BLOCKS.register("cosmetic_beehive", () -> new CosmeticBeehive(BlockBehaviour.Properties.copy(Blocks.BEEHIVE))); - COSMETIC_FURNACE = BLOCKS.register("cosmetic_furnace", () -> new CosmeticFurnace(BlockBehaviour.Properties.copy(Blocks.FURNACE))); - COSMETIC_BLAST_FURNACE = BLOCKS.register("cosmetic_blast_furnace", () -> new CosmeticFurnace(BlockBehaviour.Properties.copy(Blocks.BLAST_FURNACE))); - COSMETIC_BARREL = BLOCKS.register("cosmetic_barrel", () -> new CosmeticBarrel(BlockBehaviour.Properties.copy(Blocks.BARREL))); + COSMETIC_BEEHIVE = BLOCKS.register("cosmetic_beehive", () -> new CosmeticBeehive(BlockBehaviour.Properties.ofFullCopy(Blocks.BEEHIVE))); + COSMETIC_FURNACE = BLOCKS.register("cosmetic_furnace", () -> new CosmeticFurnace(BlockBehaviour.Properties.ofFullCopy(Blocks.FURNACE))); + COSMETIC_BLAST_FURNACE = BLOCKS.register("cosmetic_blast_furnace", () -> new CosmeticFurnace(BlockBehaviour.Properties.ofFullCopy(Blocks.BLAST_FURNACE))); + COSMETIC_BARREL = BLOCKS.register("cosmetic_barrel", () -> new CosmeticBarrel(BlockBehaviour.Properties.ofFullCopy(Blocks.BARREL))); ITEMS.register("cosmetic_beehive", () -> new BlockItem(COSMETIC_BEEHIVE.get(), new Item.Properties())); ITEMS.register("cosmetic_furnace", () -> new BlockItem(COSMETIC_FURNACE.get(), new Item.Properties())); @@ -152,16 +157,27 @@ public static void register() { private static void regTrapDoors(Map existing) { for (var type : existing.entrySet()) { var name = "cosmetic_" + type.getKey().name() + "_trapdoor"; - var block = BLOCKS.register(name, () -> new CosmeticTrapdoor(BlockBehaviour.Properties.copy(type.getValue()))); + var block = BLOCKS.register(name, () -> new CosmeticTrapdoor(BlockBehaviour.Properties.ofFullCopy(type.getValue()))); ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties())); } } + @SuppressWarnings("SameParameterValue") private static void regSimpleCosmetic(List existing) { for (var existingBlock : existing) { - var name = "cosmetic_" + ForgeRegistries.BLOCKS.getKey(existingBlock).getPath(); - var block = BLOCKS.register(name, () -> new CosmeticSimpleBlock(BlockBehaviour.Properties.copy(existingBlock))); + var name = "cosmetic_" + BuiltInRegistries.BLOCK.getKey(existingBlock).getPath(); + var block = BLOCKS.register(name, () -> new CosmeticSimpleBlock(BlockBehaviour.Properties.ofFullCopy(existingBlock))); ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties())); } } + + + @SubscribeEvent + public static void regBlockCapabilities(final RegisterCapabilitiesEvent event) { + event.registerBlockEntity( + Capabilities.ItemHandler.BLOCK, + ITEM_SUPPLIER_BLOCK_ENTITY.get(), + (be,context) -> be.getItemHandler() + ); + } } diff --git a/src/main/java/org/teacon/powertool/block/SlimItemSupplierBlock.java b/src/main/java/org/teacon/powertool/block/SlimItemSupplierBlock.java index 0a54a78..549cd3a 100644 --- a/src/main/java/org/teacon/powertool/block/SlimItemSupplierBlock.java +++ b/src/main/java/org/teacon/powertool/block/SlimItemSupplierBlock.java @@ -1,5 +1,6 @@ package org.teacon.powertool.block; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; @@ -12,6 +13,10 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; +import javax.annotation.ParametersAreNonnullByDefault; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class SlimItemSupplierBlock extends ItemSupplierBlock { protected static final VoxelShape DOWN_AABB = Block.box(0, 12, 0, 16, 16, 16); @@ -27,6 +32,7 @@ public SlimItemSupplierBlock(Properties prop) { } @Override + @SuppressWarnings("DuplicatedCode") //The "duplicated code" in switch cannot actually extract methods. public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { return switch (state.getValue(FACING)) { case NORTH -> NORTH_AABB; diff --git a/src/main/java/org/teacon/powertool/block/TrashCanBlock.java b/src/main/java/org/teacon/powertool/block/TrashCanBlock.java index 4fa012e..f6a11be 100644 --- a/src/main/java/org/teacon/powertool/block/TrashCanBlock.java +++ b/src/main/java/org/teacon/powertool/block/TrashCanBlock.java @@ -1,15 +1,15 @@ package org.teacon.powertool.block; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.TagKey; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; @@ -22,15 +22,16 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import org.teacon.powertool.PowerTool; +import javax.annotation.ParametersAreNonnullByDefault; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class TrashCanBlock extends Block { private static final VoxelShape OUTER_SHAPE = Shapes.block(); private static final VoxelShape SHAPE = Shapes.join(OUTER_SHAPE, Block.box(2, 2, 2, 14, 16, 14), BooleanOp.ONLY_FIRST); - private static final TagKey> ITEM_TYPE = TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation(PowerTool.MODID, "item")); - private static final BooleanProperty POWERED = BlockStateProperties.POWERED; public TrashCanBlock(Properties prop) { @@ -52,14 +53,21 @@ public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, public VoxelShape getCollisionShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) { return SHAPE; } - - @Override + + //xkball: What does this method for? public Object getRenderPropertiesInternal() { return OUTER_SHAPE; } - + @Override - public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult) { + if (!player.getAbilities().instabuild) { + stack.shrink(1); + } + return ItemInteractionResult.sidedSuccess(level.isClientSide); + } + + public InteractionResult use(Level level, Player player, InteractionHand hand) { if (!player.getAbilities().instabuild) { player.getItemInHand(hand).shrink(1); } @@ -68,12 +76,14 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player @Override public void entityInside(BlockState state, Level level, BlockPos pos, Entity entity) { - if (entity.getType().is(ITEM_TYPE)) { + //noinspection deprecation + if (entity.getType().builtInRegistryHolder().is(EntityType.ITEM.builtInRegistryHolder().key())) { entity.discard(); } } - + @Override + @SuppressWarnings("deprecation") public int getSignal(BlockState state, BlockGetter level, BlockPos pos, Direction direction) { return direction == Direction.DOWN && state.getValue(POWERED) ? 1 : 0; } diff --git a/src/main/java/org/teacon/powertool/block/entity/HolographicSignBlockEntity.java b/src/main/java/org/teacon/powertool/block/entity/HolographicSignBlockEntity.java index 54e5b38..2b45ca3 100644 --- a/src/main/java/org/teacon/powertool/block/entity/HolographicSignBlockEntity.java +++ b/src/main/java/org/teacon/powertool/block/entity/HolographicSignBlockEntity.java @@ -5,19 +5,26 @@ */ package org.teacon.powertool.block.entity; +import com.mojang.serialization.Codec; +import io.netty.buffer.ByteBuf; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.StringTag; import net.minecraft.nbt.Tag; import net.minecraft.network.Connection; import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; +import net.minecraft.util.StringRepresentable; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.teacon.powertool.block.PowerToolBlocks; @@ -31,11 +38,15 @@ public class HolographicSignBlockEntity extends BlockEntity { /** Controls how text are aligned: left-align, centered, or right-align. */ - public enum Align { + public enum Align implements StringRepresentable { LEFT(Component.translatable("powertool.gui.holographic_sign.align_left")), CENTER(Component.translatable("powertool.gui.holographic_sign.align_center")), RIGHT(Component.translatable("powertool.gui.holographic_sign.align_right")); - + + + public static final Codec CODEC = StringRepresentable.fromEnum(Align::values); + public static final StreamCodec STREAM_CODEC = ByteBufCodecs.fromCodec(CODEC); + private static final Align[] VALUES = Align.values(); public final Component displayName; @@ -46,14 +57,24 @@ public enum Align { public static Align byOrdinal(int ordinal) { return ordinal >= 0 && ordinal <= VALUES.length ? VALUES[ordinal] : CENTER; } + + @Override + @NotNull + public String getSerializedName() { + return name(); + } + } /** Represents the text shadow. */ - public enum Shadow { + public enum Shadow implements StringRepresentable { NONE(Component.translatable("powertool.gui.holographic_sign.shadow_none")), DROP(Component.translatable("powertool.gui.holographic_sign.shadow_drop")), PLATE(Component.translatable("powertool.gui.holographic_sign.shadow_plate")); - + + public static final Codec CODEC = StringRepresentable.fromEnum(Shadow::values); + public static final StreamCodec STREAM_CODEC = ByteBufCodecs.fromCodec(CODEC); + private static final Shadow[] VALUES = Shadow.values(); public final Component displayName; @@ -64,14 +85,22 @@ public enum Shadow { public static Shadow byOrdinal(int ordinal) { return ordinal >= 0 && ordinal <= VALUES.length ? VALUES[ordinal] : PLATE; } - } + + @Override + @NotNull + public String getSerializedName() { + return name(); +}} /** Represents the Z-offset of the text: above things, same layer or below things. */ - public enum LayerArrange { + public enum LayerArrange implements StringRepresentable { FRONT(Component.translatable("powertool.gui.holographic_sign.arrange_front")), CENTER(Component.translatable("powertool.gui.holographic_sign.arrange_center")), BACK(Component.translatable("powertool.gui.holographic_sign.arrange_back")); - + + public static final Codec CODEC = StringRepresentable.fromEnum(LayerArrange::values); + public static final StreamCodec STREAM_CODEC = ByteBufCodecs.fromCodec(CODEC); + private static final LayerArrange[] VALUES = LayerArrange.values(); public final Component displayName; @@ -82,7 +111,12 @@ public enum LayerArrange { public static LayerArrange byOrdinal(int ordinal) { return ordinal >= 0 && ordinal <= VALUES.length ? VALUES[ordinal] : CENTER; } - } + + @Override + @NotNull + public String getSerializedName() { + return name(); +}} public List contents = Collections.emptyList(); public int colorInARGB = 0xFFFFFFFF; @@ -102,10 +136,10 @@ public HolographicSignBlockEntity(BlockPos pPos, BlockState pBlockState) { super(PowerToolBlocks.HOLOGRAPHIC_SIGN_BLOCK_ENTITY.get(), pPos, pBlockState); } - private void writeTo(CompoundTag tag) { + private void writeTo(CompoundTag tag, HolderLookup.Provider registries) { var list = new ListTag(); for (var text : this.contents) { - list.add(StringTag.valueOf(Component.Serializer.toJson(text))); + list.add(StringTag.valueOf(Component.Serializer.toJson(text,registries))); } tag.put("content", list); tag.putInt("color", this.colorInARGB); @@ -119,10 +153,10 @@ private void writeTo(CompoundTag tag) { tag.putBoolean("bidirectional",bidirectional); } - private void readFrom(CompoundTag tag) { + private void readFrom(CompoundTag tag,HolderLookup.Provider registries) { var loaded = new ArrayList(); for (var entry : tag.getList("content", Tag.TAG_STRING)) { - loaded.add(Component.Serializer.fromJson(entry.getAsString())); + loaded.add(Component.Serializer.fromJson(entry.getAsString(),registries)); } this.contents = loaded; if (tag.contains("color", Tag.TAG_INT)) { @@ -154,29 +188,30 @@ private void readFrom(CompoundTag tag) { this.bidirectional = tag.getBoolean("bidirectional"); } } - + @Override - protected void saveAdditional(CompoundTag tag) { - this.writeTo(tag); - super.saveAdditional(tag); + protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + this.writeTo(tag,registries); + super.saveAdditional(tag, registries); } - + @Override - public void load(CompoundTag tag) { - super.load(tag); - this.readFrom(tag); + protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { + super.loadAdditional(tag, registries); + this.readFrom(tag,registries); } - + @Override - public CompoundTag getUpdateTag() { - var tag = new CompoundTag(); - this.writeTo(tag); - return tag; + public CompoundTag getUpdateTag(HolderLookup.Provider registries) { + var result = super.getUpdateTag(registries); + this.writeTo(result,registries); + return result; } - + @Override - public void handleUpdateTag(CompoundTag tag) { - this.readFrom(tag); + public void handleUpdateTag(CompoundTag tag, HolderLookup.Provider lookupProvider) { + this.readFrom(tag,lookupProvider); + super.handleUpdateTag(tag, lookupProvider); } @Nullable @@ -184,10 +219,11 @@ public void handleUpdateTag(CompoundTag tag) { public Packet getUpdatePacket() { return ClientboundBlockEntityDataPacket.create(this); } - + @Override - public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket pkt) { - super.onDataPacket(net, pkt); - this.handleUpdateTag(pkt.getTag()); + public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket pkt, HolderLookup.Provider lookupProvider) { + super.onDataPacket(net, pkt, lookupProvider); + this.handleUpdateTag(pkt.getTag(),lookupProvider); } + } diff --git a/src/main/java/org/teacon/powertool/block/entity/ItemDisplayBlockEntity.java b/src/main/java/org/teacon/powertool/block/entity/ItemDisplayBlockEntity.java index e8728d8..ad921df 100644 --- a/src/main/java/org/teacon/powertool/block/entity/ItemDisplayBlockEntity.java +++ b/src/main/java/org/teacon/powertool/block/entity/ItemDisplayBlockEntity.java @@ -1,6 +1,8 @@ package org.teacon.powertool.block.entity; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.Connection; import net.minecraft.network.protocol.Packet; @@ -12,6 +14,10 @@ import org.jetbrains.annotations.Nullable; import org.teacon.powertool.block.PowerToolBlocks; +import javax.annotation.ParametersAreNonnullByDefault; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class ItemDisplayBlockEntity extends BlockEntity { public ItemStack itemToDisplay = ItemStack.EMPTY; @@ -20,33 +26,34 @@ public class ItemDisplayBlockEntity extends BlockEntity { public ItemDisplayBlockEntity(BlockPos pos, BlockState state) { super(PowerToolBlocks.ITEM_DISPLAY_BLOCK_ENTITY.get(), pos, state); } - + @Override - protected void saveAdditional(CompoundTag tag) { - tag.put("item", this.itemToDisplay.save(new CompoundTag())); + protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + tag.put("item", this.itemToDisplay.saveOptional(registries)); tag.putInt("rotation", this.rotation); - super.saveAdditional(tag); + super.saveAdditional(tag, registries); } - + @Override - public void load(CompoundTag tag) { - super.load(tag); - this.itemToDisplay = ItemStack.of(tag.getCompound("item")); + protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { + super.loadAdditional(tag, registries); + this.itemToDisplay = ItemStack.parseOptional(registries,tag.getCompound("item")); this.rotation = tag.getInt("rotation"); } - + @Override - public CompoundTag getUpdateTag() { - var tag = new CompoundTag(); - tag.put("item", this.itemToDisplay.save(new CompoundTag())); - tag.putInt("rotation", this.rotation); - return tag; + public CompoundTag getUpdateTag(HolderLookup.Provider registries) { + var result = super.getUpdateTag(registries); + result.put("item", this.itemToDisplay.saveOptional(registries)); + result.putInt("rotation", this.rotation); + return result; } - + @Override - public void handleUpdateTag(CompoundTag tag) { - this.itemToDisplay = ItemStack.of(tag.getCompound("item")); + public void handleUpdateTag(CompoundTag tag, HolderLookup.Provider registries) { + this.itemToDisplay = ItemStack.parseOptional(registries,tag.getCompound("item")); this.rotation = tag.getInt("rotation"); + super.handleUpdateTag(tag, registries); } @Nullable @@ -54,10 +61,10 @@ public void handleUpdateTag(CompoundTag tag) { public Packet getUpdatePacket() { return ClientboundBlockEntityDataPacket.create(this); } - + @Override - public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket pkt) { - super.onDataPacket(net, pkt); - this.handleUpdateTag(pkt.getTag()); + public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket pkt, HolderLookup.Provider lookupProvider) { + super.onDataPacket(net, pkt, lookupProvider); + this.handleUpdateTag(pkt.getTag(), lookupProvider); } } diff --git a/src/main/java/org/teacon/powertool/block/entity/ItemSupplierBlockEntity.java b/src/main/java/org/teacon/powertool/block/entity/ItemSupplierBlockEntity.java index 4498c4e..34b9251 100644 --- a/src/main/java/org/teacon/powertool/block/entity/ItemSupplierBlockEntity.java +++ b/src/main/java/org/teacon/powertool/block/entity/ItemSupplierBlockEntity.java @@ -1,7 +1,8 @@ package org.teacon.powertool.block.entity; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.Connection; import net.minecraft.network.protocol.Packet; @@ -10,36 +11,38 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.IItemHandler; +import net.neoforged.neoforge.common.util.Lazy; +import net.neoforged.neoforge.items.IItemHandler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.teacon.powertool.block.PowerToolBlocks; -public class ItemSupplierBlockEntity extends BlockEntity { +import javax.annotation.ParametersAreNonnullByDefault; - public ItemStack theItem = ItemStack.EMPTY; +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +public class ItemSupplierBlockEntity extends BlockEntity{ - final LazyOptional fakeInv = LazyOptional.of(() -> new IItemHandler() { + public ItemStack theItem = ItemStack.EMPTY; + + private final Lazy iItemHandlerLazy = Lazy.of(() -> new IItemHandler() { @Override public int getSlots() { return 1; } - + @NotNull @Override public ItemStack getStackInSlot(int slot) { return theItem; } - + @NotNull @Override public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) { return stack; } - + @NotNull @Override public ItemStack extractItem(int slot, int amount, boolean simulate) { @@ -47,44 +50,45 @@ public ItemStack extractItem(int slot, int amount, boolean simulate) { copy.setCount(amount); return copy; } - + @Override public int getSlotLimit(int slot) { return 1; } - + @Override public boolean isItemValid(int slot, @NotNull ItemStack stack) { return false; } }); - + public ItemSupplierBlockEntity(BlockPos pPos, BlockState pBlockState) { super(PowerToolBlocks.ITEM_SUPPLIER_BLOCK_ENTITY.get(), pPos, pBlockState); } - + @Override - protected void saveAdditional(CompoundTag tag) { - tag.put("item", this.theItem.save(new CompoundTag())); - super.saveAdditional(tag); + protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { + this.theItem = ItemStack.parseOptional(registries,tag.getCompound("item")); + super.loadAdditional(tag, registries); } - + @Override - public void load(CompoundTag tag) { - super.load(tag); - this.theItem = ItemStack.of(tag.getCompound("item")); + protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + super.saveAdditional(tag, registries); + tag.put("item", this.theItem.saveOptional(registries)); } - + @Override - public CompoundTag getUpdateTag() { - var tag = new CompoundTag(); - tag.put("item", this.theItem.save(new CompoundTag())); - return tag; + public CompoundTag getUpdateTag(HolderLookup.Provider registries) { + var result = super.getUpdateTag(registries); + result.put("item", this.theItem.saveOptional(registries)); + return result; } - + @Override - public void handleUpdateTag(CompoundTag tag) { - this.theItem = ItemStack.of(tag.getCompound("item")); + public void handleUpdateTag(CompoundTag tag, HolderLookup.Provider registries) { + this.theItem = ItemStack.parseOptional(registries,tag.getCompound("item")); + super.handleUpdateTag(tag, registries); } @Nullable @@ -92,22 +96,16 @@ public void handleUpdateTag(CompoundTag tag) { public Packet getUpdatePacket() { return ClientboundBlockEntityDataPacket.create(this); } - + + @Override - public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket pkt) { - super.onDataPacket(net, pkt); - this.handleUpdateTag(pkt.getTag()); + public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket pkt, HolderLookup.Provider lookupProvider) { + super.onDataPacket(net, pkt, lookupProvider); + this.handleUpdateTag(pkt.getTag(),lookupProvider); } - - @NotNull - @Override - public LazyOptional getCapability(@NotNull Capability cap, Direction dir) { - return cap == ForgeCapabilities.ITEM_HANDLER ? this.fakeInv.cast() : super.getCapability(cap, dir); - } - - @Override - public void invalidateCaps() { - this.fakeInv.invalidate(); - super.invalidateCaps(); + + public IItemHandler getItemHandler() { + return iItemHandlerLazy.get(); } + } diff --git a/src/main/java/org/teacon/powertool/block/entity/PeriodicCommandBlockEntity.java b/src/main/java/org/teacon/powertool/block/entity/PeriodicCommandBlockEntity.java index f35dad2..9e73d7f 100644 --- a/src/main/java/org/teacon/powertool/block/entity/PeriodicCommandBlockEntity.java +++ b/src/main/java/org/teacon/powertool/block/entity/PeriodicCommandBlockEntity.java @@ -2,6 +2,7 @@ import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.CommandBlockEntity; @@ -38,17 +39,17 @@ public Mode getMode() { return super.getMode(); } } - + @Override - protected void saveAdditional(CompoundTag tag) { - super.saveAdditional(tag); + protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + super.saveAdditional(tag, registries); tag.putInt("period", period); } - + @Override - public void load(CompoundTag tag) { - super.load(tag); + protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { period = tag.getInt("period"); + super.loadAdditional(tag, registries); } @Override diff --git a/src/main/java/org/teacon/powertool/block/entity/PowerSupplyBlockEntity.java b/src/main/java/org/teacon/powertool/block/entity/PowerSupplyBlockEntity.java index c0311ce..43c0f63 100644 --- a/src/main/java/org/teacon/powertool/block/entity/PowerSupplyBlockEntity.java +++ b/src/main/java/org/teacon/powertool/block/entity/PowerSupplyBlockEntity.java @@ -1,21 +1,22 @@ package org.teacon.powertool.block.entity; + import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.IEnergyStorage; -import org.jetbrains.annotations.NotNull; +import net.neoforged.neoforge.common.util.Lazy; +import net.neoforged.neoforge.energy.IEnergyStorage; import org.teacon.powertool.block.PowerSupplyBlock; import org.teacon.powertool.block.PowerToolBlocks; +import javax.annotation.ParametersAreNonnullByDefault; + +@ParametersAreNonnullByDefault public final class PowerSupplyBlockEntity extends BlockEntity { - private final LazyOptional energyStore = LazyOptional.of(() -> new IEnergyStorage() { + private final Lazy energyStore = Lazy.of(() -> new IEnergyStorage() { @Override public int receiveEnergy(int maxReceive, boolean simulate) { return 0; @@ -53,30 +54,22 @@ public PowerSupplyBlockEntity(BlockPos pWorldPosition, BlockState pBlockState) { super(PowerToolBlocks.POWER_SUPPLY_BLOCK_ENTITY.get(), pWorldPosition, pBlockState); this.data.markDirty = this::setChanged; } - + @Override - protected void saveAdditional(CompoundTag tag) { - tag.putInt("status", this.data.status); - tag.putInt("power", this.data.power); - super.saveAdditional(tag); - } - - @Override - public void load(CompoundTag tag) { - super.load(tag); + protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { + super.loadAdditional(tag, registries); this.data.status = tag.getInt("status"); this.data.power = tag.getInt("power"); } - - @NotNull + @Override - public LazyOptional getCapability(@NotNull Capability cap, Direction d) { - return cap == ForgeCapabilities.ENERGY ? this.energyStore.cast() : super.getCapability(cap, d); + protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + tag.putInt("status", this.data.status); + tag.putInt("power", this.data.power); + super.saveAdditional(tag, registries); } - - @Override - public void invalidateCaps() { - this.energyStore.invalidate(); - super.invalidateCaps(); + + public IEnergyStorage getEnergyStore() { + return energyStore.get(); } } diff --git a/src/main/java/org/teacon/powertool/bridge/PeriodCommandBlockBridge.java b/src/main/java/org/teacon/powertool/bridge/PeriodCommandBlockBridge.java index c8e8c30..f863308 100644 --- a/src/main/java/org/teacon/powertool/bridge/PeriodCommandBlockBridge.java +++ b/src/main/java/org/teacon/powertool/bridge/PeriodCommandBlockBridge.java @@ -5,5 +5,5 @@ public interface PeriodCommandBlockBridge { - int powerToolPeriod(ServerLevel level, BlockPos pos); + int powerTool$Period(ServerLevel level, BlockPos pos); } diff --git a/src/main/java/org/teacon/powertool/client/ButtonWithHighlight.java b/src/main/java/org/teacon/powertool/client/ButtonWithHighlight.java index 1b23105..e1aed83 100644 --- a/src/main/java/org/teacon/powertool/client/ButtonWithHighlight.java +++ b/src/main/java/org/teacon/powertool/client/ButtonWithHighlight.java @@ -6,6 +6,9 @@ import net.minecraft.client.renderer.GameRenderer; import net.minecraft.resources.ResourceLocation; +import javax.annotation.ParametersAreNonnullByDefault; + +@ParametersAreNonnullByDefault public class ButtonWithHighlight extends Button { private final ResourceLocation texture; diff --git a/src/main/java/org/teacon/powertool/client/ClientEvents.java b/src/main/java/org/teacon/powertool/client/ClientEvents.java index cde6d2c..dc1aedc 100644 --- a/src/main/java/org/teacon/powertool/client/ClientEvents.java +++ b/src/main/java/org/teacon/powertool/client/ClientEvents.java @@ -1,39 +1,24 @@ package org.teacon.powertool.client; -import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen; -import net.minecraft.client.player.AbstractClientPlayer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.entity.Entity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.EntityRenderersEvent; -import net.minecraftforge.client.event.ScreenEvent; -import net.minecraftforge.event.AttachCapabilitiesEvent; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.client.event.ClientTickEvent; +import net.neoforged.neoforge.client.event.EntityRenderersEvent; +import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; +import net.neoforged.neoforge.client.event.ScreenEvent; import org.teacon.powertool.PowerTool; import org.teacon.powertool.block.PowerToolBlocks; import org.teacon.powertool.block.entity.PeriodicCommandBlockEntity; import org.teacon.powertool.entity.PowerToolEntities; import org.teacon.powertool.menu.PowerToolMenus; -import org.teacon.powertool.network.capability.Permission; -import java.util.function.Predicate; - -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = PowerTool.MODID) +@EventBusSubscriber(value = Dist.CLIENT, modid = PowerTool.MODID) public class ClientEvents { static int tickCount = 0; - @SubscribeEvent - public static void on(AttachCapabilitiesEvent event) { - if (event.getObject() instanceof AbstractClientPlayer) { - event.addCapability(Permission.KEY, new Permission.Provider()); - } - } - @SubscribeEvent public static void on(ScreenEvent.Opening event) { if (event.getScreen() instanceof CommandBlockEditScreen screen @@ -43,19 +28,15 @@ public static void on(ScreenEvent.Opening event) { } @SubscribeEvent - public static void on(TickEvent.ClientTickEvent event) { - if (event.phase == TickEvent.Phase.START) { - tickCount++; - } + public static void on(ClientTickEvent.Pre event) { + tickCount++; } - @Mod.EventBusSubscriber(value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD, modid = PowerTool.MODID) + @EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD, modid = PowerTool.MODID) public static final class OnModBus { @SubscribeEvent - public static void setup(FMLClientSetupEvent event) { - event.enqueueWork(() -> { - MenuScreens.register(PowerToolMenus.POWER_SUPPLY_MENU.get(), PowerSupplyScreen::new); - }); + public static void setup(final RegisterMenuScreensEvent event) { + event.register(PowerToolMenus.POWER_SUPPLY_MENU.get(), PowerSupplyScreen::new); } @SubscribeEvent public static void ber(EntityRenderersEvent.RegisterRenderers event) { diff --git a/src/main/java/org/teacon/powertool/client/FenceKnotRenderer.java b/src/main/java/org/teacon/powertool/client/FenceKnotRenderer.java index 9fbfd7b..6cffe5e 100644 --- a/src/main/java/org/teacon/powertool/client/FenceKnotRenderer.java +++ b/src/main/java/org/teacon/powertool/client/FenceKnotRenderer.java @@ -2,6 +2,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.model.LeashKnotModel; @@ -21,9 +22,14 @@ import net.minecraft.world.phys.Vec3; import org.joml.Matrix4f; import org.teacon.powertool.entity.FenceKnotEntity; +import org.teacon.powertool.utils.VanillaUtils; +import javax.annotation.ParametersAreNonnullByDefault; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class FenceKnotRenderer extends EntityRenderer { - private static final ResourceLocation KNOT_LOCATION = new ResourceLocation("textures/entity/lead_knot.png"); + private static final ResourceLocation KNOT_LOCATION = ResourceLocation.withDefaultNamespace("textures/entity/lead_knot.png"); private final LeashKnotModel model; public FenceKnotRenderer(EntityRendererProvider.Context context) { @@ -43,7 +49,7 @@ public void render(FenceKnotEntity e, float yRot, float partialTick, PoseStack t transform.scale(-1.0F, -1.0F, 1.0F); this.model.setupAnim(e, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F); VertexConsumer vertexconsumer = buffers.getBuffer(this.model.renderType(KNOT_LOCATION)); - this.model.renderToBuffer(transform, vertexconsumer, packedLight, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F); + this.model.renderToBuffer(transform, vertexconsumer, packedLight, OverlayTexture.NO_OVERLAY, VanillaUtils.getColor(255,255,255,255)); transform.popPose(); for (var fromPos : e.getConnectTo()) { this.renderLeash(e, partialTick, transform, buffers, fromPos); @@ -115,8 +121,8 @@ private static void addVertexPair(VertexConsumer vertexes, Matrix4f transform, f float f5 = p_174310_ * f; float f6 = p_174311_ > 0.0F ? p_174311_ * f * f : p_174311_ - p_174311_ * (1.0F - f) * (1.0F - f); float f7 = p_174312_ * f; - vertexes.vertex(transform, f5 - p_174319_, f6 + p_174318_, f7 + p_174320_).color(f2, f3, f4, 1.0F).uv2(k).endVertex(); - vertexes.vertex(transform, f5 + p_174319_, f6 + p_174317_ - p_174318_, f7 - p_174320_).color(f2, f3, f4, 1.0F).uv2(k).endVertex(); + vertexes.addVertex(transform, f5 - p_174319_, f6 + p_174318_, f7 + p_174320_).setColor(f2, f3, f4, 1.0F).setLight(k); + vertexes.addVertex(transform, f5 + p_174319_, f6 + p_174317_ - p_174318_, f7 - p_174320_).setColor(f2, f3, f4, 1.0F).setLight(k); } } diff --git a/src/main/java/org/teacon/powertool/client/HolographicSignEditingScreen.java b/src/main/java/org/teacon/powertool/client/HolographicSignEditingScreen.java index 5d63e26..79b5bed 100644 --- a/src/main/java/org/teacon/powertool/client/HolographicSignEditingScreen.java +++ b/src/main/java/org/teacon/powertool/client/HolographicSignEditingScreen.java @@ -15,11 +15,10 @@ import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TextColor; -import net.minecraftforge.network.PacketDistributor; +import net.neoforged.neoforge.network.PacketDistributor; import org.jetbrains.annotations.NotNull; import org.lwjgl.glfw.GLFW; import org.teacon.powertool.block.entity.HolographicSignBlockEntity; -import org.teacon.powertool.network.PowerToolNetwork; import org.teacon.powertool.network.server.UpdateHolographicSignData; import java.util.Arrays; @@ -99,7 +98,7 @@ protected void init() { .createNarration(displayed -> Component.translatable("powertool.gui.holographic_sign.scale", displayed.get())) .build(); - Button scaleUp = new Button.Builder(Component.literal("+"), btn -> this.scale += 0.125) + Button scaleUp = new Button.Builder(Component.literal("+"), btn -> this.scale += 0.125f) .pos(100, 0) .size(20, 20) .createNarration(displayed -> Component.translatable("powertool.gui.holographic_sign.scale", displayed.get())) @@ -132,7 +131,7 @@ protected void init() { this.colorInput = new EditBox(this.minecraft.font, 280 + innerPadding * 2, 0, 50, 20, Component.empty()); this.colorInput.setValue("#" + Integer.toHexString(this.colorInARGB)); this.colorInput.setResponder(string -> { - TextColor color = TextColor.parseColor(this.colorInput.getValue()); + TextColor color = TextColor.parseColor(this.colorInput.getValue()).result().orElse(null); this.colorInARGB = color == null ? 0xFFFFFFFF : color.getValue() | 0xFF000000; }); this.colorInput.setFocused(false); @@ -243,9 +242,10 @@ public void removed() { } } var toSend = Arrays.copyOfRange(this.messages, 0, last + 1); - PowerToolNetwork.channel().send(PacketDistributor.SERVER.with(() -> null), - new UpdateHolographicSignData(this.sign.getBlockPos(), toSend, this.colorInARGB, this.scale, - this.textAlign, this.shadowType, this.layerArrange,this.locked,this.rotation,this.bidirectional)); + PacketDistributor.sendToServer(UpdateHolographicSignData.create(this.sign.getBlockPos(), + Arrays.asList(toSend), this.colorInARGB, this.scale, + this.textAlign, this.shadowType, this.layerArrange, + this.locked,this.rotation,this.bidirectional)); } @Override @@ -305,10 +305,10 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (!this.colorInput.mouseClicked(mouseX, mouseX, button)) { + if (!this.colorInput.mouseClicked(mouseX, mouseY, button)) { this.colorInput.setFocused(false); } - if (!this.rotationInput.mouseClicked(mouseX, mouseX, button)) { + if (!this.rotationInput.mouseClicked(mouseX, mouseY, button)) { this.rotationInput.setFocused(false); } this.setFocused(null); @@ -318,7 +318,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { @Override public void render(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { Lighting.setupForFlatItems(); - this.renderBackground(guiGraphics); + super.render(guiGraphics, mouseX, mouseY, partialTick); guiGraphics.drawString(this.font, Component.translatable("powertool.gui.holographic_sign.scale", this.scale), 7, 7, 0xFFFFFF, true); // I don't know, someone please explain why these transforms are necessary??? var transform = guiGraphics.pose(); @@ -384,6 +384,6 @@ public void render(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, flo transform.popPose(); Lighting.setupFor3DItems(); - super.render(guiGraphics, mouseX, mouseY, partialTick); + } } diff --git a/src/main/java/org/teacon/powertool/client/ItemDisplayBlockEntityRenderer.java b/src/main/java/org/teacon/powertool/client/ItemDisplayBlockEntityRenderer.java index 9016630..39c01bd 100644 --- a/src/main/java/org/teacon/powertool/client/ItemDisplayBlockEntityRenderer.java +++ b/src/main/java/org/teacon/powertool/client/ItemDisplayBlockEntityRenderer.java @@ -11,6 +11,9 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import org.teacon.powertool.block.entity.ItemDisplayBlockEntity; +import javax.annotation.ParametersAreNonnullByDefault; + +@ParametersAreNonnullByDefault public class ItemDisplayBlockEntityRenderer implements BlockEntityRenderer { private final ItemRenderer itemRenderer; diff --git a/src/main/java/org/teacon/powertool/client/ItemSupplierBlockEntityRenderer.java b/src/main/java/org/teacon/powertool/client/ItemSupplierBlockEntityRenderer.java index e83f9e8..e5cb198 100644 --- a/src/main/java/org/teacon/powertool/client/ItemSupplierBlockEntityRenderer.java +++ b/src/main/java/org/teacon/powertool/client/ItemSupplierBlockEntityRenderer.java @@ -11,6 +11,9 @@ import net.minecraft.world.item.ItemStack; import org.teacon.powertool.block.entity.ItemSupplierBlockEntity; +import javax.annotation.ParametersAreNonnullByDefault; + +@ParametersAreNonnullByDefault public class ItemSupplierBlockEntityRenderer implements BlockEntityRenderer { public ItemSupplierBlockEntityRenderer(BlockEntityRendererProvider.Context context) { diff --git a/src/main/java/org/teacon/powertool/client/PeriodicCommandBlockEditScreen.java b/src/main/java/org/teacon/powertool/client/PeriodicCommandBlockEditScreen.java index 2be177f..5e35e69 100644 --- a/src/main/java/org/teacon/powertool/client/PeriodicCommandBlockEditScreen.java +++ b/src/main/java/org/teacon/powertool/client/PeriodicCommandBlockEditScreen.java @@ -6,8 +6,8 @@ import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.level.BaseCommandBlock; +import net.neoforged.neoforge.network.PacketDistributor; import org.teacon.powertool.block.entity.PeriodicCommandBlockEntity; -import org.teacon.powertool.network.PowerToolNetwork; import org.teacon.powertool.network.server.SetCommandBlockPacket; import javax.annotation.ParametersAreNonnullByDefault; @@ -44,12 +44,13 @@ public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPar guiGraphics.drawString(this.font, PERIOD, this.width / 2 - 150 + (300 - 40), 95, 10526880); } + //todo 修复命令方块使其正常工作 @Override protected void populateAndSendPacket(BaseCommandBlock baseCommandBlock) { super.populateAndSendPacket(baseCommandBlock); try { var period = Integer.parseInt(this.periodBox.getValue()); - PowerToolNetwork.channel().sendToServer(new SetCommandBlockPacket( + PacketDistributor.sendToServer(new SetCommandBlockPacket( BlockPos.containing(baseCommandBlock.getPosition()), period )); } catch (NumberFormatException ignored) { diff --git a/src/main/java/org/teacon/powertool/client/PowerSupplyScreen.java b/src/main/java/org/teacon/powertool/client/PowerSupplyScreen.java index e4ee94d..33ef722 100644 --- a/src/main/java/org/teacon/powertool/client/PowerSupplyScreen.java +++ b/src/main/java/org/teacon/powertool/client/PowerSupplyScreen.java @@ -10,16 +10,18 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import net.minecraftforge.network.PacketDistributor; +import net.neoforged.neoforge.network.PacketDistributor; import org.lwjgl.glfw.GLFW; -import org.teacon.powertool.PowerTool; import org.teacon.powertool.menu.PowerSupplyMenu; -import org.teacon.powertool.network.PowerToolNetwork; import org.teacon.powertool.network.server.UpdatePowerSupplyData; +import org.teacon.powertool.utils.VanillaUtils; +import javax.annotation.ParametersAreNonnullByDefault; + +@ParametersAreNonnullByDefault public final class PowerSupplyScreen extends AbstractContainerScreen { - private static final ResourceLocation BG_LOCATION = new ResourceLocation(PowerTool.MODID, "textures/gui/power_supply.png"); + private static final ResourceLocation BG_LOCATION = VanillaUtils.modResourceLocation("textures/gui/power_supply.png"); private EditBox input; private ButtonWithHighlight minus, plus; @@ -35,11 +37,11 @@ public PowerSupplyScreen(PowerSupplyMenu menu, Inventory playerInventory, Compon public void onToggled(Button toggle) { this.status = this.status == 0 ? 1 : 0; - PowerToolNetwork.channel().send(PacketDistributor.SERVER.with(null), new UpdatePowerSupplyData(0, this.status)); + PacketDistributor.sendToServer(new UpdatePowerSupplyData(0, this.status)); } public void updatePowerOutput() { - PowerToolNetwork.channel().send(PacketDistributor.SERVER.with(null), new UpdatePowerSupplyData(1, this.power)); + PacketDistributor.sendToServer(new UpdatePowerSupplyData(1, this.power)); } @Override @@ -83,7 +85,6 @@ protected void init() { @Override protected void containerTick() { super.containerTick(); - this.input.tick(); this.minus.tick(); this.plus.tick(); } @@ -113,7 +114,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @Override public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { - this.renderBackground(guiGraphics); + this.renderBackground(guiGraphics,mouseX,mouseY,partialTick); super.render(guiGraphics, mouseX, mouseY, partialTick); RenderSystem.disableBlend(); this.input.render(guiGraphics, mouseX, mouseY, partialTick); diff --git a/src/main/java/org/teacon/powertool/command/FlyCommand.java b/src/main/java/org/teacon/powertool/command/FlyCommand.java index d727562..f4da9ae 100644 --- a/src/main/java/org/teacon/powertool/command/FlyCommand.java +++ b/src/main/java/org/teacon/powertool/command/FlyCommand.java @@ -19,8 +19,12 @@ private static int fly0(CommandContext sourceStack) { var abilities = p.getAbilities(); var gameMode = p.gameMode; if (gameMode.isSurvival()) { + //todo 使用attribute去控制飞行 + //p.getAttribute(NeoForgeMod.CREATIVE_FLIGHT).getValue(); + //noinspection deprecation abilities.mayfly = !abilities.mayfly; p.connection.send(new ClientboundPlayerAbilitiesPacket(p.getAbilities())); + //noinspection deprecation if (abilities.mayfly) { sourceStack.getSource().sendSuccess(() -> Component.translatable("powertool.command.fly.enabled"), true); } else { diff --git a/src/main/java/org/teacon/powertool/command/PowerToolCommands.java b/src/main/java/org/teacon/powertool/command/PowerToolCommands.java index 34ae294..7c9bd34 100644 --- a/src/main/java/org/teacon/powertool/command/PowerToolCommands.java +++ b/src/main/java/org/teacon/powertool/command/PowerToolCommands.java @@ -1,11 +1,11 @@ package org.teacon.powertool.command; -import net.minecraftforge.event.RegisterCommandsEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.RegisterCommandsEvent; import org.teacon.powertool.PowerTool; -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, modid = PowerTool.MODID) +@EventBusSubscriber(bus = EventBusSubscriber.Bus.GAME, modid = PowerTool.MODID) public class PowerToolCommands { @SubscribeEvent diff --git a/src/main/java/org/teacon/powertool/compat/top/PowerToolTOPProvider.java b/src/main/java/org/teacon/powertool/compat/top/PowerToolTOPProvider.java index bee6edb..fb0fd6c 100644 --- a/src/main/java/org/teacon/powertool/compat/top/PowerToolTOPProvider.java +++ b/src/main/java/org/teacon/powertool/compat/top/PowerToolTOPProvider.java @@ -11,15 +11,15 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; -import org.teacon.powertool.PowerTool; import org.teacon.powertool.block.entity.ItemSupplierBlockEntity; +import org.teacon.powertool.utils.VanillaUtils; import java.util.function.Function; public final class PowerToolTOPProvider implements IProbeInfoProvider, Function { @Override public ResourceLocation getID() { - return new ResourceLocation(PowerTool.MODID, "the_one_probe"); + return VanillaUtils.modResourceLocation( "the_one_probe"); } @Override diff --git a/src/main/java/org/teacon/powertool/compat/top/TOPCompatibility.java b/src/main/java/org/teacon/powertool/compat/top/TOPCompatibility.java index 9f130f5..79456cb 100644 --- a/src/main/java/org/teacon/powertool/compat/top/TOPCompatibility.java +++ b/src/main/java/org/teacon/powertool/compat/top/TOPCompatibility.java @@ -1,13 +1,13 @@ package org.teacon.powertool.compat.top; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.InterModComms; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.InterModComms; +import net.neoforged.fml.ModList; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent; import org.teacon.powertool.PowerTool; -@Mod.EventBusSubscriber(modid = PowerTool.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = PowerTool.MODID, bus = EventBusSubscriber.Bus.MOD) public final class TOPCompatibility { @SubscribeEvent diff --git a/src/main/java/org/teacon/powertool/datagen/DataGenerators.java b/src/main/java/org/teacon/powertool/datagen/DataGenerators.java index c28cf94..63a546b 100644 --- a/src/main/java/org/teacon/powertool/datagen/DataGenerators.java +++ b/src/main/java/org/teacon/powertool/datagen/DataGenerators.java @@ -2,14 +2,14 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.data.event.GatherDataEvent; import org.teacon.powertool.PowerTool; -@Mod.EventBusSubscriber(modid = DataGenerators.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(modid = DataGenerators.MOD_ID, bus = EventBusSubscriber.Bus.MOD) public class DataGenerators { public static final String MOD_ID = PowerTool.MODID; diff --git a/src/main/java/org/teacon/powertool/datagen/ModBlockModelProvider.java b/src/main/java/org/teacon/powertool/datagen/ModBlockModelProvider.java index be324e3..a914c2f 100644 --- a/src/main/java/org/teacon/powertool/datagen/ModBlockModelProvider.java +++ b/src/main/java/org/teacon/powertool/datagen/ModBlockModelProvider.java @@ -1,18 +1,19 @@ package org.teacon.powertool.datagen; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraftforge.client.model.generators.BlockStateProvider; -import net.minecraftforge.client.model.generators.ConfiguredModel; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.neoforge.client.model.generators.BlockStateProvider; +import net.neoforged.neoforge.client.model.generators.ConfiguredModel; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.teacon.powertool.block.CosmeticFurnace; import org.teacon.powertool.block.PowerToolBlocks; import java.util.Objects; + public class ModBlockModelProvider extends BlockStateProvider { public ModBlockModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) { @@ -29,18 +30,20 @@ protected void registerStatesAndModels() { } private Block cosmeticBlock(Block block){ - return ForgeRegistries.BLOCKS.getValue(modLoc("cosmetic_" + name(block))); + return BuiltInRegistries.BLOCK.get(modLoc("cosmetic_" + name(block))); } private static String name(Block block){ - return Objects.requireNonNull(ForgeRegistries.BLOCKS.getKey(block)).getPath(); + return Objects.requireNonNull(BuiltInRegistries.BLOCK.getKey(block)).getPath(); } + @SuppressWarnings("SameParameterValue") private void cosmeticHorizontalBlockWithItem(Block block){ horizontalBlock(cosmeticBlock(block), models().getExistingFile(mcLoc(name(block)))); item(block); } + @SuppressWarnings("SameParameterValue") private void cosmeticDirectionalBlockWithItem(Block block){ directionalBlock(cosmeticBlock(block), models().getExistingFile(mcLoc(name(block)))); item(block); diff --git a/src/main/java/org/teacon/powertool/entity/FenceKnotEntity.java b/src/main/java/org/teacon/powertool/entity/FenceKnotEntity.java index ee0e8fe..5d94b67 100644 --- a/src/main/java/org/teacon/powertool/entity/FenceKnotEntity.java +++ b/src/main/java/org/teacon/powertool/entity/FenceKnotEntity.java @@ -1,16 +1,23 @@ package org.teacon.powertool.entity; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import io.netty.buffer.ByteBuf; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.NbtUtils; import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.server.level.ServerEntity; import net.minecraft.sounds.SoundEvents; import net.minecraft.tags.BlockTags; import net.minecraft.world.InteractionHand; @@ -24,13 +31,17 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.Nullable; +import org.teacon.powertool.item.PowerToolItems; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.LinkedHashSet; import java.util.Set; +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault public class FenceKnotEntity extends HangingEntity { - private static final EntityDataAccessor> CONNECT_TO = SynchedEntityData.defineId(FenceKnotEntity.class, PowerToolEntities.BLOCK_POS_LIST.get()); + private static final EntityDataAccessor> CONNECT_TO = SynchedEntityData.defineId(FenceKnotEntity.class, PowerToolEntities.BLOCK_POS_LIST); public FenceKnotEntity(Level level, BlockPos pos) { super(PowerToolEntities.FENCE_KNOT.get(), level, pos); @@ -44,26 +55,11 @@ public FenceKnotEntity(EntityType type, Level level) { this.noCulling = true; } - @Override - protected void defineSynchedData() { - this.getEntityData().define(CONNECT_TO, new LinkedHashSet<>()); - } - @Override protected Vec3 getLeashOffset() { return Vec3.ZERO; } - @Override - public int getWidth() { - return 9; - } - - @Override - public int getHeight() { - return 9; - } - @Override public void dropItem(@Nullable Entity e) { this.playSound(SoundEvents.LEASH_KNOT_BREAK, 1.0F, 1.0F); @@ -80,7 +76,7 @@ public void readAdditionalSaveData(CompoundTag data) { if (!toPos.isEmpty()) { var list = new LinkedHashSet(); for (var tag : toPos) { - list.add(NbtUtils.readBlockPos((CompoundTag) tag)); + NbtUtils.readBlockPos((CompoundTag) tag, "pos").ifPresent(list::add); } this.getEntityData().set(CONNECT_TO, list); } @@ -90,13 +86,16 @@ public void readAdditionalSaveData(CompoundTag data) { public void addAdditionalSaveData(CompoundTag data) { var toPos = new ListTag(); for (var pos : this.getEntityData().get(CONNECT_TO)) { - toPos.add(NbtUtils.writeBlockPos(pos)); + var tag = new CompoundTag(); + tag.put("pos", NbtUtils.writeBlockPos(pos)); + toPos.add(tag); } data.put("ConnectTo", toPos); } - + + @Override - public Packet getAddEntityPacket() { + public Packet getAddEntityPacket(ServerEntity entity) { return new ClientboundAddEntityPacket(this, 0, this.getPos()); } @@ -108,16 +107,16 @@ public InteractionResult interact(Player p, InteractionHand hand) { var held = p.getItemInHand(hand); if (held.getItem() == Items.LEAD) { - var itemNbt = held.getTagElement("PowerToolKnot"); - if (itemNbt == null) { + var data = held.get(PowerToolItems.KNOT_DATA); + if (data == null) { // Connection start. - held.getOrCreateTag().put("PowerToolKnot", NbtUtils.writeBlockPos(this.pos)); + held.set(PowerToolItems.KNOT_DATA,new PowerToolKnotData(this.pos)); p.sendSystemMessage(Component.translatable("entity.powertool.fence_knot.connecting", this.pos.toShortString())); } else { - var fromPos = NbtUtils.readBlockPos(itemNbt); + var fromPos = data.pos; var knots = this.level().getEntitiesOfClass(FenceKnotEntity.class, new AABB(fromPos.getX(), fromPos.getY(), fromPos.getZ(), fromPos.getX() + 1, fromPos.getY() + 1, fromPos.getZ() + 1)); if (!knots.isEmpty()) { - var fromKnot = knots.get(0); + var fromKnot = knots.getFirst(); var thisConnectTo = this.getEntityData().get(CONNECT_TO); var otherConnectTo = fromKnot.getEntityData().get(CONNECT_TO); if (otherConnectTo.contains(this.pos)) { @@ -140,13 +139,7 @@ public InteractionResult interact(Player p, InteractionHand hand) { p.sendSystemMessage(Component.translatable("entity.powertool.fence_knot.connected", fromKnot.pos.toShortString(), this.pos.toShortString())); } } - var mainTag = held.getTag(); - if (mainTag != null) { - mainTag.remove("PowerToolKnot"); - if (mainTag.isEmpty()) { - held.setTag(null); - } - } + held.set(PowerToolItems.KNOT_DATA,null); } } return InteractionResult.CONSUME; @@ -156,21 +149,42 @@ public InteractionResult interact(Player p, InteractionHand hand) { public boolean survives() { return this.level().getBlockState(this.pos).is(BlockTags.FENCES); } - + + @Override + protected void defineSynchedData(SynchedEntityData.Builder builder) { + builder.define(CONNECT_TO,new LinkedHashSet<>()); + } + @Override public boolean shouldRenderAtSqrDistance(double distanceSq) { return distanceSq < 1024.0; } - + @Override - protected void recalculateBoundingBox() { - this.setPosRaw((double)this.pos.getX() + 0.5D, (double)this.pos.getY() + 0.375D, (double)this.pos.getZ() + 0.5D); + protected AABB calculateBoundingBox(BlockPos pos, Direction direction) { + var x_ = pos.getX() + 0.5D; + var y_ = pos.getY() + 0.375D; + var z_ = pos.getZ() + 0.5D; double width = (double)this.getType().getWidth() / 2.0D; double height = this.getType().getHeight(); - this.setBoundingBox(new AABB(this.getX() - width, this.getY(), this.getZ() - width, this.getX() + width, this.getY() + height, this.getZ() + width)); + return new AABB(x_ - width, y_, z_ - width, x_ + width, y_ + height, z_ + width); } - + public Set getConnectTo() { return this.entityData.get(CONNECT_TO); } + + public record PowerToolKnotData(BlockPos pos) { + + public static final Codec CODEC = RecordCodecBuilder.create( + ins -> ins.group( + BlockPos.CODEC.fieldOf("pos").forGetter(PowerToolKnotData::pos) + ).apply(ins, PowerToolKnotData::new)); + + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + BlockPos.STREAM_CODEC, + PowerToolKnotData::pos, + PowerToolKnotData::new + ); + } } diff --git a/src/main/java/org/teacon/powertool/entity/PowerToolEntities.java b/src/main/java/org/teacon/powertool/entity/PowerToolEntities.java index 16e9de1..2adf44d 100644 --- a/src/main/java/org/teacon/powertool/entity/PowerToolEntities.java +++ b/src/main/java/org/teacon/powertool/entity/PowerToolEntities.java @@ -1,55 +1,34 @@ package org.teacon.powertool.entity; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.syncher.EntityDataSerializer; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; import org.teacon.powertool.PowerTool; -import java.util.LinkedHashSet; +import java.util.HashSet; import java.util.Set; public class PowerToolEntities { - public static final DeferredRegister> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, PowerTool.MODID); + public static final DeferredRegister> ENTITIES = DeferredRegister.create(Registries.ENTITY_TYPE, PowerTool.MODID); + - public static final DeferredRegister> ENTITY_DATA_SERIALIZERS = DeferredRegister.create(ForgeRegistries.Keys.ENTITY_DATA_SERIALIZERS, PowerTool.MODID); - - public static final RegistryObject> FENCE_KNOT = ENTITIES.register("fence_knot", () -> + public static final DeferredHolder,EntityType> FENCE_KNOT = ENTITIES.register("fence_knot", () -> EntityType.Builder.of(FenceKnotEntity::new, MobCategory.MISC) .sized(0.375F, 0.5F) .clientTrackingRange(10) .updateInterval(Integer.MAX_VALUE) .build("fence_knot")); - public static final RegistryObject>> BLOCK_POS_LIST = ENTITY_DATA_SERIALIZERS.register("block_pos_list", () -> - new EntityDataSerializer.ForValueType<>() { - @Override - public void write(FriendlyByteBuf buf, Set poses) { - buf.writeVarInt(poses.size()); - for (var pos : poses) { - buf.writeBlockPos(pos); - } - } - - @Override - public Set read(FriendlyByteBuf buf) { - final int count = buf.readVarInt(); - var ret = new LinkedHashSet(count); - for (int i = 0; i < count; i++) { - ret.add(buf.readBlockPos()); - } - return ret; - } - }); + public static final EntityDataSerializer> BLOCK_POS_LIST = EntityDataSerializer.forValueType(BlockPos.STREAM_CODEC.apply(ByteBufCodecs.collection(HashSet::new))); public static void register(IEventBus bus) { ENTITIES.register(bus); - ENTITY_DATA_SERIALIZERS.register(bus); } } diff --git a/src/main/java/org/teacon/powertool/item/ItemEventHandler.java b/src/main/java/org/teacon/powertool/item/ItemEventHandler.java index 07e1b89..780c119 100644 --- a/src/main/java/org/teacon/powertool/item/ItemEventHandler.java +++ b/src/main/java/org/teacon/powertool/item/ItemEventHandler.java @@ -4,14 +4,14 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.AABB; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.LogicalSide; -import net.minecraftforge.fml.common.Mod; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.LogicalSide; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import org.teacon.powertool.PowerTool; import org.teacon.powertool.entity.FenceKnotEntity; -@Mod.EventBusSubscriber(modid = PowerTool.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@EventBusSubscriber(modid = PowerTool.MODID, bus = EventBusSubscriber.Bus.GAME) public class ItemEventHandler { @SubscribeEvent diff --git a/src/main/java/org/teacon/powertool/item/PowerToolItems.java b/src/main/java/org/teacon/powertool/item/PowerToolItems.java index 9ded33c..a665fcb 100644 --- a/src/main/java/org/teacon/powertool/item/PowerToolItems.java +++ b/src/main/java/org/teacon/powertool/item/PowerToolItems.java @@ -1,41 +1,50 @@ package org.teacon.powertool.item; import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.core.component.DataComponentType; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; import org.teacon.powertool.PowerTool; import org.teacon.powertool.block.PowerToolBlocks; +import org.teacon.powertool.entity.FenceKnotEntity; import javax.annotation.ParametersAreNonnullByDefault; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = PowerTool.MODID) +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = PowerTool.MODID) public class PowerToolItems { - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, PowerTool.MODID); + public static final DeferredRegister ITEMS = DeferredRegister.create(Registries.ITEM, PowerTool.MODID); public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, PowerTool.MODID); + + public static final DeferredRegister> DATA_COMPONENTS = DeferredRegister.create(Registries.DATA_COMPONENT_TYPE,PowerTool.MODID); - public static final RegistryObject THE_TAB = CREATIVE_MODE_TABS.register("tab", () -> CreativeModeTab.builder() + public static final DeferredHolder THE_TAB = CREATIVE_MODE_TABS.register("tab", () -> CreativeModeTab.builder() .title(Component.translatable("itemGroup.powertool")) .icon(() -> new ItemStack(PowerToolBlocks.COMMAND_BLOCK.get())) .withTabsBefore(CreativeModeTabs.FOOD_AND_DRINKS, CreativeModeTabs.INGREDIENTS, CreativeModeTabs.SPAWN_EGGS) .build()); - public static void register() { - var bus = FMLJavaModLoadingContext.get().getModEventBus(); + public static final DeferredHolder,DataComponentType> KNOT_DATA = DATA_COMPONENTS.register( + "knot_data",() -> DataComponentType.builder() + .persistent(FenceKnotEntity.PowerToolKnotData.CODEC) + .networkSynchronized(FenceKnotEntity.PowerToolKnotData.STREAM_CODEC) + .build() + ); + + public static void register(IEventBus bus) { ITEMS.register(bus); ITEMS.register("useless_stick", () -> new Item(new Item.Properties()) { @Override @@ -48,6 +57,7 @@ public boolean isFoil(ItemStack stack) { ITEMS.register("clap_but_angry", () -> new ClapItem(new Item.Properties())); ITEMS.register("transparent_brush",TransparentBrushItem::new); CREATIVE_MODE_TABS.register(bus); + DATA_COMPONENTS.register(bus); } @SubscribeEvent diff --git a/src/main/java/org/teacon/powertool/item/TransparentBrushItem.java b/src/main/java/org/teacon/powertool/item/TransparentBrushItem.java index e843d8f..c1f107a 100644 --- a/src/main/java/org/teacon/powertool/item/TransparentBrushItem.java +++ b/src/main/java/org/teacon/powertool/item/TransparentBrushItem.java @@ -8,8 +8,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.Level; -import org.jetbrains.annotations.Nullable; import org.teacon.powertool.block.ItemDisplayBlock; import javax.annotation.ParametersAreNonnullByDefault; @@ -35,9 +33,10 @@ public InteractionResult useOn(UseOnContext context) { return super.useOn(context); } + @Override - public void appendHoverText(ItemStack p_41421_, @Nullable Level p_41422_, List components, TooltipFlag p_41424_) { - super.appendHoverText(p_41421_, p_41422_, components, p_41424_); - components.add(Component.translatable("tooltip.powertool.transparent_brush").withStyle(ChatFormatting.GRAY)); + public void appendHoverText(ItemStack stack, TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable("tooltip.powertool.transparent_brush").withStyle(ChatFormatting.GRAY)); } } diff --git a/src/main/java/org/teacon/powertool/menu/PowerSupplyMenu.java b/src/main/java/org/teacon/powertool/menu/PowerSupplyMenu.java index d79315a..d65589f 100644 --- a/src/main/java/org/teacon/powertool/menu/PowerSupplyMenu.java +++ b/src/main/java/org/teacon/powertool/menu/PowerSupplyMenu.java @@ -1,5 +1,6 @@ package org.teacon.powertool.menu; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.network.chat.Component; import net.minecraft.world.MenuProvider; import net.minecraft.world.entity.player.Inventory; @@ -8,6 +9,10 @@ import net.minecraft.world.item.ItemStack; import org.teacon.powertool.block.PowerSupplyBlock; +import javax.annotation.ParametersAreNonnullByDefault; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault public class PowerSupplyMenu extends AbstractContainerMenu { public PowerSupplyBlock.Data dataHolder; diff --git a/src/main/java/org/teacon/powertool/menu/PowerToolMenus.java b/src/main/java/org/teacon/powertool/menu/PowerToolMenus.java index a031130..ab0c2e1 100644 --- a/src/main/java/org/teacon/powertool/menu/PowerToolMenus.java +++ b/src/main/java/org/teacon/powertool/menu/PowerToolMenus.java @@ -1,24 +1,23 @@ package org.teacon.powertool.menu; +import net.minecraft.core.registries.Registries; import net.minecraft.world.inventory.MenuType; -import net.minecraftforge.common.extensions.IForgeMenuType; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.common.extensions.IMenuTypeExtension; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; import org.teacon.powertool.PowerTool; import org.teacon.powertool.block.PowerSupplyBlock; public class PowerToolMenus { - public static final DeferredRegister> MENUS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, PowerTool.MODID); + public static final DeferredRegister> MENUS = DeferredRegister.create(Registries.MENU, PowerTool.MODID); - public static RegistryObject> POWER_SUPPLY_MENU; + public static DeferredHolder,MenuType> POWER_SUPPLY_MENU; - public static void register() { - var bus = FMLJavaModLoadingContext.get().getModEventBus(); + public static void register(IEventBus bus) { MENUS.register(bus); - POWER_SUPPLY_MENU = MENUS.register("power_supply", () -> IForgeMenuType.create(((windowId, inv, data) -> { + POWER_SUPPLY_MENU = MENUS.register("power_supply", () -> IMenuTypeExtension.create(((windowId, inv, data) -> { final var dataHolder = new PowerSupplyBlock.Data(); dataHolder.status = data.readVarInt(); dataHolder.power = data.readVarInt(); diff --git a/src/main/java/org/teacon/powertool/mixin/CommandBlockMixin.java b/src/main/java/org/teacon/powertool/mixin/CommandBlockMixin.java index 8e93200..c690d44 100644 --- a/src/main/java/org/teacon/powertool/mixin/CommandBlockMixin.java +++ b/src/main/java/org/teacon/powertool/mixin/CommandBlockMixin.java @@ -14,11 +14,11 @@ public class CommandBlockMixin implements PeriodCommandBlockBridge { @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;scheduleTick(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;I)V")) private void usePowerToolPeriod(ServerLevel level, BlockPos pos, Block block, int i) { - level.scheduleTick(pos, block, powerToolPeriod(level, pos)); + level.scheduleTick(pos, block, powerTool$Period(level, pos)); } @Override - public int powerToolPeriod(ServerLevel level, BlockPos pos) { + public int powerTool$Period(ServerLevel level, BlockPos pos) { return 1; } } diff --git a/src/main/java/org/teacon/powertool/mixin/CommandsMixin.java b/src/main/java/org/teacon/powertool/mixin/CommandsMixin.java index a3cdad8..5275841 100644 --- a/src/main/java/org/teacon/powertool/mixin/CommandsMixin.java +++ b/src/main/java/org/teacon/powertool/mixin/CommandsMixin.java @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.teacon.powertool.network.capability.Permission; +import org.teacon.powertool.network.attachment.Permission; @Mixin(Commands.class) public class CommandsMixin { diff --git a/src/main/java/org/teacon/powertool/mixin/client/GameModeSwitcherScreenMixin.java b/src/main/java/org/teacon/powertool/mixin/client/GameModeSwitcherScreenMixin.java index ed0b933..05fd346 100644 --- a/src/main/java/org/teacon/powertool/mixin/client/GameModeSwitcherScreenMixin.java +++ b/src/main/java/org/teacon/powertool/mixin/client/GameModeSwitcherScreenMixin.java @@ -5,7 +5,10 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import org.teacon.powertool.network.capability.Permission; +import org.teacon.powertool.attachment.PowerToolAttachments; +import org.teacon.powertool.network.attachment.Permission; + +import java.util.Optional; @Mixin(GameModeSwitcherScreen.class) public class GameModeSwitcherScreenMixin { @@ -13,6 +16,8 @@ public class GameModeSwitcherScreenMixin { @Redirect(method = "switchToHoveredGameMode(Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/debug/GameModeSwitcherScreen$GameModeIcon;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;hasPermissions(I)Z")) private static boolean usePermission(LocalPlayer player, int i) { - return player.getCapability(Permission.CAPABILITY).resolve().flatMap(Permission::isCanSwitchGameMode).orElse(player.hasPermissions(i)); + return Optional.of(player.getData(PowerToolAttachments.PERMISSION)) + .flatMap(Permission::isCanSwitchGameMode) + .orElse(player.hasPermissions(i)); } } diff --git a/src/main/java/org/teacon/powertool/mixin/client/KeyboardHandlerMixin.java b/src/main/java/org/teacon/powertool/mixin/client/KeyboardHandlerMixin.java index 0c473ca..a078b44 100644 --- a/src/main/java/org/teacon/powertool/mixin/client/KeyboardHandlerMixin.java +++ b/src/main/java/org/teacon/powertool/mixin/client/KeyboardHandlerMixin.java @@ -6,7 +6,10 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Slice; -import org.teacon.powertool.network.capability.Permission; +import org.teacon.powertool.attachment.PowerToolAttachments; +import org.teacon.powertool.network.attachment.Permission; + +import java.util.Optional; @Mixin(KeyboardHandler.class) public class KeyboardHandlerMixin { @@ -14,6 +17,8 @@ public class KeyboardHandlerMixin { @Redirect(method = "handleDebugKeys", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;hasPermissions(I)Z"), slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/client/KeyboardHandler;copyRecreateCommand(ZZ)V"))) private boolean usePermission(LocalPlayer player, int i) { - return player.getCapability(Permission.CAPABILITY).resolve().flatMap(Permission::isCanSwitchGameMode).orElse(player.hasPermissions(i)); + return Optional.of(player.getData(PowerToolAttachments.PERMISSION)) + .flatMap(Permission::isCanSwitchGameMode) + .orElse(player.hasPermissions(i)); } } diff --git a/src/main/java/org/teacon/powertool/mixin/client/PlayerMixin.java b/src/main/java/org/teacon/powertool/mixin/client/PlayerMixin.java index 0c4ef93..f39b479 100644 --- a/src/main/java/org/teacon/powertool/mixin/client/PlayerMixin.java +++ b/src/main/java/org/teacon/powertool/mixin/client/PlayerMixin.java @@ -9,7 +9,10 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.teacon.powertool.network.capability.Permission; +import org.teacon.powertool.attachment.PowerToolAttachments; +import org.teacon.powertool.network.attachment.Permission; + +import java.util.Optional; @Mixin(Player.class) public class PlayerMixin { @@ -20,8 +23,10 @@ public class PlayerMixin { private void usePermission(CallbackInfoReturnable cir) { // noinspection ConstantConditions if ((Object) this instanceof AbstractClientPlayer player) { - cir.setReturnValue(this.abilities.instabuild && player.getCapability(Permission.CAPABILITY) - .resolve().flatMap(Permission::isCanUseGameMasterBlock).orElse(player.hasPermissions(2))); + cir.setReturnValue(this.abilities.instabuild && + Optional.of(player.getData(PowerToolAttachments.PERMISSION)) + .flatMap(Permission::isCanUseGameMasterBlock) + .orElse(player.hasPermissions(2))); } } } diff --git a/src/main/java/org/teacon/powertool/motd/MotDHandler.java b/src/main/java/org/teacon/powertool/motd/MotDHandler.java index 018b68a..0e14217 100644 --- a/src/main/java/org/teacon/powertool/motd/MotDHandler.java +++ b/src/main/java/org/teacon/powertool/motd/MotDHandler.java @@ -1,12 +1,12 @@ package org.teacon.powertool.motd; import net.minecraft.network.chat.Component; -import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.entity.player.PlayerEvent; import org.teacon.powertool.PowerTool; -@Mod.EventBusSubscriber(modid = PowerTool.MODID) +@EventBusSubscriber(modid = PowerTool.MODID) public class MotDHandler { public static Component motd = null; diff --git a/src/main/java/org/teacon/powertool/network/PowerToolNetwork.java b/src/main/java/org/teacon/powertool/network/PowerToolNetwork.java index a88ad29..20e03df 100644 --- a/src/main/java/org/teacon/powertool/network/PowerToolNetwork.java +++ b/src/main/java/org/teacon/powertool/network/PowerToolNetwork.java @@ -1,9 +1,8 @@ package org.teacon.powertool.network; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.network.NetworkDirection; -import net.minecraftforge.network.NetworkRegistry; -import net.minecraftforge.network.simple.SimpleChannel; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; import org.teacon.powertool.PowerTool; import org.teacon.powertool.network.client.OpenHolographicSignEditor; import org.teacon.powertool.network.client.UpdatePermissionPacket; @@ -11,32 +10,40 @@ import org.teacon.powertool.network.server.UpdateHolographicSignData; import org.teacon.powertool.network.server.UpdatePowerSupplyData; -import java.util.Optional; - +@EventBusSubscriber(modid = PowerTool.MODID,bus = EventBusSubscriber.Bus.MOD) public class PowerToolNetwork { + - private static SimpleChannel channel; - - public static void register() { - channel = NetworkRegistry.newSimpleChannel( - new ResourceLocation(PowerTool.MODID, "ch"), - () -> "1", - NetworkRegistry.acceptMissingOr("1"::equals), - "1"::equals + @SubscribeEvent + public static void register(RegisterPayloadHandlersEvent event) { + var register = event.registrar(PowerTool.MODID); + + register.commonToClient( + UpdatePermissionPacket.TYPE, + UpdatePermissionPacket.STREAM_CODEC, + UpdatePermissionPacket::handle + ); + register.commonToClient( + OpenHolographicSignEditor.TYPE, + OpenHolographicSignEditor.STREAM_CODEC, + OpenHolographicSignEditor::handle + ); + + register.commonToServer( + SetCommandBlockPacket.TYPE, + SetCommandBlockPacket.STREAM_CODEC, + SetCommandBlockPacket::handle + ); + register.commonToServer( + UpdatePowerSupplyData.TYPE, + UpdatePowerSupplyData.STREAM_CODEC, + UpdatePowerSupplyData::handle + ); + register.commonToServer( + UpdateHolographicSignData.TYPE, + UpdateHolographicSignData.STREAM_CODEC, + UpdateHolographicSignData::handle ); - channel.registerMessage(0, SetCommandBlockPacket.class, SetCommandBlockPacket::write, - SetCommandBlockPacket::new, SetCommandBlockPacket::handle, Optional.of(NetworkDirection.PLAY_TO_SERVER)); - channel.registerMessage(1, UpdatePermissionPacket.class, UpdatePermissionPacket::write, - UpdatePermissionPacket::new, UpdatePermissionPacket::handle, Optional.of(NetworkDirection.PLAY_TO_CLIENT)); - channel.registerMessage(2, UpdatePowerSupplyData.class, UpdatePowerSupplyData::write, - UpdatePowerSupplyData::new, UpdatePowerSupplyData::handle, Optional.of(NetworkDirection.PLAY_TO_SERVER)); - channel.registerMessage(3, OpenHolographicSignEditor.class, OpenHolographicSignEditor::write, - OpenHolographicSignEditor::new, OpenHolographicSignEditor::handle, Optional.of(NetworkDirection.PLAY_TO_CLIENT)); - channel.registerMessage(4, UpdateHolographicSignData.class, UpdateHolographicSignData::write, - UpdateHolographicSignData::new, UpdateHolographicSignData::handle, Optional.of(NetworkDirection.PLAY_TO_SERVER)); - } - - public static SimpleChannel channel() { - return channel; } + } diff --git a/src/main/java/org/teacon/powertool/network/capability/Permission.java b/src/main/java/org/teacon/powertool/network/attachment/Permission.java similarity index 58% rename from src/main/java/org/teacon/powertool/network/capability/Permission.java rename to src/main/java/org/teacon/powertool/network/attachment/Permission.java index 0db72b5..90cc191 100644 --- a/src/main/java/org/teacon/powertool/network/capability/Permission.java +++ b/src/main/java/org/teacon/powertool/network/attachment/Permission.java @@ -1,32 +1,23 @@ -package org.teacon.powertool.network.capability; +package org.teacon.powertool.network.attachment; -import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.CapabilityManager; -import net.minecraftforge.common.capabilities.CapabilityToken; -import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.network.PacketDistributor; -import net.minecraftforge.server.permission.PermissionAPI; -import net.minecraftforge.server.permission.events.PermissionGatherEvent; -import net.minecraftforge.server.permission.nodes.PermissionNode; -import net.minecraftforge.server.permission.nodes.PermissionTypes; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.network.PacketDistributor; +import net.neoforged.neoforge.server.permission.PermissionAPI; +import net.neoforged.neoforge.server.permission.events.PermissionGatherEvent; +import net.neoforged.neoforge.server.permission.nodes.PermissionNode; +import net.neoforged.neoforge.server.permission.nodes.PermissionTypes; import org.teacon.powertool.PowerTool; -import org.teacon.powertool.network.PowerToolNetwork; import org.teacon.powertool.network.client.UpdatePermissionPacket; +import org.teacon.powertool.utils.VanillaUtils; import java.util.Optional; public class Permission { - - public static final Capability CAPABILITY = CapabilityManager.get(new CapabilityToken<>() {}); - public static final ResourceLocation KEY = new ResourceLocation(PowerTool.MODID, "permission"); + + public static final ResourceLocation KEY = VanillaUtils.resourceLocationOf(PowerTool.MODID, "permission"); private Boolean canUseGameMasterBlock; private Boolean canSwitchGameMode; @@ -56,18 +47,9 @@ public void setCanUseSelector(Boolean canUseSelector) { this.canUseSelector = canUseSelector; } - @Mod.EventBusSubscriber - public static class Provider implements ICapabilityProvider { - - private final Permission permission = new Permission(); - private final LazyOptional provider = LazyOptional.of(() -> permission); - - @NotNull - @Override - public LazyOptional getCapability(@NotNull Capability cap, @Nullable Direction side) { - return CAPABILITY.orEmpty(cap, this.provider); - } - + @EventBusSubscriber + public static class Provider { + private static final PermissionNode GAMEMODE = new PermissionNode<>( "minecraft", "command.gamemode", PermissionTypes.BOOLEAN, (player, uuid, context) -> player != null && player.hasPermissions(2) @@ -88,8 +70,7 @@ public static void on(PermissionGatherEvent.Nodes event) { } public static void updatePermission(ServerPlayer player) { - PowerToolNetwork.channel().send( - PacketDistributor.PLAYER.with(() -> player), + PacketDistributor.sendToPlayer(player, new UpdatePermissionPacket( PermissionAPI.getPermission(player, Provider.COMMAND_BLOCK), PermissionAPI.getPermission(player, Provider.GAMEMODE), diff --git a/src/main/java/org/teacon/powertool/network/client/OpenHolographicSignEditor.java b/src/main/java/org/teacon/powertool/network/client/OpenHolographicSignEditor.java index 2808dc0..8095780 100644 --- a/src/main/java/org/teacon/powertool/network/client/OpenHolographicSignEditor.java +++ b/src/main/java/org/teacon/powertool/network/client/OpenHolographicSignEditor.java @@ -1,36 +1,35 @@ package org.teacon.powertool.network.client; +import io.netty.buffer.ByteBuf; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.network.NetworkEvent; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.neoforged.neoforge.network.handling.IPayloadContext; import org.teacon.powertool.block.entity.HolographicSignBlockEntity; import org.teacon.powertool.client.HolographicSignEditingScreen; - -import java.util.function.Supplier; - -public class OpenHolographicSignEditor { - - private BlockPos location; - - public OpenHolographicSignEditor(BlockPos location) { - this.location = location; - } - - public OpenHolographicSignEditor(FriendlyByteBuf buf) { - this.location = buf.readBlockPos(); - } - - public void write(FriendlyByteBuf buf) { - buf.writeBlockPos(this.location); - } - - public void handle(Supplier contextSupplier) { - var context = contextSupplier.get(); +import org.teacon.powertool.utils.VanillaUtils; + +@MethodsReturnNonnullByDefault +public record OpenHolographicSignEditor(BlockPos location) implements CustomPacketPayload { + + public static final CustomPacketPayload.Type TYPE = new Type<>(VanillaUtils.modResourceLocation("open_holographic_sign_editor")); + + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + BlockPos.STREAM_CODEC,OpenHolographicSignEditor::location, + OpenHolographicSignEditor::new + ); + + public void handle(IPayloadContext context) { context.enqueueWork(new Handler()); - context.setPacketHandled(true); } - + + @Override + public Type type() { + return TYPE; + } + public class Handler implements Runnable { @Override public void run() { diff --git a/src/main/java/org/teacon/powertool/network/client/UpdatePermissionPacket.java b/src/main/java/org/teacon/powertool/network/client/UpdatePermissionPacket.java index 896b0aa..72f9735 100644 --- a/src/main/java/org/teacon/powertool/network/client/UpdatePermissionPacket.java +++ b/src/main/java/org/teacon/powertool/network/client/UpdatePermissionPacket.java @@ -1,36 +1,41 @@ package org.teacon.powertool.network.client; +import io.netty.buffer.ByteBuf; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.network.NetworkEvent; -import org.teacon.powertool.network.capability.Permission; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.neoforged.neoforge.network.handling.IPayloadContext; +import org.teacon.powertool.attachment.PowerToolAttachments; +import org.teacon.powertool.utils.VanillaUtils; -import java.util.function.Supplier; +@MethodsReturnNonnullByDefault +public record UpdatePermissionPacket(boolean canUseGameMasterBlock, boolean canSwitchGameMode, boolean canUseSelector) implements CustomPacketPayload { + + public static final CustomPacketPayload.Type TYPE = new Type<>(VanillaUtils.modResourceLocation("update_permission")); -public record UpdatePermissionPacket(boolean canUseGameMasterBlock, boolean canSwitchGameMode, boolean canUseSelector) { - - public UpdatePermissionPacket(FriendlyByteBuf buf) { - this(buf.readBoolean(), buf.readBoolean(), buf.readBoolean()); - } - - public void write(FriendlyByteBuf buf) { - buf.writeBoolean(canUseGameMasterBlock); - buf.writeBoolean(canSwitchGameMode); - buf.writeBoolean(canUseSelector); - } - - public void handle(Supplier ctx) { - var context = ctx.get(); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.BOOL,UpdatePermissionPacket::canUseGameMasterBlock, + ByteBufCodecs.BOOL,UpdatePermissionPacket::canSwitchGameMode, + ByteBufCodecs.BOOL,UpdatePermissionPacket::canUseSelector, + UpdatePermissionPacket::new + ); + + public void handle(IPayloadContext context) { context.enqueueWork(() -> { var minecraft = Minecraft.getInstance(); if (minecraft.player != null) { - minecraft.player.getCapability(Permission.CAPABILITY).ifPresent(it -> { - it.setCanSwitchGameMode(canSwitchGameMode); - it.setCanUseGameMasterBlock(canUseGameMasterBlock); - it.setCanUseSelector(canUseSelector); - }); + var permission = minecraft.player.getData(PowerToolAttachments.PERMISSION); + permission.setCanSwitchGameMode(canSwitchGameMode); + permission.setCanUseGameMasterBlock(canUseGameMasterBlock); + permission.setCanUseSelector(canUseSelector); } }); - context.setPacketHandled(true); + } + + @Override + public Type type() { + return TYPE; } } diff --git a/src/main/java/org/teacon/powertool/network/server/SetCommandBlockPacket.java b/src/main/java/org/teacon/powertool/network/server/SetCommandBlockPacket.java index 2bdcca8..04c05d8 100644 --- a/src/main/java/org/teacon/powertool/network/server/SetCommandBlockPacket.java +++ b/src/main/java/org/teacon/powertool/network/server/SetCommandBlockPacket.java @@ -1,31 +1,38 @@ package org.teacon.powertool.network.server; +import io.netty.buffer.ByteBuf; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.network.NetworkEvent; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.neoforged.neoforge.network.handling.IPayloadContext; import org.teacon.powertool.block.entity.PeriodicCommandBlockEntity; +import org.teacon.powertool.utils.VanillaUtils; -import java.util.function.Supplier; - -public record SetCommandBlockPacket(BlockPos pos, int period) { - - public SetCommandBlockPacket(FriendlyByteBuf buf) { - this(buf.readBlockPos(), buf.readVarInt()); - } - - public void write(FriendlyByteBuf buf) { - buf.writeBlockPos(pos); - buf.writeVarInt(period); - } - - public void handle(Supplier ctx) { - var context = ctx.get(); +@MethodsReturnNonnullByDefault +public record SetCommandBlockPacket(BlockPos pos, int period) implements CustomPacketPayload { + + public static final CustomPacketPayload.Type TYPE = new Type<>(VanillaUtils.modResourceLocation("set_command_block_packet")); + + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + BlockPos.STREAM_CODEC,SetCommandBlockPacket::pos, + ByteBufCodecs.INT,SetCommandBlockPacket::period, + SetCommandBlockPacket::new + ); + + public void handle(IPayloadContext context) { context.enqueueWork(() -> { - var level = context.getSender().level(); + var level = context.player().level(); if (level.isLoaded(pos) && level.getBlockEntity(pos) instanceof PeriodicCommandBlockEntity blockEntity) { blockEntity.setPeriod(period); } }); - context.setPacketHandled(true); + + } + + @Override + public Type type() { + return TYPE; } } diff --git a/src/main/java/org/teacon/powertool/network/server/UpdateHolographicSignData.java b/src/main/java/org/teacon/powertool/network/server/UpdateHolographicSignData.java index a429fce..a1a2a5c 100644 --- a/src/main/java/org/teacon/powertool/network/server/UpdateHolographicSignData.java +++ b/src/main/java/org/teacon/powertool/network/server/UpdateHolographicSignData.java @@ -1,120 +1,118 @@ package org.teacon.powertool.network.server; +import io.netty.buffer.ByteBuf; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.block.Block; -import net.minecraftforge.network.NetworkEvent; +import net.neoforged.neoforge.network.handling.IPayloadContext; import org.teacon.powertool.block.entity.HolographicSignBlockEntity; +import org.teacon.powertool.utils.CodecUtils; +import org.teacon.powertool.utils.VanillaUtils; -import java.util.Arrays; -import java.util.function.Supplier; - -public class UpdateHolographicSignData { +import java.util.List; +import java.util.stream.Collectors; +@MethodsReturnNonnullByDefault +public record UpdateHolographicSignData(UpdateHolographicSignDataInner data) implements CustomPacketPayload { + + public static final int MAXIMUM_LINE_COUNT = 10; - - private BlockPos location; - private String[] messages; - private int color; - private float scale; - private HolographicSignBlockEntity.Align align; - private HolographicSignBlockEntity.Shadow shadow; - private HolographicSignBlockEntity.LayerArrange layerArrange; - private boolean locked; - private int rotation; - private boolean bidirectional; + public static final Type TYPE = new Type<>(VanillaUtils.modResourceLocation("update_holographic_sign")); - public UpdateHolographicSignData(BlockPos location, String[] messages, int color, float scale, + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + UpdateHolographicSignDataInner.STREAM_CODEC, + UpdateHolographicSignData::data, + UpdateHolographicSignData::new + ); + + public static UpdateHolographicSignData create(BlockPos location, List messages, int color, float scale, HolographicSignBlockEntity.Align align, HolographicSignBlockEntity.Shadow shadow, HolographicSignBlockEntity.LayerArrange layerArrange, boolean locked,int rotation,boolean bidirectional) { - this.location = location; - this.messages = messages; - if (messages.length > MAXIMUM_LINE_COUNT) { - this.messages = Arrays.copyOfRange(messages, 0, MAXIMUM_LINE_COUNT); - } - this.color = color; - this.scale = scale; - this.align = align; - this.shadow = shadow; - this.layerArrange = layerArrange; - this.locked = locked; - this.rotation = rotation; - this.bidirectional = bidirectional; - } - - public UpdateHolographicSignData(FriendlyByteBuf buf) { - this.location = buf.readBlockPos(); - var len = buf.readVarInt(); - if (len > MAXIMUM_LINE_COUNT) { - len = MAXIMUM_LINE_COUNT; + if (messages.size() > MAXIMUM_LINE_COUNT) { + messages = messages.stream().limit(10).collect(Collectors.toList()); } - this.messages = new String[len]; - for (int i = 0; i < len; i++) { - this.messages[i] = buf.readUtf(); - } - this.color = buf.readVarInt(); - this.scale = buf.readFloat(); - this.align = buf.readEnum(HolographicSignBlockEntity.Align.class); - this.shadow = buf.readEnum(HolographicSignBlockEntity.Shadow.class); - this.layerArrange = buf.readEnum(HolographicSignBlockEntity.LayerArrange.class); - this.locked = buf.readBoolean(); - this.rotation = buf.readInt(); - this.bidirectional = buf.readBoolean(); - } - - public void write(FriendlyByteBuf buf) { - buf.writeBlockPos(this.location); - buf.writeVarInt(this.messages.length); - for (var text : this.messages) { - buf.writeUtf(text); - } - buf.writeVarInt(this.color); - buf.writeFloat(this.scale); - buf.writeEnum(this.align); - buf.writeEnum(this.shadow); - buf.writeEnum(this.layerArrange); - buf.writeBoolean(locked); - buf.writeInt(rotation); - buf.writeBoolean(bidirectional); + return new UpdateHolographicSignData(new UpdateHolographicSignDataInner(location,messages,color,scale,align,shadow,layerArrange,locked, rotation, bidirectional)); } - public void handle(Supplier contextSupplier) { - var context = contextSupplier.get(); + public void handle(IPayloadContext context) { context.enqueueWork(() -> { - var sender = context.getSender(); - if (sender != null && sender.getAbilities().instabuild) { + var sender = context.player(); + if (sender.getAbilities().instabuild) { var level = sender.level(); - if (level.isLoaded(this.location)) { - if (level.getBlockEntity(this.location) instanceof HolographicSignBlockEntity theSign) { - theSign.colorInARGB = this.color; - theSign.scale = this.scale; - theSign.align = this.align; - theSign.shadow = this.shadow; - theSign.arrange = this.layerArrange; - theSign.lock = this.locked; - theSign.rotate = this.rotation; - theSign.bidirectional = this.bidirectional; - var state = level.getBlockState(this.location); + if (level.isLoaded(this.data.location)) { + if (level.getBlockEntity(this.data.location) instanceof HolographicSignBlockEntity theSign) { + theSign.colorInARGB = this.data.color; + theSign.scale = this.data.scale; + theSign.align = this.data.align; + theSign.shadow = this.data.shadow; + theSign.arrange = this.data.layerArrange; + theSign.lock = this.data.locked; + theSign.rotate = this.data.rotation; + theSign.bidirectional = this.data.bidirectional; + var state = level.getBlockState(this.data.location); theSign.setChanged(); - level.sendBlockUpdated(this.location, state, state, Block.UPDATE_CLIENTS); - var task = sender.getTextFilter().processMessageBundle(Arrays.asList(this.messages)); - task.thenAcceptAsync(filtered -> { - if (sender.isTextFilteringEnabled()) { - theSign.contents = filtered.stream().map(t -> Component.literal(t.filtered())).toList(); - } else { - theSign.contents = filtered.stream().map(t -> Component.literal(t.raw())).toList(); - } - theSign.setChanged(); - level.sendBlockUpdated(this.location, state, state, Block.UPDATE_CLIENTS); - }, sender.server); + level.sendBlockUpdated(this.data.location, state, state, Block.UPDATE_CLIENTS); + if(sender instanceof ServerPlayer serverPlayer) { + var task = serverPlayer.getTextFilter().processMessageBundle(this.data.messages); + task.thenAcceptAsync(filtered -> { + if (sender.isTextFilteringEnabled()) { + theSign.contents = filtered.stream().map(t -> Component.literal(t.filtered())).toList(); + } else { + theSign.contents = filtered.stream().map(t -> Component.literal(t.raw())).toList(); + } + theSign.setChanged(); + level.sendBlockUpdated(this.data.location, state, state, Block.UPDATE_CLIENTS); + }, serverPlayer.server); + } + } } } }); - context.setPacketHandled(true); + } + + @Override + public Type type() { + return TYPE; + } + + private record UpdateHolographicSignDataInner(BlockPos location, List messages, int color, float scale, + HolographicSignBlockEntity.Align align, + HolographicSignBlockEntity.Shadow shadow, + HolographicSignBlockEntity.LayerArrange layerArrange, + boolean locked, int rotation, boolean bidirectional){ + + public static final StreamCodec STREAM_CODEC = CodecUtils.composite10( + BlockPos.STREAM_CODEC, + UpdateHolographicSignDataInner::location, + ByteBufCodecs.STRING_UTF8.apply(ByteBufCodecs.list()), + UpdateHolographicSignDataInner::messages, + ByteBufCodecs.INT, + UpdateHolographicSignDataInner::color, + ByteBufCodecs.FLOAT, + UpdateHolographicSignDataInner::scale, + HolographicSignBlockEntity.Align.STREAM_CODEC, + UpdateHolographicSignDataInner::align, + HolographicSignBlockEntity.Shadow.STREAM_CODEC, + UpdateHolographicSignDataInner::shadow, + HolographicSignBlockEntity.LayerArrange.STREAM_CODEC, + UpdateHolographicSignDataInner::layerArrange, + ByteBufCodecs.BOOL, + UpdateHolographicSignDataInner::locked, + ByteBufCodecs.VAR_INT, + UpdateHolographicSignDataInner::rotation, + ByteBufCodecs.BOOL, + UpdateHolographicSignDataInner::bidirectional, + UpdateHolographicSignDataInner::new + ); + } } diff --git a/src/main/java/org/teacon/powertool/network/server/UpdatePowerSupplyData.java b/src/main/java/org/teacon/powertool/network/server/UpdatePowerSupplyData.java index 7413485..5558984 100644 --- a/src/main/java/org/teacon/powertool/network/server/UpdatePowerSupplyData.java +++ b/src/main/java/org/teacon/powertool/network/server/UpdatePowerSupplyData.java @@ -1,51 +1,49 @@ package org.teacon.powertool.network.server; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.network.NetworkEvent; +import io.netty.buffer.ByteBuf; +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.neoforged.neoforge.network.handling.IPayloadContext; import org.teacon.powertool.menu.PowerSupplyMenu; - -import java.util.function.Supplier; - -public class UpdatePowerSupplyData { - - private int type, data; - - public UpdatePowerSupplyData(int type, int data) { - this.type = type; - this.data = data; - } - - public UpdatePowerSupplyData(FriendlyByteBuf buf) { - this.type = buf.readVarInt(); - this.data = buf.readVarInt(); - } - - public void write(FriendlyByteBuf buf) { - buf.writeVarInt(this.type).writeVarInt(this.data); - } - - public void handle(Supplier contextSupplier) { - var context = contextSupplier.get(); +import org.teacon.powertool.utils.VanillaUtils; + +@MethodsReturnNonnullByDefault +public record UpdatePowerSupplyData(int type_, int data) implements CustomPacketPayload { + + public static final Type TYPE = new Type<>(VanillaUtils.modResourceLocation("update_power_supply")); + + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.INT,UpdatePowerSupplyData::type_, + ByteBufCodecs.INT,UpdatePowerSupplyData::data, + UpdatePowerSupplyData::new + ); + + public void handle(IPayloadContext context) { context.enqueueWork(() -> { - var player = context.getSender(); - if (player != null) { - if (player.containerMenu instanceof PowerSupplyMenu theMenu) { - if (this.type == 0) { - theMenu.dataHolder.status = this.data; - var callback = theMenu.dataHolder.markDirty; - if (callback != null) { - callback.run(); - } - } else if (this.type == 1) { - theMenu.dataHolder.power = this.data; - var callback = theMenu.dataHolder.markDirty; - if (callback != null) { - callback.run(); - } + var player = context.player(); + if (player.containerMenu instanceof PowerSupplyMenu theMenu) { + if (this.type_ == 0) { + theMenu.dataHolder.status = this.data; + var callback = theMenu.dataHolder.markDirty; + if (callback != null) { + callback.run(); + } + } else if (this.type_ == 1) { + theMenu.dataHolder.power = this.data; + var callback = theMenu.dataHolder.markDirty; + if (callback != null) { + callback.run(); } } } }); - context.setPacketHandled(true); + + } + + @Override + public Type type() { + return TYPE; } } diff --git a/src/main/java/org/teacon/powertool/utils/CodecUtils.java b/src/main/java/org/teacon/powertool/utils/CodecUtils.java new file mode 100644 index 0000000..5108b9e --- /dev/null +++ b/src/main/java/org/teacon/powertool/utils/CodecUtils.java @@ -0,0 +1,69 @@ +package org.teacon.powertool.utils; + +import com.mojang.datafixers.util.Function10; +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.network.codec.StreamCodec; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.function.Function; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +public class CodecUtils { + + public static StreamCodec composite10( + final StreamCodec codec1, + final Function getter1, + final StreamCodec codec2, + final Function getter2, + final StreamCodec codec3, + final Function getter3, + final StreamCodec codec4, + final Function getter4, + final StreamCodec codec5, + final Function getter5, + final StreamCodec codec6, + final Function getter6, + final StreamCodec codec7, + final Function getter7, + final StreamCodec codec8, + final Function getter8, + final StreamCodec codec9, + final Function getter9, + final StreamCodec codec10, + final Function getter10, + final Function10 factory + ) { + return new StreamCodec<>() { + @Override + public C decode(B buffer) { + T1 t1 = codec1.decode(buffer); + T2 t2 = codec2.decode(buffer); + T3 t3 = codec3.decode(buffer); + T4 t4 = codec4.decode(buffer); + T5 t5 = codec5.decode(buffer); + T6 t6 = codec6.decode(buffer); + T7 t7 = codec7.decode(buffer); + T8 t8 = codec8.decode(buffer); + T9 t9 = codec9.decode(buffer); + T10 t10 = codec10.decode(buffer); + return factory.apply(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10); + } + + @Override + @SuppressWarnings("DuplicatedCode") //no need to extract a method + public void encode(B buffer, C value) { + codec1.encode(buffer, getter1.apply(value)); + codec2.encode(buffer, getter2.apply(value)); + codec3.encode(buffer, getter3.apply(value)); + codec4.encode(buffer, getter4.apply(value)); + codec5.encode(buffer, getter5.apply(value)); + codec6.encode(buffer, getter6.apply(value)); + codec7.encode(buffer, getter7.apply(value)); + codec8.encode(buffer, getter8.apply(value)); + codec9.encode(buffer, getter9.apply(value)); + codec10.encode(buffer, getter10.apply(value)); + } + }; + } +} diff --git a/src/main/java/org/teacon/powertool/utils/VanillaUtils.java b/src/main/java/org/teacon/powertool/utils/VanillaUtils.java new file mode 100644 index 0000000..c8ffb51 --- /dev/null +++ b/src/main/java/org/teacon/powertool/utils/VanillaUtils.java @@ -0,0 +1,38 @@ +package org.teacon.powertool.utils; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.entity.EquipmentSlot; +import org.teacon.powertool.PowerTool; + +public class VanillaUtils { + + public static ResourceLocation modResourceLocation(String path) { + return resourceLocationOf(PowerTool.MODID, path); + } + + public static ResourceLocation resourceLocationOf(String namespace, String path) { + return ResourceLocation.fromNamespaceAndPath(namespace, path); + } + + public static EquipmentSlot equipmentSlotFromHand(InteractionHand hand) { + return hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND; + } + + public static ItemInteractionResult itemInteractionFrom(InteractionResult result) { + return switch (result){ + case SUCCESS, SUCCESS_NO_ITEM_USED -> ItemInteractionResult.SUCCESS; + case CONSUME -> ItemInteractionResult.CONSUME; + case CONSUME_PARTIAL -> ItemInteractionResult.CONSUME_PARTIAL; + case PASS -> ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + case FAIL -> ItemInteractionResult.FAIL; + }; + } + + //irrelevant vanilla(笑) + public static int getColor(int r,int g,int b,int a){ + return a << 24 | r << 16 | g << 8 | b; + } +} diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index e8c3f3e..10d65b1 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -1 +1 @@ -public net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen f_98374_ # autoCommandBlock \ No newline at end of file +public net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen autoCommandBlock \ No newline at end of file