From ada9172fba151920fef7f0759a7be69f25443315 Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Mon, 10 Nov 2025 18:52:40 -0500 Subject: [PATCH] Fix Garnydnia --- .../crops/gregtechCrops/GarnydniaCrop.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java b/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java index fd5714b..e062bf6 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java @@ -3,6 +3,7 @@ import java.util.Arrays; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import com.github.bartimaeusnek.cropspp.ConfigValues; @@ -10,10 +11,9 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.objects.ItemData; import gregtech.api.objects.XSTR; import gregtech.api.util.GTOreDictUnificator; -import gregtech.common.ores.OreInfo; -import gregtech.common.ores.OreManager; import ic2.api.crops.ICropTile; public class GarnydniaCrop extends BasicCrop { @@ -97,15 +97,18 @@ public boolean isBlockBelow(ICropTile aCrop) { int y = aCrop.getLocation().posY - i; int z = aCrop.getLocation().posZ; - try (OreInfo info = OreManager.getOreInfo(aCrop.getWorld(), x, y, z)) { - if (info == null) continue; + Block block = aCrop.getWorld().getBlock(x, y, z); + int itemMeta = block.getDamageValue(aCrop.getWorld(), x, y, z); - if (info.material == Materials.GarnetRed || info.material == Materials.GarnetYellow) return true; - } + ItemData data = GTOreDictUnificator.getAssociation(new ItemStack(block, 1, itemMeta)); + + if (data == null) continue; + + if (data.mMaterial.mMaterial == Materials.GarnetRed) return true; + if (data.mMaterial.mMaterial == Materials.GarnetYellow) return true; } return false; - } @Override