diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-12-06 20:52:24 +0100 |
|---|---|---|
| committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-12-06 20:52:24 +0100 |
| commit | c46c6723e6a7af3edd6d3f660901388d7e01389e (patch) | |
| tree | a5e33a5cd91a1f46accc9770f3ee8997947e4e6c | |
| parent | b16c70e48cf7c35fd8d3552d0cb1ed6191b4b569 (diff) | |
| download | GT5-Unofficial-c46c6723e6a7af3edd6d3f660901388d7e01389e.tar.gz GT5-Unofficial-c46c6723e6a7af3edd6d3f660901388d7e01389e.tar.bz2 GT5-Unofficial-c46c6723e6a7af3edd6d3f660901388d7e01389e.zip | |
WerkstoffLoaderAPI fixes
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Former-commit-id: 953e1f8f195691105e3bcefedc3f34fb101ac71d
2 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java index 0bf9f2a6f6..d519da3ef6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java @@ -47,11 +47,11 @@ public class BW_MetaGeneratedFrames extends MetaPipeEntity { mMaterial = aMaterial; GT_OreDictUnificator.registerOre(OrePrefixes.frameGt, aMaterial, getStackForm(1)); - GT_ModHandler.addCraftingRecipe(getStackForm(2), RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"SSS", "SwS", "SSS", 'S', OrePrefixes.stick.get(mMaterial)}); - RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 4), ItemList.Circuit_Integrated.getWithDamage(0, 4), getStackForm(1), 64, 8); + GT_ModHandler.addCraftingRecipe(getStackForm(2), RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"SSS", "SwS", "SSS", 'S', mMaterial.get(OrePrefixes.stick)}); + RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.getVarName(), 4), ItemList.Circuit_Integrated.getWithDamage(0, 4), getStackForm(1), 64, 8); } - public BW_MetaGeneratedFrames(String aName, Werkstoff aMaterial) { + private BW_MetaGeneratedFrames(String aName, Werkstoff aMaterial) { super(aName, 0); mMaterial = aMaterial; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java index 0c8d6270b3..d4a7ec89a3 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java @@ -163,10 +163,9 @@ public class BW_MetaGenerated_Ores extends BW_TileEntityContainer { @Override public void getSubBlocks(Item aItem, CreativeTabs aTab, List aList) { - for (int i = 0; i < Werkstoff.werkstoffHashSet.size(); i++) { - Werkstoff tMaterial = Werkstoff.werkstoffHashMap.get((short) i); + for (Werkstoff tMaterial : Werkstoff.werkstoffHashSet) { if ((tMaterial != null) && ((tMaterial.getGenerationFeatures().toGenerate & 0x8) != 0) && ((tMaterial.getGenerationFeatures().blacklist & 0x8) == 0)) { - aList.add(new ItemStack(aItem, 1, i)); + aList.add(new ItemStack(aItem, 1, tMaterial.getmID())); } } } |