Merge remote-tracking branch 'origin/1.12' into 1.12
This commit is contained in:
commit
23b4ef1038
2 changed files with 19 additions and 9 deletions
|
@ -39,4 +39,7 @@ public class CompatConfigs {
|
||||||
@ConfigRegistry(config = "compat", category = "theoneprobe", key = "EnableTOPSupport", comment = "Display machine info in The One Probe's HUD")
|
@ConfigRegistry(config = "compat", category = "theoneprobe", key = "EnableTOPSupport", comment = "Display machine info in The One Probe's HUD")
|
||||||
public static boolean enableTOP = true;
|
public static boolean enableTOP = true;
|
||||||
|
|
||||||
|
@ConfigRegistry(config = "compat", category = "jei", key = "ShowScrabpox", comment = "Show Scrapbox loot in JEI")
|
||||||
|
public static boolean showScrapbox = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,6 +57,7 @@ import techreborn.api.recipe.machines.*;
|
||||||
import techreborn.blocks.cable.EnumCableType;
|
import techreborn.blocks.cable.EnumCableType;
|
||||||
import techreborn.client.gui.*;
|
import techreborn.client.gui.*;
|
||||||
import techreborn.client.gui.slot.GuiSlotConfiguration;
|
import techreborn.client.gui.slot.GuiSlotConfiguration;
|
||||||
|
import techreborn.compat.CompatConfigs;
|
||||||
import techreborn.compat.CompatManager;
|
import techreborn.compat.CompatManager;
|
||||||
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory;
|
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory;
|
||||||
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeWrapper;
|
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeWrapper;
|
||||||
|
@ -158,9 +159,12 @@ public class TechRebornJeiPlugin implements IModPlugin {
|
||||||
new IndustrialElectrolyzerRecipeCategory(guiHelper),
|
new IndustrialElectrolyzerRecipeCategory(guiHelper),
|
||||||
new IndustrialSawmillRecipeCategory(guiHelper),
|
new IndustrialSawmillRecipeCategory(guiHelper),
|
||||||
new RollingMachineRecipeCategory(guiHelper),
|
new RollingMachineRecipeCategory(guiHelper),
|
||||||
new ScrapboxRecipeCategory(guiHelper),
|
|
||||||
new VacuumFreezerRecipeCategory(guiHelper));
|
new VacuumFreezerRecipeCategory(guiHelper));
|
||||||
|
|
||||||
|
if (CompatConfigs.showScrapbox) {
|
||||||
|
registry.addRecipeCategories(new ScrapboxRecipeCategory(guiHelper));
|
||||||
|
}
|
||||||
|
|
||||||
for (final EFluidGenerator type : EFluidGenerator.values())
|
for (final EFluidGenerator type : EFluidGenerator.values())
|
||||||
registry.addRecipeCategories(new FluidGeneratorRecipeCategory(type, guiHelper));
|
registry.addRecipeCategories(new FluidGeneratorRecipeCategory(type, guiHelper));
|
||||||
|
|
||||||
|
@ -250,10 +254,13 @@ public class TechRebornJeiPlugin implements IModPlugin {
|
||||||
registry.handleRecipes(IndustrialGrinderRecipe.class, recipe -> new IndustrialGrinderRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.INDUSTRIAL_GRINDER);
|
registry.handleRecipes(IndustrialGrinderRecipe.class, recipe -> new IndustrialGrinderRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.INDUSTRIAL_GRINDER);
|
||||||
registry.handleRecipes(IndustrialSawmillRecipe.class, recipe -> new IndustrialSawmillRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.INDUSTRIAL_SAWMILL);
|
registry.handleRecipes(IndustrialSawmillRecipe.class, recipe -> new IndustrialSawmillRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.INDUSTRIAL_SAWMILL);
|
||||||
registry.handleRecipes(VacuumFreezerRecipe.class, recipe -> new VacuumFreezerRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.VACUUM_FREEZER);
|
registry.handleRecipes(VacuumFreezerRecipe.class, recipe -> new VacuumFreezerRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.VACUUM_FREEZER);
|
||||||
registry.handleRecipes(ScrapboxRecipe.class, recipe -> new ScrapboxRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.SCRAPBOX);
|
|
||||||
registry.handleRecipes(DistillationTowerRecipe.class, recipe -> new DistillationTowerRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.DISTILLATION_TOWER);
|
registry.handleRecipes(DistillationTowerRecipe.class, recipe -> new DistillationTowerRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.DISTILLATION_TOWER);
|
||||||
registry.addRecipeHandlers(new RollingMachineRecipeHandler());
|
registry.addRecipeHandlers(new RollingMachineRecipeHandler());
|
||||||
|
|
||||||
|
if (CompatConfigs.showScrapbox) {
|
||||||
|
registry.handleRecipes(ScrapboxRecipe.class, recipe -> new ScrapboxRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.SCRAPBOX);
|
||||||
|
}
|
||||||
|
|
||||||
if (!IC2Duplicates.deduplicate()) {
|
if (!IC2Duplicates.deduplicate()) {
|
||||||
registry.handleRecipes(CompressorRecipe.class, recipe -> new CompressorRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.COMPRESSOR);
|
registry.handleRecipes(CompressorRecipe.class, recipe -> new CompressorRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.COMPRESSOR);
|
||||||
registry.handleRecipes(ExtractorRecipe.class, recipe -> new ExtractorRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.EXTRACTOR);
|
registry.handleRecipes(ExtractorRecipe.class, recipe -> new ExtractorRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.EXTRACTOR);
|
||||||
|
@ -279,14 +286,11 @@ public class TechRebornJeiPlugin implements IModPlugin {
|
||||||
TechRebornJeiPlugin.addDebugRecipes(registry);
|
TechRebornJeiPlugin.addDebugRecipes(registry);
|
||||||
}
|
}
|
||||||
|
|
||||||
registry.addDescription(ItemParts.getPartByName("rubberSap"),
|
registry.addIngredientInfo(ItemParts.getPartByName("rubberSap"), ItemStack.class, I18n.translateToLocal("techreborn.desc.rubberSap"));
|
||||||
I18n.translateToLocal("techreborn.desc.rubberSap"));
|
|
||||||
if (!BehaviorDispenseScrapbox.dispenseScrapboxes) {
|
if (!BehaviorDispenseScrapbox.dispenseScrapboxes) {
|
||||||
registry.addDescription(new ItemStack(ModItems.SCRAP_BOX),
|
registry.addIngredientInfo(new ItemStack(ModItems.SCRAP_BOX), ItemStack.class, I18n.translateToLocal("techreborn.desc.scrapBoxNoDispenser"));
|
||||||
I18n.translateToLocal("techreborn.desc.scrapBoxNoDispenser"));
|
|
||||||
} else {
|
} else {
|
||||||
registry.addDescription(new ItemStack(ModItems.SCRAP_BOX),
|
registry.addIngredientInfo(new ItemStack(ModItems.SCRAP_BOX), ItemStack.class, I18n.translateToLocal("techreborn.desc.scrapBox"));
|
||||||
I18n.translateToLocal("techreborn.desc.scrapBox"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//NEW ONES
|
//NEW ONES
|
||||||
|
@ -344,9 +348,12 @@ public class TechRebornJeiPlugin implements IModPlugin {
|
||||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), RecipeCategoryUids.INDUSTRIAL_GRINDER);
|
registry.addRecipeCatalyst(new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), RecipeCategoryUids.INDUSTRIAL_GRINDER);
|
||||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL), RecipeCategoryUids.INDUSTRIAL_SAWMILL);
|
registry.addRecipeCatalyst(new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL), RecipeCategoryUids.INDUSTRIAL_SAWMILL);
|
||||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.ROLLING_MACHINE), RecipeCategoryUids.ROLLING_MACHINE);
|
registry.addRecipeCatalyst(new ItemStack(ModBlocks.ROLLING_MACHINE), RecipeCategoryUids.ROLLING_MACHINE);
|
||||||
registry.addRecipeCatalyst(new ItemStack(ModItems.SCRAP_BOX), RecipeCategoryUids.SCRAPBOX);
|
|
||||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.DISTILLATION_TOWER), RecipeCategoryUids.DISTILLATION_TOWER);
|
registry.addRecipeCatalyst(new ItemStack(ModBlocks.DISTILLATION_TOWER), RecipeCategoryUids.DISTILLATION_TOWER);
|
||||||
|
|
||||||
|
if (CompatConfigs.showScrapbox) {
|
||||||
|
registry.addRecipeCatalyst(new ItemStack(ModItems.SCRAP_BOX), RecipeCategoryUids.SCRAPBOX);
|
||||||
|
}
|
||||||
|
|
||||||
final IRecipeTransferRegistry recipeTransferRegistry = registry.getRecipeTransferRegistry();
|
final IRecipeTransferRegistry recipeTransferRegistry = registry.getRecipeTransferRegistry();
|
||||||
|
|
||||||
recipeTransferRegistry.addRecipeTransferHandler(
|
recipeTransferRegistry.addRecipeTransferHandler(
|
||||||
|
|
Loading…
Reference in a new issue