diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt index 4370d7b36..8a094febe 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt @@ -12,8 +12,6 @@ import com.mojang.brigadier.arguments.StringArgumentType import com.mojang.brigadier.context.CommandContext import com.mojang.serialization.JsonOps import io.netty.buffer.ByteBufAllocator -import it.unimi.dsi.fastutil.io.FastByteArrayInputStream -import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream import it.unimi.dsi.fastutil.objects.Object2BooleanFunction import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap import it.unimi.dsi.fastutil.objects.Object2IntArrayMap @@ -50,6 +48,8 @@ import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.item.crafting.Recipe import net.minecraft.world.item.crafting.RecipeInput import net.minecraft.world.item.crafting.RecipeType +import net.minecraft.world.item.crafting.ShapedRecipe +import net.minecraft.world.item.crafting.ShapedRecipePattern import net.minecraft.world.item.crafting.SmithingRecipeInput import net.minecraft.world.item.crafting.SmithingTransformRecipe import net.minecraft.world.level.ItemLike @@ -97,10 +97,6 @@ import ru.dbotthepony.mc.otm.core.util.formatMatter import ru.dbotthepony.mc.otm.core.util.formatMatterFull import ru.dbotthepony.mc.otm.core.util.formatSiComponent import ru.dbotthepony.mc.otm.core.util.formatTickDuration -import ru.dbotthepony.mc.otm.core.util.readBinaryComponent -import ru.dbotthepony.mc.otm.core.util.readCollection -import ru.dbotthepony.mc.otm.core.util.writeBinaryComponent -import ru.dbotthepony.mc.otm.core.util.writeCollection import ru.dbotthepony.mc.otm.core.writeComponent import ru.dbotthepony.mc.otm.core.writeItemType import ru.dbotthepony.mc.otm.matter.MatterManager.Finder @@ -110,10 +106,6 @@ import ru.dbotthepony.mc.otm.registry.RegistryDelegate import ru.dbotthepony.mc.otm.secondTime import ru.dbotthepony.mc.otm.storage.ItemStorageStack import ru.dbotthepony.mc.otm.storage.StorageStack -import java.io.DataInputStream -import java.io.DataOutputStream -import java.io.File -import java.io.OutputStream import java.math.BigInteger import java.util.* import java.util.function.BooleanSupplier @@ -121,36 +113,9 @@ import java.util.stream.Stream import java.util.zip.Deflater import java.util.zip.Inflater import kotlin.collections.ArrayDeque -import kotlin.collections.ArrayList -import kotlin.collections.Collection -import kotlin.collections.HashMap -import kotlin.collections.LinkedHashMap -import kotlin.collections.List -import kotlin.collections.Map -import kotlin.collections.MutableMap -import kotlin.collections.all import kotlin.collections.component1 import kotlin.collections.component2 -import kotlin.collections.contains -import kotlin.collections.copyOfRange -import kotlin.collections.count -import kotlin.collections.filter -import kotlin.collections.firstOrNull -import kotlin.collections.forEach -import kotlin.collections.indices -import kotlin.collections.isNotEmpty -import kotlin.collections.isNullOrEmpty -import kotlin.collections.iterator -import kotlin.collections.joinToString -import kotlin.collections.last -import kotlin.collections.listOf -import kotlin.collections.map -import kotlin.collections.mapOf import kotlin.collections.set -import kotlin.collections.sortBy -import kotlin.collections.sortWith -import kotlin.collections.toTypedArray -import kotlin.collections.withIndex import kotlin.math.pow import kotlin.math.roundToInt @@ -517,13 +482,13 @@ object MatterManager { var width: Int var height: Int - // FIXME: this gonna break after neoforge update - if (it.value is IShapedRecipe<*>) { - width = (it.value as IShapedRecipe<*>).width - height = (it.value as IShapedRecipe<*>).height + // FIXME: this is stupid and wont properly work for shaped modded recipes which don't inherit shapedrecipe + if (it.value is ShapedRecipe) { + width = (it.value as ShapedRecipe).width + height = (it.value as ShapedRecipe).height } else { - width = 3 - height = 3 + width = ShapedRecipePattern.getMaxWidth() + height = ShapedRecipePattern.getMaxHeight() } if (width * height < it.value.ingredients.size) {