From d41da2457f836d722979080dc205ebe9f946843d Mon Sep 17 00:00:00 2001 From: drcrazy Date: Sun, 30 Dec 2018 01:19:23 +0300 Subject: [PATCH 1/7] Lock button works again --- src/main/java/techreborn/client/gui/GuiAutoCrafting.java | 2 +- src/main/java/techreborn/client/gui/GuiRollingMachine.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java index d467ae92f..8d803d276 100644 --- a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java +++ b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java @@ -110,7 +110,7 @@ public class GuiAutoCrafting extends GuiBase { @Override protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { - if (isPointInRect(145 + getGuiLeft(), 4 + getGuiTop(), 20, 12, mouseX, mouseY)) { + if (isPointInRect(145, 4, 20, 12, mouseX, mouseY)) { NetworkManager.sendToServer(new PacketAutoCraftingTableLock(tileAutoCraftingTable, !tileAutoCraftingTable.locked)); return; } diff --git a/src/main/java/techreborn/client/gui/GuiRollingMachine.java b/src/main/java/techreborn/client/gui/GuiRollingMachine.java index 81f26515e..8f8bc3b46 100644 --- a/src/main/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiRollingMachine.java @@ -76,7 +76,7 @@ public class GuiRollingMachine extends GuiBase { @Override protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { - if(isPointInRect(130 + getGuiLeft(), 4 + getGuiTop(), 20, 12, mouseX, mouseY)){ + if(isPointInRect(130, 4, 20, 12, mouseX, mouseY)){ NetworkManager.sendToServer(new PacketRollingMachineLock(rollingMachine, !rollingMachine.locked)); return; } From 03fdbe49a6fd03bf39d5dec3bb5393c3f4d4fec6 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Sun, 30 Dec 2018 02:48:35 +0300 Subject: [PATCH 2/7] Power bar tooltip should be on top of hologram button --- src/main/java/techreborn/client/gui/GuiBlastFurnace.java | 2 +- src/main/java/techreborn/client/gui/GuiDistillationTower.java | 3 ++- src/main/java/techreborn/client/gui/GuiFluidReplicator.java | 2 +- .../java/techreborn/client/gui/GuiImplosionCompressor.java | 3 ++- src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java | 2 +- src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java | 2 +- src/main/java/techreborn/client/gui/GuiVacuumFreezer.java | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index c99760eff..0d935512f 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -86,7 +86,7 @@ public class GuiBlastFurnace extends GuiBase { builder.drawBigHeatBar(this, 31, 71, tile.getCachedHeat(), 3230, layer); if (hasMultiBlock) { - addHologramButton(6, 4, 212, layer); + addHologramButton(4, 4, 212, layer); builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); } else { builder.drawMultiblockMissingBar(this, layer); diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index 4a33335b3..d36ff45c0 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -81,7 +81,6 @@ public class GuiDistillationTower extends GuiBase { final GuiBase.Layer layer = Layer.FOREGROUND; builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 55, 40, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); - builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMutliBlock()) { addHologramButton(6, 4, 212, layer); builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); @@ -90,6 +89,8 @@ public class GuiDistillationTower extends GuiBase { addHologramButton(76, 56, 212, layer); builder.drawHologramButton(this, 76, 56, mouseX, mouseY, layer); } + builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); + } public void addHologramButton(int x, int y, int id, Layer layer) { diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index 82b8b16fe..04bd554ca 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -99,7 +99,6 @@ public class GuiFluidReplicator extends GuiBase { builder.drawTank(this, 99, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); - builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMultiBlock()) { addHologramButton(6, 4, 212, layer); builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); @@ -108,6 +107,7 @@ public class GuiFluidReplicator extends GuiBase { addHologramButton(76, 56, 212, layer); builder.drawHologramButton(this, 76, 56, mouseX, mouseY, layer); } + builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } // GuiScreen diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index a4929af18..0e616a052 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -84,7 +84,6 @@ public class GuiImplosionCompressor extends GuiBase { final GuiBase.Layer layer = Layer.FOREGROUND; builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 71, 40, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); - builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMutliBlock()) { addHologramButton(6, 4, 212, layer); } else { @@ -92,6 +91,8 @@ public class GuiImplosionCompressor extends GuiBase { addHologramButton(76, 56, 212, layer); builder.drawHologramButton(this, 76, 56, mouseX, mouseY, layer); } + builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); + } public void addHologramButton(int x, int y, int id, Layer layer) { diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index 780c52483..be93ecd7e 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -87,7 +87,6 @@ public class GuiIndustrialGrinder extends GuiBase { builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 47, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawTank(this, 53, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); - builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMutliBlock()) { addHologramButton(6, 4, 212, layer); builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); @@ -96,6 +95,7 @@ public class GuiIndustrialGrinder extends GuiBase { addHologramButton(76, 56, 212, layer); builder.drawHologramButton(this, 76, 56, mouseX, mouseY, layer); } + builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } public void addHologramButton(int x, int y, int id, Layer layer) { diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index b06750fce..07d7143fa 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -86,7 +86,6 @@ public class GuiIndustrialSawmill extends GuiBase { builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 47, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawTank(this, 53, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); - builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMutliBlock()) { addHologramButton(6, 4, 212, layer); builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); @@ -95,6 +94,7 @@ public class GuiIndustrialSawmill extends GuiBase { addHologramButton(76, 56, 212, layer); builder.drawHologramButton(this, 76, 56, mouseX, mouseY, layer); } + builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } public void addHologramButton(int x, int y, int id, Layer layer) { diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index d86ebfc73..b0eb0c3b4 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -78,7 +78,6 @@ public class GuiVacuumFreezer extends GuiBase { final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); - builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); if (tile.getMultiBlock()) { addHologramButton(6, 4, 212, layer); builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); @@ -87,6 +86,7 @@ public class GuiVacuumFreezer extends GuiBase { addHologramButton(76, 56, 212, layer); builder.drawHologramButton(this, 76, 56, mouseX, mouseY, layer); } + builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } public void addHologramButton(int x, int y, int id, Layer layer) { From 3df454789f644ce1012f0ee8e85cfee36e9aa0f7 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Sun, 30 Dec 2018 22:31:52 +0300 Subject: [PATCH 3/7] Draw hologram button on background --- src/main/java/techreborn/client/gui/GuiBlastFurnace.java | 4 +++- src/main/java/techreborn/client/gui/GuiFluidReplicator.java | 4 +++- src/main/java/techreborn/client/gui/GuiFusionReactor.java | 4 +++- .../java/techreborn/client/gui/GuiIndustrialGrinder.java | 6 ++++-- .../java/techreborn/client/gui/GuiIndustrialSawmill.java | 4 +++- src/main/java/techreborn/client/gui/GuiVacuumFreezer.java | 4 +++- .../techreborn/tiles/multiblock/TileIndustrialGrinder.java | 6 +++--- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 0d935512f..5858d7d8a 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -74,6 +74,9 @@ public class GuiBlastFurnace extends GuiBase { drawOutputSlotBar(92, 36, 2, layer); builder.drawJEIButton(this, 158, 5, layer); + if (hasMultiBlock) { + builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); + } } @Override @@ -87,7 +90,6 @@ public class GuiBlastFurnace extends GuiBase { builder.drawBigHeatBar(this, 31, 71, tile.getCachedHeat(), 3230, layer); if (hasMultiBlock) { addHologramButton(4, 4, 212, layer); - builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); } else { builder.drawMultiblockMissingBar(this, layer); addHologramButton(76, 56, 212, layer); diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index 04bd554ca..82ade2a27 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -90,6 +90,9 @@ public class GuiFluidReplicator extends GuiBase { drawSlot(124, 55, layer); // JEI button builder.drawJEIButton(this, 158, 5, layer); + if (tile.getMultiBlock()) { + builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); + } } @Override @@ -101,7 +104,6 @@ public class GuiFluidReplicator extends GuiBase { builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); if (tile.getMultiBlock()) { addHologramButton(6, 4, 212, layer); - builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); } else { builder.drawMultiblockMissingBar(this, layer); addHologramButton(76, 56, 212, layer); diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 9df71b97a..7928557b9 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -73,6 +73,9 @@ public class GuiFusionReactor extends GuiBase { drawOutputSlot(80, 47, layer); builder.drawJEIButton(this, 158, 5, layer); + if (tile.getCoilStatus() > 0) { + builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); + } } @@ -85,7 +88,6 @@ public class GuiFusionReactor extends GuiBase { builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 51, mouseX, mouseY, GuiBuilder.ProgressDirection.LEFT, layer); if (tile.getCoilStatus() > 0) { addHologramButton(6, 4, 212, layer); - builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); drawCentredString(tile.getStateString(), 20, Color.BLUE.darker().getRGB(), layer); if(tile.state == 2){ drawCentredString( PowerSystem.getLocaliszedPowerFormatted((int) tile.getPowerChange()) + "/t", 30, Color.GREEN.darker().getRGB(), layer); diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index be93ecd7e..a885d9502 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -78,6 +78,9 @@ public class GuiIndustrialGrinder extends GuiBase { drawSlot(126, 72, layer); builder.drawJEIButton(this, 158, 5, layer); + if (tile.getMultiBlock()) { + builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); + } } @Override @@ -87,9 +90,8 @@ public class GuiIndustrialGrinder extends GuiBase { builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 105, 47, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawTank(this, 53, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); - if (tile.getMutliBlock()) { + if (tile.getMultiBlock()) { addHologramButton(6, 4, 212, layer); - builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); } else { builder.drawMultiblockMissingBar(this, layer); addHologramButton(76, 56, 212, layer); diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 07d7143fa..6963d3c88 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -77,6 +77,9 @@ public class GuiIndustrialSawmill extends GuiBase { drawSlot(126, 61, layer); builder.drawJEIButton(this, 158, 5, layer); + if (tile.getMutliBlock()) { + builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); + } } @Override @@ -88,7 +91,6 @@ public class GuiIndustrialSawmill extends GuiBase { builder.drawTank(this, 53, 25, mouseX, mouseY, tile.tank.getFluid(), tile.tank.getCapacity(), tile.tank.isEmpty(), layer); if (tile.getMutliBlock()) { addHologramButton(6, 4, 212, layer); - builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); } else { builder.drawMultiblockMissingBar(this, layer); addHologramButton(76, 56, 212, layer); diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index b0eb0c3b4..a30c6836f 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -70,6 +70,9 @@ public class GuiVacuumFreezer extends GuiBase { drawOutputSlot(101, 45, layer); builder.drawJEIButton(this, 158, 5, layer); + if (tile.getMultiBlock()) { + builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); + } } @Override @@ -80,7 +83,6 @@ public class GuiVacuumFreezer extends GuiBase { builder.drawProgressBar(this, tile.getProgressScaled(100), 100, 76, 48, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); if (tile.getMultiBlock()) { addHologramButton(6, 4, 212, layer); - builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); } else { builder.drawMultiblockMissingBar(this, layer); addHologramButton(76, 56, 212, layer); diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 6a5e75074..142ce73b0 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -76,7 +76,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai this.ticksSinceLastChange = 0; } - public boolean getMutliBlock() { + public boolean getMultiBlock() { if (multiblockChecker == null) { return false; } @@ -108,7 +108,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai ticksSinceLastChange = 0; } - if (!world.isRemote && getMutliBlock()) { + if (!world.isRemote && getMultiBlock()) { super.update(); } @@ -155,7 +155,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai // ITileRecipeHandler @Override public boolean canCraft(final TileEntity tile, final IndustrialGrinderRecipe recipe) { - if (!getMutliBlock()) { + if (!getMultiBlock()) { return false; } final FluidStack recipeFluid = recipe.fluidStack; From d67f67014145b3d52cb091b0ca92507604cda016 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Sun, 30 Dec 2018 22:50:03 +0300 Subject: [PATCH 4/7] addHologramButton is now in RC --- .../java/techreborn/client/gui/GuiBlastFurnace.java | 11 ----------- .../techreborn/client/gui/GuiDistillationTower.java | 13 +------------ .../techreborn/client/gui/GuiFluidReplicator.java | 11 ----------- .../techreborn/client/gui/GuiFusionReactor.java | 13 +------------ .../client/gui/GuiImplosionCompressor.java | 11 ----------- .../techreborn/client/gui/GuiIndustrialGrinder.java | 11 ----------- .../techreborn/client/gui/GuiIndustrialSawmill.java | 11 ----------- .../techreborn/client/gui/GuiVacuumFreezer.java | 11 ----------- 8 files changed, 2 insertions(+), 90 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 5858d7d8a..332d74c5f 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -36,7 +36,6 @@ import reborncore.client.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; -import reborncore.client.gui.builder.widget.GuiButtonHologram; import techreborn.init.ModBlocks; import techreborn.tiles.multiblock.TileIndustrialBlastFurnace; @@ -98,16 +97,6 @@ public class GuiBlastFurnace extends GuiBase { builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } - public void addHologramButton(int x, int y, int id, Layer layer) { - int factorX = 0; - int factorY = 0; - if (layer == Layer.BACKGROUND) { - factorX = guiLeft; - factorY = guiTop; - } - buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); - } - @Override public void actionPerformed(final GuiButton button) throws IOException { super.actionPerformed(button); diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index d36ff45c0..2e8b9d682 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -37,7 +37,6 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.blocks.BlockMachineCasing; -import reborncore.client.gui.builder.widget.GuiButtonHologram; import techreborn.init.ModBlocks; import techreborn.tiles.multiblock.TileDistillationTower; @@ -92,17 +91,7 @@ public class GuiDistillationTower extends GuiBase { builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } - - public void addHologramButton(int x, int y, int id, Layer layer) { - int factorX = 0; - int factorY = 0; - if (layer == Layer.BACKGROUND) { - factorX = guiLeft; - factorY = guiTop; - } - buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); - } - + @Override public void actionPerformed(final GuiButton button) throws IOException { super.actionPerformed(button); diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index 82ade2a27..58c480b10 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -36,7 +36,6 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.blocks.BlockMachineCasing; -import reborncore.client.gui.builder.widget.GuiButtonHologram; import techreborn.init.ModBlocks; import techreborn.tiles.multiblock.TileFluidReplicator; @@ -55,16 +54,6 @@ public class GuiFluidReplicator extends GuiBase { this.tile = tile; } - public void addHologramButton(int x, int y, int id, Layer layer) { - int factorX = 0; - int factorY = 0; - if (layer == Layer.BACKGROUND) { - factorX = guiLeft; - factorY = guiTop; - } - buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); - } - public void addComponent(final int x, final int y, final int z, final IBlockState blockState, final Multiblock multiblock) { multiblock.addComponent(new BlockPos(x, y, z), blockState); } diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 7928557b9..ea9b5dbd3 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -38,7 +38,6 @@ import reborncore.client.multiblock.MultiblockSet; import reborncore.common.network.NetworkManager; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.Torus; -import reborncore.client.gui.builder.widget.GuiButtonHologram; import reborncore.client.gui.builder.widget.GuiButtonUpDown; import techreborn.init.ModBlocks; import techreborn.packets.PacketFusionControlSize; @@ -118,17 +117,7 @@ public class GuiFusionReactor extends GuiBase { builder.drawMultiEnergyBar(this, 9, 19, (int) this.tile.getEnergy(), (int) this.tile.getMaxPower(), mouseX, mouseY, 0, layer); } - - public void addHologramButton(int x, int y, int id, Layer layer) { - int factorX = 0; - int factorY = 0; - if (layer == Layer.BACKGROUND) { - factorX = guiLeft; - factorY = guiTop; - } - buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); - } - + @Override public void actionPerformed(final GuiButton button) throws IOException { super.actionPerformed(button); diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 0e616a052..1c9bac267 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -36,7 +36,6 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.blocks.BlockMachineCasing; -import reborncore.client.gui.builder.widget.GuiButtonHologram; import techreborn.init.ModBlocks; import techreborn.tiles.multiblock.TileImplosionCompressor; @@ -95,16 +94,6 @@ public class GuiImplosionCompressor extends GuiBase { } - public void addHologramButton(int x, int y, int id, Layer layer) { - int factorX = 0; - int factorY = 0; - if (layer == Layer.BACKGROUND) { - factorX = guiLeft; - factorY = guiTop; - } - buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); - } - @Override public void actionPerformed(final GuiButton button) throws IOException { super.actionPerformed(button); diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index a885d9502..68d7f47bb 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -37,7 +37,6 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.blocks.BlockMachineCasing; -import reborncore.client.gui.builder.widget.GuiButtonHologram; import techreborn.init.ModBlocks; import techreborn.tiles.multiblock.TileIndustrialGrinder; @@ -100,16 +99,6 @@ public class GuiIndustrialGrinder extends GuiBase { builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } - public void addHologramButton(int x, int y, int id, Layer layer) { - int factorX = 0; - int factorY = 0; - if (layer == Layer.BACKGROUND) { - factorX = guiLeft; - factorY = guiTop; - } - buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); - } - @Override public void actionPerformed(final GuiButton button) throws IOException { super.actionPerformed(button); diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 6963d3c88..b4b85afc9 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -37,7 +37,6 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.blocks.BlockMachineCasing; -import reborncore.client.gui.builder.widget.GuiButtonHologram; import techreborn.init.ModBlocks; import techreborn.tiles.multiblock.TileIndustrialSawmill; @@ -99,16 +98,6 @@ public class GuiIndustrialSawmill extends GuiBase { builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } - public void addHologramButton(int x, int y, int id, Layer layer) { - int factorX = 0; - int factorY = 0; - if (layer == Layer.BACKGROUND) { - factorX = guiLeft; - factorY = guiTop; - } - buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); - } - @Override public void actionPerformed(final GuiButton button) throws IOException { super.actionPerformed(button); diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index a30c6836f..7e46266ce 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -35,7 +35,6 @@ import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.blocks.BlockMachineCasing; -import reborncore.client.gui.builder.widget.GuiButtonHologram; import techreborn.init.ModBlocks; import techreborn.tiles.multiblock.TileVacuumFreezer; @@ -91,16 +90,6 @@ public class GuiVacuumFreezer extends GuiBase { builder.drawMultiEnergyBar(this, 9, 19, (int) tile.getEnergy(), (int) tile.getMaxPower(), mouseX, mouseY, 0, layer); } - public void addHologramButton(int x, int y, int id, Layer layer) { - int factorX = 0; - int factorY = 0; - if (layer == Layer.BACKGROUND) { - factorX = guiLeft; - factorY = guiTop; - } - buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); - } - @Override public void actionPerformed(final GuiButton button) throws IOException { super.actionPerformed(button); From 94fd1112241ced5e16c6d93581de46482a987bb8 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 3 Jan 2019 14:00:33 +0000 Subject: [PATCH 5/7] #releaseBuild --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8a43eb894..03444242c 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ configurations { compile.extendsFrom shade } -version = "2.19.1" +version = "2.20.0" def ENV = System.getenv() if (ENV.BUILD_NUMBER) { From 95ef8e4df5bc636e7bfa599a7aa3d253f958e365 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 3 Jan 2019 14:05:49 +0000 Subject: [PATCH 6/7] #releaseBuild --- src/main/java/techreborn/compat/CompatManager.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 3a4ce19c2..a26f0edc6 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -27,6 +27,7 @@ package techreborn.compat; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.fml.common.Loader; +import reborncore.Distribution; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.registration.impl.ConfigRegistryFactory; @@ -96,6 +97,11 @@ public class CompatManager { return false; } + @Override + public Distribution side() { + return Distribution.UNIVERSAL; + } + @Override public String modOnly() { return ""; From 901e4728443e1c4467d01e2686d6f08a72a7e942 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 4 Jan 2019 21:47:37 +0000 Subject: [PATCH 7/7] #releaseBuild --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 03444242c..2bd55bc39 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ configurations { compile.extendsFrom shade } -version = "2.20.0" +version = "2.20.1" def ENV = System.getenv() if (ENV.BUILD_NUMBER) {