diff options
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 7 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_BartWorks_Compat.java | 48 |
2 files changed, 3 insertions, 52 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index 353a62c319..17dbd560a2 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -85,18 +85,17 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case 6: case 7: case 8: - if (Loader.isModLoaded("bartworks")) { + if (Loader.isModLoaded("bartworks")) {//todo remove via provider pattern on all enums? aRecipe[i] = "blockGlass"+VN[aTier]; break; } default: - if (Loader.isModLoaded("bartworks")) { + if (Loader.isModLoaded("bartworks")) {//todo remove via provider pattern on all enums? aRecipe[i] = "blockGlass"+VN[8]; - break; } else { aRecipe[i] = Ic2Items.reinforcedGlass; - break; } + break; } continue; } diff --git a/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java b/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java deleted file mode 100644 index eedae52716..0000000000 --- a/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java +++ /dev/null @@ -1,48 +0,0 @@ -package gregtech.api.util; - -import com.github.bartimaeusnek.bartworks.API.VoidMinerDropAdder; -import com.github.bartimaeusnek.bartworks.API.WerkstoffAPI; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; -import gregtech.api.enums.Materials; -import gregtech.api.interfaces.ISubTagContainer; - -import java.lang.reflect.InvocationTargetException; -import java.util.Optional; - -public class GT_BartWorks_Compat { - - public static Materials getBartWorksMaterialByVarName(String name) { - Materials materials = Materials._NULL; - try { - materials = WerkstoffAPI.getWerkstoff(name).getBridgeMaterial(); - } catch (NoSuchFieldException | IllegalAccessException exception) { - exception.printStackTrace(); - } - return materials; - } - - public static Materials getBartWorksMaterialByODName(String name) { - Optional<Werkstoff> material = Werkstoff.werkstoffHashSet.stream().filter(e -> e.getVarName().equals(name)).findFirst(); - if (material.isPresent()) { - return material.get().getBridgeMaterial(); - } - return Materials._NULL; - } - - public static Materials getBartWorksMaterialByIGNName(String name) { - return Optional.ofNullable(Optional.ofNullable(Werkstoff.werkstoffNameHashMap.get(name)).orElse(Werkstoff.default_null_Werkstoff).getBridgeMaterial()).orElse(Materials._NULL); - } - - public static Materials getBartWorksMaterialByID(int id) { - return Optional.ofNullable(Optional.ofNullable(Werkstoff.werkstoffHashMap.get((short) id)).orElse(Werkstoff.default_null_Werkstoff).getBridgeMaterial()).orElse(Materials._NULL); - } - - public static void addVoidMinerDropsToDimension(int dimID, ISubTagContainer material, float chance){ - try { - VoidMinerDropAdder.addDropsToDim(dimID, material, chance); - } catch (InvocationTargetException | IllegalAccessException e) { - e.printStackTrace(); - } - } - -}
\ No newline at end of file |