Anvilcraft/pccompat
2
1
Fork 1
generated from tilera/1710mod
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

chore: format code

Browse source
This commit is contained in:
LordMZTE 2023-06-18 13:46:10 +02:00
parent 07a5234e88
commit f991b3cdce
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
14 changed files with 123 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/anvilcraft/pccompat/PCCompat.java
View file

@ -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<IModProxy> mods = new HashSet<>();

7
src/main/java/net/anvilcraft/pccompat/blocks/BlockPowerConverterAppliedEnergistics.java
View file

@ -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();
}
}

4
src/main/java/net/anvilcraft/pccompat/blocks/BlockPowerConverterHBM.java
View file

@ -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();
}
}

2
src/main/java/net/anvilcraft/pccompat/items/ItemBlockPowerConverterAppliedEnergistics.java
View file

@ -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);
}
}

2
src/main/java/net/anvilcraft/pccompat/items/ItemBlockPowerConverterHBM.java
View file

@ -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);
}
}

44
src/main/java/net/anvilcraft/pccompat/mods/AppliedEnergisticsProxy.java
View file

@ -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<ItemStack> acceptor = AEApi.instance().definitions().blocks().energyAcceptor().maybeStack(1);
Optional<ItemStack> cell = AEApi.instance().definitions().blocks().energyCell().maybeStack(1);
Optional<ItemStack> acceptor
= AEApi.instance().definitions().blocks().energyAcceptor().maybeStack(1);
Optional<ItemStack> 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();
}
}

38
src/main/java/net/anvilcraft/pccompat/mods/HBMProxy.java
View file

@ -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();
}
}

12
src/main/java/net/anvilcraft/pccompat/mods/UniversalElectricityProxy.java
View file

@ -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();
}

33
src/main/java/net/anvilcraft/pccompat/tiles/TileEntityAppliedEnergisticsConsumer.java
View file

@ -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<IGridHost> implements IGridProxyable {
public class TileEntityAppliedEnergisticsConsumer
extends TileEntityEnergyConsumer<IGridHost> 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;
}
}
}

18
src/main/java/net/anvilcraft/pccompat/tiles/TileEntityAppliedEnergisticsProducer.java
View file

@ -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<IGridHost> implements IGridProxyable {
public class TileEntityAppliedEnergisticsProducer
extends TileEntityEnergyProducer<IGridHost> 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();
}
}
}

29
src/main/java/net/anvilcraft/pccompat/tiles/TileEntityHBMConsumer.java
View file

@ -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<IEnergyConnector> implements IEnergyConnector {
public class TileEntityHBMConsumer
extends TileEntityEnergyConsumer<IEnergyConnector> implements IEnergyConnector {
private boolean isLoaded = true;
private boolean recursionBrake = false;
private boolean transferLastTick = false;
@ -22,9 +22,15 @@ public class TileEntityHBMConsumer extends TileEntityEnergyConsumer<IEnergyConne
super.updateEntity();
if (!worldObj.isRemote) {
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
this.trySubscribe(worldObj, xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir);
}
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
this.trySubscribe(
worldObj,
xCoord + dir.offsetX,
yCoord + dir.offsetY,
zCoord + dir.offsetZ,
dir
);
}
if (this.transferLastTick) {
this.transferLastTick = false;
@ -32,7 +38,7 @@ public class TileEntityHBMConsumer extends TileEntityEnergyConsumer<IEnergyConne
this.lastTransfer = 0.0;
}
}
@Override
public double getInputRate() {
return lastTransfer;
@ -45,7 +51,8 @@ public class TileEntityHBMConsumer extends TileEntityEnergyConsumer<IEnergyConne
@Override
public long getMaxPower() {
return (long) (this.getTotalEnergyDemand() / this.getPowerSystem().getScaleAmmount());
return (long
) (this.getTotalEnergyDemand() / this.getPowerSystem().getScaleAmmount());
}
@Override
@ -61,13 +68,16 @@ public class TileEntityHBMConsumer extends TileEntityEnergyConsumer<IEnergyConne
@Override
public long transferPower(long power) {
if (recursionBrake) return power;
if (recursionBrake)
return power;
this.recursionBrake = true;
long toInsert = power * this.getPowerSystem().getScaleAmmount();
double leftover = this.storeEnergy(toInsert, false);
long ret = MathHelper.floor_double_long(leftover / this.getPowerSystem().getScaleAmmount());
long ret = MathHelper.floor_double_long(
leftover / this.getPowerSystem().getScaleAmmount()
);
this.lastTransfer = power - ret;
@ -76,5 +86,4 @@ public class TileEntityHBMConsumer extends TileEntityEnergyConsumer<IEnergyConne
return ret;
}
}

25
src/main/java/net/anvilcraft/pccompat/tiles/TileEntityHBMProducer.java
View file

@ -7,8 +7,8 @@ import net.anvilcraft.pccompat.mods.HBMProxy;
import net.minecraft.util.MathHelper;
import net.minecraftforge.common.util.ForgeDirection;
public class TileEntityHBMProducer extends TileEntityEnergyProducer<IEnergyConnector> implements IEnergyGenerator {
public class TileEntityHBMProducer
extends TileEntityEnergyProducer<IEnergyConnector> implements IEnergyGenerator {
private boolean isLoaded = true;
private boolean recursionBrake = false;
private long subBuffer = 0;
@ -19,17 +19,25 @@ public class TileEntityHBMProducer extends TileEntityEnergyProducer<IEnergyConne
@Override
public double produceEnergy(double energy) {
if (this.recursionBrake) return energy;
if (this.recursionBrake)
return energy;
this.recursionBrake = true;
long toProduce = MathHelper.floor_double_long(energy / this.getPowerSystem().getScaleAmmount());
long toProduce = MathHelper.floor_double_long(
energy / this.getPowerSystem().getScaleAmmount()
);
this.subBuffer = toProduce;
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
this.sendPower(worldObj, xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir);
}
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
this.sendPower(
worldObj,
xCoord + dir.offsetX,
yCoord + dir.offsetY,
zCoord + dir.offsetZ,
dir
);
}
this.recursionBrake = false;
@ -64,5 +72,4 @@ public class TileEntityHBMProducer extends TileEntityEnergyProducer<IEnergyConne
this.isLoaded = false;
super.onChunkUnload();
}
}

24
src/main/java/net/anvilcraft/pccompat/tiles/TileEntityUniversalElectricityConsumer.java
View file

@ -12,12 +12,11 @@ import universalelectricity.core.electricity.ElectricityNetworkHelper;
import universalelectricity.core.electricity.ElectricityPack;
public class TileEntityUniversalElectricityConsumer
extends TileEntityEnergyConsumer<IConductor> implements IConnector, IVoltage {
extends TileEntityEnergyConsumer<IConductor> 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;
}

4
src/main/java/net/anvilcraft/pccompat/tiles/TileEntityUniversalElectricityProducer.java
View file

@ -13,9 +13,7 @@ import universalelectricity.core.electricity.ElectricityPack;
public class TileEntityUniversalElectricityProducer
extends TileEntityEnergyProducer<IConductor> implements IConnector, IVoltage {
public TileEntityUniversalElectricityProducer(int voltageNameIndex) {
super(
UniversalElectricityProxy.powerSystem, voltageNameIndex, IConductor.class
);
super(UniversalElectricityProxy.powerSystem, voltageNameIndex, IConductor.class);
}
// TODO: WTF