From 3f464bcefab62e96974a2ad3921837fcb41832bc Mon Sep 17 00:00:00 2001 From: justliliandev <36055315+justliliandev@users.noreply.github.com> Date: Fri, 14 Feb 2025 10:02:53 +0100 Subject: [PATCH 1/9] stop adventure mode from changing block configs (#7043) --- .../behaviour/ValueSettingsInputHandler.java | 4 ++-- .../networking/BlockEntityConfigurationPacket.java | 6 ++++-- .../create/foundation/utility/AdventureUtil.java | 11 +++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/simibubi/create/foundation/utility/AdventureUtil.java diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsInputHandler.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsInputHandler.java index 5ab4fd6848..27e3d73ede 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsInputHandler.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsInputHandler.java @@ -5,6 +5,7 @@ import com.simibubi.create.AllTags.AllItemTags; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.filtering.SidedFilteringBehaviour; +import com.simibubi.create.foundation.utility.AdventureUtil; import com.simibubi.create.foundation.utility.RaycastHelper; import net.minecraft.core.BlockPos; @@ -92,7 +93,6 @@ public class ValueSettingsInputHandler { } public static boolean canInteract(Player player) { - return player != null && !player.isSpectator() && !player.isShiftKeyDown(); + return player != null && !player.isSpectator() && !player.isShiftKeyDown() && !AdventureUtil.isAdventure(player); } - } diff --git a/src/main/java/com/simibubi/create/foundation/networking/BlockEntityConfigurationPacket.java b/src/main/java/com/simibubi/create/foundation/networking/BlockEntityConfigurationPacket.java index 35d80758f6..fb7ab5b0c0 100644 --- a/src/main/java/com/simibubi/create/foundation/networking/BlockEntityConfigurationPacket.java +++ b/src/main/java/com/simibubi/create/foundation/networking/BlockEntityConfigurationPacket.java @@ -2,6 +2,8 @@ package com.simibubi.create.foundation.networking; import com.simibubi.create.foundation.blockEntity.SyncedBlockEntity; +import com.simibubi.create.foundation.utility.AdventureUtil; + import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; @@ -33,7 +35,7 @@ public abstract class BlockEntityConfigurationPacket { ServerPlayer player = context.getSender(); - if (player == null) + if (player == null || player.isSpectator() || AdventureUtil.isAdventure(player)) return; Level world = player.level(); if (world == null || !world.isLoaded(pos)) @@ -63,7 +65,7 @@ public abstract class BlockEntityConfigurationPacket Date: Fri, 14 Feb 2025 04:09:26 -0500 Subject: [PATCH 2/9] Fix endermen teleporting to Shafts and Fluid Pipes (#6967) --- src/main/java/com/simibubi/create/AllBlocks.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index bc794ecc36..40cc436574 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -355,7 +355,7 @@ public class AllBlocks { public static final BlockEntry SHAFT = REGISTRATE.block("shaft", ShaftBlock::new) .initialProperties(SharedProperties::stone) - .properties(p -> p.mapColor(MapColor.METAL).forceSolidOn()) + .properties(p -> p.mapColor(MapColor.METAL).forceSolidOff()) .transform(BlockStressDefaults.setNoImpact()) .transform(pickaxeOnly()) .blockstate(BlockStateGen.axisBlockProvider(false)) @@ -822,7 +822,7 @@ public class AllBlocks { public static final BlockEntry FLUID_PIPE = REGISTRATE.block("fluid_pipe", FluidPipeBlock::new) .initialProperties(SharedProperties::copperMetal) - .properties(p -> p.forceSolidOn()) + .properties(p -> p.forceSolidOff()) .transform(pickaxeOnly()) .blockstate(BlockStateGen.pipe()) .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::new)) From 7a0ebd96d1175daccca4bfefa24dce1f92b6beff Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 14 Feb 2025 11:10:45 +0100 Subject: [PATCH 3/9] Belt smelts - Fixed items processed by spout/press/deployer not able to be processed by fan afterwards #7012 #6559 #7013 - Fixed belt items resetting fan processing progress on reload --- .../fluids/spout/SpoutBlockEntity.java | 1 + .../belt/transport/TransportedItemStack.java | 19 +++++++++++++++++++ .../deployer/BeltDeployerCallbacks.java | 2 ++ .../kinetics/press/BeltPressingCallbacks.java | 2 ++ 4 files changed, 24 insertions(+) diff --git a/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java b/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java index 7ac5e382b6..756d0401a0 100644 --- a/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java @@ -113,6 +113,7 @@ public class SpoutBlockEntity extends SmartBlockEntity implements IHaveGoggleInf // Process finished ItemStack out = FillingBySpout.fillItem(level, requiredAmountForItem, transported.stack, fluid); if (!out.isEmpty()) { + transported.clearFanProcessingData(); List outList = new ArrayList<>(); TransportedItemStack held = null; TransportedItemStack result = transported.copy(); diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/transport/TransportedItemStack.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/TransportedItemStack.java index aa55002608..fb522c9f83 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/transport/TransportedItemStack.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/TransportedItemStack.java @@ -3,7 +3,9 @@ package com.simibubi.create.content.kinetics.belt.transport; import java.util.Random; import com.simibubi.create.content.kinetics.belt.BeltHelper; +import com.simibubi.create.content.kinetics.fan.processing.AllFanProcessingTypes; import com.simibubi.create.content.kinetics.fan.processing.FanProcessingType; +import com.simibubi.create.content.kinetics.fan.processing.FanProcessingTypeRegistry; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -74,6 +76,12 @@ public class TransportedItemStack implements Comparable { nbt.putInt("InSegment", insertedAt); nbt.putInt("Angle", angle); nbt.putInt("InDirection", insertedFrom.get3DDataValue()); + + if (processedBy != null && processedBy != AllFanProcessingTypes.NONE) { + nbt.putString("FanProcessingType", FanProcessingTypeRegistry.getIdOrThrow(processedBy).toString()); + nbt.putInt("FanProcessingTime", processingTime); + } + if (locked) nbt.putBoolean("Locked", locked); if (lockedExternally) @@ -92,7 +100,18 @@ public class TransportedItemStack implements Comparable { stack.insertedFrom = Direction.from3DDataValue(nbt.getInt("InDirection")); stack.locked = nbt.getBoolean("Locked"); stack.lockedExternally = nbt.getBoolean("LockedExternally"); + + if (nbt.contains("FanProcessingType")) { + stack.processedBy = AllFanProcessingTypes.parseLegacy(nbt.getString("FanProcessingType")); + stack.processingTime = nbt.getInt("FanProcessingTime"); + } + return stack; } + + public void clearFanProcessingData() { + processedBy = null; + processingTime = 0; + } } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/BeltDeployerCallbacks.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/BeltDeployerCallbacks.java index e18b1d699a..a14f80bf14 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/BeltDeployerCallbacks.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/BeltDeployerCallbacks.java @@ -113,6 +113,8 @@ public class BeltDeployerCallbacks { .collect(Collectors.toList()); blockEntity.award(AllAdvancements.DEPLOYER); + + transported.clearFanProcessingData(); TransportedItemStack left = transported.copy(); blockEntity.player.spawnedItemEffects = transported.stack.copy(); diff --git a/src/main/java/com/simibubi/create/content/kinetics/press/BeltPressingCallbacks.java b/src/main/java/com/simibubi/create/content/kinetics/press/BeltPressingCallbacks.java index 900aab84b3..2ae6407f11 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/press/BeltPressingCallbacks.java +++ b/src/main/java/com/simibubi/create/content/kinetics/press/BeltPressingCallbacks.java @@ -49,6 +49,8 @@ public class BeltPressingCallbacks { boolean bulk = behaviour.specifics.canProcessInBulk() || transported.stack.getCount() == 1; + transported.clearFanProcessingData(); + List collect = results.stream() .map(stack -> { TransportedItemStack copy = transported.copy(); From 7294ba9e2208945b4c2dcba6573d4dd8488b29ae Mon Sep 17 00:00:00 2001 From: IThundxr Date: Fri, 14 Feb 2025 05:12:09 -0500 Subject: [PATCH 4/9] Fix display links not working with large stack size inventories (#7055) - Fixes #6992 --- .../simibubi/create/foundation/item/CountedItemStackList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/foundation/item/CountedItemStackList.java b/src/main/java/com/simibubi/create/foundation/item/CountedItemStackList.java index 224f6a0fcf..6fb8085d9a 100644 --- a/src/main/java/com/simibubi/create/foundation/item/CountedItemStackList.java +++ b/src/main/java/com/simibubi/create/foundation/item/CountedItemStackList.java @@ -22,7 +22,7 @@ public class CountedItemStackList { public CountedItemStackList(IItemHandler inventory, FilteringBehaviour filteringBehaviour) { for (int slot = 0; slot < inventory.getSlots(); slot++) { - ItemStack extractItem = inventory.extractItem(slot, inventory.getSlotLimit(slot), true); + ItemStack extractItem = inventory.getStackInSlot(slot); if (filteringBehaviour.test(extractItem)) add(extractItem); } From 3c47276b67cbabaf7c08ff258bd97ba97010ea99 Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Fri, 14 Feb 2025 11:13:48 +0100 Subject: [PATCH 5/9] use remaining items to calculate remainder items for basin recipes (#7076) --- .../content/processing/basin/BasinRecipe.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java index 3bb7827151..0cf479e12d 100644 --- a/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java +++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java @@ -22,6 +22,8 @@ import com.simibubi.create.foundation.recipe.IRecipeTypeInfo; import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.client.Minecraft; +import net.minecraft.world.Container; +import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.item.crafting.Ingredient; @@ -32,7 +34,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.IItemHandler; -public class BasinRecipe extends ProcessingRecipe { +public class BasinRecipe extends ProcessingRecipe { public static boolean match(BasinBlockEntity basin, Recipe recipe) { FilteringBehaviour filter = basin.getFilter(); @@ -148,23 +150,24 @@ public class BasinRecipe extends ProcessingRecipe { } if (simulate) { + CraftingContainer remainderContainer = new DummyCraftingContainer(availableItems, extractedItemsFromSlot); + if (recipe instanceof BasinRecipe basinRecipe) { recipeOutputItems.addAll(basinRecipe.rollResults()); - + for (FluidStack fluidStack : basinRecipe.getFluidResults()) if (!fluidStack.isEmpty()) recipeOutputFluids.add(fluidStack); - for (ItemStack stack : basinRecipe.getRemainingItems(basin.getInputInventory())) + for (ItemStack stack : basinRecipe.getRemainingItems(remainderContainer)) if (!stack.isEmpty()) recipeOutputItems.add(stack); - + } else { recipeOutputItems.add(recipe.getResultItem(basin.getLevel() .registryAccess())); if (recipe instanceof CraftingRecipe craftingRecipe) { - for (ItemStack stack : craftingRecipe - .getRemainingItems(new DummyCraftingContainer(availableItems, extractedItemsFromSlot))) + for (ItemStack stack : craftingRecipe.getRemainingItems(remainderContainer)) if (!stack.isEmpty()) recipeOutputItems.add(stack); } @@ -225,7 +228,7 @@ public class BasinRecipe extends ProcessingRecipe { } @Override - public boolean matches(SmartInventory inv, @Nonnull Level worldIn) { + public boolean matches(Container inv, @Nonnull Level worldIn) { return false; } From 4949df978ae516e422a79ecb81e63eb1c86c065c Mon Sep 17 00:00:00 2001 From: MoePus <547007249@qq.com> Date: Fri, 14 Feb 2025 19:16:38 +0900 Subject: [PATCH 6/9] use itemRenderer.render instead of renderStatic in ValueBoxRenderer (#7125) --- .../foundation/blockEntity/behaviour/ValueBoxRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java index fc60eb4e41..2a20d8fdb5 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java @@ -34,7 +34,7 @@ public class ValueBoxRenderer { float zOffset = (!blockItem ? -.15f : 0) + customZOffset(filter.getItem()); ms.scale(scale, scale, scale); ms.translate(0, 0, zOffset); - itemRenderer.renderStatic(filter, ItemDisplayContext.FIXED, light, overlay, ms, buffer, mc.level, 0); + itemRenderer.render(filter, ItemDisplayContext.FIXED, false, ms, buffer, light, overlay, modelWithOverrides); } public static void renderFlatItemIntoValueBox(ItemStack filter, PoseStack ms, MultiBufferSource buffer, int light, From d95515a4053a16e269cd3241049fdcceb4b335a8 Mon Sep 17 00:00:00 2001 From: Kevin Z Date: Fri, 14 Feb 2025 03:17:38 -0700 Subject: [PATCH 7/9] add writeBytes to displayLinkPeripheral to allow write utf8 from CC:T (#7231) --- .../peripherals/DisplayLinkPeripheral.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/DisplayLinkPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/DisplayLinkPeripheral.java index 693a72aa71..2c3008b9c1 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/DisplayLinkPeripheral.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/DisplayLinkPeripheral.java @@ -1,5 +1,7 @@ package com.simibubi.create.compat.computercraft.implementation.peripherals; +import java.nio.charset.StandardCharsets; +import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import org.jetbrains.annotations.NotNull; @@ -8,7 +10,11 @@ import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity; import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats; +import dan200.computercraft.api.lua.IArguments; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.lua.LuaFunction; +import dan200.computercraft.api.lua.LuaValues; +import dan200.computercraft.api.lua.ObjectLuaTable; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.StringTag; import net.minecraft.nbt.Tag; @@ -53,6 +59,28 @@ public class DisplayLinkPeripheral extends SyncedPeripheral map) { + ObjectLuaTable table = new ObjectLuaTable(map); + bytes = new byte[table.length()]; + for (int i = 0; i < bytes.length; i++) { + bytes[i] = (byte) (table.getInt(i + 1) & 0xff); + } + } else { + throw LuaValues.badArgumentOf(args, 0, "string or table"); + } + writeImpl(new String(bytes, StandardCharsets.UTF_8)); + } + + protected final void writeImpl(String text) { ListTag tag = blockEntity.getSourceConfig().getList(TAG_KEY, Tag.TAG_STRING); int x = cursorX.get(); From 773fd257b929285a851a4ee5d3e4b0f9c51efd5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luiz=20Kr=C3=BCger?= <46863600+itisluiz@users.noreply.github.com> Date: Fri, 14 Feb 2025 07:18:51 -0300 Subject: [PATCH 8/9] fix: Resolve issue with book & quills on lectern contraptions (#7276) Resolves #7253. Where an attempt to parse JSON out of a writable book (not a written book), which has raw string data for the pages array caused a game crash. --- .../create/foundation/utility/NBTProcessors.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/foundation/utility/NBTProcessors.java b/src/main/java/com/simibubi/create/foundation/utility/NBTProcessors.java index d23f57e895..62cd194ad4 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/NBTProcessors.java +++ b/src/main/java/com/simibubi/create/foundation/utility/NBTProcessors.java @@ -15,13 +15,16 @@ import net.minecraft.nbt.ListTag; import net.minecraft.nbt.StringTag; import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.world.item.EnchantedBookItem; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.SpawnerBlockEntity; import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.registries.ForgeRegistries; public final class NBTProcessors { @@ -43,6 +46,11 @@ public final class NBTProcessors { return data; CompoundTag book = data.getCompound("Book"); + // Writable books can't have click events, so they're safe to keep + ResourceLocation writableBookResource = ForgeRegistries.ITEMS.getKey(Items.WRITABLE_BOOK); + if (writableBookResource != null && book.getString("id").equals(writableBookResource.toString())) + return data; + if (!book.contains("tag", Tag.TAG_COMPOUND)) return data; CompoundTag tag = book.getCompound("tag"); @@ -67,7 +75,7 @@ public final class NBTProcessors { if (!book.contains("tag", Tag.TAG_COMPOUND)) return data; CompoundTag itemData = book.getCompound("tag"); - + for (List entries : NBTHelper.readCompoundList(itemData.getList("Pages", Tag.TAG_COMPOUND), pageTag -> NBTHelper.readCompoundList(pageTag.getList("Entries", Tag.TAG_COMPOUND), tag -> tag.getString("Text")))) { From b1565391a498cd2311e704855b0955a32d875784 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 14 Feb 2025 11:44:37 +0100 Subject: [PATCH 9/9] Update CreateNBTProcessors.java --- .../create/foundation/utility/CreateNBTProcessors.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/simibubi/create/foundation/utility/CreateNBTProcessors.java b/src/main/java/com/simibubi/create/foundation/utility/CreateNBTProcessors.java index c55e66907d..8bb79c133a 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/CreateNBTProcessors.java +++ b/src/main/java/com/simibubi/create/foundation/utility/CreateNBTProcessors.java @@ -9,7 +9,10 @@ import net.createmod.catnip.nbt.NBTProcessors; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Items; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraftforge.registries.ForgeRegistries; public class CreateNBTProcessors { public static void register() { @@ -26,6 +29,11 @@ public class CreateNBTProcessors { if (!data.contains("Book", Tag.TAG_COMPOUND)) return data; CompoundTag book = data.getCompound("Book"); + + // Writable books can't have click events, so they're safe to keep + ResourceLocation writableBookResource = ForgeRegistries.ITEMS.getKey(Items.WRITABLE_BOOK); + if (writableBookResource != null && book.getString("id").equals(writableBookResource.toString())) + return data; if (!book.contains("tag", Tag.TAG_COMPOUND)) return data;