diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java | 27 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java | 2 |
2 files changed, 27 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java index d3386a1608..babd607aab 100644 --- a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java +++ b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java @@ -1,8 +1,12 @@ package gtPlusPlus.xmod.bartworks; +import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Map; +import gregtech.api.enums.OrePrefixes; +import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import net.minecraft.item.ItemStack; @@ -10,12 +14,21 @@ public class BW_Utils { private final static Method sName; private final static Method sGet; - private static final Class sClassBW_NonMeta_MaterialItems; + private static final Class<?> sClassBW_NonMeta_MaterialItems; + private static final Class<?> Werkstoff; + private static final Class<?> WerkstoffLoader; + private static final Map<Short, ?> werkstoffHashMap; + private static final Method getCorrespondingItemStackUnsafe; static { sName = ReflectionUtils.getMethod(Enum.class, "name"); sClassBW_NonMeta_MaterialItems = ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.BW_NonMeta_MaterialItems"); sGet = ReflectionUtils.getMethod(sClassBW_NonMeta_MaterialItems, "get", long.class, Object[].class); + Werkstoff = ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.Werkstoff"); + WerkstoffLoader = ReflectionUtils.getClass("com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader"); + Field fieldWerkstoffHashMap = ReflectionUtils.getField(Werkstoff, "werkstoffHashMap"); + werkstoffHashMap = ReflectionUtils.getFieldValue(fieldWerkstoffHashMap); + getCorrespondingItemStackUnsafe = ReflectionUtils.getMethod(WerkstoffLoader, "getCorrespondingItemStackUnsafe", OrePrefixes.class, Werkstoff, int.class); } public enum NonMeta_MaterialItem { @@ -52,4 +65,16 @@ public class BW_Utils { aItems.add(getBW_NonMeta_MaterialItems(NonMeta_MaterialItem.TheCoreCell, aStackSize)); return aItems; } + + public static ItemStack getCorrespondingItemStack(OrePrefixes orePrefixes, short werkstoffID, int amount) { + if (LoadedMods.BartWorks) { + if (werkstoffHashMap != null) { + Object werkstoff = werkstoffHashMap.get(werkstoffID); + if (werkstoff != null) { + return (ItemStack) ReflectionUtils.invokeNonBool(null, getCorrespondingItemStackUnsafe, new Object[]{orePrefixes, werkstoff, amount}); + } + } + } + return null; + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index f5abad2373..c8219155d2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -216,7 +216,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { } } else { - components[irc] = M.getComposites().get(irc).getDustStack(r); + components[irc] = M.getComposites().get(irc).getUnificatedDustStack(r); } } } |