diff --git a/build.gradle b/build.gradle index 4709b953a..5d751a3ef 100644 --- a/build.gradle +++ b/build.gradle @@ -231,16 +231,6 @@ repositories { includeGroup("me.shedaniel.cloth") } } - maven { - url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage") - credentials { - username = "anything" - password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX" - } - content { - includeModule("com.refinedmods", "refinedstorage") - } - } maven { name = 'Kotlin for Forge' url = 'https://thedarkcolour.github.io/KotlinForForge/' @@ -294,9 +284,8 @@ dependencies { runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}") // Refined Storage - implementation fg.deobf("com.refinedmods:refinedstorage:${refinedstorage_version}") { - transitive false - } + compileOnly fg.deobf("curse.maven:refined-storage-243076:4861827") + runtimeOnly fg.deobf("curse.maven:refined-storage-243076:4861827") // AE2 Things compileOnly fg.deobf("curse.maven:ae2things-609977:${ae2things_version}-sources") diff --git a/src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java b/src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java index 959836c2a..e45cea9af 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java +++ b/src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java @@ -1,5 +1,6 @@ package de.srendi.advancedperipherals.common.util; +import dan200.computercraft.api.detail.VanillaDetailRegistries; import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.shared.util.NBTUtil; import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.InventoryManagerPeripheral; @@ -102,11 +103,10 @@ public static Object posToObject(BlockPos pos) { public static Map stackToObject(@NotNull ItemStack stack) { if (stack.isEmpty()) return new HashMap<>(); - Map map = itemToObject(stack.getItem()); + Map map = new HashMap<>(VanillaDetailRegistries.ITEM_STACK.getDetails(stack)); CompoundTag nbt = stack.copy().getOrCreateTag(); - map.put("count", stack.getCount()); - map.put("displayName", stack.getDisplayName().getString()); map.put("maxStackSize", stack.getMaxStackSize()); + map.put("nbtHash", map.get("nbt")); map.put("nbt", NBTUtil.toLua(nbt)); map.put("fingerprint", ItemUtil.getFingerprint(stack)); return map;