Modify resource path to prevent resource pack conflicts; Fix tag(ComponentSelectorTag) effect not working.

Author: KasumiNova

src/main/java/hellfirepvp/modularmachinery/client/gui/GuiScreenBlueprint.java

@@ -68,17 +68,17 @@
  */
 public class GuiScreenBlueprint extends GuiScreen {
 
-    public static final ResourceLocation TEXTURE_BACKGROUND = new ResourceLocation(ModularMachinery.MODID, "textures/gui/guiblueprint.png");
+    public static final ResourceLocation TEXTURE_BACKGROUND = new ResourceLocation(ModularMachinery.MODID, "textures/gui/guiblueprint_large.png");
+    public static final int X_SIZE = 176;
+    public static final int Y_SIZE = 184;
+
     private static final ResourceLocation ic2TileBlock = new ResourceLocation("ic2", "te");
-    protected final int xSize = 176;
-    protected final int ySize = 184;
 
     private final DynamicMachine machine;
     private final DynamicMachineRenderContext renderContext;
-    private GuiScrollbar ingredientListScrollbar;
-
     protected int guiLeft;
     protected int guiTop;
+    private GuiScrollbar ingredientListScrollbar;
     private int frameCount = 0;
 
     public GuiScreenBlueprint(DynamicMachine machine) {
@@ -89,8 +89,8 @@ public GuiScreenBlueprint(DynamicMachine machine) {
     @Override
     public void initGui() {
         super.initGui();
-        this.guiLeft = (this.width - this.xSize) / 2;
-        this.guiTop = (this.height - this.ySize) / 2;
+        this.guiLeft = (this.width - X_SIZE) / 2;
+        this.guiTop = (this.height - Y_SIZE) / 2;
         this.ingredientListScrollbar = new GuiScrollbar().setLeft(guiLeft + 156).setTop(guiTop + 142).setHeight(34);
     }
 
@@ -106,9 +106,9 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
 
         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
         this.mc.getTextureManager().bindTexture(TEXTURE_BACKGROUND);
-        int x = (this.width - this.xSize) / 2;
-        int z = (this.height - this.ySize) / 2;
-        this.drawTexturedModalRect(x, z, 0, 0, this.xSize, this.ySize);
+        int x = (this.width - X_SIZE) / 2;
+        int z = (this.height - Y_SIZE) / 2;
+        this.drawTexturedModalRect(x, z, 0, 0, X_SIZE, Y_SIZE);
 
         if (renderContext.doesRenderIn3D()) {
             if (Mouse.isButtonDown(0) && frameCount > 20) {

src/main/java/hellfirepvp/modularmachinery/common/crafting/helper/RecipeCraftingContext.java

@@ -108,7 +108,7 @@ public Iterable<ProcessingComponent<?>> getComponentsFor(ComponentRequirement<?,
                 continue;
             }
 
-            if (tag != null && typeComponent.tag.equals(requirement.tag)) {
+            if (tag != null && tag.equals(requirement.tag)) {
                 validComponents.addFirst(typeComponent);
             } else {
                 validComponents.addLast(typeComponent);

src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementCatalyst.java

@@ -72,6 +72,7 @@ public RequirementCatalyst deepCopy() {
                 catalyst = new RequirementCatalyst(this.required.copy());
                 break;
         }
+        catalyst.setTag(getTag());
         catalyst.triggerTime = this.triggerTime;
         catalyst.triggerRepeatable = this.triggerRepeatable;
         catalyst.chance = this.chance;
@@ -112,7 +113,7 @@ public RequirementCatalyst deepCopyModified(List<RecipeModifier> modifiers) {
                 catalyst = new RequirementCatalyst(inReq);
                 break;
         }
-
+        catalyst.setTag(getTag());
         catalyst.chance = RecipeModifier.applyModifiers(modifiers, this, this.chance, true);
         catalyst.parallelizeUnaffected = this.parallelizeUnaffected;
         if (this.tag != null) {

src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementEnergy.java

@@ -57,6 +57,7 @@ public int getSortingWeight() {
     @Override
     public ComponentRequirement<Long, RequirementTypeEnergy> deepCopy() {
         RequirementEnergy energy = new RequirementEnergy(this.actionType, this.requirementPerTick);
+        energy.setTag(getTag());
         energy.activeIO = this.activeIO;
         energy.parallelizeUnaffected = this.parallelizeUnaffected;
         return energy;
@@ -66,6 +67,7 @@ public ComponentRequirement<Long, RequirementTypeEnergy> deepCopy() {
     public ComponentRequirement<Long, RequirementTypeEnergy> deepCopyModified(List<RecipeModifier> modifiers) {
         long requirement = Math.round((double) RecipeModifier.applyModifiers(modifiers, this, this.requirementPerTick, false));
         RequirementEnergy energy = new RequirementEnergy(this.actionType, requirement);
+        energy.setTag(getTag());
         energy.activeIO = this.activeIO;
         energy.parallelizeUnaffected = this.parallelizeUnaffected;
         return energy;

src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementFluid.java

@@ -76,6 +76,7 @@ public int getSortingWeight() {
     @Override
     public ComponentRequirement<HybridFluid, RequirementTypeFluid> deepCopy() {
         RequirementFluid fluid = new RequirementFluid(this.requirementType, this.actionType, this.required.copy());
+        fluid.setTag(getTag());
         fluid.triggerTime = this.triggerTime;
         fluid.triggerRepeatable = this.triggerRepeatable;
         fluid.chance = this.chance;
@@ -90,7 +91,7 @@ public ComponentRequirement<HybridFluid, RequirementTypeFluid> deepCopyModified(
         HybridFluid hybrid = this.required.copy();
         hybrid.setAmount(Math.round(RecipeModifier.applyModifiers(modifiers, this, hybrid.getAmount(), false)));
         RequirementFluid fluid = new RequirementFluid(this.requirementType, this.actionType, hybrid);
-
+        fluid.setTag(getTag());
         fluid.chance = RecipeModifier.applyModifiers(modifiers, this, this.chance, true);
         fluid.tagMatch = getTagMatch();
         fluid.tagDisplay = getTagDisplay();

src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementFluidPerTick.java

@@ -128,6 +128,7 @@ public CraftCheck doFluidIO(ProcessingComponent<?> component, RecipeCraftingCont
     @Override
     public RequirementFluidPerTick deepCopy() {
         RequirementFluidPerTick fluid = new RequirementFluidPerTick(actionType, required.asFluidStack());
+        fluid.setTag(getTag());
         fluid.tagMatch = tagMatch;
         fluid.tagDisplay = tagDisplay;
         return fluid;
@@ -138,7 +139,7 @@ public RequirementFluidPerTick deepCopyModified(List<RecipeModifier> modifiers)
         HybridFluid hybrid = this.required.copy();
         hybrid.setAmount(Math.round(RecipeModifier.applyModifiers(modifiers, this, hybrid.getAmount(), false)));
         RequirementFluidPerTick fluid = new RequirementFluidPerTick(actionType, hybrid.asFluidStack());
-
+        fluid.setTag(getTag());
         fluid.tagMatch = tagMatch;
         fluid.tagDisplay = tagDisplay;
         fluid.parallelizeUnaffected = parallelizeUnaffected;

src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementIngredientArray.java

@@ -148,6 +148,7 @@ public CraftCheck canStartCrafting(ProcessingComponent<?> component, RecipeCraft
     @Override
     public ComponentRequirement<ItemStack, RequirementTypeIngredientArray> deepCopy() {
         RequirementIngredientArray copied = new RequirementIngredientArray(this.itemArray);
+        copied.setTag(getTag());
         copied.parallelizeUnaffected = this.parallelizeUnaffected;
         copied.triggerTime = this.triggerTime;
         copied.triggerRepeatable = this.triggerRepeatable;
@@ -174,6 +175,7 @@ public ComponentRequirement<ItemStack, RequirementTypeIngredientArray> deepCopyM
             item.chance = RecipeModifier.applyModifiers(modifiers, this, item.chance, true);
         });
         RequirementIngredientArray copied = new RequirementIngredientArray(newArray);
+        copied.setTag(getTag());
         copied.parallelizeUnaffected = this.parallelizeUnaffected;
         return copied;
     }

src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementInterfaceNumInput.java

@@ -100,7 +100,9 @@ public CraftCheck canStartCrafting(ProcessingComponent<?> component, RecipeCraft
 
     @Override
     public ComponentRequirement<Float, RequirementTypeInterfaceNumInput> deepCopy() {
-        return new RequirementInterfaceNumInput(type, minValue, maxValue);
+        RequirementInterfaceNumInput copied = new RequirementInterfaceNumInput(type, minValue, maxValue);
+        copied.setTag(getTag());
+        return copied;
     }
 
     @Override

src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementItem.java

@@ -115,6 +115,8 @@ public ComponentRequirement<ItemStack, RequirementTypeItem> deepCopy() {
                 item = new RequirementItem(this.actionType, this.required.copy());
                 break;
         }
+        // ComponentSelectorTag
+        item.setTag(getTag());
         item.triggerTime = this.triggerTime;
         item.triggerRepeatable = this.triggerRepeatable;
         item.chance = this.chance;

src/main/java/hellfirepvp/modularmachinery/common/integration/preview/CategoryStructurePreview.java

@@ -32,7 +32,7 @@ public class CategoryStructurePreview implements IRecipeCategory<StructurePrevie
     private final String trTitle;
 
     public CategoryStructurePreview() {
-        ResourceLocation location = new ResourceLocation(ModularMachinery.MODID, "textures/gui/guiblueprint_jei.png");
+        ResourceLocation location = new ResourceLocation(ModularMachinery.MODID, "textures/gui/guiblueprint_jei_large.png");
         this.background = ModIntegrationJEI.jeiHelpers.getGuiHelper()
                 .drawableBuilder(location, 4, 4, 168, 180)
                 .addPadding(6, 0, 0, 0)