diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index ae6d0633a..73a9c4883 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -10,6 +10,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; @@ -91,5 +92,9 @@ public class BlockMachineCasing extends BlockMultiblockBase { return b != this && super.shouldSideBeRendered(blockState, worldIn, pos, side); } + @Override + public boolean canRenderInLayer(BlockRenderLayer layer) { + return true; + } } diff --git a/1.11/jei/BaseRecipeWrapper.java b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java similarity index 71% rename from 1.11/jei/BaseRecipeWrapper.java rename to src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java index 28b9c0d07..81bd3c80c 100644 --- a/1.11/jei/BaseRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java @@ -3,6 +3,7 @@ package techreborn.compat.jei; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import techreborn.api.recipe.BaseRecipe; @@ -13,11 +14,14 @@ public abstract class BaseRecipeWrapper extends BlankRecip protected final T baseRecipe; @Nonnull private final List> inputs; + @Nonnull + private final List> outputs; public BaseRecipeWrapper(T baseRecipe) { this.baseRecipe = baseRecipe; inputs = new ArrayList<>(); + outputs = new ArrayList<>(); for (ItemStack input : baseRecipe.getInputs()) { if (baseRecipe.useOreDic()) { List oreDictInputs = expandOreDict(input); @@ -26,6 +30,14 @@ public abstract class BaseRecipeWrapper extends BlankRecip inputs.add(Collections.singletonList(input)); } } + for (ItemStack input : baseRecipe.getOutputs()) { + if (baseRecipe.useOreDic()) { + List oreDictInputs = expandOreDict(input); + outputs.add(oreDictInputs); + } else { + outputs.add(Collections.singletonList(input)); + } + } } private static List expandOreDict(ItemStack itemStack) { @@ -39,9 +51,9 @@ public abstract class BaseRecipeWrapper extends BlankRecip String oreName = OreDictionary.getOreName(oreId); List ores = OreDictionary.getOres(oreName); for (ItemStack ore : ores) { - if (ore.getCount() != itemStack.stackSize) { + if (ore.getCount() != itemStack.getCount()) { ItemStack oreCopy = ore.copy(); - oreCopy.stackSize = itemStack.stackSize; + oreCopy.setCount(itemStack.getCount()); itemStackSet.add(oreCopy); } else { itemStackSet.add(ore); @@ -60,14 +72,20 @@ public abstract class BaseRecipeWrapper extends BlankRecip } @Nonnull - @Override public List> getInputs() { return inputs; } + public List getFluidInputs(){ + return new ArrayList<>(); + } + @Nonnull - @Override public List getOutputs() { - return baseRecipe.getOutputs(); + List stacks = new ArrayList<>(); + for(List stackList : outputs){ + stacks.addAll(stackList); + } + return stacks; } } diff --git a/1.11/jei/RecipeCategoryUids.java b/src/main/java/techreborn/compat/jei/RecipeCategoryUids.java similarity index 100% rename from 1.11/jei/RecipeCategoryUids.java rename to src/main/java/techreborn/compat/jei/RecipeCategoryUids.java diff --git a/1.11/jei/RecipeUtil.java b/src/main/java/techreborn/compat/jei/RecipeUtil.java similarity index 91% rename from 1.11/jei/RecipeUtil.java rename to src/main/java/techreborn/compat/jei/RecipeUtil.java index 56beca527..3ee6d3cfc 100644 --- a/1.11/jei/RecipeUtil.java +++ b/src/main/java/techreborn/compat/jei/RecipeUtil.java @@ -100,13 +100,14 @@ public class RecipeUtil { } } - if (fluidOutputSlots != null) { - List fluidOutputs = recipe.getFluidOutputs(); - for (int i = 0; i < fluidOutputs.size() && i < fluidOutputSlots.length; i++) { - int outputTank = fluidOutputSlots[i]; - guiFluidStacks.set(outputTank, fluidOutputs.get(i)); - } - } + //TODO 1.11 +// if (fluidOutputSlots != null) { +// List fluidOutputs = recipe.getFluidOutputs(); +// for (int i = 0; i < fluidOutputs.size() && i < fluidOutputSlots.length; i++) { +// int outputTank = fluidOutputSlots[i]; +// guiFluidStacks.set(outputTank, fluidOutputs.get(i)); +// } +// } } public static void setRecipeItems( @@ -134,7 +135,7 @@ public class RecipeUtil { } if (itemOutputSlots != null) { - List outputs = ingredients.getOutputs(ItemStack.class); + List> outputs = ingredients.getOutputs(ItemStack.class); for (int i = 0; i < outputs.size() && i < itemOutputSlots.length; i++) { int outputSlot = itemOutputSlots[i]; guiItemStacks.set(outputSlot, outputs.get(i)); @@ -150,7 +151,7 @@ public class RecipeUtil { } if (fluidOutputSlots != null) { - List fluidOutputs = ingredients.getOutputs(FluidStack.class); + List> fluidOutputs = ingredients.getOutputs(FluidStack.class); for (int i = 0; i < fluidOutputs.size() && i < fluidOutputSlots.length; i++) { int outputTank = fluidOutputSlots[i]; guiFluidStacks.set(outputTank, fluidOutputs.get(i)); diff --git a/1.11/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java similarity index 99% rename from 1.11/jei/TechRebornJeiPlugin.java rename to src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index cc0ce92a0..80ecbf7a3 100644 --- a/1.11/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -248,8 +248,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin { .addRecipeTransferHandler(ContainerExtractor.class, RecipeCategoryUids.EXTRACTOR, 0, 1, 2, 36); recipeTransferRegistry .addRecipeTransferHandler(ContainerCompressor.class, RecipeCategoryUids.COMPRESSOR, 0, 1, 2, 36); - - registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.pump)); + if (CompatManager.isQuantumStorageLoaded) { registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.quantumChest)); diff --git a/1.11/jei/alloySmelter/AlloySmelterRecipeCategory.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java similarity index 81% rename from 1.11/jei/alloySmelter/AlloySmelterRecipeCategory.java rename to src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java index 1d63f0085..3611ec3d7 100644 --- a/1.11/jei/alloySmelter/AlloySmelterRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java @@ -53,20 +53,6 @@ public class AlloySmelterRecipeCategory extends BlankRecipeCategory return CentrifugeRecipe.class; } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return RecipeCategoryUids.CENTRIFUGE; - } @Nonnull @Override diff --git a/1.11/jei/centrifuge/CentrifugeRecipeWrapper.java b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java similarity index 93% rename from 1.11/jei/centrifuge/CentrifugeRecipeWrapper.java rename to src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java index 2a3191f26..872d065f7 100644 --- a/1.11/jei/centrifuge/CentrifugeRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java @@ -42,10 +42,8 @@ public class CentrifugeRecipeWrapper extends BaseRecipeWrapper } @Override - public void drawAnimations( - @Nonnull - Minecraft minecraft, int recipeWidth, int recipeHeight) { - super.drawAnimations(minecraft, recipeWidth, recipeHeight); + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); progressUp.draw(minecraft, 33, 18); progressLeft.draw(minecraft, 18, 33); progressDown.draw(minecraft, 33, 48); diff --git a/1.11/jei/chemicalReactor/ChemicalReactorRecipeCategory.java b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java similarity index 79% rename from 1.11/jei/chemicalReactor/ChemicalReactorRecipeCategory.java rename to src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java index c9c092a22..eeebdb6eb 100644 --- a/1.11/jei/chemicalReactor/ChemicalReactorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java @@ -43,20 +43,6 @@ public class ChemicalReactorRecipeCategory extends BlankRecipeCategory return CompressorRecipe.class; } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return RecipeCategoryUids.COMPRESSOR; - } @Nonnull @Override diff --git a/1.11/jei/compressor/CompressorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java similarity index 88% rename from 1.11/jei/compressor/CompressorRecipeWrapper.java rename to src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java index 8c026b9f1..7b504d49f 100644 --- a/1.11/jei/compressor/CompressorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java @@ -29,10 +29,8 @@ public class CompressorRecipeWrapper extends BaseRecipeWrapper } @Override - public void drawAnimations( - @Nonnull - Minecraft minecraft, int recipeWidth, int recipeHeight) { - super.drawAnimations(minecraft, recipeWidth, recipeHeight); + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); progress.draw(minecraft, 25, 7); int x = -45; diff --git a/1.11/jei/extractor/ExtractorRecipeCategory.java b/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java similarity index 80% rename from 1.11/jei/extractor/ExtractorRecipeCategory.java rename to src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java index b4eac619b..5827f1d04 100644 --- a/1.11/jei/extractor/ExtractorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java @@ -43,19 +43,7 @@ public class ExtractorRecipeCategory extends BlankRecipeCategory { return ExtractorRecipe.class; } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return RecipeCategoryUids.EXTRACTOR; - } @Nonnull @Override diff --git a/1.11/jei/extractor/ExtractorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java similarity index 88% rename from 1.11/jei/extractor/ExtractorRecipeWrapper.java rename to src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java index 4c7dcee36..d3af5113a 100644 --- a/1.11/jei/extractor/ExtractorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java @@ -29,10 +29,8 @@ public class ExtractorRecipeWrapper extends BaseRecipeWrapper { } @Override - public void drawAnimations( - @Nonnull - Minecraft minecraft, int recipeWidth, int recipeHeight) { - super.drawAnimations(minecraft, recipeWidth, recipeHeight); + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); progress.draw(minecraft, 25, 7); int x = -45; diff --git a/1.11/jei/fusionReactor/FusionReactorRecipeCategory.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java similarity index 77% rename from 1.11/jei/fusionReactor/FusionReactorRecipeCategory.java rename to src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java index c3022babb..6548ba33d 100644 --- a/1.11/jei/fusionReactor/FusionReactorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java @@ -47,21 +47,6 @@ public class FusionReactorRecipeCategory extends BlankRecipeCategory getInputs() { - return Arrays.asList(baseRecipe.getTopInput(), baseRecipe.getBottomInput()); - } - - @Override - @Nonnull - public List getOutputs() { - return Collections.singletonList(baseRecipe.getOutput()); - } public ItemStack getTopInput() { return baseRecipe.getTopInput(); diff --git a/1.11/jei/grinder/GrinderRecipeCategory.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java similarity index 80% rename from 1.11/jei/grinder/GrinderRecipeCategory.java rename to src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java index 55ae1677f..6cef21426 100644 --- a/1.11/jei/grinder/GrinderRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java @@ -43,19 +43,6 @@ public class GrinderRecipeCategory extends BlankRecipeCategory { return GrinderRecipe.class; } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return RecipeCategoryUids.GRINDER; - } @Nonnull @Override diff --git a/1.11/jei/grinder/GrinderRecipeWrapper.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java similarity index 88% rename from 1.11/jei/grinder/GrinderRecipeWrapper.java rename to src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java index 9f70d42ec..04d5cfe6a 100644 --- a/1.11/jei/grinder/GrinderRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java @@ -29,10 +29,8 @@ public class GrinderRecipeWrapper extends BaseRecipeWrapper { } @Override - public void drawAnimations( - @Nonnull - Minecraft minecraft, int recipeWidth, int recipeHeight) { - super.drawAnimations(minecraft, recipeWidth, recipeHeight); + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); progress.draw(minecraft, 25, 7); int x = -45; diff --git a/1.11/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java similarity index 78% rename from 1.11/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java rename to src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java index 36c4e4677..8c5cbfbdf 100644 --- a/1.11/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java @@ -47,28 +47,11 @@ public class ImplosionCompressorRecipeCategory extends BlankRecipeCategory getOutputs() { - return baseRecipe.getOutputs(); - } } diff --git a/1.11/jei/scrapbox/ScrapboxRecipeCategory.java b/src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java similarity index 80% rename from 1.11/jei/scrapbox/ScrapboxRecipeCategory.java rename to src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java index 8f8832a52..c4673a99e 100644 --- a/1.11/jei/scrapbox/ScrapboxRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java @@ -43,20 +43,6 @@ public class ScrapboxRecipeCategory extends BlankRecipeCategory { return ScrapboxRecipe.class; } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return RecipeCategoryUids.SCRAPBOX; - } @Nonnull @Override diff --git a/1.11/jei/scrapbox/ScrapboxRecipeWrapper.java b/src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeWrapper.java similarity index 85% rename from 1.11/jei/scrapbox/ScrapboxRecipeWrapper.java rename to src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeWrapper.java index 017d3fc59..9b4a94d76 100644 --- a/1.11/jei/scrapbox/ScrapboxRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeWrapper.java @@ -29,10 +29,8 @@ public class ScrapboxRecipeWrapper extends BaseRecipeWrapper { } @Override - public void drawAnimations( - @Nonnull - Minecraft minecraft, int recipeWidth, int recipeHeight) { - super.drawAnimations(minecraft, recipeWidth, recipeHeight); + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); progress.draw(minecraft, 25, 7); } } diff --git a/1.11/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java similarity index 80% rename from 1.11/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java rename to src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java index c112e1e5e..f6cd4d63b 100644 --- a/1.11/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java @@ -43,20 +43,6 @@ public class VacuumFreezerRecipeCategory extends BlankRecipeCategory