diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index 451b94b63..463318a02 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -26,12 +26,14 @@ package techreborn; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import reborncore.api.power.ItemPowerHolder; +import reborncore.common.blockentity.RedstoneConfiguration; import reborncore.common.config.Configuration; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.Torus; @@ -40,7 +42,14 @@ import techreborn.blockentity.storage.energy.idsu.IDSUManager; import techreborn.client.GuiHandler; import techreborn.config.TechRebornConfig; import techreborn.events.ModRegistry; -import techreborn.init.*; +import techreborn.init.FluidGeneratorRecipes; +import techreborn.init.ModLoot; +import techreborn.init.ModRecipes; +import techreborn.init.ModSounds; +import techreborn.init.TRBlockEntities; +import techreborn.init.TRContent; +import techreborn.init.TRDispenserBehavior; +import techreborn.items.DynamicCellItem; import techreborn.packets.ClientboundPackets; import techreborn.packets.ServerboundPackets; import techreborn.utils.PoweredCraftingHandler; @@ -87,6 +96,9 @@ public class TechReborn implements ModInitializer { DataAttachment.REGISTRY.register(IDSUManager.class, IDSUManager::new); + RedstoneConfiguration.fluidStack = DynamicCellItem.getCellWithFluid(Fluids.LAVA); + RedstoneConfiguration.powerStack = new ItemStack(TRContent.RED_CELL_BATTERY); + LOGGER.info("TechReborn setup done!"); } diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index 6440b0a06..fb63f56db 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -70,7 +70,7 @@ public class GuiAESU extends GuiBase { super.drawForeground(mouseX, mouseY); final Layer layer = Layer.FOREGROUND; - if(!isTabOpen()){ + if(!hideGuiElements()){ RenderSystem.pushMatrix(); RenderSystem.scaled(0.6, 0.6, 1); drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getEnergy()) + "/" diff --git a/src/main/java/techreborn/client/gui/GuiBatbox.java b/src/main/java/techreborn/client/gui/GuiBatbox.java index c5d9dbb24..b87faf1a1 100644 --- a/src/main/java/techreborn/client/gui/GuiBatbox.java +++ b/src/main/java/techreborn/client/gui/GuiBatbox.java @@ -54,7 +54,7 @@ public class GuiBatbox extends GuiBase { super.drawForeground(mouseX, mouseY); final Layer layer = Layer.FOREGROUND; - if(!isTabOpen()){ + if(!hideGuiElements()){ RenderSystem.pushMatrix(); RenderSystem.scaled(0.6, 0.6, 5); drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) blockEntity.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer); diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 6d267964e..4529b6edf 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -93,7 +93,7 @@ public class GuiBlastFurnace extends GuiBase { } public void onClick(GuiButtonExtended button, Double x, Double y){ - if (isTabOpen()) return; + if (hideGuiElements()) return; if (blockEntity.renderMultiblock == null) { { // This code here makes a basic multiblock and then sets to the selected one. diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index 30866883e..f05779b66 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -59,7 +59,7 @@ public class GuiChunkLoader extends GuiBase { super.drawBackground(partialTicks, mouseX, mouseY); final Layer layer = Layer.BACKGROUND; - if (isTabOpen()) return; + if (hideGuiElements()) return; String text = "Radius: " + blockEntity.getRadius(); drawCentredString(text, 25, 4210752, layer); diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index a6d3c0751..8ea820821 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -82,7 +82,7 @@ public class GuiDistillationTower extends GuiBase { } public void onClick(GuiButtonExtended button, Double x, Double y){ - if (isTabOpen()) return; + if (hideGuiElements()) return; if (blockEntity.renderMultiblock == null) { { // This code here makes a basic multiblock and then sets to the selected one. diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index 706c9ac3d..d94542e19 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -87,7 +87,7 @@ public class GuiFluidReplicator extends GuiBase { // GuiScreen public void onClick(GuiButtonExtended button, Double x, Double y){ - if (isTabOpen()) return; + if (hideGuiElements()) return; if (blockEntity.renderMultiblock == null) { { // This code here makes a basic multiblock and then sets to the selected one. diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 5a3da82a8..17db6dda7 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -115,7 +115,7 @@ public class GuiFusionReactor extends GuiBase { } public void hologramToggle(GuiButtonExtended button, double x, double y){ - if (isTabOpen()) return; + if (hideGuiElements()) return; if (blockEntity.renderMultiblock == null) { updateMultiBlockRender(); } else { diff --git a/src/main/java/techreborn/client/gui/GuiGreenhouseController.java b/src/main/java/techreborn/client/gui/GuiGreenhouseController.java index 7a1d5b267..49ac5d1c8 100644 --- a/src/main/java/techreborn/client/gui/GuiGreenhouseController.java +++ b/src/main/java/techreborn/client/gui/GuiGreenhouseController.java @@ -101,7 +101,7 @@ public class GuiGreenhouseController extends GuiBase { } public void onClick(GuiButtonExtended button, Double x, Double y) { - if (isTabOpen()) return; + if (hideGuiElements()) return; if (blockEntity.renderMultiblock == null) { final Multiblock multiblock = new Multiblock(); BlockState lamp = TRContent.Machine.LAMP_INCANDESCENT.block.getDefaultState().with(Properties.FACING, Direction.DOWN); diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 48599be30..486e96378 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -84,7 +84,7 @@ public class GuiImplosionCompressor extends GuiBase { } public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY){ - if (isTabOpen()) return; + if (hideGuiElements()) return; if (blockEntity.renderMultiblock == null) { { // This code here makes a basic multiblock and then sets to the selected one. diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index 7a9705768..55db604ff 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -89,7 +89,7 @@ public class GuiIndustrialGrinder extends GuiBase { } public void onClick(GuiButtonExtended button, double mouseX, double mouseY){ - if (isTabOpen()) return; + if (hideGuiElements()) return; if (blockEntity.renderMultiblock == null) { { // This code here makes a basic multiblock and then sets to the selected one. diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 04c5a51f4..8896a2676 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -94,7 +94,7 @@ public class GuiIndustrialSawmill extends GuiBase { } public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY){ - if (isTabOpen()) return; + if (hideGuiElements()) return; if (blockEntity.renderMultiblock == null) { { // This code here makes a basic multiblock and then sets to the selected one. diff --git a/src/main/java/techreborn/client/gui/GuiMFE.java b/src/main/java/techreborn/client/gui/GuiMFE.java index 45e3beaae..1b8824c18 100644 --- a/src/main/java/techreborn/client/gui/GuiMFE.java +++ b/src/main/java/techreborn/client/gui/GuiMFE.java @@ -55,7 +55,7 @@ public class GuiMFE extends GuiBase { super.drawForeground(mouseX, mouseY); final Layer layer = Layer.FOREGROUND; - if(!isTabOpen()){ + if(!hideGuiElements()){ RenderSystem.pushMatrix(); RenderSystem.scaled(0.6, 0.6, 1); drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) mfe.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) mfe.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer); diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index 4466e507d..e98151d9a 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -80,7 +80,7 @@ public class GuiVacuumFreezer extends GuiBase { } public void onClick(GuiButtonExtended button, Double mouseX, Double mouseY){ - if (isTabOpen()) return; + if (hideGuiElements()) return; if (blockEntity.renderMultiblock == null) { { // This code here makes a basic multiblock and then sets to the selected one.