From d866a37e4ffb0a3f481b08f0add6a3d308039b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Mon, 23 Dec 2024 08:47:27 +0100 Subject: [PATCH] Init --- .gitignore | 119 ++++++++++++++++++ LICENSE.txt | 21 ++++ build.gradle | 93 ++++++++++++++ gradle.properties | 14 +++ gradle/wrapper/gradle-wrapper.properties | 1 + settings.gradle | 9 ++ .../brn/minetestlike/Minetestlike.java | 51 ++++++++ .../minetestlike/mixins/BlockDropMixin.java | 57 +++++++++ .../mixins/ItemConstructorMixin.java | 32 +++++ src/main/resources/fabric.mod.json | 26 ++++ src/main/resources/minetestlike.accesswidener | 3 + src/main/resources/minetestlike.mixins.json | 15 +++ 12 files changed, 441 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE.txt create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 settings.gradle create mode 100644 src/main/java/systems/brn/minetestlike/Minetestlike.java create mode 100644 src/main/java/systems/brn/minetestlike/mixins/BlockDropMixin.java create mode 100644 src/main/java/systems/brn/minetestlike/mixins/ItemConstructorMixin.java create mode 100644 src/main/resources/fabric.mod.json create mode 100644 src/main/resources/minetestlike.accesswidener create mode 100644 src/main/resources/minetestlike.mixins.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d5f737e --- /dev/null +++ b/.gitignore @@ -0,0 +1,119 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# 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/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ +runs/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..c986429 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2024 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..6d487cb --- /dev/null +++ b/build.gradle @@ -0,0 +1,93 @@ +plugins { + id 'fabric-loom' version '1.9-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + inputs.property "minecraft_version", project.minecraft_version + inputs.property "loader_version", project.loader_version + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand "version": project.version, + "minecraft_version": project.minecraft_version, + "loader_version": project.loader_version + } +} + +def targetJavaVersion = 21 +tasks.withType(JavaCompile).configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + it.options.release.set(targetJavaVersion) + } +} + +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}" } + } +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} + +loom { + accessWidenerPath = file("src/main/resources/minetestlike.accesswidener") +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..8006859 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,14 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +# Fabric Properties +# check these on https://modmuss50.me/fabric.html +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.2 +loader_version=0.16.9 +# Mod Properties +mod_version=1.0 +maven_group=systems.brn +archives_base_name=minetestlike +# Dependencies +# check this on https://modmuss50.me/fabric.html +fabric_version=0.112.1+1.21.4 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ab6f03b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..f91a4fe --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/systems/brn/minetestlike/Minetestlike.java b/src/main/java/systems/brn/minetestlike/Minetestlike.java new file mode 100644 index 0000000..64755ca --- /dev/null +++ b/src/main/java/systems/brn/minetestlike/Minetestlike.java @@ -0,0 +1,51 @@ +package systems.brn.minetestlike; + +import net.fabricmc.api.ModInitializer; +import net.minecraft.component.ComponentMap; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; + +import java.lang.reflect.Field; +import java.util.Map; + +import static net.minecraft.component.DataComponentTypes.MAX_STACK_SIZE; + +public class Minetestlike implements ModInitializer { + + @Override + public void onInitialize() { + Registries.ITEM.stream() + .filter(item -> item.getMaxCount() > 1) // Only modify stackable items + .forEach(this::modifyMaxStackSizeComponent); + } + + private void modifyMaxStackSizeComponent(Item item) { + try { + // Access the `components` field using reflection + Field componentsField = Item.class.getDeclaredField("components"); + componentsField.setAccessible(true); + + // Remove the `final` modifier using reflection + Field modifiersField = Field.class.getDeclaredField("modifiers"); + modifiersField.setAccessible(true); + modifiersField.setInt(componentsField, componentsField.getModifiers() & ~java.lang.reflect.Modifier.FINAL); + + // Access the current components map + ComponentMap components = (ComponentMap) componentsField.get(item); + + // Create a new components map with the modified MAX_STACK_SIZE + ComponentMap newComponents = ComponentMap.builder() + .addAll(components) + .add(DataComponentTypes.MAX_STACK_SIZE, 99) + .build(); + + // Assign the modified components map back to the field + componentsField.set(item, newComponents); + + int x = 0; + } catch (NoSuchFieldException | IllegalAccessException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/systems/brn/minetestlike/mixins/BlockDropMixin.java b/src/main/java/systems/brn/minetestlike/mixins/BlockDropMixin.java new file mode 100644 index 0000000..bbd23af --- /dev/null +++ b/src/main/java/systems/brn/minetestlike/mixins/BlockDropMixin.java @@ -0,0 +1,57 @@ +package systems.brn.minetestlike.mixins; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.ExperienceDroppingBlock; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.List; + +import static net.minecraft.block.Block.dropStack; +import static net.minecraft.block.Block.getDroppedStacks; + +@Mixin(Block.class) +public class BlockDropMixin { + + @Inject( + method = "dropStacks(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/entity/BlockEntity;Lnet/minecraft/entity/Entity;Lnet/minecraft/item/ItemStack;)V", + at = @At("HEAD"), + cancellable = true + ) + private static void injectDropStacks( + BlockState state, World worldT, BlockPos pos, BlockEntity blockEntity, Entity entity, ItemStack tool, CallbackInfo ci + ) { + if (worldT instanceof ServerWorld world) { + if (entity != null) { + if (entity instanceof PlayerEntity player) { + + List stacks = getDroppedStacks(state, world, pos, blockEntity, entity, tool); + + for (ItemStack stack : stacks) { + if (!player.getInventory().insertStack(stack)) { + dropStack(world, pos, stack); + } + } + + if (state.getBlock() instanceof ExperienceDroppingBlock experienceDroppingBlock) { + player.addExperience(experienceDroppingBlock.experienceDropped.get(world.getRandom())); + } + + state.onStacksDropped(world, pos, tool, false); + ci.cancel(); + } + } + } + } + +} diff --git a/src/main/java/systems/brn/minetestlike/mixins/ItemConstructorMixin.java b/src/main/java/systems/brn/minetestlike/mixins/ItemConstructorMixin.java new file mode 100644 index 0000000..6393b37 --- /dev/null +++ b/src/main/java/systems/brn/minetestlike/mixins/ItemConstructorMixin.java @@ -0,0 +1,32 @@ +package systems.brn.minetestlike.mixins; + +import net.minecraft.component.ComponentMap; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.item.Item; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(Item.class) +public class ItemConstructorMixin { + @Mutable + @Shadow + @Final + public ComponentMap components; + + + @Shadow + @Final + public static int MAX_MAX_COUNT; + + @Inject(method = "", at = @At("RETURN")) + private void modifyCreateItem(Item.Settings settings, CallbackInfo ci) { + if (this.components.getOrDefault(DataComponentTypes.MAX_STACK_SIZE, 1) > 1) { + this.components = ComponentMap.builder().addAll(this.components).add(DataComponentTypes.MAX_STACK_SIZE, MAX_MAX_COUNT).build(); + } + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..20b8434 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,26 @@ +{ + "schemaVersion": 1, + "id": "minetestlike", + "version": "${version}", + "name": "MinetestLike", + "description": "", + "authors": [], + "contact": {}, + "license": "MIT", + "accessWidener" : "minetestlike.accesswidener", + "icon": "assets/minetestlike/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "systems.brn.minetestlike.Minetestlike" + ] + }, + "mixins": [ + "minetestlike.mixins.json" + ], + "depends": { + "fabricloader": ">=${loader_version}", + "fabric": "*", + "minecraft": "${minecraft_version}" + } +} diff --git a/src/main/resources/minetestlike.accesswidener b/src/main/resources/minetestlike.accesswidener new file mode 100644 index 0000000..6b67fd9 --- /dev/null +++ b/src/main/resources/minetestlike.accesswidener @@ -0,0 +1,3 @@ +accessWidener v2 named +accessible field net/minecraft/item/Item components Lnet/minecraft/component/ComponentMap; +accessible field net/minecraft/block/ExperienceDroppingBlock experienceDropped Lnet/minecraft/util/math/intprovider/IntProvider; diff --git a/src/main/resources/minetestlike.mixins.json b/src/main/resources/minetestlike.mixins.json new file mode 100644 index 0000000..e31c495 --- /dev/null +++ b/src/main/resources/minetestlike.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "systems.brn.minetestlike.mixins", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "BlockDropMixin", + "ItemConstructorMixin" + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +}