diff options
| author | Martin Robertz <dream-master@gmx.net> | 2023-04-18 17:11:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-18 17:11:16 +0200 |
| commit | 8a72ed6fcc335832d6279ef4ca098b9bb7ac22cc (patch) | |
| tree | 2638cf251d8888fcf42e591827884fa1bae15a37 /src/main | |
| parent | 3f760a8651a9b51ab4594c020390044eb5eddd14 (diff) | |
| parent | 66d03d9c94b55faf259a2deaf0078678695b2780 (diff) | |
| download | GT5-Unofficial-8a72ed6fcc335832d6279ef4ca098b9bb7ac22cc.tar.gz GT5-Unofficial-8a72ed6fcc335832d6279ef4ca098b9bb7ac22cc.tar.bz2 GT5-Unofficial-8a72ed6fcc335832d6279ef4ca098b9bb7ac22cc.zip | |
Merge pull request #53 from chochem/zirconolite-fix
Zirconolite fix
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java | 26 | ||||
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java | 4 |
2 files changed, 8 insertions, 22 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index b6e962d966..f21b23b738 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -1459,26 +1459,12 @@ public class RecipeLoader { tRecipe.mOutputs[i].stackSize, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); modified = true; - } else if (tRecipe.mOutputs[i] - .isItemEqual(WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1))) { // TODO: - // Does - // not - // work - // and - // I - // have - // zero - // clue - // why - tRecipe.mOutputs[i] = null; - modified = true; - } else - if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, - WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1)); - modified = true; - } + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, + WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1)); + modified = true; + } } if (modified) { reAdd.add(tRecipe); diff --git a/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java index 90b8c503ac..a3fade1f7e 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java @@ -22,12 +22,12 @@ import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.reflect.MethodUtils; import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool; -import com.github.bartimaeusnek.bartworks.API.LoaderReference; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.util.BW_Util; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; import gregtech.api.util.GT_Log; @@ -63,7 +63,7 @@ public class ZPMRubberChanges implements Runnable { || item.toString().contains("UEV")) && item.hasBeenSet()) .forEach(item -> ZPMPlusComponents.add(item.get(1))); - if (LoaderReference.dreamcraft) { + if (Mods.NewHorizonsCoreMod.isModLoaded()) { addDreamcraftItemListItems(ZPMPlusComponents); } |