From 36d5c6219624be39f9172b4cf0b477d4149da6a2 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Sat, 10 Dec 2022 09:29:42 +0100 Subject: [PATCH] feat: update to UE 5 --- build.gradle | 5 +- .../java/atomicscience/AtomicScience.java | 6 +- .../java/atomicscience/api/AtomicScience.java | 17 --- .../atomicscience/api/BlockRadioactive.java | 140 ------------------ .../atomicscience/api/IAntiPoisonArmor.java | 14 -- .../atomicscience/api/IAntiPoisonBlock.java | 9 -- .../atomicscience/api/IElectromagnet.java | 8 - .../atomicscience/api/IFissileMaterial.java | 8 - .../java/atomicscience/api/IHeatSource.java | 6 - src/main/java/atomicscience/api/IReactor.java | 7 - .../atomicscience/api/ISteamReceptor.java | 7 - .../java/atomicscience/api/ITemperature.java | 9 -- src/main/java/atomicscience/api/Plasma.java | 17 --- .../java/atomicscience/api/poison/Poison.java | 77 ---------- .../api/poison/PoisonRadiation.java | 66 --------- .../api/poison/PotionRadiation.java | 32 ---- .../atomicscience/shimian/GAccelerator.java | 15 +- .../atomicscience/shimian/GCentrifuge.java | 10 +- .../shimian/GChemicalExtractor.java | 10 +- .../shimian/GFissionReactor.java | 4 +- .../atomicscience/shimian/GNuclearBoiler.java | 10 +- 21 files changed, 31 insertions(+), 446 deletions(-) delete mode 100644 src/main/java/atomicscience/api/AtomicScience.java delete mode 100644 src/main/java/atomicscience/api/BlockRadioactive.java delete mode 100644 src/main/java/atomicscience/api/IAntiPoisonArmor.java delete mode 100644 src/main/java/atomicscience/api/IAntiPoisonBlock.java delete mode 100644 src/main/java/atomicscience/api/IElectromagnet.java delete mode 100644 src/main/java/atomicscience/api/IFissileMaterial.java delete mode 100644 src/main/java/atomicscience/api/IHeatSource.java delete mode 100644 src/main/java/atomicscience/api/IReactor.java delete mode 100644 src/main/java/atomicscience/api/ISteamReceptor.java delete mode 100644 src/main/java/atomicscience/api/ITemperature.java delete mode 100644 src/main/java/atomicscience/api/Plasma.java delete mode 100644 src/main/java/atomicscience/api/poison/Poison.java delete mode 100644 src/main/java/atomicscience/api/poison/PoisonRadiation.java delete mode 100644 src/main/java/atomicscience/api/poison/PotionRadiation.java diff --git a/build.gradle b/build.gradle index 83e9419..8cdae79 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ apply plugin: 'maven-publish' sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 -version = "1.0.1" +version = "1.1.0" group = "universalelectricity" archivesBaseName = "atomicscience" @@ -37,7 +37,8 @@ repositories { } dependencies { - implementation "universalelectricity:basiccomponents:1.1.1:deobf" + implementation "universalelectricity:basiccomponents:2.0.0:deobf" + implementation "universalelectricity:universalelectricity:5.1.0:deobf" } processResources { diff --git a/src/main/java/atomicscience/AtomicScience.java b/src/main/java/atomicscience/AtomicScience.java index a7bb9e9..8bf60f9 100644 --- a/src/main/java/atomicscience/AtomicScience.java +++ b/src/main/java/atomicscience/AtomicScience.java @@ -105,7 +105,7 @@ import universalelectricity.prefab.ore.OreGenBase; import universalelectricity.prefab.ore.OreGenReplaceStone; import universalelectricity.prefab.ore.OreGenerator; -@Mod(modid = "AtomicScience", name = "Atomic Science", version = "0.6.2", +@Mod(modid = "AtomicScience", name = "Atomic Science", version = "1.1.0", dependencies = "required-after:basiccomponents") public class AtomicScience { public static Configuration CONFIGURATION = @@ -402,8 +402,8 @@ public class AtomicScience { "Electricity generation is always a burden. That\'s why we are here to bring in high tech nuclear power to solve all your electricity-lack problems. With our fission reactors, fusion reactors, and antimatter generators, you won\'t be lacking electricity ever again!"; metadata.url = "https://git.tilera.org/Anvilcraft/atomicscience"; metadata.logoFile = "/as_logo.png"; - metadata.version = "0.6.2.117"; - metadata.authorList = Arrays.asList(new String[] {"Calclavia"}); + metadata.version = "1.1.0"; + metadata.authorList = Arrays.asList(new String[] {"Calclavia", "LordMZTE", "tilera"}); metadata.credits = "Please visit the website."; metadata.logoFile = "as_logo.png"; metadata.autogenerated = false; diff --git a/src/main/java/atomicscience/api/AtomicScience.java b/src/main/java/atomicscience/api/AtomicScience.java deleted file mode 100644 index 1fdc223..0000000 --- a/src/main/java/atomicscience/api/AtomicScience.java +++ /dev/null @@ -1,17 +0,0 @@ -package atomicscience.api; - -import cpw.mods.fml.common.Loader; -import net.minecraftforge.common.config.Configuration; - -import java.io.File; - -public class AtomicScience { - - public static final String MAJOR_VERSION = "0"; - public static final String MINOR_VERSION = "6"; - public static final String REVISION_VERSION = "2"; - public static final String BUILD_VERSION = "117"; - public static final String VERSION = "0.6.2"; - public static final String NAME = "Atomic Science"; - public static final Configuration CONFIGURATION = new Configuration(new File(Loader.instance().getConfigDir(), "AtomicScience.cfg")); -} diff --git a/src/main/java/atomicscience/api/BlockRadioactive.java b/src/main/java/atomicscience/api/BlockRadioactive.java deleted file mode 100644 index 04aa906..0000000 --- a/src/main/java/atomicscience/api/BlockRadioactive.java +++ /dev/null @@ -1,140 +0,0 @@ -package atomicscience.api; - -import atomicscience.api.poison.PoisonRadiation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import java.util.List; -import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntitySmokeFX; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import universalelectricity.core.vector.Vector3; - -public class BlockRadioactive extends Block { - - public static int RECOMMENDED_ID = 3768; - public boolean canSpread; - public float radius; - public int amplifier; - public boolean canWalkPoison; - public boolean isRandomlyRadioactive; - private IIcon iconTop; - private IIcon iconBottom; - - public BlockRadioactive(Material material) { - super(material); - this.canSpread = true; - this.radius = 5.0F; - this.amplifier = 2; - this.canWalkPoison = true; - this.isRandomlyRadioactive = true; - this.setTickRandomly(true); - this.setHardness(0.2F); - this.setLightLevel(0.1F); - } - - public BlockRadioactive() { this(Material.rock); } - - @Override - public IIcon getIcon(int side, int metadata) { - return side == 1 ? this.iconTop - : (side == 0 ? this.iconBottom : this.blockIcon); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - super.registerBlockIcons(iconRegister); - this.blockIcon = iconRegister.registerIcon( - this.getUnlocalizedName().replace("tile.", "")); - this.iconTop = iconRegister.registerIcon( - this.getUnlocalizedName().replace("tile.", "") + "_top"); - this.iconBottom = iconRegister.registerIcon( - this.getUnlocalizedName().replace("tile.", "") + "_bottom"); - } - - @Override - public void onBlockClicked(World world, int x, int y, int z, - EntityPlayer par5EntityPlayer) { - if ((double)world.rand.nextFloat() > 0.8D) { - this.updateTick(world, x, y, z, world.rand); - } - } - - @Override - public void updateTick(World world, int x, int y, int z, Random rand) { - if (!world.isRemote) { - if (this.isRandomlyRadioactive) { - AxisAlignedBB i = AxisAlignedBB.getBoundingBox( - (double)((float)x - this.radius), (double)((float)y - this.radius), - (double)((float)z - this.radius), (double)((float)x + this.radius), - (double)((float)y + this.radius), (double)((float)z + this.radius)); - List newX = - world.getEntitiesWithinAABB(EntityLiving.class, i); - - for (EntityLiving newZ : newX) { - PoisonRadiation.INSTANCE.poisonEntity( - new Vector3((double)x, (double)y, (double)z), newZ, - this.amplifier); - } - } - - if (this.canSpread) { - for (int var11 = 0; var11 < 4; ++var11) { - int xOffset = x + rand.nextInt(3) - 1; - int yOffset = y + rand.nextInt(5) - 3; - int zOffset = z + rand.nextInt(3) - 1; - Block block = world.getBlock(xOffset, yOffset, zOffset); - if ((double)rand.nextFloat() > 0.4D && - (block == Blocks.farmland || block == Blocks.grass)) { - world.setBlock(xOffset, yOffset, zOffset, this); - } - } - - if ((double)rand.nextFloat() > 0.85D) { - world.setBlock(x, y, z, Blocks.mycelium); - } - } - } - } - - public void func_71891_b(World par1World, int x, int y, int z, - Entity par5Entity) { - if (par5Entity instanceof EntityLiving && this.canWalkPoison) { - PoisonRadiation.INSTANCE.poisonEntity( - new Vector3((double)x, (double)y, (double)z), - (EntityLiving)par5Entity); - } - } - - public int func_71925_a(Random par1Random) { return 0; } - - @SideOnly(Side.CLIENT) - public void func_71862_a(World world, int x, int y, int z, - Random par5Random) { - if (Minecraft.getMinecraft().gameSettings.particleSetting == 0) { - byte radius = 3; - - for (int i = 0; i < 2; ++i) { - Vector3 diDian = new Vector3((double)x, (double)y, (double)z); - diDian.x += Math.random() * (double)radius - (double)(radius / 2); - diDian.y += Math.random() * (double)radius - (double)(radius / 2); - diDian.z += Math.random() * (double)radius - (double)(radius / 2); - EntitySmokeFX fx = new EntitySmokeFX( - world, diDian.x, diDian.y, diDian.z, (Math.random() - 0.5D) / 2.0D, - (Math.random() - 0.5D) / 2.0D, (Math.random() - 0.5D) / 2.0D); - fx.setRBGColorF(0.2F, 0.8F, 0.0F); - Minecraft.getMinecraft().effectRenderer.addEffect(fx); - } - } - } -} diff --git a/src/main/java/atomicscience/api/IAntiPoisonArmor.java b/src/main/java/atomicscience/api/IAntiPoisonArmor.java deleted file mode 100644 index fc05b65..0000000 --- a/src/main/java/atomicscience/api/IAntiPoisonArmor.java +++ /dev/null @@ -1,14 +0,0 @@ -package atomicscience.api; - -import atomicscience.api.poison.Poison; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -public interface IAntiPoisonArmor { - - boolean isProtectedFromPoison(ItemStack var1, EntityLivingBase var2, Poison var3); - - void onProtectFromPoison(ItemStack var1, EntityLivingBase var2, Poison var3); - - Poison.ArmorType getArmorType(); -} diff --git a/src/main/java/atomicscience/api/IAntiPoisonBlock.java b/src/main/java/atomicscience/api/IAntiPoisonBlock.java deleted file mode 100644 index c013b03..0000000 --- a/src/main/java/atomicscience/api/IAntiPoisonBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package atomicscience.api; - -import atomicscience.api.poison.Poison; -import net.minecraft.world.World; - -public interface IAntiPoisonBlock { - - boolean isPoisonPrevention(World var1, int var2, int var3, int var4, Poison var5); -} diff --git a/src/main/java/atomicscience/api/IElectromagnet.java b/src/main/java/atomicscience/api/IElectromagnet.java deleted file mode 100644 index 7b92be0..0000000 --- a/src/main/java/atomicscience/api/IElectromagnet.java +++ /dev/null @@ -1,8 +0,0 @@ -package atomicscience.api; - -import net.minecraft.world.World; - -public interface IElectromagnet { - - boolean isRunning(World var1, int var2, int var3, int var4); -} diff --git a/src/main/java/atomicscience/api/IFissileMaterial.java b/src/main/java/atomicscience/api/IFissileMaterial.java deleted file mode 100644 index 174c7e7..0000000 --- a/src/main/java/atomicscience/api/IFissileMaterial.java +++ /dev/null @@ -1,8 +0,0 @@ -package atomicscience.api; - -import atomicscience.api.ITemperature; - -public interface IFissileMaterial { - - int onFissile(ITemperature var1); -} diff --git a/src/main/java/atomicscience/api/IHeatSource.java b/src/main/java/atomicscience/api/IHeatSource.java deleted file mode 100644 index 14a3f7d..0000000 --- a/src/main/java/atomicscience/api/IHeatSource.java +++ /dev/null @@ -1,6 +0,0 @@ -package atomicscience.api; - -import atomicscience.api.ITemperature; - -public interface IHeatSource extends ITemperature { -} diff --git a/src/main/java/atomicscience/api/IReactor.java b/src/main/java/atomicscience/api/IReactor.java deleted file mode 100644 index 1e85b0e..0000000 --- a/src/main/java/atomicscience/api/IReactor.java +++ /dev/null @@ -1,7 +0,0 @@ -package atomicscience.api; - - -public interface IReactor { - - boolean isOverToxic(); -} diff --git a/src/main/java/atomicscience/api/ISteamReceptor.java b/src/main/java/atomicscience/api/ISteamReceptor.java deleted file mode 100644 index 057cbed..0000000 --- a/src/main/java/atomicscience/api/ISteamReceptor.java +++ /dev/null @@ -1,7 +0,0 @@ -package atomicscience.api; - - -public interface ISteamReceptor { - - void onReceiveSteam(int var1); -} diff --git a/src/main/java/atomicscience/api/ITemperature.java b/src/main/java/atomicscience/api/ITemperature.java deleted file mode 100644 index 943e2fa..0000000 --- a/src/main/java/atomicscience/api/ITemperature.java +++ /dev/null @@ -1,9 +0,0 @@ -package atomicscience.api; - - -public interface ITemperature { - - float getTemperature(); - - void setTemperature(float var1); -} diff --git a/src/main/java/atomicscience/api/Plasma.java b/src/main/java/atomicscience/api/Plasma.java deleted file mode 100644 index 4505c99..0000000 --- a/src/main/java/atomicscience/api/Plasma.java +++ /dev/null @@ -1,17 +0,0 @@ -package atomicscience.api; - -import net.minecraft.world.World; - -public class Plasma { - - public static Plasma.IPlasma blockPlasma; - - - - public interface IPlasma { - - void spawn(World var1, int var2, int var3, int var4, byte var5); - - boolean canPlace(World var1, int var2, int var3, int var4); - } -} diff --git a/src/main/java/atomicscience/api/poison/Poison.java b/src/main/java/atomicscience/api/poison/Poison.java deleted file mode 100644 index 81abe27..0000000 --- a/src/main/java/atomicscience/api/poison/Poison.java +++ /dev/null @@ -1,77 +0,0 @@ -package atomicscience.api.poison; - -import atomicscience.api.IAntiPoisonArmor; -import java.util.EnumSet; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import universalelectricity.core.vector.Vector3; - -public abstract class Poison { - - public static Poison[] list = new Poison[32]; - protected String name; - protected EnumSet armorRequired; - - public Poison(String name, int id) { - this.armorRequired = EnumSet.range(Poison.ArmorType.HELM, Poison.ArmorType.BOOTS); - this.name = name; - if (list == null) { - list = new Poison[32]; - } - - list[0] = this; - } - - public String getName() { - return this.name; - } - - public EnumSet getArmorRequired() { - return this.armorRequired; - } - - public void poisonEntity(Vector3 emitPosition, EntityLivingBase entity, - int amplifier) { - EnumSet armorWorn = EnumSet.of(Poison.ArmorType.UNKNOWN); - if (entity instanceof EntityPlayer) { - EntityPlayer entityPlayer = (EntityPlayer) entity; - - for (int i = 0; i < entityPlayer.inventory.armorInventory.length; ++i) { - if (entityPlayer.inventory.armorInventory[i] != null && - entityPlayer.inventory.armorInventory[i].getItem() instanceof IAntiPoisonArmor && - ((IAntiPoisonArmor) entityPlayer.inventory.armorInventory[i] - .getItem()) - .isProtectedFromPoison(entityPlayer.inventory.armorInventory[i], - entity, this)) { - ((IAntiPoisonArmor) entityPlayer.inventory.armorInventory[i].getItem()) - .onProtectFromPoison(entityPlayer.inventory.armorInventory[i], - entity, this); - armorWorn.add( - ((IAntiPoisonArmor) entityPlayer.inventory.armorInventory[i] - .getItem()) - .getArmorType()); - } - } - } - - if (!armorWorn.containsAll(this.armorRequired)) { - this.doPoisonEntity(emitPosition, entity, armorWorn, amplifier); - } - } - - public void poisonEntity(Vector3 emitPosition, EntityLivingBase entity) { - this.poisonEntity(emitPosition, entity, 0); - } - - protected abstract void doPoisonEntity(Vector3 var1, EntityLivingBase var2, - EnumSet var3, int var4); - - public static enum ArmorType { - HELM, - BODY, - LEGGINGS, - BOOTS, - UNKNOWN; - } -} diff --git a/src/main/java/atomicscience/api/poison/PoisonRadiation.java b/src/main/java/atomicscience/api/poison/PoisonRadiation.java deleted file mode 100644 index 21fc3af..0000000 --- a/src/main/java/atomicscience/api/poison/PoisonRadiation.java +++ /dev/null @@ -1,66 +0,0 @@ -package atomicscience.api.poison; - -import atomicscience.api.IAntiPoisonBlock; -import java.util.EnumSet; -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import universalelectricity.core.vector.Vector3; -import universalelectricity.prefab.CustomDamageSource; -import universalelectricity.prefab.potion.CustomPotionEffect; - -public class PoisonRadiation extends Poison { - - public static final Poison INSTANCE = new PoisonRadiation("radiation", 0); - public static final CustomDamageSource damageSource = (CustomDamageSource) (new CustomDamageSource("radiation")) - .setDamageBypassesArmor(); - public static boolean disabled = false; - - public PoisonRadiation(String name, int id) { - super(name, id); - } - - @Override - protected void doPoisonEntity(Vector3 emitPosition, EntityLivingBase entity, - EnumSet armorWorn, - int amplifier) { - if (!disabled) { - if (emitPosition == null) { - entity.addPotionEffect( - new CustomPotionEffect(PotionRadiation.INSTANCE.getId(), - 300 * (amplifier + 1), amplifier, null)); - return; - } - - if (this.getAntiRadioactiveCount(entity.worldObj, emitPosition, - new Vector3(entity)) <= amplifier) { - entity.addPotionEffect( - new CustomPotionEffect(PotionRadiation.INSTANCE.getId(), - 400 * (amplifier + 1), amplifier, null)); - } - } - } - - public int getAntiRadioactiveCount(World world, Vector3 startingPosition, - Vector3 endingPosition) { - Vector3 delta = Vector3.subtract(endingPosition, startingPosition).normalize(); - Vector3 targetPosition = startingPosition.clone(); - double totalDistance = startingPosition.distanceTo(endingPosition); - int count = 0; - if (totalDistance > 1.0D) { - for (; targetPosition.distanceTo(endingPosition) <= totalDistance; targetPosition.add(delta)) { - Block block = targetPosition.getBlock(world); - if (block != Blocks.air && block instanceof IAntiPoisonBlock && - ((IAntiPoisonBlock) block) - .isPoisonPrevention(world, targetPosition.intX(), - targetPosition.intY(), - targetPosition.intZ(), this)) { - ++count; - } - } - } - - return count; - } -} diff --git a/src/main/java/atomicscience/api/poison/PotionRadiation.java b/src/main/java/atomicscience/api/poison/PotionRadiation.java deleted file mode 100644 index c36d417..0000000 --- a/src/main/java/atomicscience/api/poison/PotionRadiation.java +++ /dev/null @@ -1,32 +0,0 @@ -package atomicscience.api.poison; - -import atomicscience.api.AtomicScience; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import universalelectricity.prefab.potion.CustomPotion; - -public class PotionRadiation extends CustomPotion { - public static PotionRadiation INSTANCE; - - public PotionRadiation(int id, boolean isBadEffect, int color, String name) { - super(AtomicScience.CONFIGURATION.get("Potion", name + " potion ID", id) - .getInt(id), - isBadEffect, color, name); - this.setIconIndex(6, 0); - } - - @Override - public void performEffect(EntityLivingBase entity, int amplifier) { - if ((double) entity.worldObj.rand.nextFloat() > 0.9D - (double) amplifier * 0.08D) { - entity.attackEntityFrom(PoisonRadiation.damageSource, 1); - if (entity instanceof EntityPlayer) { - ((EntityPlayer) entity) - .addExhaustion(0.01F * (float) (amplifier + 1)); - } - } - } - - public boolean isReady(int duration, int amplifier) { - return duration % 10 == 0; - } -} diff --git a/src/main/java/atomicscience/shimian/GAccelerator.java b/src/main/java/atomicscience/shimian/GAccelerator.java index 6bba559..8422e74 100644 --- a/src/main/java/atomicscience/shimian/GAccelerator.java +++ b/src/main/java/atomicscience/shimian/GAccelerator.java @@ -7,7 +7,8 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import universalelectricity.core.electricity.ElectricityDisplay; + +import universalelectricity.api.energy.UnitDisplay; import universalelectricity.core.vector.Vector3; public class GAccelerator extends GuiContainer { @@ -54,20 +55,20 @@ public class GAccelerator extends GuiContainer { 8, 27, 4210752); this.fontRendererObj.drawString("Status: " + status, 8, 38, 4210752); this.fontRendererObj.drawString( - "Used: " + ElectricityDisplay.getDisplayShort( + "Used: " + UnitDisplay.getDisplayShort( this.tileEntity.yongDianLiang, - ElectricityDisplay.ElectricUnit.JOULES), + UnitDisplay.Unit.JOULES), 8, 49, 4210752); StringBuilder var10001 = new StringBuilder(); this.tileEntity.getClass(); this.fontRendererObj.drawString( var10001 - .append(ElectricityDisplay.getDisplayShort( - (double)(10000 * 20), ElectricityDisplay.ElectricUnit.WATT)) + .append(UnitDisplay.getDisplayShort( + (double)(10000 * 20), UnitDisplay.Unit.WATT)) .append(" ") - .append(ElectricityDisplay.getDisplayShort( + .append(UnitDisplay.getDisplayShort( this.tileEntity.getVoltage(), - ElectricityDisplay.ElectricUnit.VOLTAGE)) + UnitDisplay.Unit.VOLTAGE)) .toString(), 8, 60, 4210752); this.fontRendererObj.drawString( diff --git a/src/main/java/atomicscience/shimian/GCentrifuge.java b/src/main/java/atomicscience/shimian/GCentrifuge.java index c0968f3..50a90b3 100644 --- a/src/main/java/atomicscience/shimian/GCentrifuge.java +++ b/src/main/java/atomicscience/shimian/GCentrifuge.java @@ -4,7 +4,7 @@ import atomicscience.fenlie.CCentrifuge; import atomicscience.fenlie.TCentrifuge; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; -import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.api.energy.UnitDisplay; public class GCentrifuge extends GBase { private TCentrifuge tileEntity; @@ -32,12 +32,12 @@ public class GCentrifuge extends GBase { this.fontRendererObj.drawString("Status: " + displayText, 70, 50, 4210752); this.fontRendererObj.drawString( - ElectricityDisplay.getDisplay(10000.0D, - ElectricityDisplay.ElectricUnit.WATT), + UnitDisplay.getDisplay(10000.0D, + UnitDisplay.Unit.WATT), 70, 60, 4210752); this.fontRendererObj.drawString( - ElectricityDisplay.getDisplay(this.tileEntity.getVoltage(), - ElectricityDisplay.ElectricUnit.VOLTAGE), + UnitDisplay.getDisplay(this.tileEntity.getVoltage(), + UnitDisplay.Unit.VOLTAGE), 70, 70, 4210752); this.fontRendererObj.drawString( StatCollector.translateToLocal("container.inventory"), 8, diff --git a/src/main/java/atomicscience/shimian/GChemicalExtractor.java b/src/main/java/atomicscience/shimian/GChemicalExtractor.java index 563612d..4dd319a 100644 --- a/src/main/java/atomicscience/shimian/GChemicalExtractor.java +++ b/src/main/java/atomicscience/shimian/GChemicalExtractor.java @@ -4,7 +4,7 @@ import atomicscience.hecheng.CChemicalExtractor; import atomicscience.jiqi.TChemicalExtractor; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; -import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.api.energy.UnitDisplay; public class GChemicalExtractor extends GBase { private TChemicalExtractor tileEntity; @@ -21,12 +21,12 @@ public class GChemicalExtractor extends GBase { 4210752); this.tileEntity.getClass(); this.fontRendererObj.drawString( - ElectricityDisplay.getDisplay((double)(500.0F * 20.0F), - ElectricityDisplay.ElectricUnit.WATT), + UnitDisplay.getDisplay((double)(500.0F * 20.0F), + UnitDisplay.Unit.WATT), 90, 48, 4210752); this.fontRendererObj.drawString( - ElectricityDisplay.getDisplay(this.tileEntity.getVoltage(), - ElectricityDisplay.ElectricUnit.VOLTAGE), + UnitDisplay.getDisplay(this.tileEntity.getVoltage(), + UnitDisplay.Unit.VOLTAGE), 90, 60, 4210752); this.fontRendererObj.drawString( StatCollector.translateToLocal("container.inventory"), 8, diff --git a/src/main/java/atomicscience/shimian/GFissionReactor.java b/src/main/java/atomicscience/shimian/GFissionReactor.java index 810b5af..fba64e1 100644 --- a/src/main/java/atomicscience/shimian/GFissionReactor.java +++ b/src/main/java/atomicscience/shimian/GFissionReactor.java @@ -3,7 +3,7 @@ package atomicscience.shimian; import atomicscience.fenlie.TFissionReactor; import calclavia.lib.gui.GuiContainerBase; import net.minecraft.entity.player.InventoryPlayer; -import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.api.energy.UnitDisplay; public class GFissionReactor extends GuiContainerBase { private TFissionReactor tileEntity; @@ -33,7 +33,7 @@ public class GFissionReactor extends GuiContainerBase { 4210752); this.fontRendererObj.drawString( "Steam Emission: " + - ElectricityDisplay.roundDecimals( + UnitDisplay.roundDecimals( (double)(1.0F / (Math.max(40.0F - this.tileEntity.wenDu / 2000.0F * 40.0F, 2.0F) / diff --git a/src/main/java/atomicscience/shimian/GNuclearBoiler.java b/src/main/java/atomicscience/shimian/GNuclearBoiler.java index 946acb6..cad12eb 100644 --- a/src/main/java/atomicscience/shimian/GNuclearBoiler.java +++ b/src/main/java/atomicscience/shimian/GNuclearBoiler.java @@ -4,7 +4,7 @@ import atomicscience.fenlie.TNuclearBoiler; import atomicscience.hecheng.CNuclearBoiler; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; -import universalelectricity.core.electricity.ElectricityDisplay; +import universalelectricity.api.energy.UnitDisplay; public class GNuclearBoiler extends GBase { @@ -21,12 +21,12 @@ public class GNuclearBoiler extends GBase { 4210752); this.tileEntity.getClass(); this.fontRendererObj.drawString( - ElectricityDisplay.getDisplay((double)(800.0F * 20.0F), - ElectricityDisplay.ElectricUnit.WATT), + UnitDisplay.getDisplay((double)(800.0F * 20.0F), + UnitDisplay.Unit.WATT), 55, 48, 4210752); this.fontRendererObj.drawString( - ElectricityDisplay.getDisplay(this.tileEntity.getVoltage(), - ElectricityDisplay.ElectricUnit.VOLTAGE), + UnitDisplay.getDisplay(this.tileEntity.getVoltage(), + UnitDisplay.Unit.VOLTAGE), 55, 60, 4210752); this.fontRendererObj.drawString( StatCollector.translateToLocal("container.inventory"), 8,