From b8414ab8c96590e7b1bb0133e75eb6e9b598346e Mon Sep 17 00:00:00 2001 From: AngelBottomless <35677394+aria1th@users.noreply.github.com> Date: Fri, 4 Feb 2022 15:09:27 +0900 Subject: [PATCH 1/4] Fix cobblestone duping with hopper below and add Limit for stack size --- .../block/entity/AbstractCobblestoneGeneratorBlockEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java b/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java index 6d9b016..77abcad 100644 --- a/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java +++ b/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java @@ -73,7 +73,7 @@ public static void tick(World world, BlockPos pos, BlockState state, AbstractCob ItemStack itemStack = blockEntity.inventory.getStack(0); if (itemStack.getItem() != Items.COBBLESTONE){ itemStack = new ItemStack(Items.COBBLESTONE); - } else { + } else if (itemStack.getCount() < 65536) { itemStack.increment(1); } blockEntity.inventory.setStack(0, itemStack); @@ -137,7 +137,7 @@ public ItemStack removeStack(int slot) { return this.inventory.removeStack(slot); } - public void setStack(int slot, ItemStack stack) {} + public void setStack(int slot, ItemStack stack) {this.inventory.setStack(slot, stack);} public boolean canPlayerUse(PlayerEntity player) { if (this.world.getBlockEntity(this.pos) != this) { From 5eb248c64010bef19ffdf5950151e5e8002dd899 Mon Sep 17 00:00:00 2001 From: aria1th <35677394+aria1th@users.noreply.github.com> Date: Thu, 26 Jan 2023 08:16:55 +0900 Subject: [PATCH 2/4] 1.19.2 local --- build.gradle | 69 ----------------------------------------------- gradle.properties | 8 +++--- 2 files changed, 4 insertions(+), 73 deletions(-) diff --git a/build.gradle b/build.gradle index 88a0c90..c2632ac 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,6 @@ plugins { id 'fabric-loom' version '0.12-SNAPSHOT' id 'maven-publish' - id 'com.matthewprenger.cursegradle' version '1.4.0' - id "com.modrinth.minotaur" version "1.1.0" } sourceCompatibility = JavaVersion.VERSION_17 @@ -12,13 +10,6 @@ archivesBaseName = project.archives_base_name version = project.mod_version group = project.maven_group -loadProperties() - -def loadProperties() { - def configFile = file('config.groovy') - def config = new ConfigSlurper().parse(configFile.toURL()) - project.ext.config = config -} dependencies { // To change the versions see the gradle.properties file @@ -48,63 +39,3 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() } - -jar { - from("LICENSE") { - rename { "${it}_${project.archivesBaseName}"} - } -} - -// configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } -} - -import com.modrinth.minotaur.TaskModrinthUpload - -task publishModrinth (type: TaskModrinthUpload) { - token = config.modrinth.token - projectId = config.modrinth.project.id - versionNumber = project.mod_version - releaseType = project.release_type - uploadFile = file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar") - addGameVersion(project.minecraft_version) - changelog = new File('changelog.md').text - addLoader('fabric') -} - -curseforge { - apiKey = config.curse.api_key - project { - id = config.curse.project.id - changelogType = 'markdown' - changelog = file('changelog.md') - releaseType = project.release_type - addGameVersion project.curse_minecraft_version - addGameVersion "Fabric" - - relations { - requiredLibrary 'fabric-api' - } - - mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) { - displayName = "[Fabric $project.minecraft_version] Simple cobblestone generator $version" - } - - afterEvaluate { - uploadTask.dependsOn("remapJar") - } - } -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 207a583..51d2771 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,15 @@ org.gradle.jvmargs = -Xmx1G #Fabric properties -minecraft_version=1.19 -yarn_mappings=1.19+build.1 +minecraft_version=1.19.2 +yarn_mappings=1.19.2+build.1 loader_version=0.14.7 #Fabric api -fabric_version=0.55.3+1.19 +fabric_version=0.73.0+1.19.2 #Curseforge properties -curse_minecraft_version=1.19 +curse_minecraft_version=1.19.2 #Mod properties mod_version = 1.1.9 From 31f15635cc5a17d84374d7e8b1ed59c97c0a11f6 Mon Sep 17 00:00:00 2001 From: aria1th <35677394+aria1th@users.noreply.github.com> Date: Mon, 6 Feb 2023 19:06:20 +0900 Subject: [PATCH 3/4] port to fabric API --- ...stractCobblestoneGeneratorBlockEntity.java | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java b/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java index 00ce8b4..fffed41 100644 --- a/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java +++ b/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java @@ -1,5 +1,8 @@ package dev.fulmineo.simple_cobblestone_generator.block.entity; +import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage; +import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; import org.jetbrains.annotations.Nullable; import dev.fulmineo.simple_cobblestone_generator.screen.CobblestoneGeneratorScreenHandler; @@ -63,7 +66,7 @@ public void writeNbt(NbtCompound tag) { listTag.add(this.inventory.getStack(0).writeNbt(new NbtCompound())); tag.put("Items", listTag); } - + @SuppressWarnings("UnstableApiUsage") public static void tick(World world, BlockPos pos, BlockState state, AbstractCobblestoneGeneratorBlockEntity blockEntity) { if (blockEntity.genTicks > 0) blockEntity.genTicks--; if (blockEntity.genTicks == 0) { @@ -77,26 +80,13 @@ public static void tick(World world, BlockPos pos, BlockState state, AbstractCob } blockEntity.inventory.setStack(0, itemStack); - BlockEntity upperBlockEntity = world.getBlockEntity(pos.up()); - if (upperBlockEntity != null && upperBlockEntity instanceof LootableContainerBlockEntity) { - LootableContainerBlockEntity inventory = (LootableContainerBlockEntity) upperBlockEntity; - for (int i = 0; i < inventory.size(); i++) { - ItemStack stack = inventory.getStack(i); - if (stack.isEmpty()){ - stack = new ItemStack(itemStack.getItem()); - inventory.setStack(i, stack); - } - if (stack.getItem() == itemStack.getItem()) { - int toInsert = stack.getMaxCount() - stack.getCount(); - if (toInsert > 0) { - if (toInsert > itemStack.getCount()) toInsert = itemStack.getCount(); - itemStack.decrement(toInsert); - stack.increment(toInsert); - if (itemStack.getCount() == 0) break; - } - } - } - } + StorageUtil.move( + InventoryStorage.of(blockEntity.inventory, Direction.UP).getSlot(0), + ItemStorage.SIDED.find(world, pos.up(), Direction.DOWN), + iv -> true, + Long.MAX_VALUE, + null + ); } } From 8712e1d242416509294f9d6f8a54e6b801509bc3 Mon Sep 17 00:00:00 2001 From: aria1th <35677394+aria1th@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:31:18 +0900 Subject: [PATCH 4/4] why? --- .../entity/AbstractCobblestoneGeneratorBlockEntity.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java b/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java index fffed41..2720c49 100644 --- a/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java +++ b/src/main/java/dev/fulmineo/simple_cobblestone_generator/block/entity/AbstractCobblestoneGeneratorBlockEntity.java @@ -91,11 +91,7 @@ public static void tick(World world, BlockPos pos, BlockState state, AbstractCob } public int[] getAvailableSlots(Direction side) { - if (side == Direction.DOWN) { - return new int[]{0}; - } else { - return new int[]{}; - } + return new int[]{0}; } public boolean canInsert(int slot, ItemStack stack, @Nullable Direction dir) {