diff options
| author | boubou19 <miisterunknown@gmail.com> | 2023-04-01 18:11:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-01 18:11:43 +0200 |
| commit | 5f50e4a36ec000657b0a1664784acf00275293c6 (patch) | |
| tree | 5ef81441032735438c9fd9c620224ca58e46e537 /src/main/java/gregtech/common/tileentities/boilers | |
| parent | 6b77557e0e87cf5afd9ebd3985323ff1249e615c (diff) | |
| download | GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.gz GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.bz2 GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.zip | |
update spotless formatting (#1827)
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/boilers')
5 files changed, 253 insertions, 154 deletions
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java index 2519afd4a5..ed22d41f70 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java @@ -135,7 +135,8 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa fill(Materials.Water.getFluid(1000L * (long) aPlayer.getCurrentEquippedItem().stackSize), true); if (!aPlayer.capabilities.isCreativeMode) { - aPlayer.getCurrentEquippedItem().func_150996_a(Items.bucket); + aPlayer.getCurrentEquippedItem() + .func_150996_a(Items.bucket); } } else { GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); @@ -197,7 +198,8 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa @Override public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCover) { - return GregTech_API.getCoverBehaviorNew(aCover.toStack()).isSimpleCover(); + return GregTech_API.getCoverBehaviorNew(aCover.toStack()) + .isSimpleCover(); } @Override @@ -328,13 +330,20 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa if (mSteam == null || mSteam.amount == 0) return; IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide((byte) aSide); if (tTileEntity == null) return; - FluidStack tDrained = aBaseMetaTileEntity - .drain(ForgeDirection.getOrientation(aSide), Math.max(1, this.mSteam.amount / 2), false); + FluidStack tDrained = aBaseMetaTileEntity.drain( + ForgeDirection.getOrientation(aSide), + Math.max(1, this.mSteam.amount / 2), + false); if (tDrained == null) return; - int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tDrained, false); + int tFilledAmount = tTileEntity.fill( + ForgeDirection.getOrientation(aSide) + .getOpposite(), + tDrained, + false); if (tFilledAmount <= 0) return; tTileEntity.fill( - ForgeDirection.getOrientation(aSide).getOpposite(), + ForgeDirection.getOrientation(aSide) + .getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(aSide), tFilledAmount, true), true); } @@ -378,13 +387,16 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa if (aIndex == GT_MetaTileEntity_Boiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) { GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ); - new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD).setWorld(getBaseMetaTileEntity().getWorld()) - .setMotion(0D, 0D, 0D).<ParticleEventBuilder>times( - 8, - x -> x.setPosition( - aX - 0.5D + XSTR_INSTANCE.nextFloat(), - aY, - aZ - 0.5D + XSTR_INSTANCE.nextFloat()).run()); + new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD) + .setWorld(getBaseMetaTileEntity().getWorld()) + .setMotion(0D, 0D, 0D) + .<ParticleEventBuilder>times( + 8, + x -> x.setPosition( + aX - 0.5D + XSTR_INSTANCE.nextFloat(), + aY, + aZ - 0.5D + XSTR_INSTANCE.nextFloat()) + .run()); } } @@ -442,48 +454,58 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( new SlotWidget(inventoryHandler, 0).setPos(43, 25) - .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotIn())) - .widget( - new SlotWidget(inventoryHandler, 1).setPos( - 43, - 61).setBackground( - getGUITextureSet().getItemSlot(), - getOverlaySlotOut())) - .widget(createFuelSlot()).widget( - createAshSlot()) - .widget( - new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) - .setTexture( - getProgressbarEmpty(), - GT_UITextures.PROGRESSBAR_BOILER_STEAM, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(70, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_WATER, 10) - .setDirection(ProgressBar.Direction.UP).setPos(83, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10) - .setDirection(ProgressBar.Direction.UP).setPos(96, 25).setSize(10, 54)) - .widget( - new ProgressBar() - // cap minimum so that one can easily see there's fuel remaining - .setProgress( - () -> mProcessingEnergy > 0 ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) - : 0) - .setTexture(getProgressbarFuel(), 14).setDirection(ProgressBar.Direction.UP) - .setPos(116, 45).setSize(14, 14)) - .widget(new DrawableWidget().setDrawable(getOverlaySlotCanister()).setPos(43, 43).setSize(18, 18)); + .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotIn())) + .widget( + new SlotWidget(inventoryHandler, 1).setPos(43, 61) + .setBackground( + getGUITextureSet().getItemSlot(), + getOverlaySlotOut())) + .widget(createFuelSlot()) + .widget(createAshSlot()) + .widget( + new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_STEAM, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(70, 25) + .setSize(10, 54)) + .widget( + new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_WATER, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(83, 25) + .setSize(10, 54)) + .widget( + new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(96, 25) + .setSize(10, 54)) + .widget( + new ProgressBar() + // cap minimum so that one can easily see there's fuel remaining + .setProgress( + () -> mProcessingEnergy > 0 + ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) + : 0) + .setTexture(getProgressbarFuel(), 14) + .setDirection(ProgressBar.Direction.UP) + .setPos(116, 45) + .setSize(14, 14)) + .widget( + new DrawableWidget().setDrawable(getOverlaySlotCanister()) + .setPos(43, 43) + .setSize(18, 18)); } protected SlotWidget createFuelSlot() { - return (SlotWidget) new SlotWidget(inventoryHandler, 2).setPos(115, 61).setBackground(getFuelSlotBackground()); + return (SlotWidget) new SlotWidget(inventoryHandler, 2).setPos(115, 61) + .setBackground(getFuelSlotBackground()); } protected SlotWidget createAshSlot() { - return (SlotWidget) new SlotWidget(inventoryHandler, 3).setAccess(true, false).setPos(115, 25) - .setBackground(getAshSlotBackground()); + return (SlotWidget) new SlotWidget(inventoryHandler, 3).setAccess(true, false) + .setPos(115, 25) + .setBackground(getAshSlotBackground()); } @Override diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java index e88a35c617..0e617312df 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java @@ -62,9 +62,15 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { texTop = { TextureFactory.of(MACHINE_BRONZEBRICKS_TOP), TextureFactory.of(OVERLAY_PIPE) }, texSide = { TextureFactory.of(MACHINE_BRONZEBRICKS_SIDE), TextureFactory.of(OVERLAY_PIPE) }, texFront = { TextureFactory.of(MACHINE_BRONZEBRICKS_SIDE), TextureFactory.of(BOILER_FRONT), - TextureFactory.builder().addIcon(BOILER_FRONT_GLOW).glow().build() }, + TextureFactory.builder() + .addIcon(BOILER_FRONT_GLOW) + .glow() + .build() }, texFrontActive = { TextureFactory.of(MACHINE_BRONZEBRICKS_SIDE), TextureFactory.of(BOILER_FRONT_ACTIVE), - TextureFactory.builder().addIcon(BOILER_FRONT_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(BOILER_FRONT_ACTIVE_GLOW) + .glow() + .build() }; for (int i = 0; i < 17; i++) { rTextures[0][i] = texBottom; rTextures[1][i] = texTop; @@ -126,9 +132,13 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { } ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(0D, 0D, 0D) - .setPosition(x, y, z).setWorld(getBaseMetaTileEntity().getWorld()); - particleEventBuilder.setIdentifier(ParticleFX.SMOKE).run(); - particleEventBuilder.setIdentifier(ParticleFX.FLAME).run(); + .setPosition(x, y, z) + .setWorld( + getBaseMetaTileEntity().getWorld()); + particleEventBuilder.setIdentifier(ParticleFX.SMOKE) + .run(); + particleEventBuilder.setIdentifier(ParticleFX.FLAME) + .run(); } } } @@ -206,38 +216,55 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { } else if ( // If its a block of the following materials GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.block.get(Materials.Coal)) - || GT_OreDictUnificator - .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.block.get(Materials.Lignite)) - || GT_OreDictUnificator - .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.block.get(Materials.Charcoal)) - || GT_OreDictUnificator - .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.block.get(Materials.Diamond)) + || GT_OreDictUnificator.isItemStackInstanceOf( + this.mInventory[2], + OrePrefixes.block.get(Materials.Lignite)) + || GT_OreDictUnificator.isItemStackInstanceOf( + this.mInventory[2], + OrePrefixes.block.get(Materials.Charcoal)) + || GT_OreDictUnificator.isItemStackInstanceOf( + this.mInventory[2], + OrePrefixes.block.get(Materials.Diamond)) || // if its either a Railcraft Coke Block or a custom GTNH compressed Coal/charcoal/lignite/coke block (Block.getBlockFromItem(this.mInventory[2].getItem()) != null && // check if the block exists - (Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName().toLowerCase() - .contains("tile") && // check if the block is a tile -> block + (Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("tile") && // check if the block is a tile -> block ( // If the name of the block contains these names - Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName().toLowerCase() - .contains("charcoal") - || Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName() - .toLowerCase().contains("coal") - || Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName() - .toLowerCase().contains("diamond") - || Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName() - .toLowerCase().contains("coke") - || Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName() - .toLowerCase().contains("railcraft.cube") - || Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName() - .toLowerCase().contains("lignite"))))) { + Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("charcoal") + || Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("coal") + || Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("diamond") + || Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("coke") + || Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("railcraft.cube") + || Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("lignite"))))) { // try to add 10% of the burnvalue as Processing energy, no boost // for coal coke here if ((TileEntityFurnace.getItemBurnTime(this.mInventory[2]) / 10) > 0) { - this.mProcessingEnergy += (TileEntityFurnace - .getItemBurnTime(this.mInventory[2]) / 10); + this.mProcessingEnergy += (TileEntityFurnace.getItemBurnTime( + this.mInventory[2]) / 10); aBaseMetaTileEntity.decrStackSize(2, 1); aBaseMetaTileEntity.addStackToSlot( 3, @@ -252,7 +279,8 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { || Block.getBlockFromItem( this.mInventory[2].getItem()) .getUnlocalizedName() - .toLowerCase().contains("coal") + .toLowerCase() + .contains("coal") || Block.getBlockFromItem( this.mInventory[2].getItem()) .getUnlocalizedName() @@ -268,22 +296,28 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { // same goes for lava } else if ((TileEntityFurnace.getItemBurnTime(this.mInventory[2])) >= 2000 - && !(this.mInventory[2].getUnlocalizedName().toLowerCase().contains("bucket") - || this.mInventory[2].getUnlocalizedName().toLowerCase().contains("cell"))) { - this.mProcessingEnergy += (TileEntityFurnace.getItemBurnTime(this.mInventory[2]) / 10); - aBaseMetaTileEntity.decrStackSize(2, 1); - // adds tiny pile of ash for burntime under 10k, small pile for under 100k and pile for - // bigger values - if (XSTR.XSTR_INSTANCE.nextInt(2) == 0) aBaseMetaTileEntity.addStackToSlot( - 3, - GT_OreDictUnificator.get( - (TileEntityFurnace.getItemBurnTime(this.mInventory[2]) >= 10000 - ? TileEntityFurnace.getItemBurnTime(this.mInventory[2]) - >= 100000 ? OrePrefixes.dust : OrePrefixes.dustSmall - : OrePrefixes.dustTiny), - Materials.Ash, - 1L)); - } + && !(this.mInventory[2].getUnlocalizedName() + .toLowerCase() + .contains("bucket") + || this.mInventory[2].getUnlocalizedName() + .toLowerCase() + .contains("cell"))) { + this.mProcessingEnergy += (TileEntityFurnace.getItemBurnTime( + this.mInventory[2]) / 10); + aBaseMetaTileEntity.decrStackSize(2, 1); + // adds tiny pile of ash for burntime under 10k, small pile for + // under 100k and pile for + // bigger values + if (XSTR.XSTR_INSTANCE.nextInt(2) == 0) + aBaseMetaTileEntity.addStackToSlot( + 3, + GT_OreDictUnificator.get( + (TileEntityFurnace.getItemBurnTime( + this.mInventory[2]) + >= 10000 ? TileEntityFurnace.getItemBurnTime(this.mInventory[2]) >= 100000 ? OrePrefixes.dust : OrePrefixes.dustSmall : OrePrefixes.dustTiny), + Materials.Ash, + 1L)); + } } @Override diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java index 9e17dc12ee..b6b293d8d1 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java @@ -124,8 +124,10 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { rTextures[3][i] = new ITexture[] { TextureFactory.of(MACHINE_STEELBRICKS_SIDE, colorModulation), TextureFactory.of(BOILER_LAVA_FRONT, colorModulation), TextureFactory.of(BOILER_LAVA_FRONT_GLOW) }; rTextures[4][i] = new ITexture[] { TextureFactory.of(MACHINE_STEELBRICKS_SIDE, colorModulation), - TextureFactory.of(BOILER_LAVA_FRONT_ACTIVE), - TextureFactory.builder().addIcon(BOILER_LAVA_FRONT_ACTIVE_GLOW).glow().build() }; + TextureFactory.of(BOILER_LAVA_FRONT_ACTIVE), TextureFactory.builder() + .addIcon(BOILER_LAVA_FRONT_ACTIVE_GLOW) + .glow() + .build() }; rTextures[5][i] = new ITexture[] { TextureFactory.of(MACHINE_STEELBRICKS_SIDE, colorModulation), TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(FLUID_OUT_SIGN) }; } @@ -222,13 +224,14 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { if (returnedItemStack != null && !aPlayer.capabilities.isCreativeMode) { if (equippedItemStack.stackSize > 1) { if (!aPlayer.inventory.addItemStackToInventory(returnedItemStack)) { - aBaseMetaTileEntity.getWorld().spawnEntityInWorld( - new EntityItem( - aBaseMetaTileEntity.getWorld(), - (double) aBaseMetaTileEntity.getXCoord() + 0.5D, - (double) aBaseMetaTileEntity.getYCoord() + 1.5D, - (double) aBaseMetaTileEntity.getZCoord() + 0.5D, - equippedItemStack)); + aBaseMetaTileEntity.getWorld() + .spawnEntityInWorld( + new EntityItem( + aBaseMetaTileEntity.getWorld(), + (double) aBaseMetaTileEntity.getXCoord() + 0.5D, + (double) aBaseMetaTileEntity.getYCoord() + 1.5D, + (double) aBaseMetaTileEntity.getZCoord() + 0.5D, + equippedItemStack)); } else if (aPlayer instanceof EntityPlayerMP) { ((EntityPlayerMP) aPlayer).sendContainerToPlayer(aPlayer.inventoryContainer); } @@ -243,7 +246,10 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { @Override public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); - if (lavaTank.getFluid() != null) aNBT.setTag("mLava", lavaTank.getFluid().writeToNBT(new NBTTagCompound())); + if (lavaTank.getFluid() != null) aNBT.setTag( + "mLava", + lavaTank.getFluid() + .writeToNBT(new NBTTagCompound())); aNBT.setInteger("mCooledLava", this.mCooledLava); } @@ -264,7 +270,9 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { if (mSteam == null || mSteam.amount == 0) return; pushSteamToSide( aBaseMetaTileEntity, - ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).getOpposite().ordinal()); + ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()) + .getOpposite() + .ordinal()); } /** @@ -352,9 +360,13 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { } ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(0D, 0D, 0D) - .setPosition(x, y, z).setWorld(getBaseMetaTileEntity().getWorld()); - particleEventBuilder.setIdentifier(ParticleFX.SMOKE).run(); - particleEventBuilder.setIdentifier(ParticleFX.FLAME).run(); + .setPosition(x, y, z) + .setWorld( + getBaseMetaTileEntity().getWorld()); + particleEventBuilder.setIdentifier(ParticleFX.SMOKE) + .run(); + particleEventBuilder.setIdentifier(ParticleFX.FLAME) + .run(); } } } @@ -401,7 +413,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { if (aIndex != GT_MetaTileEntity_Boiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) return; final ForgeDirection rearDirection = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()) - .getOpposite(); + .getOpposite(); GT_Utility.doSoundAtClient( SoundResource.RANDOM_FIZZ, 2, @@ -411,12 +423,18 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { aY, aZ + 0.5 * rearDirection.offsetZ); - new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD).setWorld(getBaseMetaTileEntity().getWorld()) - // Particles emitted with a 1 block/s velocity toward rear - .setMotion(rearDirection.offsetX / 20D, 0D, rearDirection.offsetZ / 20D).<ParticleEventBuilder>times( - 8, - // Particles emitted from center of rear face (Steam Output) - x -> x.setPosition(aX + rearDirection.offsetX / 2D, aY, aZ + rearDirection.offsetZ / 2D).run()); + new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD) + .setWorld(getBaseMetaTileEntity().getWorld()) + // Particles emitted with a 1 block/s velocity toward rear + .setMotion(rearDirection.offsetX / 20D, 0D, rearDirection.offsetZ / 20D) + .<ParticleEventBuilder>times( + 8, + // Particles emitted from center of rear face (Steam Output) + x -> x.setPosition( + aX + rearDirection.offsetX / 2D, + aY, + aZ + rearDirection.offsetZ / 2D) + .run()); } @Override @@ -464,39 +482,53 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( new SlotWidget(inventoryHandler, 0).setPos(43, 25) - .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotIn())) - .widget( - new SlotWidget(inventoryHandler, 1).setAccess(true, false).setPos(43, 61) - .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotOut())) - .widget( - new FluidSlotWidget(lavaTank) - .setBackground(getGUITextureSet().getFluidSlot(), getOverlaySlotIn()).setPos(115, 61)) - .widget( - createAshSlot()) - .widget( - new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) - .setTexture( - getProgressbarEmpty(), - GT_UITextures.PROGRESSBAR_BOILER_STEAM, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(70, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_WATER, 10) - .setDirection(ProgressBar.Direction.UP).setPos(83, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10) - .setDirection(ProgressBar.Direction.UP).setPos(96, 25).setSize(10, 54)) - .widget( - new ProgressBar() - // cap minimum so that one can easily see there's fuel remaining - .setProgress( - () -> mProcessingEnergy > 0 ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) - : 0) - .setTexture(getProgressbarFuel(), 14).setDirection(ProgressBar.Direction.UP) - .setPos(116, 45).setSize(14, 14)) - .widget(new DrawableWidget().setDrawable(getOverlaySlotCanister()).setPos(43, 43).setSize(18, 18)); + .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotIn())) + .widget( + new SlotWidget(inventoryHandler, 1).setAccess(true, false) + .setPos(43, 61) + .setBackground( + getGUITextureSet().getItemSlot(), + getOverlaySlotOut())) + .widget( + new FluidSlotWidget(lavaTank) + .setBackground( + getGUITextureSet().getFluidSlot(), + getOverlaySlotIn()) + .setPos(115, 61)) + .widget(createAshSlot()) + .widget( + new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_STEAM, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(70, 25) + .setSize(10, 54)) + .widget( + new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_WATER, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(83, 25) + .setSize(10, 54)) + .widget( + new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(96, 25) + .setSize(10, 54)) + .widget( + new ProgressBar() + // cap minimum so that one can easily see there's fuel remaining + .setProgress( + () -> mProcessingEnergy > 0 + ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) + : 0) + .setTexture(getProgressbarFuel(), 14) + .setDirection(ProgressBar.Direction.UP) + .setPos(116, 45) + .setSize(14, 14)) + .widget( + new DrawableWidget().setDrawable(getOverlaySlotCanister()) + .setPos(43, 43) + .setSize(18, 18)); } static class LavaTank extends FluidTank { diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java index 746f0602d6..04fa676c16 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java @@ -100,7 +100,8 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { return String.format( localizedDescFormat, GT_Utility.formatNumbers(getMaxOutputPerSecond()), - GT_Utility.formatNumbers(getMinOutputPerSecond())).split("\\R"); + GT_Utility.formatNumbers(getMinOutputPerSecond())) + .split("\\R"); } public int getMinOutputPerSecond() { @@ -278,7 +279,8 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { GT_Utility.formatNumbers(getHotTimeSeconds()), GT_Utility.formatNumbers(getMinOutputPerSecond()), GT_Utility.formatNumbers(getMaxOutputPerSecond()), - GT_Utility.formatNumbers(getProductionPerSecond())).split("\\R"); + GT_Utility.formatNumbers(getProductionPerSecond())) + .split("\\R"); } public int getHeatCapacityPercent() { @@ -368,9 +370,12 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { protected int get(final String aCategory, final String aKey, final int aDefaultValue, final String... aComments) { final StringBuilder tCommentBuilder = new StringBuilder(); - for (String tComment : aComments) tCommentBuilder.append(tComment).append('\n'); - tCommentBuilder.append("Default: ").append(aDefaultValue); - return sMachineFile.mConfig.get(aCategory, aKey, aDefaultValue, tCommentBuilder.toString()).getInt(); + for (String tComment : aComments) tCommentBuilder.append(tComment) + .append('\n'); + tCommentBuilder.append("Default: ") + .append(aDefaultValue); + return sMachineFile.mConfig.get(aCategory, aKey, aDefaultValue, tCommentBuilder.toString()) + .getInt(); } public int getCalcificationTicks() { diff --git a/src/main/java/gregtech/com |
