From 37fe246ac62b2775d65382a20416cee2b7ff9f01 Mon Sep 17 00:00:00 2001 From: Blake Rain Date: Mon, 29 Jan 2024 16:47:37 +0000 Subject: [PATCH 1/2] fix: misspelling in digitizer peripheral type --- .../computercraft/peripheral/DigitizerPeripheral.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/banutama/utamacraft/integrations/computercraft/peripheral/DigitizerPeripheral.java b/src/main/java/net/banutama/utamacraft/integrations/computercraft/peripheral/DigitizerPeripheral.java index 2aabafa..4795664 100644 --- a/src/main/java/net/banutama/utamacraft/integrations/computercraft/peripheral/DigitizerPeripheral.java +++ b/src/main/java/net/banutama/utamacraft/integrations/computercraft/peripheral/DigitizerPeripheral.java @@ -21,7 +21,7 @@ import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.registries.ForgeRegistries; public class DigitizerPeripheral extends BasePeripheral { - public static final String PERIPHERAL_TYPE = "digitizier"; + public static final String PERIPHERAL_TYPE = "digitizer"; protected DigitizerPeripheral(BasePeripheralOwner owner) { super(PERIPHERAL_TYPE, owner); -- 2.45.2 From 09db7639ee601e05ab96697286c10c9dddfa7230 Mon Sep 17 00:00:00 2001 From: Blake Rain Date: Mon, 29 Jan 2024 17:49:27 +0000 Subject: [PATCH 2/2] fix: issue with name being erased from returned structure --- .../peripheral/DigitizerPeripheral.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/banutama/utamacraft/integrations/computercraft/peripheral/DigitizerPeripheral.java b/src/main/java/net/banutama/utamacraft/integrations/computercraft/peripheral/DigitizerPeripheral.java index 4795664..cc9a014 100644 --- a/src/main/java/net/banutama/utamacraft/integrations/computercraft/peripheral/DigitizerPeripheral.java +++ b/src/main/java/net/banutama/utamacraft/integrations/computercraft/peripheral/DigitizerPeripheral.java @@ -17,7 +17,6 @@ import net.banutama.utamacraft.integrations.computercraft.peripheral.digitizer.D import net.banutama.utamacraft.integrations.computercraft.peripheral.digitizer.DigitizedItem; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.registries.ForgeRegistries; public class DigitizerPeripheral extends BasePeripheral { @@ -170,6 +169,9 @@ public class DigitizerPeripheral extends BasePeripheral { return MethodResult.of(null, "No digitized item with ID " + id.toString()); } + // Store the name of the digitized item for later + var itemName = ForgeRegistries.ITEMS.getKey(digitizedItem.itemStack.getItem()); + // This is the number of items available in the digitized item stack. var available = digitizedItem.itemStack.getCount(); @@ -254,7 +256,16 @@ public class DigitizerPeripheral extends BasePeripheral { result.put("cost", cost); result.put("materializeCost", materializeCost); result.put("refreshCost", refreshCost); - result.put("item", digitizedItem.describeItem(gameTime)); + + { + // Here we need to overwrite the stored `name` property with the original item + // name. This is because the `describeItem` method will return a `name` property + // of `minecraft:air` if we've successfully materialized the entire digitized + // stack. + var item = digitizedItem.describeItem(gameTime); + item.put("name", itemName.toString()); + result.put("item", item); + } return MethodResult.of(result); } -- 2.45.2