From ded3877b419a1514994bc454f299302a94c80b4b Mon Sep 17 00:00:00 2001 From: Shadows_of_Fire Date: Thu, 2 May 2019 04:43:27 -0400 Subject: [PATCH] rerun the formatter --- .../mod/blocks/base/BlockPlant.java | 18 +- .../config/values/ConfigStringListValues.java | 1 - .../mod/tile/TileEntityBase.java | 2 +- .../mod/tile/TileEntityLaserRelay.java | 2 +- .../actuallyadditions/mod/util/AssetUtil.java | 16 +- .../mod/util/NetHandlerSpaghettiServer.java | 216 +++++++++--------- 6 files changed, 127 insertions(+), 128 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index a33595ebc..712bd03c1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -1,12 +1,12 @@ /* - * This file ("BlockPlant.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2017 Ellpeck - */ +* This file ("BlockPlant.java") is part of the Actually Additions mod for Minecraft. +* It is created and owned by Ellpeck and distributed +* under the Actually Additions License to be found at +* http://ellpeck.de/actaddlicense +* View the source code at https://github.com/Ellpeck/ActuallyAdditions +* +* © 2015-2017 Ellpeck +*/ package de.ellpeck.actuallyadditions.mod.blocks.base; @@ -103,7 +103,7 @@ public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarit drop.shrink(1); deductedSeedSize = true; } - if(StackUtil.isValid(drop)){ + if (StackUtil.isValid(drop)) { ItemHandlerHelper.giveItemToPlayer(player, drop); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigStringListValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigStringListValues.java index 7b83fcd09..bfcb883cd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigStringListValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigStringListValues.java @@ -85,7 +85,6 @@ public enum ConfigStringListValues { new String[0], "The items that aren't allowed to be put in the Repairer. Use REGISTRY NAMES, and if metadata is needed, add it like so: somemod:some_block@3"); - public final String name; public final String category; public final String[] defaultValue; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java index 006fe5ac5..0ac6cb8cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java @@ -163,7 +163,7 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { if(this.world != null && !this.world.isRemote){ NBTTagCompound compound = new NBTTagCompound(); this.writeSyncableNBT(compound, NBTType.SYNC); - + NBTTagCompound data = new NBTTagCompound(); data.setTag("Data", compound); data.setInteger("X", this.pos.getX()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java index 858a08401..b79c8d5cf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java @@ -109,7 +109,7 @@ public abstract class TileEntityLaserRelay extends TileEntityInventoryBase { this.renderParticles(); } } - + @SideOnly(Side.CLIENT) public void renderParticles(){ if(this.world.rand.nextInt(8) == 0){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java index 66e23549b..75a6103de 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java @@ -289,42 +289,42 @@ public final class AssetUtil { /*if(r != r2 || g != g2 || b != b2){ render.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); Minecraft.getMinecraft().renderEngine.bindTexture(ClientUtil.LIGHT_BEAM_GRADIENT); - + render.pos(length, -beamWidth, beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex(); render.pos(length, beamWidth, beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex(); render.pos(0, beamWidth, beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex(); render.pos(0, -beamWidth, beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex(); - + render.pos(length, -beamWidth, beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(length, beamWidth, beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, beamWidth, beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, -beamWidth, beamWidth).tex(0, 0).color(r2, g2, b2, alpha).endVertex(); - + render.pos(length, beamWidth, -beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex(); render.pos(length, -beamWidth, -beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex(); render.pos(0, -beamWidth, -beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex(); render.pos(0, beamWidth, -beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex(); - + render.pos(length, beamWidth, -beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(length, -beamWidth, -beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, -beamWidth, -beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, beamWidth, -beamWidth).tex(0, 0).color(r2, g2, b2, alpha).endVertex(); - + render.pos(length, beamWidth, beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex(); render.pos(length, beamWidth, -beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex(); render.pos(0, beamWidth, -beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex(); render.pos(0, beamWidth, beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex(); - + render.pos(length, beamWidth, beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(length, beamWidth, -beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, beamWidth, -beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, beamWidth, beamWidth).tex(0, 0).color(r2, g2, b2, alpha).endVertex(); - + render.pos(length, -beamWidth, -beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex(); render.pos(length, -beamWidth, beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex(); render.pos(0, -beamWidth, beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex(); render.pos(0, -beamWidth, -beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex(); - + render.pos(length, -beamWidth, -beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(length, -beamWidth, beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, -beamWidth, beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/NetHandlerSpaghettiServer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/NetHandlerSpaghettiServer.java index f2c0aa850..651d67554 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/NetHandlerSpaghettiServer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/NetHandlerSpaghettiServer.java @@ -42,149 +42,149 @@ import net.minecraftforge.common.util.FakePlayer; public class NetHandlerSpaghettiServer extends NetHandlerPlayServer { - public NetHandlerSpaghettiServer(FakePlayer player) { - super(null, new NetworkManager(EnumPacketDirection.CLIENTBOUND), player); - } + public NetHandlerSpaghettiServer(FakePlayer player) { + super(null, new NetworkManager(EnumPacketDirection.CLIENTBOUND), player); + } - @Override - public void disconnect(ITextComponent textComponent) { - } + @Override + public void disconnect(ITextComponent textComponent) { + } - @Override - public void func_194308_a(CPacketPlaceRecipe p_194308_1_) { - } + @Override + public void func_194308_a(CPacketPlaceRecipe p_194308_1_) { + } - @Override - public void handleAnimation(CPacketAnimation packetIn) { - } + @Override + public void handleAnimation(CPacketAnimation packetIn) { + } - @Override - public void handleRecipeBookUpdate(CPacketRecipeInfo p_191984_1_) { - } + @Override + public void handleRecipeBookUpdate(CPacketRecipeInfo p_191984_1_) { + } - @Override - public void handleResourcePackStatus(CPacketResourcePackStatus packetIn) { - } + @Override + public void handleResourcePackStatus(CPacketResourcePackStatus packetIn) { + } - @Override - public void handleSeenAdvancements(CPacketSeenAdvancements p_194027_1_) { - } + @Override + public void handleSeenAdvancements(CPacketSeenAdvancements p_194027_1_) { + } - @Override - public void handleSpectate(CPacketSpectate packetIn) { - } + @Override + public void handleSpectate(CPacketSpectate packetIn) { + } - @Override - public void onDisconnect(ITextComponent reason) { - } + @Override + public void onDisconnect(ITextComponent reason) { + } - @Override - public void processChatMessage(CPacketChatMessage packetIn) { - } + @Override + public void processChatMessage(CPacketChatMessage packetIn) { + } - @Override - public void processClickWindow(CPacketClickWindow packetIn) { - } + @Override + public void processClickWindow(CPacketClickWindow packetIn) { + } - @Override - public void processClientSettings(CPacketClientSettings packetIn) { - } + @Override + public void processClientSettings(CPacketClientSettings packetIn) { + } - @Override - public void processClientStatus(CPacketClientStatus packetIn) { - } + @Override + public void processClientStatus(CPacketClientStatus packetIn) { + } - @Override - public void processCloseWindow(CPacketCloseWindow packetIn) { - } + @Override + public void processCloseWindow(CPacketCloseWindow packetIn) { + } - @Override - public void processConfirmTeleport(CPacketConfirmTeleport packetIn) { - } + @Override + public void processConfirmTeleport(CPacketConfirmTeleport packetIn) { + } - @Override - public void processConfirmTransaction(CPacketConfirmTransaction packetIn) { - } + @Override + public void processConfirmTransaction(CPacketConfirmTransaction packetIn) { + } - @Override - public void processCreativeInventoryAction(CPacketCreativeInventoryAction packetIn) { - } + @Override + public void processCreativeInventoryAction(CPacketCreativeInventoryAction packetIn) { + } - @Override - public void processCustomPayload(CPacketCustomPayload packetIn) { - } + @Override + public void processCustomPayload(CPacketCustomPayload packetIn) { + } - @Override - public void processEnchantItem(CPacketEnchantItem packetIn) { - } + @Override + public void processEnchantItem(CPacketEnchantItem packetIn) { + } - @Override - public void processEntityAction(CPacketEntityAction packetIn) { - } + @Override + public void processEntityAction(CPacketEntityAction packetIn) { + } - @Override - public void processHeldItemChange(CPacketHeldItemChange packetIn) { - } + @Override + public void processHeldItemChange(CPacketHeldItemChange packetIn) { + } - @Override - public void processInput(CPacketInput packetIn) { - } + @Override + public void processInput(CPacketInput packetIn) { + } - @Override - public void processKeepAlive(CPacketKeepAlive packetIn) { - } + @Override + public void processKeepAlive(CPacketKeepAlive packetIn) { + } - @Override - public void processPlayer(CPacketPlayer packetIn) { - } + @Override + public void processPlayer(CPacketPlayer packetIn) { + } - @Override - public void processPlayerAbilities(CPacketPlayerAbilities packetIn) { - } + @Override + public void processPlayerAbilities(CPacketPlayerAbilities packetIn) { + } - @Override - public void processPlayerDigging(CPacketPlayerDigging packetIn) { - } + @Override + public void processPlayerDigging(CPacketPlayerDigging packetIn) { + } - @Override - public void processSteerBoat(CPacketSteerBoat packetIn) { - } + @Override + public void processSteerBoat(CPacketSteerBoat packetIn) { + } - @Override - public void processTabComplete(CPacketTabComplete packetIn) { - } + @Override + public void processTabComplete(CPacketTabComplete packetIn) { + } - @Override - public void processTryUseItem(CPacketPlayerTryUseItem packetIn) { - } + @Override + public void processTryUseItem(CPacketPlayerTryUseItem packetIn) { + } - @Override - public void processTryUseItemOnBlock(CPacketPlayerTryUseItemOnBlock packetIn) { - } + @Override + public void processTryUseItemOnBlock(CPacketPlayerTryUseItemOnBlock packetIn) { + } - @Override - public void processUpdateSign(CPacketUpdateSign packetIn) { - } + @Override + public void processUpdateSign(CPacketUpdateSign packetIn) { + } - @Override - public void processUseEntity(CPacketUseEntity packetIn) { - } + @Override + public void processUseEntity(CPacketUseEntity packetIn) { + } - @Override - public void processVehicleMove(CPacketVehicleMove packetIn) { - } + @Override + public void processVehicleMove(CPacketVehicleMove packetIn) { + } - @Override - public void sendPacket(Packet packetIn) { - } + @Override + public void sendPacket(Packet packetIn) { + } - @Override - public void setPlayerLocation(double x, double y, double z, float yaw, float pitch) { - } + @Override + public void setPlayerLocation(double x, double y, double z, float yaw, float pitch) { + } - @Override - public void setPlayerLocation(double x, double y, double z, float yaw, float pitch, Set relativeSet) { + @Override + public void setPlayerLocation(double x, double y, double z, float yaw, float pitch, Set relativeSet) { - } + } }