diff --git a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java index 22c53c1bc..a6111824a 100644 --- a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java +++ b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java @@ -46,12 +46,13 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte public AEBaseBlockItemChargeable(Block id, Properties props) { super(id, props); - ItemModelsProperties.func_239418_a_(this, new ResourceLocation("appliedenergistics2:fill_level"), (is, world, entity) -> { - double curPower = getAECurrentPower(is); - double maxPower = getAEMaxPower(is); + ItemModelsProperties.func_239418_a_(this, new ResourceLocation("appliedenergistics2:fill_level"), + (is, world, entity) -> { + double curPower = getAECurrentPower(is); + double maxPower = getAEMaxPower(is); - return (int) Math.round(100 * curPower / maxPower); - }); + return (int) Math.round(100 * curPower / maxPower); + }); } @Override diff --git a/src/main/java/appeng/block/networking/CableBusBlock.java b/src/main/java/appeng/block/networking/CableBusBlock.java index a792836ed..48fbca28c 100644 --- a/src/main/java/appeng/block/networking/CableBusBlock.java +++ b/src/main/java/appeng/block/networking/CableBusBlock.java @@ -222,8 +222,8 @@ public class CableBusBlock extends AEBaseTileBlock implement double z = target.getHitVec().z; // FIXME: Check how this looks, probably like shit, maybe provide parts the // ability to supply particle textures??? - effectRenderer - .addEffect(new CableBusBreakingParticle((ClientWorld) world, x, y, z, texture).multipleParticleScaleBy(0.8F)); + effectRenderer.addEffect( + new CableBusBreakingParticle((ClientWorld) world, x, y, z, texture).multipleParticleScaleBy(0.8F)); } return true; @@ -264,8 +264,8 @@ public class CableBusBlock extends AEBaseTileBlock implement // FIXME: Check how this looks, probably like shit, maybe provide parts the // ability to supply particle textures??? - Particle effect = new CableBusBreakingParticle((ClientWorld) world, x, y, z, x - pos.getX() - 0.5D, - y - pos.getY() - 0.5D, z - pos.getZ() - 0.5D, texture); + Particle effect = new CableBusBreakingParticle((ClientWorld) world, x, y, z, + x - pos.getX() - 0.5D, y - pos.getY() - 0.5D, z - pos.getZ() - 0.5D, texture); effectRenderer.addEffect(effect); } } diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index bdc0b44ac..fed98f876 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -38,7 +38,8 @@ class QnbFormedBakedModel implements IDynamicBakedModel { new ResourceLocation(AppEng.MOD_ID, "block/quantum_ring")); private static final RenderMaterial TEXTURE_RING_LIGHT = new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(AppEng.MOD_ID, "block/quantum_ring_light")); - private static final RenderMaterial TEXTURE_RING_LIGHT_CORNER = new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, + private static final RenderMaterial TEXTURE_RING_LIGHT_CORNER = new RenderMaterial( + AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(AppEng.MOD_ID, "block/quantum_ring_light_corner")); private static final RenderMaterial TEXTURE_CABLE_GLASS = new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(AppEng.MOD_ID, "part/cable/glass/transparent")); diff --git a/src/main/java/appeng/block/spatial/MatrixFrameBlock.java b/src/main/java/appeng/block/spatial/MatrixFrameBlock.java index 7fee2f631..99f81a36b 100644 --- a/src/main/java/appeng/block/spatial/MatrixFrameBlock.java +++ b/src/main/java/appeng/block/spatial/MatrixFrameBlock.java @@ -46,8 +46,8 @@ import appeng.block.AEBaseBlock; */ public class MatrixFrameBlock extends AEBaseBlock { - private static final Material MATERIAL = new Material(MaterialColor.AIR, false, true, true, false, false, - false, PushReaction.PUSH_ONLY); + private static final Material MATERIAL = new Material(MaterialColor.AIR, false, true, true, false, false, false, + PushReaction.PUSH_ONLY); public MatrixFrameBlock() { super(Properties.create(MATERIAL).hardnessAndResistance(-1.0F, 6000000.0F).notSolid().noDrops()); diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 6e4124b92..50d0efbb0 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -208,8 +208,8 @@ public class ClientHelper extends ServerHelper { private void spawnLightningArc(final World world, final double posX, final double posY, final double posZ, final Vector3d second) { - final LightningFX fx = new LightningArcFX((ClientWorld) world, posX, posY, posZ, second.x, second.y, second.z, 0.0f, 0.0f, - 0.0f); + final LightningFX fx = new LightningArcFX((ClientWorld) world, posX, posY, posZ, second.x, second.y, second.z, + 0.0f, 0.0f, 0.0f); Minecraft.getInstance().particles.addEffect(fx); } diff --git a/src/main/java/appeng/client/gui/AEBaseMEScreen.java b/src/main/java/appeng/client/gui/AEBaseMEScreen.java index 867242078..a6a41200c 100644 --- a/src/main/java/appeng/client/gui/AEBaseMEScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseMEScreen.java @@ -62,7 +62,8 @@ public abstract class AEBaseMEScreen extends AEBaseSc if (myStack.getStackSize() > bigNumber || (myStack.getStackSize() > 1 && stack.isDamaged())) { final String formattedAmount = NumberFormat.getNumberInstance(Locale.US) .format(myStack.getStackSize()); - currentToolTip.add(ButtonToolTips.ItemsStored.text(formattedAmount).func_240699_a_(TextFormatting.GRAY)); + currentToolTip + .add(ButtonToolTips.ItemsStored.text(formattedAmount).func_240699_a_(TextFormatting.GRAY)); } if (myStack.getCountRequestable() > 0) { @@ -76,7 +77,8 @@ public abstract class AEBaseMEScreen extends AEBaseSc return; } else if (stack.getCount() > bigNumber) { final String formattedAmount = NumberFormat.getNumberInstance(Locale.US).format(stack.getCount()); - currentToolTip.add(ButtonToolTips.ItemsStored.text(formattedAmount).func_240699_a_(TextFormatting.GRAY)); + currentToolTip + .add(ButtonToolTips.ItemsStored.text(formattedAmount).func_240699_a_(TextFormatting.GRAY)); this.renderToolTip(matrixStack, currentToolTip, x, y, this.font); diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index ff968ce47..c297ab724 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -192,7 +192,8 @@ public abstract class AEBaseScreen extends ContainerS protected void drawTooltip(MatrixStack matrices, int x, int y, ITextComponent message) { String[] lines = message.getString().split("\n"); // FIXME FABRIC - List textLines = Arrays.stream(lines).map(StringTextComponent::new).collect(Collectors.toList()); + List textLines = Arrays.stream(lines).map(StringTextComponent::new) + .collect(Collectors.toList()); this.drawTooltip(matrices, x, y, textLines); } @@ -233,8 +234,7 @@ public abstract class AEBaseScreen extends ContainerS public abstract void drawFG(MatrixStack matrixStack, int offsetX, int offsetY, int mouseX, int mouseY); @Override - protected final void func_230450_a_(MatrixStack matrixStack, final float f, final int x, - final int y) { + protected final void func_230450_a_(MatrixStack matrixStack, final float f, final int x, final int y) { final int ox = this.guiLeft; // (width - xSize) / 2; final int oy = this.guiTop; // (height - ySize) / 2; RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java index a746ec826..de71d25d9 100644 --- a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java @@ -62,7 +62,8 @@ public class CellWorkbenchScreen extends UpgradeableScreen { } @Override - public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { + public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY) { this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.Chest.text()).getString(), 8, 6, 4210752); this.font.drawString(matrixStack, GuiText.inventory.text().getString(), 8, this.ySize - 96 + 3, 4210752); } @Override - public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY, float partialTicks) { this.bindTexture("guis/chest.png"); GuiUtils.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize, getBlitOffset()); } diff --git a/src/main/java/appeng/client/gui/implementations/CondenserScreen.java b/src/main/java/appeng/client/gui/implementations/CondenserScreen.java index 8216c4911..5e173d4d5 100644 --- a/src/main/java/appeng/client/gui/implementations/CondenserScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CondenserScreen.java @@ -56,7 +56,8 @@ public class CondenserScreen extends AEBaseScreen { } @Override - public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { + public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY) { this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.Condenser.text()).getString(), 8, 6, 4210752); this.font.drawString(matrixStack, GuiText.inventory.text().getString(), 8, this.ySize - 96 + 3, 4210752); @@ -65,7 +66,8 @@ public class CondenserScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY, float partialTicks) { this.bindTexture("guis/condenser.png"); GuiUtils.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize, getBlitOffset()); diff --git a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java index cb4cb8a75..c967aefca 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java @@ -67,12 +67,14 @@ public class CraftAmountScreen extends AEBaseScreen { } @Override - public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { + public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY) { this.font.drawString(matrixStack, GuiText.SelectAmount.text().getString(), 8, 6, 4210752); } @Override - public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY, float partialTicks) { this.next.setMessage(hasShiftDown() ? GuiText.Start.text() : GuiText.Next.text()); this.bindTexture("guis/craft_amt.png"); diff --git a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java index 423e50533..771d58cda 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java @@ -84,8 +84,8 @@ public class CraftConfirmScreen extends AEBaseScreen { public void init() { super.init(); - this.start = new Button(this.guiLeft + 162, this.guiTop + this.ySize - 25, 50, 20, - GuiText.Start.text(), btn -> start()); + this.start = new Button(this.guiLeft + 162, this.guiTop + this.ySize - 25, 50, 20, GuiText.Start.text(), + btn -> start()); this.start.active = false; this.addButton(this.start); diff --git a/src/main/java/appeng/client/gui/implementations/DriveScreen.java b/src/main/java/appeng/client/gui/implementations/DriveScreen.java index cfb351670..93d3c13d6 100644 --- a/src/main/java/appeng/client/gui/implementations/DriveScreen.java +++ b/src/main/java/appeng/client/gui/implementations/DriveScreen.java @@ -54,10 +54,8 @@ public class DriveScreen extends AEBaseScreen { @Override public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.Drive.text()).getString(), 8, 6, - 4210752); - this.font.drawString(matrixStack, GuiText.inventory.text().getString(), 8, this.ySize - 96 + 3, - 4210752); + this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.Drive.text()).getString(), 8, 6, 4210752); + this.font.drawString(matrixStack, GuiText.inventory.text().getString(), 8, this.ySize - 96 + 3, 4210752); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java b/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java index ca67db830..e37afc06c 100644 --- a/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java +++ b/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java @@ -60,8 +60,10 @@ public class FormationPlaneScreen extends UpgradeableScreen { } @Override - public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { + public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY) { this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.GrindStone.text()).getString(), 8, 6, 4210752); this.font.drawString(matrixStack, GuiText.inventory.text().getString(), 8, this.ySize - 96 + 3, 4210752); } @Override - public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY, float partialTicks) { this.bindTexture("guis/grinder.png"); GuiUtils.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize, getBlitOffset()); } diff --git a/src/main/java/appeng/client/gui/implementations/IOPortScreen.java b/src/main/java/appeng/client/gui/implementations/IOPortScreen.java index e8174527e..981faed83 100644 --- a/src/main/java/appeng/client/gui/implementations/IOPortScreen.java +++ b/src/main/java/appeng/client/gui/implementations/IOPortScreen.java @@ -61,8 +61,7 @@ public class IOPortScreen extends UpgradeableScreen { @Override public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.IOPort.text()).getString(), 8, 6, - 4210752); + this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.IOPort.text()).getString(), 8, 6, 4210752); this.font.drawString(matrixStack, GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); if (this.redstoneMode != null) { diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java index a7284d056..a7d885ac8 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java @@ -61,7 +61,8 @@ public class InterfaceScreen extends UpgradeableScreen { } @Override - public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { + public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY) { if (this.blockMode != null) { this.blockMode.set(((InterfaceContainer) this.cvb).getBlockingMode()); } diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java index 7dbca6054..b1b031b1f 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java @@ -94,8 +94,10 @@ public class InterfaceTerminalScreen extends AEBaseScreen extends AEBas } @Override - public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { + public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY) { this.font.drawString(matrixStack, this.getGuiDisplayName(this.myName.text()).getString(), 8, 6, 4210752); this.font.drawString(matrixStack, GuiText.inventory.text().getString(), 8, this.ySize - 96 + 3, 4210752); @@ -320,7 +321,8 @@ public class MEMonitorableScreen extends AEBas } @Override - public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY, float partialTicks) { this.bindTexture(this.getBackground()); final int x_width = 197; diff --git a/src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java b/src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java index 7a13f743f..49190e769 100644 --- a/src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java +++ b/src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java @@ -144,8 +144,9 @@ public class NetworkStatusScreen extends AEBaseScreen im } final int w = this.font.getStringWidth(str); - this.font.drawString(matrixStack, str, (int) ((x * sectionLength + xo + sectionLength - 19 - (w * 0.5)) * 2), - (y * 18 + yo + 6) * 2, 4210752); + this.font.drawString(matrixStack, str, + (int) ((x * sectionLength + xo + sectionLength - 19 - (w * 0.5)) * 2), (y * 18 + yo + 6) * 2, + 4210752); RenderSystem.popMatrix(); final int posX = x * sectionLength + xo + sectionLength - 18; @@ -225,8 +226,8 @@ public class NetworkStatusScreen extends AEBaseScreen im } currentToolTip.add(GuiText.Installed.withSuffix(": " + (myStack.getStackSize()))); - currentToolTip.add(GuiText.EnergyDrain.withSuffix(": " - + Platform.formatPowerLong(myStack.getCountRequestable(), true))); + currentToolTip.add(GuiText.EnergyDrain + .withSuffix(": " + Platform.formatPowerLong(myStack.getCountRequestable(), true))); this.drawTooltip(matrixStack, x, y, currentToolTip); } diff --git a/src/main/java/appeng/client/gui/implementations/QNBScreen.java b/src/main/java/appeng/client/gui/implementations/QNBScreen.java index f072cccad..7867587c6 100644 --- a/src/main/java/appeng/client/gui/implementations/QNBScreen.java +++ b/src/main/java/appeng/client/gui/implementations/QNBScreen.java @@ -38,8 +38,8 @@ public class QNBScreen extends AEBaseScreen { @Override public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.font.drawString(matrixStack, - this.getGuiDisplayName(GuiText.QuantumLinkChamber.text()).getString(), 8, 6, 4210752); + this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.QuantumLinkChamber.text()).getString(), 8, 6, + 4210752); this.font.drawString(matrixStack, GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); } diff --git a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java index 7fb23ca29..96ed04828 100644 --- a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java +++ b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java @@ -62,8 +62,8 @@ public class QuartzKnifeScreen extends AEBaseScreen { @Override public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.font.drawString(matrixStack, - this.getGuiDisplayName(GuiText.QuartzCuttingKnife.text()).getString(), 8, 6, 4210752); + this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.QuartzCuttingKnife.text()).getString(), 8, 6, + 4210752); this.font.drawString(matrixStack, GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); } diff --git a/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java b/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java index 404945e9e..46f346943 100644 --- a/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java +++ b/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java @@ -82,10 +82,11 @@ public class SecurityStationScreen extends MEMonitorableScreen { @Override public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.SkyChest.text()).getString(), 8, 8, - 4210752); + this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.SkyChest.text()).getString(), 8, 8, 4210752); this.font.drawString(matrixStack, GuiText.inventory.getLocal(), 8, this.ySize - 96 + 2, 4210752); } diff --git a/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java b/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java index d37afce9c..6131d116f 100644 --- a/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java +++ b/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java @@ -58,8 +58,8 @@ public class SpatialIOPortScreen extends AEBaseScreen { GuiText.Efficiency.getLocal() + ": " + (((float) this.container.getEfficency()) / 100) + '%', 13, 83, 4210752); - this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.SpatialIOPort.text()).getString(), 8, - 6, 4210752); + this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.SpatialIOPort.text()).getString(), 8, 6, + 4210752); this.font.drawString(matrixStack, GuiText.inventory.getLocal(), 8, this.ySize - 96, 4210752); if (this.container.xSize != 0 && this.container.ySize != 0 && this.container.zSize != 0) { diff --git a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java index 68aed64cb..40fc1cafc 100644 --- a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java +++ b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java @@ -71,8 +71,7 @@ public class StorageBusScreen extends UpgradeableScreen { @Override public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.StorageBus.text()).getString(), 8, 6, - 4210752); + this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.StorageBus.text()).getString(), 8, 6, 4210752); this.font.drawString(matrixStack, GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); if (this.fuzzyMode != null) { diff --git a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java index ffda0419f..64265b5f9 100644 --- a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java +++ b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java @@ -86,8 +86,7 @@ public class UpgradeableScreen extends AEBaseScr @Override public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.font.drawString(matrixStack, this.getGuiDisplayName(this.getName().text()).getString(), 8, 6, - 4210752); + this.font.drawString(matrixStack, this.getGuiDisplayName(this.getName().text()).getString(), 8, 6, 4210752); this.font.drawString(matrixStack, GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); if (this.redstoneMode != null) { diff --git a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java index 3fa4b8da0..435618de0 100644 --- a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java +++ b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java @@ -54,8 +54,8 @@ public class VibrationChamberScreen extends AEBaseScreen { } @Override - public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { + public void drawFG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY) { this.font.drawString(matrixStack, this.getGuiDisplayName(GuiText.Wireless.text()).getString(), 8, 6, 4210752); this.font.drawString(matrixStack, GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); @@ -63,7 +64,8 @@ public class WirelessScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrixStack, final int offsetX, final int offsetY, final int mouseX, + final int mouseY, float partialTicks) { this.bindTexture("guis/wireless.png"); GuiUtils.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize, getBlitOffset()); } diff --git a/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java b/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java index 17400b9c0..8498e3ac1 100644 --- a/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java +++ b/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java @@ -31,7 +31,8 @@ public abstract class CustomSlotWidget extends AbstractGui implements ITooltip { public void slotClicked(final ItemStack clickStack, final int mouseButton) { } - public abstract void drawContent(MatrixStack matrixStack, final Minecraft mc, final int mouseX, final int mouseY, final float partialTicks); + public abstract void drawContent(MatrixStack matrixStack, final Minecraft mc, final int mouseX, final int mouseY, + final float partialTicks); public void drawBackground(int guileft, int guitop, int currentZIndex) { } diff --git a/src/main/java/appeng/client/gui/widgets/ProgressBar.java b/src/main/java/appeng/client/gui/widgets/ProgressBar.java index f5df1e9f4..10980c2e8 100644 --- a/src/main/java/appeng/client/gui/widgets/ProgressBar.java +++ b/src/main/java/appeng/client/gui/widgets/ProgressBar.java @@ -88,8 +88,7 @@ public class ProgressBar extends Widget implements ITooltip { ITextComponent result = this.titleName != null ? this.titleName : new StringTextComponent(""); return result.deepCopy().func_240702_b_("\n").func_240702_b_(this.source.getCurrentProgress() + " ") - .func_230529_a_( - GuiText.Of.text().deepCopy().func_240702_b_(" " + this.source.getMaxProgress())); + .func_230529_a_(GuiText.Of.text().deepCopy().func_240702_b_(" " + this.source.getMaxProgress())); } @Override diff --git a/src/main/java/appeng/client/render/ColorableTileBlockColor.java b/src/main/java/appeng/client/render/ColorableTileBlockColor.java index 78cff513c..1ce5268e7 100644 --- a/src/main/java/appeng/client/render/ColorableTileBlockColor.java +++ b/src/main/java/appeng/client/render/ColorableTileBlockColor.java @@ -37,7 +37,8 @@ public class ColorableTileBlockColor implements IBlockColor { public static final ColorableTileBlockColor INSTANCE = new ColorableTileBlockColor(); @Override - public int getColor(BlockState state, @Nullable IBlockDisplayReader worldIn, @Nullable BlockPos pos, int tintIndex) { + public int getColor(BlockState state, @Nullable IBlockDisplayReader worldIn, @Nullable BlockPos pos, + int tintIndex) { AEColor color = AEColor.TRANSPARENT; // Default to a neutral color if (worldIn != null && pos != null) { diff --git a/src/main/java/appeng/client/render/StaticBlockColor.java b/src/main/java/appeng/client/render/StaticBlockColor.java index 1282f9ad3..ece378594 100644 --- a/src/main/java/appeng/client/render/StaticBlockColor.java +++ b/src/main/java/appeng/client/render/StaticBlockColor.java @@ -39,7 +39,8 @@ public class StaticBlockColor implements IBlockColor { } @Override - public int getColor(BlockState state, @Nullable IBlockDisplayReader worldIn, @Nullable BlockPos pos, int tintIndex) { + public int getColor(BlockState state, @Nullable IBlockDisplayReader worldIn, @Nullable BlockPos pos, + int tintIndex) { return this.color.getVariantByTintIndex(tintIndex); } diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java index cb45d7cb7..4d9df844e 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java @@ -75,7 +75,9 @@ class CraftingCubeModel implements IModelGeometry { } @Override - public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation) { + public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, + Function spriteGetter, IModelTransform modelTransform, + ItemOverrideList overrides, ResourceLocation modelLocation) { // Retrieve our textures and pass them on to the baked model TextureAtlasSprite ringCorner = spriteGetter.apply(RING_CORNER); TextureAtlasSprite ringSideHor = spriteGetter.apply(RING_SIDE_HOR); diff --git a/src/main/java/appeng/client/render/effects/ChargedOreFX.java b/src/main/java/appeng/client/render/effects/ChargedOreFX.java index 75665e4a7..4419e03fb 100644 --- a/src/main/java/appeng/client/render/effects/ChargedOreFX.java +++ b/src/main/java/appeng/client/render/effects/ChargedOreFX.java @@ -59,7 +59,7 @@ public class ChargedOreFX extends RedstoneParticle { @Override public Particle makeParticle(BasicParticleType typeIn, ClientWorld worldIn, double x, double y, double z, - double xSpeed, double ySpeed, double zSpeed) { + double xSpeed, double ySpeed, double zSpeed) { return new ChargedOreFX(worldIn, x, y, z, xSpeed, ySpeed, zSpeed, this.spriteSet); } } diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index 087574d6f..5b638f775 100644 --- a/src/main/java/appeng/client/render/effects/CraftingFx.java +++ b/src/main/java/appeng/client/render/effects/CraftingFx.java @@ -134,8 +134,8 @@ public class CraftingFx extends SpriteTexturedParticle { } @Override - public Particle makeParticle(BasicParticleType data, ClientWorld worldIn, double x, double y, double z, double xSpeed, - double ySpeed, double zSpeed) { + public Particle makeParticle(BasicParticleType data, ClientWorld worldIn, double x, double y, double z, + double xSpeed, double ySpeed, double zSpeed) { return new CraftingFx(worldIn, x, y, z, spriteSet); } } diff --git a/src/main/java/appeng/client/render/effects/LightningArcFX.java b/src/main/java/appeng/client/render/effects/LightningArcFX.java index a53b0adf5..8f280556c 100644 --- a/src/main/java/appeng/client/render/effects/LightningArcFX.java +++ b/src/main/java/appeng/client/render/effects/LightningArcFX.java @@ -76,7 +76,7 @@ public class LightningArcFX extends LightningFX { @Override public Particle makeParticle(LightningArcParticleData data, ClientWorld worldIn, double x, double y, double z, - double xSpeed, double ySpeed, double zSpeed) { + double xSpeed, double ySpeed, double zSpeed) { SpriteTexturedParticle lightningFX = new LightningArcFX(worldIn, x, y, z, data.target.x, data.target.y, data.target.z, 0, 0, 0); lightningFX.selectSpriteRandomly(this.spriteSet); diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java index b32b0c113..c5cdc765b 100644 --- a/src/main/java/appeng/client/render/effects/MatterCannonFX.java +++ b/src/main/java/appeng/client/render/effects/MatterCannonFX.java @@ -85,8 +85,8 @@ public class MatterCannonFX extends SpriteTexturedParticle { } @Override - public Particle makeParticle(BasicParticleType data, ClientWorld world, double x, double y, double z, double xSpeed, - double ySpeed, double zSpeed) { + public Particle makeParticle(BasicParticleType data, ClientWorld world, double x, double y, double z, + double xSpeed, double ySpeed, double zSpeed) { return new MatterCannonFX(world, x, y, z, spriteSet); } } diff --git a/src/main/java/appeng/client/render/effects/ParticleTypes.java b/src/main/java/appeng/client/render/effects/ParticleTypes.java index ba539c81b..1eea99bb7 100644 --- a/src/main/java/appeng/client/render/effects/ParticleTypes.java +++ b/src/main/java/appeng/client/render/effects/ParticleTypes.java @@ -20,8 +20,8 @@ public final class ParticleTypes { return null; } }; - public static final ParticleType LIGHTNING_ARC = new ParticleType(false, - LightningArcParticleData.DESERIALIZER) { + public static final ParticleType LIGHTNING_ARC = new ParticleType( + false, LightningArcParticleData.DESERIALIZER) { @Override public Codec func_230522_e_() { return null; diff --git a/src/main/java/appeng/client/render/model/MemoryCardModel.java b/src/main/java/appeng/client/render/model/MemoryCardModel.java index 9a60f18cc..98cdb2115 100644 --- a/src/main/java/appeng/client/render/model/MemoryCardModel.java +++ b/src/main/java/appeng/client/render/model/MemoryCardModel.java @@ -41,7 +41,9 @@ public class MemoryCardModel implements IModelGeometry { @Nullable @Override - public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation) { + public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, + Function spriteGetter, IModelTransform modelTransform, + ItemOverrideList overrides, ResourceLocation modelLocation) { TextureAtlasSprite texture = spriteGetter.apply(TEXTURE); IBakedModel baseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter); diff --git a/src/main/java/appeng/container/ContainerLocator.java b/src/main/java/appeng/container/ContainerLocator.java index 78c7ebc88..e213614ce 100644 --- a/src/main/java/appeng/container/ContainerLocator.java +++ b/src/main/java/appeng/container/ContainerLocator.java @@ -72,7 +72,8 @@ public final class ContainerLocator { this(type, itemIndex, world.func_234923_W_().func_240901_a_(), blockPos, side); } - private ContainerLocator(Type type, int itemIndex, ResourceLocation worldId, BlockPos blockPos, AEPartLocation side) { + private ContainerLocator(Type type, int itemIndex, ResourceLocation worldId, BlockPos blockPos, + AEPartLocation side) { this.type = type; this.itemIndex = itemIndex; this.worldId = worldId; @@ -132,8 +133,7 @@ public final class ContainerLocator { public static ContainerLocator forPart(AEBasePart part) { IPartHost host = part.getHost(); DimensionalCoord pos = host.getLocation(); - return new ContainerLocator(Type.PART, -1, pos.getWorld().getWorld(), pos.getBlockPos(), - part.getSide()); + return new ContainerLocator(Type.PART, -1, pos.getWorld().getWorld(), pos.getBlockPos(), part.getSide()); } public boolean hasItemIndex() { @@ -202,8 +202,8 @@ public final class ContainerLocator { case 0: return new ContainerLocator(Type.PLAYER_INVENTORY, buf.readInt(), (ResourceLocation) null, null, null); case 1: - return new ContainerLocator(Type.PLAYER_INVENTORY_WITH_BLOCK_CONTEXT, buf.readInt(), buf.readResourceLocation(), - buf.readBlockPos(), AEPartLocation.values()[buf.readByte()]); + return new ContainerLocator(Type.PLAYER_INVENTORY_WITH_BLOCK_CONTEXT, buf.readInt(), + buf.readResourceLocation(), buf.readBlockPos(), AEPartLocation.values()[buf.readByte()]); case 2: return new ContainerLocator(Type.BLOCK, -1, buf.readResourceLocation(), buf.readBlockPos(), null); case 3: diff --git a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java index a67b27658..c4d548386 100644 --- a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java +++ b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java @@ -257,7 +257,8 @@ public class CraftConfirmContainer extends AEBaseContainer { // :P } } catch (final Throwable e) { - this.getPlayerInv().player.sendMessage(new StringTextComponent("Error: " + e.toString()), Util.DUMMY_UUID); + this.getPlayerInv().player.sendMessage(new StringTextComponent("Error: " + e.toString()), + Util.DUMMY_UUID); AELog.debug(e); this.setValidContainer(false); this.result = null; diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 330e03d76..783b0df34 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -689,12 +689,11 @@ final class Registration { public void registerStructures(RegistryEvent.Register> evt) { // Registering into the Forge registry is INSUFFICIENT! - // There's a bidirectional map in the Structure class itself primarily for the purposes of NBT serialization - StructureAccessor.register( - MeteoriteStructure.ID.toString(), + // There's a bidirectional map in the Structure class itself primarily for the + // purposes of NBT serialization + StructureAccessor.register(MeteoriteStructure.ID.toString(), MeteoriteStructure.INSTANCE.setRegistryName(MeteoriteStructure.ID), - GenerationStage.Decoration.TOP_LAYER_MODIFICATION - ); + GenerationStage.Decoration.TOP_LAYER_MODIFICATION); } public void registerBiomes(RegistryEvent.Register evt) { diff --git a/src/main/java/appeng/core/api/ApiClientHelper.java b/src/main/java/appeng/core/api/ApiClientHelper.java index cbc8891c6..0e43e3099 100644 --- a/src/main/java/appeng/core/api/ApiClientHelper.java +++ b/src/main/java/appeng/core/api/ApiClientHelper.java @@ -52,8 +52,8 @@ public class ApiClientHelper implements IClientHelper { final ICellInventory cellInventory = handler.getCellInv(); if (cellInventory != null) { - lines.add(new StringTextComponent(cellInventory.getUsedBytes() + " ") - .func_230529_a_(GuiText.Of.text()).func_240702_b_(" " + cellInventory.getTotalBytes() + " ") + lines.add(new StringTextComponent(cellInventory.getUsedBytes() + " ").func_230529_a_(GuiText.Of.text()) + .func_240702_b_(" " + cellInventory.getTotalBytes() + " ") .func_230529_a_(GuiText.BytesUsed.text())); lines.add(new StringTextComponent(cellInventory.getStoredItemTypes() + " ") @@ -66,11 +66,9 @@ public class ApiClientHelper implements IClientHelper { : GuiText.Excluded).getLocal(); if (handler.isFuzzy()) { - lines.add(GuiText.Partitioned.withSuffix(" - " + list + " ") - .func_230529_a_(GuiText.Fuzzy.text())); + lines.add(GuiText.Partitioned.withSuffix(" - " + list + " ").func_230529_a_(GuiText.Fuzzy.text())); } else { - lines.add(GuiText.Partitioned.withSuffix(" - " + list + " ") - .func_230529_a_(GuiText.Precise.text())); + lines.add(GuiText.Partitioned.withSuffix(" - " + list + " ").func_230529_a_(GuiText.Precise.text())); } } diff --git a/src/main/java/appeng/core/sync/network/NetworkHandler.java b/src/main/java/appeng/core/sync/network/NetworkHandler.java index 3b34ca687..6bed6b3af 100644 --- a/src/main/java/appeng/core/sync/network/NetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/NetworkHandler.java @@ -118,8 +118,8 @@ public class NetworkHandler { public void sendToAllAround(final BasePacket message, final TargetPoint point) { IPacket pkt = message.toPacket(NetworkDirection.PLAY_TO_CLIENT); - getServer().getPlayerList().sendToAllNearExcept(point.excluded, point.x, point.y, point.z, point.r2, point.world.func_234923_W_(), - pkt); + getServer().getPlayerList().sendToAllNearExcept(point.excluded, point.x, point.y, point.z, point.r2, + point.world.func_234923_W_(), pkt); } public void sendToServer(final BasePacket message) { diff --git a/src/main/java/appeng/core/sync/network/TargetPoint.java b/src/main/java/appeng/core/sync/network/TargetPoint.java index ed107c74d..1b56c1409 100644 --- a/src/main/java/appeng/core/sync/network/TargetPoint.java +++ b/src/main/java/appeng/core/sync/network/TargetPoint.java @@ -32,8 +32,7 @@ public class TargetPoint { return new TargetPoint(x, y, z, r2, world); } - public static TargetPoint at(ServerPlayerEntity excluded, double x, double y, double z, double r2, - World world) { + public static TargetPoint at(ServerPlayerEntity excluded, double x, double y, double z, double r2, World world) { return new TargetPoint(excluded, x, y, z, r2, world); } } diff --git a/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java index cc12abd53..398d91b14 100644 --- a/src/main/java/appeng/core/worlddata/WorldData.java +++ b/src/main/java/appeng/core/worlddata/WorldData.java @@ -62,8 +62,7 @@ public final class WorldData implements IWorldData { // Attach shared data to the server's overworld dimension if (overworld.func_234923_W_() != ServerWorld.field_234918_g_) { - throw new IllegalStateException( - "The server doesn't have an overworld we could store our data on!"); + throw new IllegalStateException("The server doesn't have an overworld we could store our data on!"); } final PlayerData playerData = overworld.getSavedData().getOrCreate(PlayerData::new, PlayerData.NAME); diff --git a/src/main/java/appeng/debug/ChunkLoaderTileEntity.java b/src/main/java/appeng/debug/ChunkLoaderTileEntity.java index 9dc2b6aaf..0fea38731 100644 --- a/src/main/java/appeng/debug/ChunkLoaderTileEntity.java +++ b/src/main/java/appeng/debug/ChunkLoaderTileEntity.java @@ -64,8 +64,7 @@ public class ChunkLoaderTileEntity extends AEBaseTileEntity implements ITickable ServerWorld serverWorld = (ServerWorld) world; if (!serverWorld.getForcedChunks().contains(chunkPos.asLong())) { - AELog.debug("Force-loading chunk @ %d,%d in %s", chunkPos.x, chunkPos.z, - serverWorld.func_234923_W_()); + AELog.debug("Force-loading chunk @ %d,%d in %s", chunkPos.x, chunkPos.z, serverWorld.func_234923_W_()); serverWorld.forceChunk(chunkPos.x, chunkPos.z, false); } } diff --git a/src/main/java/appeng/debug/DebugPartPlacerItem.java b/src/main/java/appeng/debug/DebugPartPlacerItem.java index b0af73c9e..70bf196e0 100644 --- a/src/main/java/appeng/debug/DebugPartPlacerItem.java +++ b/src/main/java/appeng/debug/DebugPartPlacerItem.java @@ -56,7 +56,8 @@ public class DebugPartPlacerItem extends AEBaseItem { TileEntity te = world.getTileEntity(pos); if (!(te instanceof IPartHost)) { - player.sendMessage(new StringTextComponent("Right-click something that will accept parts"), Util.DUMMY_UUID); + player.sendMessage(new StringTextComponent("Right-click something that will accept parts"), + Util.DUMMY_UUID); return ActionResultType.FAIL; } IPartHost center = (IPartHost) te; diff --git a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java b/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java index d2fb64b51..7aac566ed 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java @@ -57,8 +57,8 @@ public class FluidInterfaceScreen extends UpgradeableScreen openPriorityGui())); + this.addButton(new TabButton(this.getGuiLeft() + 154, this.getGuiTop(), 2 + 4 * 16, GuiText.Priority.text(), + this.itemRenderer, btn -> openPriorityGui())); } @Override @@ -67,8 +67,8 @@ public class FluidInterfaceScreen extends UpgradeableScreen 0) { @@ -75,12 +76,12 @@ public class FluidTankWidget extends Widget implements ITooltip { int iconHeightRemainder = scaledHeight % 16; if (iconHeightRemainder > 0) { - blit(matrixStack, this.x, this.y + this.height - iconHeightRemainder, getBlitOffset(), 16, iconHeightRemainder, - sprite); + blit(matrixStack, this.x, this.y + this.height - iconHeightRemainder, getBlitOffset(), 16, + iconHeightRemainder, sprite); } for (int i = 0; i < scaledHeight / 16; i++) { - blit(matrixStack, this.x, this.y + this.height - iconHeightRemainder - (i + 1) * 16, getBlitOffset(), 16, 16, - sprite); + blit(matrixStack, this.x, this.y + this.height - iconHeightRemainder - (i + 1) * 16, + getBlitOffset(), 16, 16, sprite); } } diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 15d61c354..dfee4ec24 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -970,7 +970,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn hostTile.getPos().getZ() + 0.5); from = from.add(direction.getXOffset() * 0.501, direction.getYOffset() * 0.501, direction.getZOffset() * 0.501); - final Vector3d to = from.add(direction.getXOffset(), direction.getYOffset(), direction.getZOffset()); + final Vector3d to = from.add(direction.getXOffset(), direction.getYOffset(), + direction.getZOffset()); final BlockRayTraceResult hit = null;// hostWorld.rayTraceBlocks( from, to ); //FIXME: // https://github.com/MinecraftForge/MinecraftForge/pull/6708 if (hit != null && !BAD_BLOCKS.contains(directedBlock)) { diff --git a/src/main/java/appeng/helpers/InvalidPatternHelper.java b/src/main/java/appeng/helpers/InvalidPatternHelper.java index 85cfd2f90..72288e9c6 100644 --- a/src/main/java/appeng/helpers/InvalidPatternHelper.java +++ b/src/main/java/appeng/helpers/InvalidPatternHelper.java @@ -126,7 +126,8 @@ public class InvalidPatternHelper { } public ITextComponent getFormattedToolTip() { - IFormattableTextComponent result = new StringTextComponent(this.getCount() + " ").func_230529_a_(this.getName()); + IFormattableTextComponent result = new StringTextComponent(this.getCount() + " ") + .func_230529_a_(this.getName()); if (!this.isValid()) { result.func_240699_a_(TextFormatting.RED); diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index 61d3a40d2..fcc49a0fd 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -58,7 +58,7 @@ public class MetaRotation implements IOrientable { public Direction getUp() { final BlockState state = this.w.getBlockState(this.pos); - if (this.facingProp != null && state.func_235901_b_(this.facingProp) ) { + if (this.facingProp != null && state.func_235901_b_(this.facingProp)) { return state.get(this.facingProp); } diff --git a/src/main/java/appeng/hooks/DynamicDimensions.java b/src/main/java/appeng/hooks/DynamicDimensions.java index 65a6b1190..92e4b8097 100644 --- a/src/main/java/appeng/hooks/DynamicDimensions.java +++ b/src/main/java/appeng/hooks/DynamicDimensions.java @@ -9,6 +9,6 @@ import net.minecraft.world.server.ServerWorld; public interface DynamicDimensions { ServerWorld addWorld(RegistryKey worldId, RegistryKey dimensionTypeId, - ChunkGenerator chunkGenerator); + ChunkGenerator chunkGenerator); } diff --git a/src/main/java/appeng/items/misc/EncodedPatternItem.java b/src/main/java/appeng/items/misc/EncodedPatternItem.java index d9f44bb92..b0117d4a2 100644 --- a/src/main/java/appeng/items/misc/EncodedPatternItem.java +++ b/src/main/java/appeng/items/misc/EncodedPatternItem.java @@ -120,10 +120,10 @@ public class EncodedPatternItem extends AEBaseItem { InvalidPatternHelper invalid = new InvalidPatternHelper(stack); - final ITextComponent label = (invalid.isCraftable() ? GuiText.Crafts.text() - : GuiText.Creates.text()).deepCopy().func_240702_b_(": "); - final ITextComponent and = new StringTextComponent(" ").deepCopy() - .func_230529_a_(GuiText.And.text()).deepCopy().func_240702_b_(" "); + final ITextComponent label = (invalid.isCraftable() ? GuiText.Crafts.text() : GuiText.Creates.text()) + .deepCopy().func_240702_b_(": "); + final ITextComponent and = new StringTextComponent(" ").deepCopy().func_230529_a_(GuiText.And.text()) + .deepCopy().func_240702_b_(" "); final ITextComponent with = GuiText.With.text().deepCopy().func_240702_b_(": "); boolean first = true; @@ -139,10 +139,8 @@ public class EncodedPatternItem extends AEBaseItem { } if (invalid.isCraftable()) { - final ITextComponent substitutionLabel = GuiText.Substitute.text().deepCopy() - .func_240702_b_(" "); - final ITextComponent canSubstitute = invalid.canSubstitute() ? GuiText.Yes.text() - : GuiText.No.text(); + final ITextComponent substitutionLabel = GuiText.Substitute.text().deepCopy().func_240702_b_(" "); + final ITextComponent canSubstitute = invalid.canSubstitute() ? GuiText.Yes.text() : GuiText.No.text(); lines.add(substitutionLabel.deepCopy().func_230529_a_(canSubstitute)); } @@ -160,8 +158,8 @@ public class EncodedPatternItem extends AEBaseItem { final Collection in = details.getInputs(); final Collection out = details.getOutputs(); - final ITextComponent label = (isCrafting ? GuiText.Crafts.text() : GuiText.Creates.text()) - .deepCopy().func_240702_b_(": "); + final ITextComponent label = (isCrafting ? GuiText.Crafts.text() : GuiText.Creates.text()).deepCopy() + .func_240702_b_(": "); final ITextComponent and = new StringTextComponent(" ").deepCopy().func_230529_a_(GuiText.And.text()) .func_240702_b_(" "); final ITextComponent with = GuiText.With.text().deepCopy().func_240702_b_(": "); diff --git a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java index c3cfe7239..6a47e7409 100644 --- a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java +++ b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java @@ -100,7 +100,7 @@ public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorag @Override public TransitionResult doSpatialTransition(final ItemStack is, final ServerWorld w, final WorldCoord min, - final WorldCoord max, int playerId) { + final WorldCoord max, int playerId) { final int targetX = max.x - min.x - 1; final int targetY = max.y - min.y - 1; final int targetZ = max.z - min.z - 1; diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java index a0b796cf7..7012a92d7 100644 --- a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java +++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java @@ -107,14 +107,15 @@ public class ColorApplicatorItem extends AEBasePoweredItem public ColorApplicatorItem(Item.Properties props) { super(AEConfig.instance().getColorApplicatorBattery(), props); - ItemModelsProperties.func_239418_a_(this, new ResourceLocation(AppEng.MOD_ID, "colored"), (itemStack, world, entity) -> { - // If the stack has no color, don't use the colored model since the impact of - // calling getColor for every quad is extremely high, if the stack tries to - // re-search its - // inventory for a new paintball everytime - AEColor col = getActiveColor(itemStack); - return (col != null) ? 1 : 0; - }); + ItemModelsProperties.func_239418_a_(this, new ResourceLocation(AppEng.MOD_ID, "colored"), + (itemStack, world, entity) -> { + // If the stack has no color, don't use the colored model since the impact of + // calling getColor for every quad is extremely high, if the stack tries to + // re-search its + // inventory for a new paintball everytime + AEColor col = getActiveColor(itemStack); + return (col != null) ? 1 : 0; + }); } @Override @@ -321,7 +322,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem } private boolean recolourBlock(final Block blk, final Direction side, final World w, final BlockPos pos, - final AEColor newColor, @Nullable final PlayerEntity p) { + final AEColor newColor, @Nullable final PlayerEntity p) { final BlockState state = w.getBlockState(pos); Block recolored = BlockRecolorer.recolor(blk, newColor); diff --git a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java index 71f414e5f..87bd8fe41 100644 --- a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java +++ b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java @@ -285,8 +285,9 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< while (penetration > 0 && hasDestroyed) { hasDestroyed = false; - final AxisAlignedBB bb = new AxisAlignedBB(Math.min(Vector3d.x, Vector3d1.x), Math.min(Vector3d.y, Vector3d1.y), - Math.min(Vector3d.z, Vector3d1.z), Math.max(Vector3d.x, Vector3d1.x), Math.max(Vector3d.y, Vector3d1.y), + final AxisAlignedBB bb = new AxisAlignedBB(Math.min(Vector3d.x, Vector3d1.x), + Math.min(Vector3d.y, Vector3d1.y), Math.min(Vector3d.z, Vector3d1.z), + Math.max(Vector3d.x, Vector3d1.x), Math.max(Vector3d.y, Vector3d1.y), Math.max(Vector3d.z, Vector3d1.z)).grow(16, 16, 16); Entity entity = null; @@ -322,8 +323,8 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< } } - RayTraceContext rayTraceContext = new RayTraceContext(Vector3d, Vector3d1, RayTraceContext.BlockMode.COLLIDER, - RayTraceContext.FluidMode.NONE, p); + RayTraceContext rayTraceContext = new RayTraceContext(Vector3d, Vector3d1, + RayTraceContext.BlockMode.COLLIDER, RayTraceContext.FluidMode.NONE, p); final Vector3d vec = new Vector3d(d0, d1, d2); RayTraceResult pos = w.rayTraceBlocks(rayTraceContext); if (entity != null && pos.getType() != RayTraceResult.Type.MISS diff --git a/src/main/java/appeng/mixins/DimensionStructuresSettingsMixin.java b/src/main/java/appeng/mixins/DimensionStructuresSettingsMixin.java index da616a07d..2790dc139 100644 --- a/src/main/java/appeng/mixins/DimensionStructuresSettingsMixin.java +++ b/src/main/java/appeng/mixins/DimensionStructuresSettingsMixin.java @@ -16,11 +16,13 @@ import net.minecraft.world.gen.settings.StructureSeparationSettings; import appeng.worldgen.meteorite.MeteoriteStructure; /** - * This Mixin will add the structure placement configuration for the meteorite structure - * to the static final immutable map that contains them. There is currently no - * Forge hook for this, and registering them during the registry event is already too late. + * This Mixin will add the structure placement configuration for the meteorite + * structure to the static final immutable map that contains them. There is + * currently no Forge hook for this, and registering them during the registry + * event is already too late. *

- * If this is not done, Meteorites spawn every chunk, since that is the default for missing entries. + * If this is not done, Meteorites spawn every chunk, since that is the default + * for missing entries. */ @Mixin(DimensionStructuresSettings.class) public class DimensionStructuresSettingsMixin { @@ -31,8 +33,7 @@ public class DimensionStructuresSettingsMixin { @Inject(method = "", at = @At("TAIL")) private static void addMeteoriteSpreadConfig(CallbackInfo ci) { - field_236191_b_ = ImmutableMap., StructureSeparationSettings>builder() - .putAll(field_236191_b_) + field_236191_b_ = ImmutableMap., StructureSeparationSettings>builder().putAll(field_236191_b_) .put(MeteoriteStructure.INSTANCE, new StructureSeparationSettings(32, 8, 124895654)).build(); } diff --git a/src/main/java/appeng/mixins/DimensionTypeMixin.java b/src/main/java/appeng/mixins/DimensionTypeMixin.java index e7812b11c..26fe8b0a3 100644 --- a/src/main/java/appeng/mixins/DimensionTypeMixin.java +++ b/src/main/java/appeng/mixins/DimensionTypeMixin.java @@ -20,8 +20,8 @@ public class DimensionTypeMixin { private static void addRegistryDefaults(IDynamicRegistries.Impl registryTracker, CallbackInfoReturnable cir) { registryTracker.func_239774_a_(SpatialDimensionManager.STORAGE_DIMENSION_TYPE, - new DimensionType(OptionalLong.of(12000), false, false, false, false, false, false, true, false, - false, 256, BlockTags.INFINIBURN_OVERWORLD.getName(), 1.0f)); + new DimensionType(OptionalLong.of(12000), false, false, false, false, false, false, true, false, false, + 256, BlockTags.INFINIBURN_OVERWORLD.getName(), 1.0f)); } diff --git a/src/main/java/appeng/mixins/MinecraftServerMixin.java b/src/main/java/appeng/mixins/MinecraftServerMixin.java index 5666a0c73..02cbf477e 100644 --- a/src/main/java/appeng/mixins/MinecraftServerMixin.java +++ b/src/main/java/appeng/mixins/MinecraftServerMixin.java @@ -48,7 +48,7 @@ public class MinecraftServerMixin implements DynamicDimensions { private SaveFormat.LevelSave anvilConverterForAnvilFile; public ServerWorld addWorld(RegistryKey worldId, RegistryKey dimensionTypeId, - ChunkGenerator chunkGenerator) { + ChunkGenerator chunkGenerator) { Preconditions.checkArgument(!worlds.containsKey(worldId), "World with id %s already exists.", worldId.func_240901_a_()); @@ -84,9 +84,9 @@ public class MinecraftServerMixin implements DynamicDimensions { MinecraftServer self = (MinecraftServer) (Object) this; DerivedWorldInfo unmodifiableLevelProperties = new DerivedWorldInfo(this.field_240768_i_, serverWorldProperties); - ServerWorld world = new ServerWorld(self, this.backgroundExecutor, this.anvilConverterForAnvilFile, unmodifiableLevelProperties, - worldId, dimensionTypeId, dimensionType, worldGenerationProgressListener, chunkGenerator, false, seed, - ImmutableList.of(), false); + ServerWorld world = new ServerWorld(self, this.backgroundExecutor, this.anvilConverterForAnvilFile, + unmodifiableLevelProperties, worldId, dimensionTypeId, dimensionType, worldGenerationProgressListener, + chunkGenerator, false, seed, ImmutableList.of(), false); worldBorder.addListener(new IBorderListener.Impl(world.getWorldBorder())); this.worlds.put(worldId, world); @@ -96,7 +96,8 @@ public class MinecraftServerMixin implements DynamicDimensions { generatorOptions.func_236224_e_().func_239662_d_(dimOptKey); // Otherwise it wont be saved // Ensure the save properties are saved, or the world will potentially be lost // on restart - this.anvilConverterForAnvilFile.func_237288_a_(this.field_240767_f_, this.field_240768_i_, self.getPlayerList().getHostPlayerData()); + this.anvilConverterForAnvilFile.func_237288_a_(this.field_240767_f_, this.field_240768_i_, + self.getPlayerList().getHostPlayerData()); return world; } diff --git a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java index f1882cc79..e18dbee82 100644 --- a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java @@ -179,7 +179,8 @@ public abstract class AbstractMonitorPart extends AbstractDisplayPart if (player.getHeldItem(hand).isEmpty()) { this.isLocked = !this.isLocked; - player.sendMessage((this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked).get(), Util.DUMMY_UUID); + player.sendMessage((this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked).get(), + Util.DUMMY_UUID); this.getHost().markForSave(); this.getHost().markForUpdate(); } diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 68e3864a7..e15fea31e 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -65,8 +65,8 @@ public class CachedPlane { private int verticalBits; private final BlockState matrixBlockState; - public CachedPlane(final ServerWorld w, final int minX, final int minY, final int minZ, final int maxX, final int maxY, - final int maxZ) { + public CachedPlane(final ServerWorld w, final int minX, final int minY, final int minZ, final int maxX, + final int maxY, final int maxZ) { Block matrixFrameBlock = Api.instance().definitions().blocks().matrixFrame().maybeBlock().orElse(null); if (matrixFrameBlock != null) { diff --git a/src/main/java/appeng/spatial/SpatialDimensionManager.java b/src/main/java/appeng/spatial/SpatialDimensionManager.java index 1e902a980..cdad38c6b 100644 --- a/src/main/java/appeng/spatial/SpatialDimensionManager.java +++ b/src/main/java/appeng/spatial/SpatialDimensionManager.java @@ -49,12 +49,12 @@ public final class SpatialDimensionManager implements ISpatialDimension { // we move the origin to the middle of region 0,0 public static final BlockPos REGION_CENTER = new BlockPos(512 / 2, 64, 512 / 2); - public static final RegistryKey STORAGE_DIMENSION_TYPE = RegistryKey.func_240903_a_(Registry.DIMENSION_TYPE_KEY, - AppEng.makeId("storage_cell")); + public static final RegistryKey STORAGE_DIMENSION_TYPE = RegistryKey + .func_240903_a_(Registry.DIMENSION_TYPE_KEY, AppEng.makeId("storage_cell")); // See the fabric version of this to get any idea what its doing - public static final DimensionRenderInfo STORAGE_SKY = new DimensionRenderInfo(Float.NaN /* disables clouds */, false, - DimensionRenderInfo.FogType.NONE /* we use a custom render mixin */, true, false) { + public static final DimensionRenderInfo STORAGE_SKY = new DimensionRenderInfo(Float.NaN /* disables clouds */, + false, DimensionRenderInfo.FogType.NONE /* we use a custom render mixin */, true, false) { @Override public Vector3d func_230494_a_(Vector3d p_230494_1_, float p_230494_2_) { @@ -97,8 +97,8 @@ public final class SpatialDimensionManager implements ISpatialDimension { ServerWorld world = dynamicDimensions.addWorld(worldId, STORAGE_DIMENSION_TYPE, StorageChunkGenerator.INSTANCE); - SpatialDimensionExtraData spatialExtraData = world.getSavedData() - .getOrCreate(SpatialDimensionExtraData::new, SpatialDimensionExtraData.ID); + SpatialDimensionExtraData spatialExtraData = world.getSavedData().getOrCreate(SpatialDimensionExtraData::new, + SpatialDimensionExtraData.ID); spatialExtraData.setSize(size); return worldId; diff --git a/src/main/java/appeng/spatial/StorageCellBiome.java b/src/main/java/appeng/spatial/StorageCellBiome.java index 0f7cc1bd6..f2f35027f 100644 --- a/src/main/java/appeng/spatial/StorageCellBiome.java +++ b/src/main/java/appeng/spatial/StorageCellBiome.java @@ -31,11 +31,12 @@ public class StorageCellBiome extends Biome { public StorageCellBiome() { super(new Biome.Builder() - .surfaceBuilder(new ConfiguredSurfaceBuilder<>(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_STONE_GRAVEL_CONFIG)) + .surfaceBuilder( + new ConfiguredSurfaceBuilder<>(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_STONE_GRAVEL_CONFIG)) .precipitation(RainType.NONE).category(Category.NONE).depth(0).scale(1) // Copied from the vanilla void biome - .temperature(0.5F).downfall(0.5F) - .func_235097_a_(new BiomeAmbience.Builder().func_235246_b_(4159204).func_235248_c_(329011).func_235239_a_(0).func_235238_a_()) + .temperature(0.5F).downfall(0.5F).func_235097_a_(new BiomeAmbience.Builder().func_235246_b_(4159204) + .func_235248_c_(329011).func_235239_a_(0).func_235238_a_()) .parent(null)); } diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index a3ba7f351..c9b86ba78 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -97,7 +97,8 @@ public class StorageHelper { newWorld.getChunkProvider().getChunk(MathHelper.floor(link.x) >> 4, MathHelper.floor(link.z) >> 4, ChunkStatus.FULL, true); - if (entity instanceof ServerPlayerEntity && link.dim.func_234922_V_() == SpatialDimensionManager.STORAGE_DIMENSION_TYPE) { + if (entity instanceof ServerPlayerEntity + && link.dim.func_234922_V_() == SpatialDimensionManager.STORAGE_DIMENSION_TYPE) { AppEng.instance().getAdvancementTriggers().getSpatialExplorer().trigger((ServerPlayerEntity) entity); } @@ -136,8 +137,9 @@ public class StorageHelper { } } - public void swapRegions(final ServerWorld srcWorld, final int srcX, final int srcY, final int srcZ, final ServerWorld dstWorld, - final int dstX, final int dstY, final int dstZ, final int scaleX, final int scaleY, final int scaleZ) { + public void swapRegions(final ServerWorld srcWorld, final int srcX, final int srcY, final int srcZ, + final ServerWorld dstWorld, final int dstX, final int dstY, final int dstZ, final int scaleX, + final int scaleY, final int scaleZ) { Api.instance().definitions().blocks().matrixFrame().maybeBlock() .ifPresent(matrixFrameBlock -> this.transverseEdges(dstX - 1, dstY - 1, dstZ - 1, dstX + scaleX + 1, dstY + scaleY + 1, dstZ + scaleZ + 1, diff --git a/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java b/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java index 5f5b0d3ad..46eec20b1 100644 --- a/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java +++ b/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java @@ -140,8 +140,8 @@ public class SpatialIOPortTileEntity extends AENetworkInvTileEntity implements I playerId = this.getProxy().getSecurity().getOwner(); } - final TransitionResult tr = sc.doSpatialTransition(cell, serverWorld, spc.getMin(), spc.getMax(), - playerId); + final TransitionResult tr = sc.doSpatialTransition(cell, serverWorld, spc.getMin(), + spc.getMax(), playerId); if (tr.success) { energy.extractAEPower(req, Actionable.MODULATE, PowerMultiplier.CONFIG); this.inv.setStackInSlot(0, ItemStack.EMPTY); diff --git a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java index eaac90b9c..fcc2e50a8 100644 --- a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java +++ b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java @@ -27,7 +27,8 @@ public class ChargedQuartzOreFeature extends Feature { } @Override - public boolean func_230362_a_(ISeedReader worldIn, StructureManager structureAccessor, ChunkGenerator generator, Random rand, BlockPos pos, ChargedQuartzOreConfig config) { + public boolean func_230362_a_(ISeedReader worldIn, StructureManager structureAccessor, ChunkGenerator generator, + Random rand, BlockPos pos, ChargedQuartzOreConfig config) { ChunkPos chunkPos = new ChunkPos(pos); BlockPos.Mutable bpos = new BlockPos.Mutable(); diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java index 4e1da28a6..175b96918 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java @@ -17,8 +17,7 @@ public class MeteoriteStructure extends Structure { public static final ResourceLocation ID = AppEng.makeId("meteorite"); - public static final Structure INSTANCE = new MeteoriteStructure( - NoFeatureConfig.field_236558_a_); + public static final Structure INSTANCE = new MeteoriteStructure(NoFeatureConfig.field_236558_a_); public MeteoriteStructure(Codec configCodec) { super(configCodec); @@ -31,7 +30,9 @@ public class MeteoriteStructure extends Structure { } @Override - protected boolean func_230363_a_(ChunkGenerator generator, BiomeProvider biomeSource, long seed, SharedSeedRandom randIn, int chunkX, int chunkZ, Biome biome, ChunkPos chunkPos2, NoFeatureConfig featureConfig) { + protected boolean func_230363_a_(ChunkGenerator generator, BiomeProvider biomeSource, long seed, + SharedSeedRandom randIn, int chunkX, int chunkZ, Biome biome, ChunkPos chunkPos2, + NoFeatureConfig featureConfig) { return randIn.nextBoolean(); } diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java index dad15f4e8..77dd2dde2 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java @@ -86,11 +86,13 @@ public class MeteoriteStructurePiece extends StructurePiece { } @Override - public boolean func_230383_a_(ISeedReader world, StructureManager p_230383_2_, ChunkGenerator chunkGeneratorIn, Random rand, MutableBoundingBox bounds, ChunkPos chunkPos, BlockPos p_230383_7_) { + public boolean func_230383_a_(ISeedReader world, StructureManager p_230383_2_, ChunkGenerator chunkGeneratorIn, + Random rand, MutableBoundingBox bounds, ChunkPos chunkPos, BlockPos p_230383_7_) { MeteoritePlacer placer = new MeteoritePlacer(world, settings, bounds); placer.place(); - WorldData.instance().compassData().service().tryUpdateArea(world, chunkPos); // FIXME: We know the y-range here... + WorldData.instance().compassData().service().tryUpdateArea(world, chunkPos); // FIXME: We know the y-range + // here... return true; } } diff --git a/src/main/resources/appliedenergistics2.mixins.json b/src/main/resources/appliedenergistics2.mixins.json index dc34c44b5..c4dd6f20d 100644 --- a/src/main/resources/appliedenergistics2.mixins.json +++ b/src/main/resources/appliedenergistics2.mixins.json @@ -10,10 +10,7 @@ "DimensionStructuresSettingsMixin", "StructureAccessor" ], - "client": [ - "SkyRenderMixin", - "SkyPropertiesMixin" - ], + "client": ["SkyRenderMixin", "SkyPropertiesMixin"], "server": [], "injectors": { "defaultRequire": 1