A few texture fixes and hide source blocks
This commit is contained in:
parent
b76e1d1b2f
commit
01d1650ebf
8 changed files with 12 additions and 11 deletions
|
@ -69,6 +69,8 @@ import techreborn.compat.jei.industrialElectrolyzer.IndustrialElectrolyzerRecipe
|
||||||
import techreborn.compat.jei.industrialElectrolyzer.IndustrialElectrolyzerRecipeHandler;
|
import techreborn.compat.jei.industrialElectrolyzer.IndustrialElectrolyzerRecipeHandler;
|
||||||
import techreborn.compat.jei.industrialGrinder.IndustrialGrinderRecipeCategory;
|
import techreborn.compat.jei.industrialGrinder.IndustrialGrinderRecipeCategory;
|
||||||
import techreborn.compat.jei.industrialGrinder.IndustrialGrinderRecipeHandler;
|
import techreborn.compat.jei.industrialGrinder.IndustrialGrinderRecipeHandler;
|
||||||
|
import techreborn.compat.jei.industrialSawmill.IndustrialSawmillRecipeCategory;
|
||||||
|
import techreborn.compat.jei.industrialSawmill.IndustrialSawmillRecipeHandler;
|
||||||
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeCategory;
|
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeCategory;
|
||||||
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeHandler;
|
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeHandler;
|
||||||
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeMaker;
|
import techreborn.compat.jei.rollingMachine.RollingMachineRecipeMaker;
|
||||||
|
@ -76,8 +78,6 @@ import techreborn.compat.jei.scrapbox.ScrapboxRecipeCategory;
|
||||||
import techreborn.compat.jei.scrapbox.ScrapboxRecipeHandler;
|
import techreborn.compat.jei.scrapbox.ScrapboxRecipeHandler;
|
||||||
import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeCategory;
|
import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeCategory;
|
||||||
import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeHandler;
|
import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeHandler;
|
||||||
import techreborn.compat.jei.industrialSawmill.IndustrialSawmillRecipeCategory;
|
|
||||||
import techreborn.compat.jei.industrialSawmill.IndustrialSawmillRecipeHandler;
|
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.IC2Duplicates;
|
import techreborn.init.IC2Duplicates;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
|
@ -152,6 +152,8 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
||||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_DIESEL));
|
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_DIESEL));
|
||||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_NITRO_DIESEL));
|
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_NITRO_DIESEL));
|
||||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_OIL));
|
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_OIL));
|
||||||
|
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_ELECTROLYZED_WATER));
|
||||||
|
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BLOCK_COMPRESSED_AIR));
|
||||||
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.MISSING_RECIPE_PLACEHOLDER));
|
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.MISSING_RECIPE_PLACEHOLDER));
|
||||||
|
|
||||||
if (IC2Duplicates.deduplicate()) {
|
if (IC2Duplicates.deduplicate()) {
|
||||||
|
@ -186,9 +188,8 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
||||||
new ImplosionCompressorRecipeCategory(guiHelper), new IndustrialElectrolyzerRecipeCategory(guiHelper),
|
new ImplosionCompressorRecipeCategory(guiHelper), new IndustrialElectrolyzerRecipeCategory(guiHelper),
|
||||||
new RollingMachineRecipeCategory(guiHelper), new VacuumFreezerRecipeCategory(guiHelper),
|
new RollingMachineRecipeCategory(guiHelper), new VacuumFreezerRecipeCategory(guiHelper),
|
||||||
new GrinderRecipeCategory(guiHelper), new ExtractorRecipeCategory(guiHelper),
|
new GrinderRecipeCategory(guiHelper), new ExtractorRecipeCategory(guiHelper),
|
||||||
new CompressorRecipeCategory(guiHelper), new ScrapboxRecipeCategory(guiHelper),
|
new CompressorRecipeCategory(guiHelper), new ScrapboxRecipeCategory(guiHelper),
|
||||||
new IndustrialSawmillRecipeCategory(guiHelper));
|
new IndustrialSawmillRecipeCategory(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));
|
||||||
|
@ -202,7 +203,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
||||||
new GrinderRecipeHandler(jeiHelpers), new ExtractorRecipeHandler(jeiHelpers),
|
new GrinderRecipeHandler(jeiHelpers), new ExtractorRecipeHandler(jeiHelpers),
|
||||||
new CompressorRecipeHandler(jeiHelpers), new ScrapboxRecipeHandler(jeiHelpers),
|
new CompressorRecipeHandler(jeiHelpers), new ScrapboxRecipeHandler(jeiHelpers),
|
||||||
new FluidGeneratorRecipeHandler(jeiHelpers), new IndustrialSawmillRecipeHandler(jeiHelpers));
|
new FluidGeneratorRecipeHandler(jeiHelpers), new IndustrialSawmillRecipeHandler(jeiHelpers));
|
||||||
|
|
||||||
registry.addRecipes(RecipeHandler.recipeList);
|
registry.addRecipes(RecipeHandler.recipeList);
|
||||||
registry.addRecipes(FusionReactorRecipeHelper.reactorRecipes);
|
registry.addRecipes(FusionReactorRecipeHelper.reactorRecipes);
|
||||||
|
|
||||||
|
@ -241,7 +242,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
||||||
registry.addRecipeClickArea(GuiBlastFurnace.class, 150, 4, 20, 12, RecipeCategoryUids.BLAST_FURNACE);
|
registry.addRecipeClickArea(GuiBlastFurnace.class, 150, 4, 20, 12, RecipeCategoryUids.BLAST_FURNACE);
|
||||||
registry.addRecipeClickArea(GuiChemicalReactor.class, 150, 4, 20, 12, RecipeCategoryUids.CHEMICAL_REACTOR);
|
registry.addRecipeClickArea(GuiChemicalReactor.class, 150, 4, 20, 12, RecipeCategoryUids.CHEMICAL_REACTOR);
|
||||||
registry.addRecipeClickArea(GuiIndustrialGrinder.class, 150, 4, 20, 12, RecipeCategoryUids.INDUSTRIAL_GRINDER);
|
registry.addRecipeClickArea(GuiIndustrialGrinder.class, 150, 4, 20, 12, RecipeCategoryUids.INDUSTRIAL_GRINDER);
|
||||||
|
|
||||||
registry.addRecipeClickArea(GuiIndustrialSawmill.class, 55, 35, 20, 15, RecipeCategoryUids.INDUSTRIAL_SAWMILL);
|
registry.addRecipeClickArea(GuiIndustrialSawmill.class, 55, 35, 20, 15, RecipeCategoryUids.INDUSTRIAL_SAWMILL);
|
||||||
|
|
||||||
//OLD ONES
|
//OLD ONES
|
||||||
|
@ -302,7 +303,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
||||||
EFluidGenerator.DIESEL.getRecipeID());
|
EFluidGenerator.DIESEL.getRecipeID());
|
||||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.THERMAL_GENERATOR),
|
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.THERMAL_GENERATOR),
|
||||||
EFluidGenerator.THERMAL.getRecipeID());
|
EFluidGenerator.THERMAL.getRecipeID());
|
||||||
|
|
||||||
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL), RecipeCategoryUids.INDUSTRIAL_SAWMILL);
|
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL), RecipeCategoryUids.INDUSTRIAL_SAWMILL);
|
||||||
|
|
||||||
final IRecipeTransferRegistry recipeTransferRegistry = registry.getRecipeTransferRegistry();
|
final IRecipeTransferRegistry recipeTransferRegistry = registry.getRecipeTransferRegistry();
|
||||||
|
@ -343,8 +344,8 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
|
||||||
recipeTransferRegistry.addRecipeTransferHandler(
|
recipeTransferRegistry.addRecipeTransferHandler(
|
||||||
new BuiltContainerTransferInfo("compressor", RecipeCategoryUids.COMPRESSOR, 36, 1, 0, 36));
|
new BuiltContainerTransferInfo("compressor", RecipeCategoryUids.COMPRESSOR, 36, 1, 0, 36));
|
||||||
recipeTransferRegistry.addRecipeTransferHandler(
|
recipeTransferRegistry.addRecipeTransferHandler(
|
||||||
new BuiltContainerTransferInfo("industrialsawmill", RecipeCategoryUids.INDUSTRIAL_SAWMILL, 36, 2, 0, 36));
|
new BuiltContainerTransferInfo("industrialsawmill", RecipeCategoryUids.INDUSTRIAL_SAWMILL, 36, 2, 0, 36));
|
||||||
|
|
||||||
if (CompatManager.isQuantumStorageLoaded) {
|
if (CompatManager.isQuantumStorageLoaded) {
|
||||||
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.QUANTUM_CHEST));
|
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.QUANTUM_CHEST));
|
||||||
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.QUANTUM_TANK));
|
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.QUANTUM_TANK));
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
"model": "cube_bottom_top",
|
"model": "cube_bottom_top",
|
||||||
"textures": {
|
"textures": {
|
||||||
"particle": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off",
|
"particle": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off",
|
||||||
"down": "techreborn:blocks/machines/generators/semi_fluid_generator_bottom",
|
"down": "techreborn:blocks/machines/generators/generator_bottom",
|
||||||
"top": "techreborn:blocks/machines/generators/semi_fluid_generator_top_off",
|
"top": "techreborn:blocks/machines/generators/semi_fluid_generator_top_off",
|
||||||
"side": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off"
|
"side": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off"
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 5.8 KiB |
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"animation":{
|
"animation":{
|
||||||
"frametime":2
|
"frametime":4
|
||||||
}
|
}
|
||||||
}
|
}
|
Binary file not shown.
After Width: | Height: | Size: 860 B |
Binary file not shown.
After Width: | Height: | Size: 754 B |
Binary file not shown.
After Width: | Height: | Size: 506 B |
Binary file not shown.
After Width: | Height: | Size: 258 B |
Loading…
Reference in a new issue