From f991b3cdce9e729ed488a540623fba2329bc9808 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Sun, 18 Jun 2023 13:46:10 +0200 Subject: [PATCH] chore: format code --- .../net/anvilcraft/pccompat/PCCompat.java | 3 +- ...BlockPowerConverterAppliedEnergistics.java | 7 ++- .../blocks/BlockPowerConverterHBM.java | 4 +- ...BlockPowerConverterAppliedEnergistics.java | 2 - .../items/ItemBlockPowerConverterHBM.java | 2 - .../mods/AppliedEnergisticsProxy.java | 44 +++++++++---------- .../anvilcraft/pccompat/mods/HBMProxy.java | 38 ++++++---------- .../mods/UniversalElectricityProxy.java | 12 ++--- .../TileEntityAppliedEnergisticsConsumer.java | 33 +++++++++----- .../TileEntityAppliedEnergisticsProducer.java | 18 ++++---- .../pccompat/tiles/TileEntityHBMConsumer.java | 29 +++++++----- .../pccompat/tiles/TileEntityHBMProducer.java | 25 +++++++---- ...ileEntityUniversalElectricityConsumer.java | 24 +++++----- ...ileEntityUniversalElectricityProducer.java | 4 +- 14 files changed, 123 insertions(+), 122 deletions(-) diff --git a/src/main/java/net/anvilcraft/pccompat/PCCompat.java b/src/main/java/net/anvilcraft/pccompat/PCCompat.java index 1c776f6..629cf08 100644 --- a/src/main/java/net/anvilcraft/pccompat/PCCompat.java +++ b/src/main/java/net/anvilcraft/pccompat/PCCompat.java @@ -17,7 +17,8 @@ import net.anvilcraft.pccompat.mods.UniversalElectricityProxy; modid = "pccompat", name = "PC Compat", version = "0.1.0", - dependencies = "required-after:PowerConverters3;after:basiccomponents" + dependencies + = "required-after:PowerConverters3;after:basiccomponents;after:ae2;after:hbm" ) public class PCCompat { public static HashSet mods = new HashSet<>(); diff --git a/src/main/java/net/anvilcraft/pccompat/blocks/BlockPowerConverterAppliedEnergistics.java b/src/main/java/net/anvilcraft/pccompat/blocks/BlockPowerConverterAppliedEnergistics.java index 4b270c2..2d9e183 100644 --- a/src/main/java/net/anvilcraft/pccompat/blocks/BlockPowerConverterAppliedEnergistics.java +++ b/src/main/java/net/anvilcraft/pccompat/blocks/BlockPowerConverterAppliedEnergistics.java @@ -8,15 +8,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public class BlockPowerConverterAppliedEnergistics extends BlockPowerConverter { - public BlockPowerConverterAppliedEnergistics() { super(2); this.setCreativeTab(PCCreativeTab.tab); } - + @Override public TileEntity createNewTileEntity(World world, int meta) { - return meta == 0 ? new TileEntityAppliedEnergisticsProducer() : new TileEntityAppliedEnergisticsConsumer(); + return meta == 0 ? new TileEntityAppliedEnergisticsProducer() + : new TileEntityAppliedEnergisticsConsumer(); } - } diff --git a/src/main/java/net/anvilcraft/pccompat/blocks/BlockPowerConverterHBM.java b/src/main/java/net/anvilcraft/pccompat/blocks/BlockPowerConverterHBM.java index 6926327..c89f327 100644 --- a/src/main/java/net/anvilcraft/pccompat/blocks/BlockPowerConverterHBM.java +++ b/src/main/java/net/anvilcraft/pccompat/blocks/BlockPowerConverterHBM.java @@ -8,15 +8,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public class BlockPowerConverterHBM extends BlockPowerConverter { - public BlockPowerConverterHBM() { super(2); this.setCreativeTab(PCCreativeTab.tab); } - + @Override public TileEntity createNewTileEntity(World world, int meta) { return meta == 0 ? new TileEntityHBMProducer() : new TileEntityHBMConsumer(); } - } diff --git a/src/main/java/net/anvilcraft/pccompat/items/ItemBlockPowerConverterAppliedEnergistics.java b/src/main/java/net/anvilcraft/pccompat/items/ItemBlockPowerConverterAppliedEnergistics.java index 771e83b..c61e17e 100644 --- a/src/main/java/net/anvilcraft/pccompat/items/ItemBlockPowerConverterAppliedEnergistics.java +++ b/src/main/java/net/anvilcraft/pccompat/items/ItemBlockPowerConverterAppliedEnergistics.java @@ -10,7 +10,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class ItemBlockPowerConverterAppliedEnergistics extends ItemBlock { - public ItemBlockPowerConverterAppliedEnergistics(Block block) { super(block); this.setHasSubtypes(true); @@ -36,5 +35,4 @@ public class ItemBlockPowerConverterAppliedEnergistics extends ItemBlock { .mapToObj((i) -> new ItemStack(this, 1, i)) .forEach(list::add); } - } diff --git a/src/main/java/net/anvilcraft/pccompat/items/ItemBlockPowerConverterHBM.java b/src/main/java/net/anvilcraft/pccompat/items/ItemBlockPowerConverterHBM.java index 286130a..ea75053 100644 --- a/src/main/java/net/anvilcraft/pccompat/items/ItemBlockPowerConverterHBM.java +++ b/src/main/java/net/anvilcraft/pccompat/items/ItemBlockPowerConverterHBM.java @@ -10,7 +10,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class ItemBlockPowerConverterHBM extends ItemBlock { - public ItemBlockPowerConverterHBM(Block block) { super(block); this.setHasSubtypes(true); @@ -36,5 +35,4 @@ public class ItemBlockPowerConverterHBM extends ItemBlock { .mapToObj((i) -> new ItemStack(this, 1, i)) .forEach(list::add); } - } diff --git a/src/main/java/net/anvilcraft/pccompat/mods/AppliedEnergisticsProxy.java b/src/main/java/net/anvilcraft/pccompat/mods/AppliedEnergisticsProxy.java index 62da399..c13c73a 100644 --- a/src/main/java/net/anvilcraft/pccompat/mods/AppliedEnergisticsProxy.java +++ b/src/main/java/net/anvilcraft/pccompat/mods/AppliedEnergisticsProxy.java @@ -1,8 +1,7 @@ package net.anvilcraft.pccompat.mods; -import com.google.common.base.Optional; - import appeng.api.AEApi; +import com.google.common.base.Optional; import covers1624.powerconverters.api.registry.PowerSystemRegistry; import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem; import cpw.mods.fml.common.registry.GameRegistry; @@ -18,37 +17,41 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; public class AppliedEnergisticsProxy implements IModProxy { - public static PowerSystem powerSystem; public static Block blockPowerConverter; @Override public void registerPowerSystem() { PowerSystemRegistry.registerPowerSystem( - powerSystem = new PowerSystem( - "Applied Energistics", - "AE", - 2000, - "AE" - ) + powerSystem = new PowerSystem("Applied Energistics", "AE", 2000, "AE") ); } @Override public void registerBlocks() { - GameRegistry.registerBlock(blockPowerConverter = new BlockPowerConverterAppliedEnergistics(), ItemBlockPowerConverterAppliedEnergistics.class, "power_converter_applied_energistics"); + GameRegistry.registerBlock( + blockPowerConverter = new BlockPowerConverterAppliedEnergistics(), + ItemBlockPowerConverterAppliedEnergistics.class, + "power_converter_applied_energistics" + ); } @Override public void registerTiles() { - GameRegistry.registerTileEntity(TileEntityAppliedEnergisticsConsumer.class, "applied_energistics_consumer"); - GameRegistry.registerTileEntity(TileEntityAppliedEnergisticsProducer.class, "applied_energistics_producer"); + GameRegistry.registerTileEntity( + TileEntityAppliedEnergisticsConsumer.class, "applied_energistics_consumer" + ); + GameRegistry.registerTileEntity( + TileEntityAppliedEnergisticsProducer.class, "applied_energistics_producer" + ); } @Override public void registerRecipes() { - Optional acceptor = AEApi.instance().definitions().blocks().energyAcceptor().maybeStack(1); - Optional cell = AEApi.instance().definitions().blocks().energyCell().maybeStack(1); + Optional acceptor + = AEApi.instance().definitions().blocks().energyAcceptor().maybeStack(1); + Optional cell + = AEApi.instance().definitions().blocks().energyCell().maybeStack(1); if (acceptor.isPresent() || cell.isPresent()) { ItemStack stack = acceptor.isPresent() ? acceptor.get() : cell.get(); new RecipeBuilder(new ShapedOreRecipeAdapter()) @@ -60,20 +63,13 @@ public class AppliedEnergisticsProxy implements IModProxy { } new RecipeBuilder(new ShapelessOreRecipeAdapter()) - .ingredient( - new ItemStack(blockPowerConverter, 1, 0) - ) - .output( - new ItemStack(blockPowerConverter, 1, 1) - ) + .ingredient(new ItemStack(blockPowerConverter, 1, 0)) + .output(new ItemStack(blockPowerConverter, 1, 1)) .register(); new RecipeBuilder(new ShapelessOreRecipeAdapter()) - .ingredient( - new ItemStack(blockPowerConverter, 1, 1) - ) + .ingredient(new ItemStack(blockPowerConverter, 1, 1)) .output(new ItemStack(blockPowerConverter, 1, 0)) .register(); } - } diff --git a/src/main/java/net/anvilcraft/pccompat/mods/HBMProxy.java b/src/main/java/net/anvilcraft/pccompat/mods/HBMProxy.java index 661f6a0..8b7edf4 100644 --- a/src/main/java/net/anvilcraft/pccompat/mods/HBMProxy.java +++ b/src/main/java/net/anvilcraft/pccompat/mods/HBMProxy.java @@ -1,7 +1,6 @@ package net.anvilcraft.pccompat.mods; import com.hbm.blocks.ModBlocks; - import covers1624.powerconverters.api.registry.PowerSystemRegistry; import covers1624.powerconverters.api.registry.PowerSystemRegistry.PowerSystem; import cpw.mods.fml.common.registry.GameRegistry; @@ -17,25 +16,23 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; public class HBMProxy implements IModProxy { - public static PowerSystem powerSystem; public static Block blockPowerConverter; @Override public void registerPowerSystem() { PowerSystemRegistry.registerPowerSystem( - powerSystem = new PowerSystem( - "HBM", - "HBM", - 4000, - "HE" - ) + powerSystem = new PowerSystem("HBM", "HBM", 4000, "HE") ); } @Override public void registerBlocks() { - GameRegistry.registerBlock(blockPowerConverter = new BlockPowerConverterHBM(), ItemBlockPowerConverterHBM.class, "power_converter_hbm"); + GameRegistry.registerBlock( + blockPowerConverter = new BlockPowerConverterHBM(), + ItemBlockPowerConverterHBM.class, + "power_converter_hbm" + ); } @Override @@ -46,32 +43,23 @@ public class HBMProxy implements IModProxy { @Override public void registerRecipes() { - ItemStack cable = new ItemStack(ModBlocks.red_cable); new RecipeBuilder(new ShapedOreRecipeAdapter()) .pattern("G G", " C ", "G G") .ingredient('G', "ingotGold") .ingredient('C', cable) - .output(new ItemStack(blockPowerConverter, 1 ,0)) - .register(); - - - new RecipeBuilder(new ShapelessOreRecipeAdapter()) - .ingredient( - new ItemStack(blockPowerConverter, 1, 0) - ) - .output( - new ItemStack(blockPowerConverter, 1, 1) - ) + .output(new ItemStack(blockPowerConverter, 1, 0)) .register(); new RecipeBuilder(new ShapelessOreRecipeAdapter()) - .ingredient( - new ItemStack(blockPowerConverter, 1, 1) - ) + .ingredient(new ItemStack(blockPowerConverter, 1, 0)) + .output(new ItemStack(blockPowerConverter, 1, 1)) + .register(); + + new RecipeBuilder(new ShapelessOreRecipeAdapter()) + .ingredient(new ItemStack(blockPowerConverter, 1, 1)) .output(new ItemStack(blockPowerConverter, 1, 0)) .register(); } - } diff --git a/src/main/java/net/anvilcraft/pccompat/mods/UniversalElectricityProxy.java b/src/main/java/net/anvilcraft/pccompat/mods/UniversalElectricityProxy.java index 21d5107..48910a1 100644 --- a/src/main/java/net/anvilcraft/pccompat/mods/UniversalElectricityProxy.java +++ b/src/main/java/net/anvilcraft/pccompat/mods/UniversalElectricityProxy.java @@ -86,18 +86,12 @@ public class UniversalElectricityProxy implements IModProxy { for (int i = 0; i < 8; i += 2) { new RecipeBuilder(new ShapelessOreRecipeAdapter()) - .ingredient( - new ItemStack(blockPowerConverter, 1, i) - ) - .output( - new ItemStack(blockPowerConverter, 1, i + 1) - ) + .ingredient(new ItemStack(blockPowerConverter, 1, i)) + .output(new ItemStack(blockPowerConverter, 1, i + 1)) .register(); new RecipeBuilder(new ShapelessOreRecipeAdapter()) - .ingredient( - new ItemStack(blockPowerConverter, 1, i + 1) - ) + .ingredient(new ItemStack(blockPowerConverter, 1, i + 1)) .output(new ItemStack(blockPowerConverter, 1, i)) .register(); } diff --git a/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityAppliedEnergisticsConsumer.java b/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityAppliedEnergisticsConsumer.java index 18bad4e..f66faa1 100644 --- a/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityAppliedEnergisticsConsumer.java +++ b/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityAppliedEnergisticsConsumer.java @@ -17,15 +17,20 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityAppliedEnergisticsConsumer extends TileEntityEnergyConsumer implements IGridProxyable { - +public class TileEntityAppliedEnergisticsConsumer + extends TileEntityEnergyConsumer implements IGridProxyable { private AENetworkProxy proxy; private boolean init = false; private double lastInserted = 0.0; public TileEntityAppliedEnergisticsConsumer() { super(AppliedEnergisticsProxy.powerSystem, 0, IGridHost.class); - this.proxy = new AENetworkProxy(this, "proxy", new ItemStack(AppliedEnergisticsProxy.blockPowerConverter, 1, 1), true); + this.proxy = new AENetworkProxy( + this, + "proxy", + new ItemStack(AppliedEnergisticsProxy.blockPowerConverter, 1, 1), + true + ); this.proxy.setIdlePowerUsage(0.0); } @@ -60,9 +65,7 @@ public class TileEntityAppliedEnergisticsConsumer extends TileEntityEnergyConsum } @Override - public void gridChanged() { - - } + public void gridChanged() {} @Override public void readFromNBT(NBTTagCompound tagCompound) { @@ -101,20 +104,26 @@ public class TileEntityAppliedEnergisticsConsumer extends TileEntityEnergyConsum init = true; this.getProxy().onReady(); } - if (this.worldObj.isRemote) return; + if (this.worldObj.isRemote) + return; - double aeDemand = this.getTotalEnergyDemand() / this.getPowerSystem().getScaleAmmount(); + double aeDemand + = this.getTotalEnergyDemand() / this.getPowerSystem().getScaleAmmount(); try { IEnergyGrid grid = this.getProxy().getEnergy(); - double extracted = grid.extractAEPower(aeDemand, Actionable.MODULATE, PowerMultiplier.ONE); - this.storeEnergy(MathHelper.floor_double(extracted * this.getPowerSystem().getScaleAmmount()), false); + double extracted + = grid.extractAEPower(aeDemand, Actionable.MODULATE, PowerMultiplier.ONE); + this.storeEnergy( + MathHelper.floor_double( + extracted * this.getPowerSystem().getScaleAmmount() + ), + false + ); this.lastInserted = extracted; } catch (GridAccessException e) { // :P lastInserted = 0.0; } - } - } diff --git a/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityAppliedEnergisticsProducer.java b/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityAppliedEnergisticsProducer.java index c47e3d3..bc772cd 100644 --- a/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityAppliedEnergisticsProducer.java +++ b/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityAppliedEnergisticsProducer.java @@ -16,14 +16,19 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityAppliedEnergisticsProducer extends TileEntityEnergyProducer implements IGridProxyable { - +public class TileEntityAppliedEnergisticsProducer + extends TileEntityEnergyProducer implements IGridProxyable { private AENetworkProxy proxy; private boolean init = false; public TileEntityAppliedEnergisticsProducer() { super(AppliedEnergisticsProxy.powerSystem, 0, IGridHost.class); - this.proxy = new AENetworkProxy(this, "proxy", new ItemStack(AppliedEnergisticsProxy.blockPowerConverter, 1, 0), true); + this.proxy = new AENetworkProxy( + this, + "proxy", + new ItemStack(AppliedEnergisticsProxy.blockPowerConverter, 1, 0), + true + ); this.proxy.setIdlePowerUsage(0.0); } @@ -38,7 +43,7 @@ public class TileEntityAppliedEnergisticsProducer extends TileEntityEnergyProduc } catch (GridAccessException e) { // :P } - + return MathHelper.floor_double(ae * this.getPowerSystem().getScaleAmmount()); } @@ -68,9 +73,7 @@ public class TileEntityAppliedEnergisticsProducer extends TileEntityEnergyProduc } @Override - public void gridChanged() { - - } + public void gridChanged() {} @Override public void readFromNBT(NBTTagCompound tagCompound) { @@ -110,5 +113,4 @@ public class TileEntityAppliedEnergisticsProducer extends TileEntityEnergyProduc this.getProxy().onReady(); } } - } diff --git a/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityHBMConsumer.java b/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityHBMConsumer.java index cfd7fa3..d85ee5b 100644 --- a/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityHBMConsumer.java +++ b/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityHBMConsumer.java @@ -6,8 +6,8 @@ import net.anvilcraft.pccompat.mods.HBMProxy; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityHBMConsumer extends TileEntityEnergyConsumer implements IEnergyConnector { - +public class TileEntityHBMConsumer + extends TileEntityEnergyConsumer implements IEnergyConnector { private boolean isLoaded = true; private boolean recursionBrake = false; private boolean transferLastTick = false; @@ -22,9 +22,15 @@ public class TileEntityHBMConsumer extends TileEntityEnergyConsumer implements IEnergyGenerator { - +public class TileEntityHBMProducer + extends TileEntityEnergyProducer implements IEnergyGenerator { private boolean isLoaded = true; private boolean recursionBrake = false; private long subBuffer = 0; @@ -19,17 +19,25 @@ public class TileEntityHBMProducer extends TileEntityEnergyProducer implements IConnector, IVoltage { + extends TileEntityEnergyConsumer implements IConnector, IVoltage { private double wattsLastTick; public TileEntityUniversalElectricityConsumer(int voltageNameIndex) { - super( - UniversalElectricityProxy.powerSystem, voltageNameIndex, IConductor.class); + super(UniversalElectricityProxy.powerSystem, voltageNameIndex, IConductor.class); } // TODO: WTF @@ -32,24 +31,29 @@ public class TileEntityUniversalElectricityConsumer if (this.worldObj.isRemote) return; - double desiredWatts = this.getTotalEnergyDemand() / this.getPowerSystem().getScaleAmmount(); + double desiredWatts + = this.getTotalEnergyDemand() / this.getPowerSystem().getScaleAmmount(); - ElectricityPack powerRequested = new ElectricityPack(desiredWatts / this.getVoltage(), this.getVoltage()); + ElectricityPack powerRequested + = new ElectricityPack(desiredWatts / this.getVoltage(), this.getVoltage()); - ElectricityPack powerPack = ElectricityNetworkHelper.consumeFromMultipleSides(this, powerRequested); + ElectricityPack powerPack + = ElectricityNetworkHelper.consumeFromMultipleSides(this, powerRequested); if (UniversalElectricity.isVoltageSensitive - && powerPack.voltage > this.getVoltage()) { + && powerPack.voltage > this.getVoltage()) { this.worldObj.setBlockToAir(this.xCoord, this.yCoord, this.zCoord); this.worldObj.createExplosion( - null, this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, 1f, true); + null, this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, 1f, true + ); } double watts = powerPack.getWatts(); this.storeEnergy( - MathHelper.floor_double(watts * this.getPowerSystem().getScaleAmmount()), - false); + MathHelper.floor_double(watts * this.getPowerSystem().getScaleAmmount()), + false + ); this.wattsLastTick = watts; } diff --git a/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityUniversalElectricityProducer.java b/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityUniversalElectricityProducer.java index 6b7c7bc..97bb99a 100644 --- a/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityUniversalElectricityProducer.java +++ b/src/main/java/net/anvilcraft/pccompat/tiles/TileEntityUniversalElectricityProducer.java @@ -13,9 +13,7 @@ import universalelectricity.core.electricity.ElectricityPack; public class TileEntityUniversalElectricityProducer extends TileEntityEnergyProducer implements IConnector, IVoltage { public TileEntityUniversalElectricityProducer(int voltageNameIndex) { - super( - UniversalElectricityProxy.powerSystem, voltageNameIndex, IConductor.class - ); + super(UniversalElectricityProxy.powerSystem, voltageNameIndex, IConductor.class); } // TODO: WTF