diff --git a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java index 994ff13e1..b504eed0b 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java @@ -50,7 +50,7 @@ public class GuiAlloySmelter extends GuiBase { this.drawSlot(126, 47, layer); this.drawOutputSlot(80, 47, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java index 32cb51c14..d533f8f2d 100644 --- a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -52,7 +52,7 @@ public class GuiAssemblingMachine extends GuiBase { this.drawOutputSlot(101, 45, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 52d9021b5..e73e82772 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -73,7 +73,7 @@ public class GuiBlastFurnace extends GuiBase { this.drawSlot(50, 47, layer); this.drawOutputSlotBar(92, 36, 2, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiCentrifuge.java b/src/main/java/techreborn/client/gui/GuiCentrifuge.java index 6502c8ea1..59daa1edb 100644 --- a/src/main/java/techreborn/client/gui/GuiCentrifuge.java +++ b/src/main/java/techreborn/client/gui/GuiCentrifuge.java @@ -53,7 +53,7 @@ public class GuiCentrifuge extends GuiBase { this.drawSlot(120, 44, layer); this.drawSlot(101, 63, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java index 367af47e8..17ceb2837 100644 --- a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java +++ b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java @@ -49,7 +49,7 @@ public class GuiChemicalReactor extends GuiBase { this.drawSlot(126, 47, layer); this.drawOutputSlot(80, 47, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiCompressor.java b/src/main/java/techreborn/client/gui/GuiCompressor.java index 82071d2ef..1370998e1 100644 --- a/src/main/java/techreborn/client/gui/GuiCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiCompressor.java @@ -48,7 +48,7 @@ public class GuiCompressor extends GuiBase { this.drawSlot(55, 45, layer); this.drawOutputSlot(101, 45, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java index 7a42d9a18..0472359ce 100644 --- a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java @@ -47,7 +47,7 @@ public class GuiDieselGenerator extends GuiBase { final GuiBase.Layer layer = GuiBase.Layer.BACKGROUND; drawSlot(25, 35, layer); drawSlot(25, 55, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index 2f7b9258f..8129a96b4 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -72,7 +72,7 @@ public class GuiDistillationTower extends GuiBase { // Four output slots this.drawOutputSlotBar(78, 36, 4, layer); // JEI Button - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java index faf77b2c6..c869d78ba 100644 --- a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java @@ -48,7 +48,7 @@ public class GuiElectricFurnace extends GuiBase { drawSlot(55, 45, layer); drawOutputSlot(101, 45, layer); - builder.drawJEIButton(this, 150, 4, layer); + builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiExtractor.java b/src/main/java/techreborn/client/gui/GuiExtractor.java index c7c16caad..ff49aa6a5 100644 --- a/src/main/java/techreborn/client/gui/GuiExtractor.java +++ b/src/main/java/techreborn/client/gui/GuiExtractor.java @@ -48,7 +48,7 @@ public class GuiExtractor extends GuiBase { this.drawSlot(55, 45, layer); this.drawOutputSlot(101, 45, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index bec962e42..d80535467 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -89,7 +89,7 @@ public class GuiFluidReplicator extends GuiBase { // Liquid output slot drawSlot(124, 55, layer); // JEI button - builder.drawJEIButton(this, 150, 4, layer); + builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 792a43ce1..9a454c2bf 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -72,7 +72,7 @@ public class GuiFusionReactor extends GuiBase { this.drawSlot(126, 47, layer); this.drawOutputSlot(80, 47, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } diff --git a/src/main/java/techreborn/client/gui/GuiGasTurbine.java b/src/main/java/techreborn/client/gui/GuiGasTurbine.java index 905760513..85bb34688 100644 --- a/src/main/java/techreborn/client/gui/GuiGasTurbine.java +++ b/src/main/java/techreborn/client/gui/GuiGasTurbine.java @@ -44,7 +44,7 @@ public class GuiGasTurbine extends GuiBase { final GuiBase.Layer layer = GuiBase.Layer.BACKGROUND; drawSlot(25, 35, layer); drawSlot(25, 55, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } diff --git a/src/main/java/techreborn/client/gui/GuiGenerator.java b/src/main/java/techreborn/client/gui/GuiGenerator.java index 5cd19ac2d..07ad42c9a 100644 --- a/src/main/java/techreborn/client/gui/GuiGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiGenerator.java @@ -46,7 +46,7 @@ public class GuiGenerator extends GuiBase { this.drawSlot(80, 54, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiGrinder.java b/src/main/java/techreborn/client/gui/GuiGrinder.java index 516c6c472..a720549a0 100644 --- a/src/main/java/techreborn/client/gui/GuiGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiGrinder.java @@ -48,7 +48,7 @@ public class GuiGrinder extends GuiBase { this.drawSlot(55, 45, layer); this.drawOutputSlot(101, 45, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 97a2ff601..75e7940a6 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -75,7 +75,7 @@ public class GuiImplosionCompressor extends GuiBase { builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); } - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java index 77d21882b..f39ed9782 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java @@ -50,7 +50,7 @@ public class GuiIndustrialElectrolyzer extends GuiBase { this.drawSlot(81, 72, layer); //Output slots this.drawOutputSlotBar(50, 23, 4, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index 886386105..7ce597fd8 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -77,7 +77,7 @@ public class GuiIndustrialGrinder extends GuiBase { this.drawSlot(126, 54, layer); this.drawSlot(126, 72, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 5d7191ec7..506d73673 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -76,7 +76,7 @@ public class GuiIndustrialSawmill extends GuiBase { this.drawSlot(126, 43, layer); this.drawSlot(126, 61, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java b/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java index c76be4975..41c49fe56 100644 --- a/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java @@ -56,7 +56,7 @@ public class GuiPlasmaGenerator extends GuiBase { final GuiBase.Layer layer = GuiBase.Layer.BACKGROUND; drawSlot(25, 35, layer); drawSlot(25, 55, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } diff --git a/src/main/java/techreborn/client/gui/GuiRollingMachine.java b/src/main/java/techreborn/client/gui/GuiRollingMachine.java index 1b161991d..616e189f4 100644 --- a/src/main/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiRollingMachine.java @@ -55,7 +55,7 @@ public class GuiRollingMachine extends GuiBase { this.drawSlot(8, 70, layer); this.drawOutputSlot(124, gridYPos + 18, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); this.builder.drawLockButton(this, 130, 4, mouseX, mouseY, layer,rollingMachine.locked); } diff --git a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java index 1f6b8be72..0315dcab2 100644 --- a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java +++ b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java @@ -50,7 +50,7 @@ public class GuiScrapboxinator extends GuiBase { // Output slot this.drawOutputSlot(101, 45, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java index 09a38cfc4..eca5ed3fd 100644 --- a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -44,7 +44,7 @@ public class GuiSemifluidGenerator extends GuiBase { final GuiBase.Layer layer = GuiBase.Layer.BACKGROUND; drawSlot(25, 35, layer); drawSlot(25, 55, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } diff --git a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java index 87986061f..1cb7506fb 100644 --- a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java @@ -44,7 +44,7 @@ public class GuiThermalGenerator extends GuiBase { final GuiBase.Layer layer = GuiBase.Layer.BACKGROUND; drawSlot(25, 35, layer); drawSlot(25, 55, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index 854cbbd98..6ba592452 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -69,7 +69,7 @@ public class GuiVacuumFreezer extends GuiBase { // Output slot this.drawOutputSlot(101, 45, layer); - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 158, 5, layer); } @Override diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index 50430eead..43bc5a8e7 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -321,31 +321,31 @@ public class TechRebornJeiPlugin implements IModPlugin { } //NEW ONES - addRecipeClickArea(GuiCentrifuge.class, 150, 4, 20, 12, RecipeCategoryUids.CENTRIFUGE); - addRecipeClickArea(GuiElectricFurnace.class, 150, 4, 20, 12, VanillaRecipeCategoryUid.SMELTING); - addRecipeClickArea(GuiGenerator.class, 150, 4, 20, 12, VanillaRecipeCategoryUid.FUEL); - addRecipeClickArea(GuiExtractor.class, 150, 4, 20, 12, RecipeCategoryUids.EXTRACTOR); - addRecipeClickArea(GuiCompressor.class, 150, 4, 20, 12, RecipeCategoryUids.COMPRESSOR); - addRecipeClickArea(GuiGrinder.class, 150, 4, 20, 12, RecipeCategoryUids.GRINDER); - addRecipeClickArea(GuiVacuumFreezer.class, 150, 4, 20, 12, RecipeCategoryUids.VACUUM_FREEZER); - addRecipeClickArea(GuiBlastFurnace.class, 150, 4, 20, 12, RecipeCategoryUids.BLAST_FURNACE); - addRecipeClickArea(GuiChemicalReactor.class, 150, 4, 20, 12, RecipeCategoryUids.CHEMICAL_REACTOR); - addRecipeClickArea(GuiImplosionCompressor.class, 150, 4, 20, 12, RecipeCategoryUids.IMPLOSION_COMPRESSOR); - addRecipeClickArea(GuiIndustrialGrinder.class, 150, 4, 20, 12, RecipeCategoryUids.INDUSTRIAL_GRINDER); - addRecipeClickArea(GuiIndustrialSawmill.class, 150, 4, 20, 15, RecipeCategoryUids.INDUSTRIAL_SAWMILL); - addRecipeClickArea(GuiIndustrialElectrolyzer.class, 150, 4, 20, 12, RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER); - addRecipeClickArea(GuiSemifluidGenerator.class, 150, 4, 18, 18, EFluidGenerator.SEMIFLUID.getRecipeID()); - addRecipeClickArea(GuiDieselGenerator.class, 150, 4, 18, 18, EFluidGenerator.DIESEL.getRecipeID()); - addRecipeClickArea(GuiGasTurbine.class, 150, 4, 18, 18, EFluidGenerator.GAS.getRecipeID()); - addRecipeClickArea(GuiThermalGenerator.class, 150, 4, 18, 18, EFluidGenerator.THERMAL.getRecipeID()); - addRecipeClickArea(GuiAlloySmelter.class, 150, 4, 18, 18, RecipeCategoryUids.ALLOY_SMELTER); - addRecipeClickArea(GuiPlasmaGenerator.class, 150, 4, 18, 18, EFluidGenerator.PLASMA.getRecipeID()); - addRecipeClickArea(GuiDistillationTower.class, 150, 4, 18, 18, RecipeCategoryUids.DISTILLATION_TOWER); - addRecipeClickArea(GuiScrapboxinator.class, 150, 4, 18, 18, RecipeCategoryUids.SCRAPBOX); - addRecipeClickArea(GuiFusionReactor.class, 150, 4, 18, 18, RecipeCategoryUids.FUSION_REACTOR); - addRecipeClickArea(GuiRollingMachine.class, 150, 4, 20, 12, RecipeCategoryUids.ROLLING_MACHINE); - addRecipeClickArea(GuiFluidReplicator.class, 150, 4, 20, 12, RecipeCategoryUids.FLUID_REPLICATOR); - addRecipeClickArea(GuiAssemblingMachine.class, 150, 4, 20, 12, RecipeCategoryUids.ASSEMBLING_MACHINE); + addRecipeClickArea(GuiCentrifuge.class, 158, 4, 12, 12, RecipeCategoryUids.CENTRIFUGE); + addRecipeClickArea(GuiElectricFurnace.class, 158, 4, 12, 12, VanillaRecipeCategoryUid.SMELTING); + addRecipeClickArea(GuiGenerator.class, 158, 4, 12, 12, VanillaRecipeCategoryUid.FUEL); + addRecipeClickArea(GuiExtractor.class, 158, 4, 12, 12, RecipeCategoryUids.EXTRACTOR); + addRecipeClickArea(GuiCompressor.class, 158, 4, 12, 12, RecipeCategoryUids.COMPRESSOR); + addRecipeClickArea(GuiGrinder.class, 158, 4, 12, 12, RecipeCategoryUids.GRINDER); + addRecipeClickArea(GuiVacuumFreezer.class, 158, 4, 12, 12, RecipeCategoryUids.VACUUM_FREEZER); + addRecipeClickArea(GuiBlastFurnace.class, 158, 4, 12, 12, RecipeCategoryUids.BLAST_FURNACE); + addRecipeClickArea(GuiChemicalReactor.class, 158, 4, 12, 12, RecipeCategoryUids.CHEMICAL_REACTOR); + addRecipeClickArea(GuiImplosionCompressor.class, 158, 4, 12, 12, RecipeCategoryUids.IMPLOSION_COMPRESSOR); + addRecipeClickArea(GuiIndustrialGrinder.class, 158, 4, 12, 12, RecipeCategoryUids.INDUSTRIAL_GRINDER); + addRecipeClickArea(GuiIndustrialSawmill.class, 158, 4, 20, 15, RecipeCategoryUids.INDUSTRIAL_SAWMILL); + addRecipeClickArea(GuiIndustrialElectrolyzer.class, 158, 4, 12, 12, RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER); + addRecipeClickArea(GuiSemifluidGenerator.class, 158, 4, 12, 12, EFluidGenerator.SEMIFLUID.getRecipeID()); + addRecipeClickArea(GuiDieselGenerator.class, 158, 4, 12, 12, EFluidGenerator.DIESEL.getRecipeID()); + addRecipeClickArea(GuiGasTurbine.class, 158, 4, 12, 12, EFluidGenerator.GAS.getRecipeID()); + addRecipeClickArea(GuiThermalGenerator.class, 158, 4, 12, 12, EFluidGenerator.THERMAL.getRecipeID()); + addRecipeClickArea(GuiAlloySmelter.class, 158, 4, 12, 12, RecipeCategoryUids.ALLOY_SMELTER); + addRecipeClickArea(GuiPlasmaGenerator.class, 158, 4, 12, 12, EFluidGenerator.PLASMA.getRecipeID()); + addRecipeClickArea(GuiDistillationTower.class, 158, 4, 12, 12, RecipeCategoryUids.DISTILLATION_TOWER); + addRecipeClickArea(GuiScrapboxinator.class, 158, 4, 12, 12, RecipeCategoryUids.SCRAPBOX); + addRecipeClickArea(GuiFusionReactor.class, 158, 4, 12, 12, RecipeCategoryUids.FUSION_REACTOR); + addRecipeClickArea(GuiRollingMachine.class, 158, 4, 12, 12, RecipeCategoryUids.ROLLING_MACHINE); + addRecipeClickArea(GuiFluidReplicator.class, 158, 4, 12, 12, RecipeCategoryUids.FLUID_REPLICATOR); + addRecipeClickArea(GuiAssemblingMachine.class, 158, 4, 12, 12, RecipeCategoryUids.ASSEMBLING_MACHINE); //OLD ONES addRecipeClickArea(GuiAlloyFurnace.class, 80, 35, 26, 20, RecipeCategoryUids.ALLOY_SMELTER,