diff --git a/build.gradle b/build.gradle index 6f53e79..3565209 100644 --- a/build.gradle +++ b/build.gradle @@ -93,7 +93,6 @@ dependencies { // soft dependencies compile 'forestry:forestry_1.7.10-4.3.1.44' compile 'gregtech:gregtech-5.09.34.16' - compile 'gtPlusPlus:GT-PlusPlus-1.7.05.68' compile 'fox.spiteful.avaritia:Avaritia-1.18' } diff --git a/libs/GT-PlusPlus-1.7.05.68.jar b/libs/GT-PlusPlus-1.7.05.68.jar deleted file mode 100644 index caf54f3..0000000 Binary files a/libs/GT-PlusPlus-1.7.05.68.jar and /dev/null differ diff --git a/src/main/java/me/towdium/jecalculation/nei/Adapter.java b/src/main/java/me/towdium/jecalculation/nei/Adapter.java index a07faa8..52efd77 100644 --- a/src/main/java/me/towdium/jecalculation/nei/Adapter.java +++ b/src/main/java/me/towdium/jecalculation/nei/Adapter.java @@ -25,10 +25,10 @@ public class Adapter { JustEnoughCalculation.logger.info("gregtech installed"); adapters.add(new GregTech()); } - if (Loader.isModLoaded("miscutils")) { - JustEnoughCalculation.logger.info("gt++ not supported"); - adapters.add(new GTPP()); - } +// if (Loader.isModLoaded("miscutils")) { +// JustEnoughCalculation.logger.info("gt++ not supported"); +// adapters.add(new GTPP()); +// } if (Loader.isModLoaded("Avaritia")) { JustEnoughCalculation.logger.info("Avaritia installed"); adapters.add(new Avaritia()); diff --git a/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java b/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java index 8ec93c4..7dac22c 100644 --- a/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java +++ b/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java @@ -2,8 +2,6 @@ package me.towdium.jecalculation.nei.adapter; import codechicken.nei.recipe.IRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import gregtech.api.util.GTPP_Recipe; -import gtPlusPlus.nei.*; import me.towdium.jecalculation.JustEnoughCalculation; import javax.annotation.ParametersAreNonnullByDefault; @@ -17,30 +15,30 @@ import java.util.stream.Stream; * don't work, why? */ @ParametersAreNonnullByDefault -public class GTPP extends GregTech { - - private final static Set> defaultHandlers = Stream.of( - GTPP_NEI_DefaultHandler.class, GT_NEI_VacFurnace.class, GT_NEI_RFPP.class, - GT_NEI_multiCentriElectroFreezer.class, GT_NEI_MillingMachine.class, GT_NEI_FluidReactor.class, - GT_NEI_FlotationCell.class, DecayableRecipeHandler.class).collect(Collectors.toSet()); - - @Override - public Set getAllOverlayIdentifier() { - Set recipeNames = GTPP_Recipe.GT_Recipe_Map.sMappings.stream() - .map(gt_recipe_map -> gt_recipe_map.mNEIName) - .collect(Collectors.toSet()); - recipeNames.add("GTPP_Decayables"); - JustEnoughCalculation.logger.info("GTPP recipe handlers cecipe name"); - for (String recipeName : recipeNames) { - JustEnoughCalculation.logger.info(" " + recipeName); - } - return recipeNames; - } - - @Override - public void handleRecipe(IRecipeHandler recipe, int index, List inputs, List outputs) { - if (defaultHandlers.stream().anyMatch(aClass -> aClass.isInstance(recipe))) { - handleDefault(recipe, index, inputs, outputs); - } - } +public class GTPP /* extends GregTech */ { +// +// private final static Set> defaultHandlers = Stream.of( +// GTPP_NEI_DefaultHandler.class, GT_NEI_VacFurnace.class, GT_NEI_RFPP.class, +// GT_NEI_multiCentriElectroFreezer.class, GT_NEI_MillingMachine.class, GT_NEI_FluidReactor.class, +// GT_NEI_FlotationCell.class, DecayableRecipeHandler.class).collect(Collectors.toSet()); +// +// @Override +// public Set getAllOverlayIdentifier() { +// Set recipeNames = GTPP_Recipe.GT_Recipe_Map.sMappings.stream() +// .map(gt_recipe_map -> gt_recipe_map.mNEIName) +// .collect(Collectors.toSet()); +// recipeNames.add("GTPP_Decayables"); +// JustEnoughCalculation.logger.info("GTPP recipe handlers cecipe name"); +// for (String recipeName : recipeNames) { +// JustEnoughCalculation.logger.info(" " + recipeName); +// } +// return recipeNames; +// } +// +// @Override +// public void handleRecipe(IRecipeHandler recipe, int index, List inputs, List outputs) { +// if (defaultHandlers.stream().anyMatch(aClass -> aClass.isInstance(recipe))) { +// handleDefault(recipe, index, inputs, outputs); +// } +// } }