diff --git a/src/api/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java similarity index 100% rename from src/api/java/cofh/api/CoFHAPIProps.java rename to src/main/java/cofh/api/CoFHAPIProps.java diff --git a/src/api/java/cofh/api/energy/EnergyStorage.java b/src/main/java/cofh/api/energy/EnergyStorage.java similarity index 100% rename from src/api/java/cofh/api/energy/EnergyStorage.java rename to src/main/java/cofh/api/energy/EnergyStorage.java diff --git a/src/api/java/cofh/api/energy/IEnergyConnection.java b/src/main/java/cofh/api/energy/IEnergyConnection.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyConnection.java rename to src/main/java/cofh/api/energy/IEnergyConnection.java diff --git a/src/api/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/java/cofh/api/energy/IEnergyContainerItem.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyContainerItem.java rename to src/main/java/cofh/api/energy/IEnergyContainerItem.java diff --git a/src/api/java/cofh/api/energy/IEnergyHandler.java b/src/main/java/cofh/api/energy/IEnergyHandler.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyHandler.java rename to src/main/java/cofh/api/energy/IEnergyHandler.java diff --git a/src/api/java/cofh/api/energy/IEnergyProvider.java b/src/main/java/cofh/api/energy/IEnergyProvider.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyProvider.java rename to src/main/java/cofh/api/energy/IEnergyProvider.java diff --git a/src/api/java/cofh/api/energy/IEnergyReceiver.java b/src/main/java/cofh/api/energy/IEnergyReceiver.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyReceiver.java rename to src/main/java/cofh/api/energy/IEnergyReceiver.java diff --git a/src/api/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyStorage.java rename to src/main/java/cofh/api/energy/IEnergyStorage.java diff --git a/src/api/java/cofh/api/energy/ItemEnergyContainer.java b/src/main/java/cofh/api/energy/ItemEnergyContainer.java similarity index 100% rename from src/api/java/cofh/api/energy/ItemEnergyContainer.java rename to src/main/java/cofh/api/energy/ItemEnergyContainer.java diff --git a/src/api/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java similarity index 100% rename from src/api/java/cofh/api/energy/TileEnergyHandler.java rename to src/main/java/cofh/api/energy/TileEnergyHandler.java diff --git a/src/api/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java similarity index 100% rename from src/api/java/cofh/api/energy/package-info.java rename to src/main/java/cofh/api/energy/package-info.java diff --git a/src/api/java/cofh/api/item/IEmpowerableItem.java b/src/main/java/cofh/api/item/IEmpowerableItem.java similarity index 100% rename from src/api/java/cofh/api/item/IEmpowerableItem.java rename to src/main/java/cofh/api/item/IEmpowerableItem.java diff --git a/src/api/java/cofh/api/item/IInventoryContainerItem.java b/src/main/java/cofh/api/item/IInventoryContainerItem.java similarity index 100% rename from src/api/java/cofh/api/item/IInventoryContainerItem.java rename to src/main/java/cofh/api/item/IInventoryContainerItem.java diff --git a/src/api/java/cofh/api/item/IToolHammer.java b/src/main/java/cofh/api/item/IToolHammer.java similarity index 100% rename from src/api/java/cofh/api/item/IToolHammer.java rename to src/main/java/cofh/api/item/IToolHammer.java diff --git a/src/api/java/cofh/api/item/package-info.java b/src/main/java/cofh/api/item/package-info.java similarity index 100% rename from src/api/java/cofh/api/item/package-info.java rename to src/main/java/cofh/api/item/package-info.java diff --git a/src/api/java/cofh/api/package-info.java b/src/main/java/cofh/api/package-info.java similarity index 100% rename from src/api/java/cofh/api/package-info.java rename to src/main/java/cofh/api/package-info.java diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index e08348559..ab8ee38d3 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -2,6 +2,9 @@ package mekanism.api; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -18,8 +21,8 @@ import net.minecraft.util.Vec3i; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; - -import java.util.ArrayList; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; /** * Coord4D - an integer-based way to keep track of and perform operations on blocks in a Minecraft-based environment. This also takes diff --git a/src/main/java/mekanism/api/IConfigCardAccess.java b/src/main/java/mekanism/api/IConfigCardAccess.java new file mode 100644 index 000000000..881d8a035 --- /dev/null +++ b/src/main/java/mekanism/api/IConfigCardAccess.java @@ -0,0 +1,34 @@ +package mekanism.api; + +import net.minecraft.nbt.NBTTagCompound; + +/** + * Implement this in your TileEntity class if you wish for Mekanism filters to be able to store any of their + * information. + * @author aidancbrady + * + */ +public interface IConfigCardAccess +{ + public static interface ISpecialConfigData extends IConfigCardAccess + { + /** + * Collects the TileEntity's filter card data into the parameterized NBTTagCompound. + * @param nbtTags - the NBTTagCompound of the filter card ItemStack + * @return the NBTTagCompound that now contains the TileEntity's filter card data + */ + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags); + + /** + * Retrieves the TileEntity's data contained in the filter card based on the given NBTTagCompopund. + * @param nbtTags - the NBTTagCompound of the filter card ItemStack + */ + public void setConfigurationData(NBTTagCompound nbtTags); + + /** + * A String name of this TileEntity that will be displayed as the type of data on the filter card. + * @return the String name of this TileEntity + */ + public String getDataType(); + } +} diff --git a/src/main/java/mekanism/api/IFilterAccess.java b/src/main/java/mekanism/api/IFilterAccess.java deleted file mode 100644 index abdcf29a8..000000000 --- a/src/main/java/mekanism/api/IFilterAccess.java +++ /dev/null @@ -1,31 +0,0 @@ -package mekanism.api; - -import net.minecraft.nbt.NBTTagCompound; - -/** - * Implement this in your TileEntity class if you wish for Mekanism filters to be able to store any of their - * information. - * @author aidancbrady - * - */ -public interface IFilterAccess -{ - /** - * Collects the TileEntity's filter card data into the parameterized NBTTagCompound. - * @param nbtTags - the NBTTagCompound of the filter card ItemStack - * @return the NBTTagCompound that now contains the TileEntity's filter card data - */ - public NBTTagCompound getFilterData(NBTTagCompound nbtTags); - - /** - * Retrieves the TileEntity's data contained in the filter card based on the given NBTTagCompopund. - * @param nbtTags - the NBTTagCompound of the filter card ItemStack - */ - public void setFilterData(NBTTagCompound nbtTags); - - /** - * A String name of this TileEntity that will be displayed as the type of data on the filter card. - * @return the String name of this TileEntity - */ - public String getDataType(); -} diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index 17ffd7c2a..d4b95807c 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -4,7 +4,6 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.util.BlockInfo; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index e6bc01795..dae1fc598 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -32,7 +32,7 @@ public class MekanismConfig public static double ENERGY_PER_REDSTONE = 10000; public static int ETHENE_BURN_TIME = 40; public static double DISASSEMBLER_USAGE = 10; - public static EnergyType activeType = EnergyType.J; + public static EnergyType energyUnit = EnergyType.J; public static TempType tempUnit = TempType.K; public static double TO_IC2; public static double TO_TE; @@ -61,6 +61,9 @@ public class MekanismConfig public static double evaporationTempMultiplier = 0.1; public static double evaporationSolarMultiplier = 0.2; public static double evaporationMaxTemp = 3000; + public static double energyPerHeat = 1000; + public static double maxEnergyPerSteam = 100; + public static double superheatingHeatTransfer = 10000; } public static class client @@ -119,6 +122,7 @@ public class MekanismConfig public static double laserUsage; public static double gasCentrifugeUsage; public static double heavyWaterElectrolysisUsage; + public static double formulaicAssemblicatorUsage; } public static class generators @@ -137,7 +141,6 @@ public class MekanismConfig public static int windGenerationMaxY; public static int turbineBladesPerCoil; - public static double turbineBaseEnergyPerSteam; public static double turbineVentGasFlow; public static double turbineDisperserGasFlow; } diff --git a/src/main/java/mekanism/api/energy/IEnergizedItem.java b/src/main/java/mekanism/api/energy/IEnergizedItem.java index b67254597..bcfb5ca29 100644 --- a/src/main/java/mekanism/api/energy/IEnergizedItem.java +++ b/src/main/java/mekanism/api/energy/IEnergizedItem.java @@ -50,10 +50,4 @@ public interface IEnergizedItem * @return if the item can send energy */ public boolean canSend(ItemStack itemStack); - - /** - * Returns whether or not this item contains metadata-specific subtypes instead of using metadata for damage display. - * @return if the item contains metadata-specific subtypes - */ - public boolean isMetadataSpecific(ItemStack itemStack); } diff --git a/src/main/java/mekanism/api/energy/package-info.java b/src/main/java/mekanism/api/energy/package-info.java index 0270f7ae1..5f2775e01 100644 --- a/src/main/java/mekanism/api/energy/package-info.java +++ b/src/main/java/mekanism/api/energy/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|energy") package mekanism.api.energy; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index e88127e66..7c7ad1092 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -1,16 +1,23 @@ package mekanism.api.gas; -import com.google.common.collect.Lists; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.eventhandler.Event; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; +import net.minecraft.util.EnumFacing; -import java.util.*; +import com.google.common.collect.Lists; + +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.Event; /** * A DynamicNetwork extension created specifically for the transfer of Gasses. By default this is server-only, but if ticked on diff --git a/src/main/java/mekanism/api/gas/IGasItem.java b/src/main/java/mekanism/api/gas/IGasItem.java index 9c7d33230..04231cd81 100644 --- a/src/main/java/mekanism/api/gas/IGasItem.java +++ b/src/main/java/mekanism/api/gas/IGasItem.java @@ -72,10 +72,4 @@ public interface IGasItem * @return maximum gas */ public int getMaxGas(ItemStack itemstack); - - /** - * Returns whether or not this item contains metadata-specific subtypes instead of using metadata for damage display. - * @return if the item contains metadata-specific subtypes - */ - public boolean isMetadataSpecific(ItemStack itemstack); } diff --git a/src/main/java/mekanism/api/gas/IGasTransmitter.java b/src/main/java/mekanism/api/gas/IGasTransmitter.java index 57ec4c1fc..2785ac1c8 100644 --- a/src/main/java/mekanism/api/gas/IGasTransmitter.java +++ b/src/main/java/mekanism/api/gas/IGasTransmitter.java @@ -1,7 +1,6 @@ package mekanism.api.gas; import mekanism.api.transmitters.IGridTransmitter; - import net.minecraft.tileentity.TileEntity; public interface IGasTransmitter extends IGridTransmitter diff --git a/src/main/java/mekanism/api/gas/package-info.java b/src/main/java/mekanism/api/gas/package-info.java index 08dcf8894..fa9cfffa0 100644 --- a/src/main/java/mekanism/api/gas/package-info.java +++ b/src/main/java/mekanism/api/gas/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|gas") package mekanism.api.gas; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/infuse/package-info.java b/src/main/java/mekanism/api/infuse/package-info.java index c164b6638..4b81b150c 100644 --- a/src/main/java/mekanism/api/infuse/package-info.java +++ b/src/main/java/mekanism/api/infuse/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|infuse") package mekanism.api.infuse; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/lasers/package-info.java b/src/main/java/mekanism/api/lasers/package-info.java index b865d5546..afd742650 100644 --- a/src/main/java/mekanism/api/lasers/package-info.java +++ b/src/main/java/mekanism/api/lasers/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|laser") package mekanism.api.lasers; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/package-info.java b/src/main/java/mekanism/api/package-info.java index 7347248ca..92e2c2eda 100644 --- a/src/main/java/mekanism/api/package-info.java +++ b/src/main/java/mekanism/api/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|core") package mekanism.api; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/reactor/IFusionReactor.java b/src/main/java/mekanism/api/reactor/IFusionReactor.java index 9d9d96de9..da96a27c3 100644 --- a/src/main/java/mekanism/api/reactor/IFusionReactor.java +++ b/src/main/java/mekanism/api/reactor/IFusionReactor.java @@ -2,7 +2,6 @@ package mekanism.api.reactor; import mekanism.api.IHeatTransfer; import mekanism.api.gas.GasTank; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidTank; @@ -36,7 +35,7 @@ public interface IFusionReactor extends IHeatTransfer public double getBufferSize(); - public void formMultiblock(); + public void formMultiblock(boolean keepBurning); public boolean isFormed(); diff --git a/src/main/java/mekanism/api/reactor/package-info.java b/src/main/java/mekanism/api/reactor/package-info.java index ae5812e65..a1fe59e4b 100644 --- a/src/main/java/mekanism/api/reactor/package-info.java +++ b/src/main/java/mekanism/api/reactor/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|reactor") package mekanism.api.reactor; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/recipe/package-info.java b/src/main/java/mekanism/api/recipe/package-info.java index 6228719ea..3ea2bfca3 100644 --- a/src/main/java/mekanism/api/recipe/package-info.java +++ b/src/main/java/mekanism/api/recipe/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|recipe") package mekanism.api.recipe; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 096bf6a8a..2bc709341 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -1,21 +1,28 @@ package mekanism.api.transmitters; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.eventhandler.Event; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.Map.Entry; +import java.util.Set; + import mekanism.api.Coord4D; import mekanism.api.IClientTicker; import mekanism.api.Range4D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraft.util.EnumFacing; -import java.util.*; -import java.util.Map.Entry; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; + +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.Event; public abstract class DynamicNetwork> implements IClientTicker, INetworkDataHandler { diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java index 8b53a774d..527829373 100644 --- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java +++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java @@ -1,12 +1,12 @@ package mekanism.api.transmitters; +import java.util.Collection; + import mekanism.api.Coord4D; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import java.util.Collection; - public interface IGridTransmitter> extends ITransmitter { public boolean hasTransmitterNetwork(); diff --git a/src/main/java/mekanism/api/transmitters/TransmissionType.java b/src/main/java/mekanism/api/transmitters/TransmissionType.java index 7b54e9cc7..8ea4b4311 100644 --- a/src/main/java/mekanism/api/transmitters/TransmissionType.java +++ b/src/main/java/mekanism/api/transmitters/TransmissionType.java @@ -1,7 +1,6 @@ package mekanism.api.transmitters; import mekanism.api.gas.IGasTransmitter; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; diff --git a/src/main/java/mekanism/api/transmitters/package-info.java b/src/main/java/mekanism/api/transmitters/package-info.java index d8d5e092c..7dd8d7606 100644 --- a/src/main/java/mekanism/api/transmitters/package-info.java +++ b/src/main/java/mekanism/api/transmitters/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|transmitter") package mekanism.api.transmitters; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/util/StackUtils.java b/src/main/java/mekanism/api/util/StackUtils.java index c36bdfbcf..01f2815f8 100644 --- a/src/main/java/mekanism/api/util/StackUtils.java +++ b/src/main/java/mekanism/api/util/StackUtils.java @@ -65,7 +65,14 @@ public final class StackUtils public static boolean equalsWildcardWithNBT(ItemStack wild, ItemStack check) { - return equalsWildcard(wild, check) && (!wild.hasTagCompound() ? !check.hasTagCompound() : (wild.getTagCompound() == check.getTagCompound() || wild.getTagCompound().equals(check.getTagCompound()))); + boolean wildcard = equalsWildcard(wild, check); + + if(wild == null || check == null) + { + return wildcard; + } + + return wildcard && (!wild.hasTagCompound() ? !check.hasTagCompound() : (wild.getTagCompound() == check.getTagCompound() || wild.getTagCompound().equals(check.getTagCompound()))); } public static List even(ItemStack stack1, ItemStack stack2) @@ -139,6 +146,7 @@ public final class StackUtils ItemStack ret = stack.copy(); ret.stackSize = size; + return ret; } diff --git a/src/main/java/mekanism/api/util/UnitDisplayUtils.java b/src/main/java/mekanism/api/util/UnitDisplayUtils.java index 9dd3e282d..a30eb630a 100644 --- a/src/main/java/mekanism/api/util/UnitDisplayUtils.java +++ b/src/main/java/mekanism/api/util/UnitDisplayUtils.java @@ -37,8 +37,8 @@ public class UnitDisplayUtils public String name; public String symbol; - double zeroOffset; - double intervalSize; + public double zeroOffset; + public double intervalSize; private TemperatureUnit(String s, String s1, double offset, double size) { diff --git a/src/main/java/mekanism/api/util/package-info.java b/src/main/java/mekanism/api/util/package-info.java index 594d76930..4ff6a0a39 100644 --- a/src/main/java/mekanism/api/util/package-info.java +++ b/src/main/java/mekanism/api/util/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|util") package mekanism.api.util; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/client/CapeBufferDownload.java b/src/main/java/mekanism/client/CapeBufferDownload.java index db571e4a3..c9f58f437 100644 --- a/src/main/java/mekanism/client/CapeBufferDownload.java +++ b/src/main/java/mekanism/client/CapeBufferDownload.java @@ -1,15 +1,9 @@ package mekanism.client; import java.io.File; -import java.lang.reflect.Method; -import mekanism.common.ObfuscatedNames; -import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.ThreadDownloadImageData; -import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StringUtils; diff --git a/src/main/java/mekanism/client/ClientPlayerTracker.java b/src/main/java/mekanism/client/ClientPlayerTracker.java index 19dd65fde..20ef79bb0 100644 --- a/src/main/java/mekanism/client/ClientPlayerTracker.java +++ b/src/main/java/mekanism/client/ClientPlayerTracker.java @@ -1,7 +1,6 @@ package mekanism.client; import mekanism.common.Mekanism; - import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 848a8ba03..8ac444105 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -9,6 +9,7 @@ import mekanism.api.Pos3D; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.client.entity.EntityLaser; import mekanism.client.gui.GuiAmbientAccumulator; +import mekanism.client.gui.GuiBoilerStats; import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.client.gui.GuiChemicalDissolutionChamber; import mekanism.client.gui.GuiChemicalInfuser; @@ -27,9 +28,10 @@ import mekanism.client.gui.GuiElectrolyticSeparator; import mekanism.client.gui.GuiEnergizedSmelter; import mekanism.client.gui.GuiEnergyCube; import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.client.gui.GuiEntangledBlock; import mekanism.client.gui.GuiFactory; +import mekanism.client.gui.GuiFluidTank; import mekanism.client.gui.GuiFluidicPlenisher; +import mekanism.client.gui.GuiFormulaicAssemblicator; import mekanism.client.gui.GuiGasTank; import mekanism.client.gui.GuiInductionMatrix; import mekanism.client.gui.GuiLaserAmplifier; @@ -41,9 +43,10 @@ import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.client.gui.GuiPRC; import mekanism.client.gui.GuiPasswordEnter; import mekanism.client.gui.GuiPasswordModify; -import mekanism.client.gui.GuiPortableTank; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.GuiQuantumEntangloporter; +import mekanism.client.gui.GuiResistiveHeater; import mekanism.client.gui.GuiRobitCrafting; import mekanism.client.gui.GuiRobitInventory; import mekanism.client.gui.GuiRobitMain; @@ -53,9 +56,10 @@ import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.client.gui.GuiSeismicReader; import mekanism.client.gui.GuiSeismicVibrator; import mekanism.client.gui.GuiSideConfiguration; -import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.client.gui.GuiSolarNeutronActivator; import mekanism.client.gui.GuiTeleporter; +import mekanism.client.gui.GuiThermalEvaporationController; +import mekanism.client.gui.GuiThermoelectricBoiler; import mekanism.client.gui.GuiTransporterConfig; import mekanism.client.gui.GuiUpgradeManagement; import mekanism.client.render.MekanismRenderer; @@ -78,16 +82,24 @@ import mekanism.client.render.tileentity.RenderElectricChest; import mekanism.client.render.tileentity.RenderElectricPump; import mekanism.client.render.tileentity.RenderElectrolyticSeparator; import mekanism.client.render.tileentity.RenderEnergyCube; +import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderFluidicPlenisher; import mekanism.client.render.tileentity.RenderGasTank; +import mekanism.client.render.tileentity.RenderLaser; import mekanism.client.render.tileentity.RenderLaserAmplifier; import mekanism.client.render.tileentity.RenderLaserTractorBeam; import mekanism.client.render.tileentity.RenderLogisticalSorter; +import mekanism.client.render.tileentity.RenderMetallurgicInfuser; +import mekanism.client.render.tileentity.RenderObsidianTNT; import mekanism.client.render.tileentity.RenderPortableTank; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; +import mekanism.client.render.tileentity.RenderRotaryCondensentrator; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.tileentity.RenderSeismicVibrator; +import mekanism.client.render.tileentity.RenderSolarNeutronActivator; import mekanism.client.render.tileentity.RenderTeleporter; +import mekanism.client.render.tileentity.RenderThermalEvaporationController; +import mekanism.client.render.tileentity.RenderThermoelectricBoiler; import mekanism.common.CommonProxy; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; @@ -110,6 +122,8 @@ import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBin; +import mekanism.common.tile.TileEntityBoilerCasing; +import mekanism.common.tile.TileEntityBoilerValve; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; @@ -130,9 +144,10 @@ import mekanism.common.tile.TileEntityEliteFactory; import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnrichmentChamber; -import mekanism.common.tile.TileEntityEntangledBlock; import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; @@ -146,16 +161,16 @@ import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; -import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; -import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; - +import mekanism.common.tile.TileEntityThermalEvaporationController; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -315,7 +330,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderPressurizedReactionChamber()); - ClientRegistry.registerTileEntity(TileEntityPortableTank.class, "PortableTank", new RenderPortableTank()); + ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank", new RenderFluidTank()); //TODO rename ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); //ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier()); @@ -328,6 +343,9 @@ public class ClientProxy extends CommonProxy GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); + GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); + ClientRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing", new RenderThermoelectricBoiler()); + ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); } @Override @@ -602,6 +620,14 @@ public class ClientProxy extends CommonProxy return new GuiTransporterConfig(player, (ISideConfiguration)tileEntity); case 52: return new GuiOredictionificator(player.inventory, (TileEntityOredictionificator)tileEntity); + case 53: + return new GuiResistiveHeater(player.inventory, (TileEntityResistiveHeater)tileEntity); + case 54: + return new GuiThermoelectricBoiler(player.inventory, (TileEntityBoilerCasing)tileEntity); + case 55: + return new GuiBoilerStats(player.inventory, (TileEntityBoilerCasing)tileEntity); + case 56: + return new GuiFormulaicAssemblicator(player.inventory, (TileEntityFormulaicAssemblicator)tileEntity); } return null; diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index edb45fce6..b1a194298 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -1,19 +1,29 @@ package mekanism.client; -import net.minecraftforge.fml.client.FMLClientHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import static mekanism.client.sound.SoundHandler.Channel.FLAMETHROWER; +import static mekanism.client.sound.SoundHandler.Channel.GASMASK; +import static mekanism.client.sound.SoundHandler.Channel.JETPACK; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import mekanism.api.IClientTicker; import mekanism.api.MekanismConfig.client; import mekanism.api.gas.GasStack; import mekanism.client.sound.SoundHandler; +import mekanism.common.CommonPlayerTickHandler; import mekanism.common.KeySync; import mekanism.common.Mekanism; -import mekanism.common.item.*; +import mekanism.common.item.ItemFlamethrower; +import mekanism.common.item.ItemFreeRunners; +import mekanism.common.item.ItemGasMask; +import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; +import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketFlamethrowerData; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; @@ -25,11 +35,17 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.StringUtils; -import java.util.*; +import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import static mekanism.client.sound.SoundHandler.Channel.*; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Client-side tick handler for Mekanism. Used mainly for the update check upon startup. @@ -295,7 +311,7 @@ public class ClientTickHandler flamethrower.useGas(mc.thePlayer.getCurrentEquippedItem()); } } - + if(isJetpackOn(mc.thePlayer)) { ItemJetpack jetpack = (ItemJetpack)mc.thePlayer.getEquipmentInSlot(3).getItem(); @@ -315,7 +331,10 @@ public class ClientTickHandler } else if(mc.thePlayer.motionY < 0) { - mc.thePlayer.motionY = Math.min(mc.thePlayer.motionY + 0.15D, 0); + if(!CommonPlayerTickHandler.isOnGround(mc.thePlayer)) + { + mc.thePlayer.motionY = Math.min(mc.thePlayer.motionY + 0.15D, 0); + } } } else { @@ -325,7 +344,10 @@ public class ClientTickHandler } else if(mc.gameSettings.keyBindSneak.isPressed() && mc.currentScreen == null) { - mc.thePlayer.motionY = Math.max(mc.thePlayer.motionY - 0.15D, -0.2D); + if(!CommonPlayerTickHandler.isOnGround(mc.thePlayer)) + { + mc.thePlayer.motionY = Math.max(mc.thePlayer.motionY - 0.15D, -0.2D); + } } } @@ -340,17 +362,26 @@ public class ClientTickHandler ItemScubaTank tank = (ItemScubaTank)mc.thePlayer.getEquipmentInSlot(3).getItem(); final int max = 300; - + tank.useGas(mc.thePlayer.getEquipmentInSlot(3)); GasStack received = tank.useGas(mc.thePlayer.getEquipmentInSlot(3), max-mc.thePlayer.getAir()); if(received != null) { mc.thePlayer.setAir(mc.thePlayer.getAir()+received.amount); - - if(mc.thePlayer.getAir() == max) + } + + if(mc.thePlayer.getAir() == max) + { + for(Object obj : mc.thePlayer.getActivePotionEffects()) { - mc.thePlayer.clearActivePotions(); + if(obj instanceof PotionEffect) + { + for(int i = 0; i < 9; i++) + { + ((PotionEffect)obj).onUpdate(mc.thePlayer); + } + } } } } @@ -377,7 +408,7 @@ public class ClientTickHandler ItemStack stack = player.inventory.armorInventory[2]; - if(stack != null) + if(stack != null && !player.capabilities.isCreativeMode) { if(stack.getItem() instanceof ItemJetpack) { @@ -391,6 +422,15 @@ public class ClientTickHandler } else if(jetpack.getMode(stack) == JetpackMode.HOVER) { + if((!mc.gameSettings.keyBindJump.getIsKeyPressed() && !mc.gameSettings.keyBindSneak.getIsKeyPressed()) || (mc.gameSettings.keyBindJump.getIsKeyPressed() && mc.gameSettings.keyBindSneak.getIsKeyPressed()) || mc.currentScreen != null) + { + return !player.onGround; + } + else if(mc.gameSettings.keyBindSneak.getIsKeyPressed() && mc.currentScreen == null) + { + return !player.onGround; + } + return true; } } diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index fc2270581..484be013f 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -1,20 +1,19 @@ package mekanism.client; -import net.minecraftforge.fml.client.FMLClientHandler; -import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.InputEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.api.util.StackUtils; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.item.*; +import mekanism.common.item.ItemBlockMachine; +import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemConfigurator.ConfiguratorMode; +import mekanism.common.item.ItemElectricBow; +import mekanism.common.item.ItemFlamethrower; +import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; +import mekanism.common.item.ItemScubaTank; +import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; import mekanism.common.network.PacketFlamethrowerData; @@ -31,8 +30,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; + import org.lwjgl.input.Keyboard; +import net.minecraftforge.fml.client.FMLClientHandler; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.InputEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class MekanismKeyHandler extends MekKeyHandler { @@ -91,7 +99,7 @@ public class MekanismKeyHandler extends MekKeyHandler { ItemBlockMachine machine = (ItemBlockMachine)item; - if(BlockStateMachine.MachineType.get(toolStack) == BlockStateMachine.MachineType.PORTABLE_TANK) + if(BlockStateMachine.MachineType.get(toolStack) == BlockStateMachine.MachineType.FLUID_TANK) { machine.setBucketMode(toolStack, !machine.getBucketMode(toolStack)); Mekanism.packetHandler.sendToServer(new PortableTankStateMessage(machine.getBucketMode(toolStack))); diff --git a/src/main/java/mekanism/client/ThreadClientUpdate.java b/src/main/java/mekanism/client/ThreadClientUpdate.java index 2a922bfc5..884a65ded 100644 --- a/src/main/java/mekanism/client/ThreadClientUpdate.java +++ b/src/main/java/mekanism/client/ThreadClientUpdate.java @@ -14,7 +14,6 @@ import mekanism.client.gui.GuiCredits; import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/entity/EntityLaser.java b/src/main/java/mekanism/client/entity/EntityLaser.java index 4405da0fd..ec4967563 100644 --- a/src/main/java/mekanism/client/entity/EntityLaser.java +++ b/src/main/java/mekanism/client/entity/EntityLaser.java @@ -2,7 +2,6 @@ package mekanism.client.entity; import mekanism.api.Pos3D; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -10,14 +9,15 @@ import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.entity.Entity; -import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class EntityLaser extends EntityFX { diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index e9a4073f7..b0036a6eb 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -4,13 +4,13 @@ import java.util.List; import mekanism.api.gas.GasStack; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java new file mode 100644 index 000000000..fcb976f18 --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -0,0 +1,109 @@ +package mekanism.client.gui; + +import java.util.List; + +import mekanism.api.MekanismConfig.general; +import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiBoilerTab; +import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiGraph; +import mekanism.client.gui.element.GuiGraph.GraphDataHandler; +import mekanism.client.gui.element.GuiHeatInfo; +import mekanism.common.content.boiler.BoilerUpdateProtocol; +import mekanism.common.content.boiler.SynchronizedBoilerData; +import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.tile.TileEntityBoilerCasing; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiBoilerStats extends GuiMekanism +{ + public TileEntityBoilerCasing tileEntity; + + public GuiGraph boilGraph; + public GuiGraph maxGraph; + + public GuiBoilerStats(InventoryPlayer inventory, TileEntityBoilerCasing tentity) + { + super(tentity, new ContainerNull(inventory.player, tentity)); + tileEntity = tentity; + guiElements.add(new GuiBoilerTab(this, tileEntity, BoilerTab.MAIN, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"))); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String loss = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + loss + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"))); + guiElements.add(boilGraph = new GuiGraph(this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"), 8, 83, 160, 36, new GraphDataHandler() { + @Override + public String getDataDisplay(int data) + { + return LangUtils.localize("gui.boilRate") + ": " + data + " mB/t"; + } + })); + guiElements.add(maxGraph = new GuiGraph(this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"), 8, 122, 160, 36, new GraphDataHandler() { + @Override + public String getDataDisplay(int data) + { + return LangUtils.localize("gui.maxBoil") + ": " + data + " mB/t"; + } + })); + maxGraph.enableFixedScale((int)((tentity.structure.superheatingElements*general.superheatingHeatTransfer)/SynchronizedBoilerData.getHeatEnthalpy())); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + String stats = LangUtils.localize("gui.boilerStats"); + + fontRendererObj.drawString(stats, (xSize/2)-(fontRendererObj.getStringWidth(stats)/2), 6, 0x404040); + + fontRendererObj.drawString(LangUtils.localize("gui.maxWater") + ": " + tileEntity.clientWaterCapacity + " mB", 8, 26, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.maxSteam") + ": " + tileEntity.clientSteamCapacity + " mB", 8, 35, 0x404040); + + fontRendererObj.drawString(LangUtils.localize("gui.heatTransfer"), 8, 49, 0x797979); + fontRendererObj.drawString(LangUtils.localize("gui.superheaters") + ": " + tileEntity.structure.superheatingElements, 14, 58, 0x404040); + + int boilCapacity = (int)((tileEntity.structure.superheatingElements*general.superheatingHeatTransfer)/SynchronizedBoilerData.getHeatEnthalpy()); + fontRendererObj.drawString(LangUtils.localize("gui.boilCapacity") + ": " + boilCapacity + " mB/t", 8, 72, 0x404040); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + public void updateScreen() + { + super.updateScreen(); + + boilGraph.addData(tileEntity.structure.lastBoilRate); + maxGraph.addData(tileEntity.structure.lastMaxBoil); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } +} diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index 5ee3644f3..980c05603 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -3,13 +3,13 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 746e3484e..b73a8230d 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -3,31 +3,27 @@ package mekanism.client.gui; import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; import mekanism.api.gas.OreGas; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalCrystallizer; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index 697221c70..0f1fb0fc3 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -4,30 +4,31 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiChemicalDissolutionChamber extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index ac8f56c70..7991117e6 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -1,38 +1,34 @@ package mekanism.client.gui; -import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalInfuser; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiChemicalInfuser extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index ef29374d9..5f2cc16cd 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -4,30 +4,31 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiChemicalOxidizer extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index f4f4b0cd9..f02d654e8 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -1,43 +1,39 @@ package mekanism.client.gui; -import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiBucketIO; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalWasher; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiChemicalWasher extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiCredits.java b/src/main/java/mekanism/client/gui/GuiCredits.java index 976198d1b..622f64393 100644 --- a/src/main/java/mekanism/client/gui/GuiCredits.java +++ b/src/main/java/mekanism/client/gui/GuiCredits.java @@ -6,7 +6,6 @@ import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index 8016758d1..2198cc7b5 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -11,12 +11,13 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiDictionary extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index aa7aba2fc..1b74e2f39 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -7,15 +7,15 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiVisualsTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiVisualsTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -30,12 +30,13 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiDigitalMiner extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 599de4260..470f0134b 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -31,13 +31,14 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiDigitalMinerConfig extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index df765b098..3bf62f3f1 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -11,11 +11,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiDynamicTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index 46a7216e7..c6eae0664 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -19,12 +19,13 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; + +import org.lwjgl.opengl.GL11; + import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class GuiElectricChest extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 6d8bbdddf..321a792af 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -3,14 +3,14 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSideConfigurationTab; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index b95a6f92e..911d4f2f2 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; @@ -66,7 +66,7 @@ public class GuiElectricPump extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040); + fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index 89ce1c8b5..e084ed910 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -1,18 +1,27 @@ package mekanism.client.gui; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.element.*; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerElectrolyticSeparator; @@ -24,11 +33,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; + import org.lwjgl.opengl.GL11; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiElectrolyticSeparator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index eae75d6a3..20a2cb172 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -4,10 +4,10 @@ import java.util.List; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyGauge; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; diff --git a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java index 811c786ff..39665bc55 100644 --- a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java +++ b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java @@ -7,28 +7,29 @@ import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityEntangledBlock; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiEntangledBlock extends GuiMekanism { - public TileEntityEntangledBlock tileEntity; + public TileEntityQuantumEntangloporter tileEntity; public GuiTextField frequencyField; public boolean isCreative; - public GuiEntangledBlock(InventoryPlayer inventory, TileEntityEntangledBlock tentity) + public GuiEntangledBlock(InventoryPlayer inventory, TileEntityQuantumEntangloporter tentity) { super(tentity, new ContainerNull(inventory.player, tentity)); tileEntity = tentity; diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 7effc8322..85cfb5469 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -6,8 +6,8 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiRecipeType; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; @@ -58,7 +58,7 @@ public class GuiFactory extends GuiMekanism @Override public List getInfo() { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick*tileEntity.tier.processes); + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.lastUsage); return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity.tier.guiLocation)); diff --git a/src/main/java/mekanism/client/gui/GuiPortableTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java similarity index 86% rename from src/main/java/mekanism/client/gui/GuiPortableTank.java rename to src/main/java/mekanism/client/gui/GuiFluidTank.java index b04bacefa..55ff1e979 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTank.java +++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java @@ -2,30 +2,31 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiContainerEditMode; import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.common.inventory.container.ContainerPortableTank; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.inventory.container.ContainerFluidTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; -@SideOnly(Side.CLIENT) -public class GuiPortableTank extends GuiMekanism -{ - public TileEntityPortableTank tileEntity; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; - public GuiPortableTank(InventoryPlayer inventory, TileEntityPortableTank tentity) +@SideOnly(Side.CLIENT) +public class GuiFluidTank extends GuiMekanism +{ + public TileEntityFluidTank tileEntity; + + public GuiFluidTank(InventoryPlayer inventory, TileEntityFluidTank tentity) { - super(tentity, new ContainerPortableTank(inventory, tentity)); + super(tentity, new ContainerFluidTank(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiContainerEditMode(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 9bce124bc..1129f7fa8 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; @@ -66,7 +66,7 @@ public class GuiFluidicPlenisher extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040); + fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.finished") + ": " + LangUtils.transYesNo(tileEntity.finishedCalc), 51, 35, 0x00CD00); diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java new file mode 100644 index 000000000..c6ffa935f --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -0,0 +1,292 @@ +package mekanism.client.gui; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.Coord4D; +import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSideConfigurationTab; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.client.render.MekanismRenderer; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; +import mekanism.common.item.ItemCraftingFormula; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiFormulaicAssemblicator extends GuiMekanism +{ + public TileEntityFormulaicAssemblicator tileEntity; + + public GuiFormulaicAssemblicator(InventoryPlayer inventory, TileEntityFormulaicAssemblicator tentity) + { + super(tentity, new ContainerFormulaicAssemblicator(inventory, tentity)); + tileEntity = tentity; + guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); + guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); + guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); + guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 159, 15)); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 151, 75).with(SlotOverlay.POWER)); + + ySize+=64; + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + + if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.fillEmpty"), xAxis, yAxis); + } + + if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.encodeFormula"), xAxis, yAxis); + } + + if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.craftSingle"), xAxis, yAxis); + } + + if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.craftAvailable"), xAxis, yAxis); + } + + if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.autoModeToggle") + " " + LangUtils.transOnOff(!tileEntity.autoMode), xAxis, yAxis); + } + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = mouseX - guiWidth; + int yAxis = mouseY - guiHeight; + + if(!tileEntity.autoMode) + { + if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 44, guiHeight + 75, 176 + 62, 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 44, guiHeight + 75, 176 + 62, 16, 16, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 44, guiHeight + 75, 176 + 62, 32, 16, 16); + } + + if(!tileEntity.autoMode && tileEntity.isRecipe) + { + if(canEncode()) + { + if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 14, 14, 14); + } + } + else { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 28, 14, 14); + } + + if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 71, guiHeight + 75, 176 + 14, 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 71, guiHeight + 75, 176 + 14, 16, 16, 16); + } + + if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 89, guiHeight + 75, 176 + 30, 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 89, guiHeight + 75, 176 + 30, 16, 16, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 28, 14, 14); + drawTexturedModalRect(guiWidth + 71, guiHeight + 75, 176 + 14, 32, 16, 16); + drawTexturedModalRect(guiWidth + 89, guiHeight + 75, 176 + 30, 32, 16, 16); + } + + if(tileEntity.formula != null) + { + if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 107, guiHeight + 75, 176 + 46, 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 107, guiHeight + 75, 176 + 46, 16, 16, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 107, guiHeight + 75, 176 + 46, 32, 16, 16); + } + + if(tileEntity.operatingTicks > 0) + { + int display = (int)((double)tileEntity.operatingTicks*22/(double)tileEntity.ticksRequired); + drawTexturedModalRect(guiWidth + 86, guiHeight + 43, 176, 48, display, 16); + } + + if(tileEntity.isRecipe) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSlot.png")); + drawTexturedModalRect(guiWidth + 90, guiHeight + 25, 2, 39, 14, 12); + } + + if(tileEntity.formula != null) + { + for(int i = 0; i < 9; i++) + { + ItemStack stack = tileEntity.formula.input[i]; + + if(stack != null) + { + Slot slot = (Slot)inventorySlots.inventorySlots.get(i+20); + + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_LIGHTING); + MekanismRenderer.blendOn(); + itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), stack, guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition); + MekanismRenderer.blendOff(); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); + } + } + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } + + private boolean canEncode() + { + return tileEntity.formula == null && tileEntity.inventory[2] != null && tileEntity.inventory[2].getItem() instanceof ItemCraftingFormula && + ((ItemCraftingFormula)tileEntity.inventory[2].getItem()).getInventory(tileEntity.inventory[2]) == null; + } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + if(button == 0) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(!tileEntity.autoMode) + { + if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91) + { + SoundHandler.playSound("gui.button.press"); + + ArrayList data = new ArrayList(); + data.add(4); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + if(tileEntity.isRecipe) + { + if(canEncode()) + { + if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + { + SoundHandler.playSound("gui.button.press"); + + ArrayList data = new ArrayList(); + data.add(1); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + } + + if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) + { + SoundHandler.playSound("gui.button.press"); + + ArrayList data = new ArrayList(); + data.add(2); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) + { + SoundHandler.playSound("gui.button.press"); + + ArrayList data = new ArrayList(); + data.add(3); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + } + } + + if(tileEntity.formula != null) + { + if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) + { + SoundHandler.playSound("gui.button.press"); + + ArrayList data = new ArrayList(); + data.add(0); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + } + } + } +} diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 4f5e70288..c87bf7d9d 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -47,7 +47,7 @@ public class GuiGasTank extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - String capacityInfo = tileEntity.gasTank.getStored() + "/" + tileEntity.MAX_GAS; + String capacityInfo = tileEntity.gasTank.getStored() + "/" + tileEntity.tier.storage; fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040); fontRendererObj.drawString(capacityInfo, 45, 40, 0x404040); @@ -75,7 +75,7 @@ public class GuiGasTank extends GuiMekanism if(tileEntity.gasTank.getGas() != null) { - int scale = (int)(((double)tileEntity.gasTank.getStored() / tileEntity.MAX_GAS) * 72); + int scale = (int)(((double)tileEntity.gasTank.getStored() / tileEntity.tier.storage) * 72); drawTexturedModalRect(guiWidth + 65, guiHeight + 17, 176, 0, scale, 10); } diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index c229a2530..3056b5ad6 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiMatrixTab; import mekanism.client.gui.element.GuiMatrixTab.MatrixTab; import mekanism.client.render.MekanismRenderer; diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index 2d3485ac0..a86f1f9c9 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -14,11 +14,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiMFilterSelect extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 2c0306169..bd80dbfa5 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -16,19 +16,19 @@ import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiMItemStackFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index f87f38d9c..829149e90 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -16,19 +16,19 @@ import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiMMaterialFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index 44346b021..2fa7a1f4e 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -2,13 +2,12 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.generators; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyGauge; -import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiMatrixTab; import mekanism.client.gui.element.GuiMatrixTab.MatrixTab; import mekanism.client.gui.element.GuiRateBar; diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index a1ad4e90d..bbb2d63d9 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -6,8 +6,8 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index a8dfb6aff..c2dcfc64a 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -1,7 +1,6 @@ package mekanism.client.gui; import java.io.IOException; -import java.util.Arrays; import java.util.List; import mekanism.api.Coord4D; diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 8486e3eb4..44747136e 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -4,8 +4,8 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGasGauge; @@ -13,9 +13,9 @@ import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java index fc5ba7258..ae07ef10e 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java @@ -18,12 +18,13 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiPasswordEnter extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java index 04f12c815..88577e711 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordModify.java @@ -16,12 +16,13 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiPasswordModify extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java new file mode 100644 index 000000000..e6a1a9d47 --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -0,0 +1,341 @@ +package mekanism.client.gui; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.client.gui.element.GuiScrollList; +import mekanism.client.gui.element.GuiSideConfigurationTab; +import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.frequency.Frequency; +import mekanism.common.inventory.container.ContainerQuantumEntangloporter; +import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; +import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterPacketType; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiQuantumEntangloporter extends GuiMekanism +{ + public static int MAX_LENGTH = 16; + + public ResourceLocation resource; + + public TileEntityQuantumEntangloporter tileEntity; + + public EntityPlayer entityPlayer; + + public GuiButton publicButton; + public GuiButton privateButton; + + public GuiButton setButton; + public GuiButton deleteButton; + + public GuiButton teleportButton; + + public GuiScrollList scrollList; + + public GuiTextField frequencyField; + + public boolean privateMode; + + public GuiQuantumEntangloporter(InventoryPlayer inventory, TileEntityQuantumEntangloporter tentity) + { + super(tentity, new ContainerQuantumEntangloporter(inventory, tentity)); + tileEntity = tentity; + resource = MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"); + + guiElements.add(scrollList = new GuiScrollList(this, resource, 28, 37, 120, 4)); + guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); + guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); + + if(tileEntity.frequency != null) + { + privateMode = !tileEntity.frequency.publicFreq; + } + + ySize+=64; + } + + @Override + public void initGui() + { + super.initGui(); + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + buttonList.clear(); + + publicButton = new GuiButton(0, guiWidth + 27, guiHeight + 14, 60, 20, LangUtils.localize("gui.public")); + privateButton = new GuiButton(1, guiWidth + 89, guiHeight + 14, 60, 20, LangUtils.localize("gui.private")); + + setButton = new GuiButton(2, guiWidth + 27, guiHeight + 116, 60, 20, LangUtils.localize("gui.set")); + deleteButton = new GuiButton(3, guiWidth + 89, guiHeight + 116, 60, 20, LangUtils.localize("gui.delete")); + + frequencyField = new GuiTextField(fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); + frequencyField.setMaxStringLength(MAX_LENGTH); + frequencyField.setEnableBackgroundDrawing(false); + + updateButtons(); + + buttonList.add(publicButton); + buttonList.add(privateButton); + buttonList.add(setButton); + buttonList.add(deleteButton); + } + + public void setFrequency(String freq) + { + if(freq.isEmpty()) + { + return; + } + + ArrayList data = new ArrayList(); + data.add(0); + data.add(freq); + data.add(!privateMode); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + public String getSecurity(Frequency freq) + { + return !freq.publicFreq ? EnumColor.DARK_RED + LangUtils.localize("gui.private") : LangUtils.localize("gui.public"); + } + + public void updateButtons() + { + if(tileEntity.owner == null) + { + return; + } + + List text = new ArrayList(); + + if(privateMode) + { + for(Frequency freq : tileEntity.privateCache) + { + text.add(freq.name); + } + } + else { + for(Frequency freq : tileEntity.publicCache) + { + text.add(freq.name + " (" + freq.owner + ")"); + } + } + + scrollList.setText(text); + + if(privateMode) + { + publicButton.enabled = true; + privateButton.enabled = false; + } + else { + publicButton.enabled = false; + privateButton.enabled = true; + } + + if(scrollList.hasSelection()) + { + Frequency freq = privateMode ? tileEntity.privateCache.get(scrollList.selected) : tileEntity.publicCache.get(scrollList.selected); + + if(tileEntity.getFrequency() == null || !tileEntity.getFrequency().equals(freq)) + { + setButton.enabled = true; + } + else { + setButton.enabled = false; + } + + if(tileEntity.owner.equals(freq.owner)) + { + deleteButton.enabled = true; + } + else { + deleteButton.enabled = false; + } + } + else { + setButton.enabled = false; + deleteButton.enabled = false; + } + } + + @Override + public void updateScreen() + { + super.updateScreen(); + + updateButtons(); + + frequencyField.updateCursorCounter(); + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + updateButtons(); + + frequencyField.mouseClicked(mouseX, mouseY, button); + + if(button == 0) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 137 && xAxis <= 148 && yAxis >= 103 && yAxis <= 114) + { + setFrequency(frequencyField.getText()); + frequencyField.setText(""); + SoundHandler.playSound("gui.button.press"); + } + } + } + + @Override + public void keyTyped(char c, int i) + { + if(!frequencyField.isFocused() || i == Keyboard.KEY_ESCAPE) + { + super.keyTyped(c, i); + } + + if(i == Keyboard.KEY_RETURN) + { + if(frequencyField.isFocused()) + { + setFrequency(frequencyField.getText()); + frequencyField.setText(""); + } + } + + if(Character.isDigit(c) || Character.isLetter(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + { + frequencyField.textboxKeyTyped(c, i); + } + + updateButtons(); + } + + @Override + protected void actionPerformed(GuiButton guibutton) + { + super.actionPerformed(guibutton); + + if(guibutton.id == 0) + { + privateMode = false; + } + else if(guibutton.id == 1) + { + privateMode = true; + } + else if(guibutton.id == 2) + { + int selection = scrollList.getSelection(); + + if(selection != -1) + { + Frequency freq = privateMode ? tileEntity.privateCache.get(selection) : tileEntity.publicCache.get(selection); + setFrequency(freq.name); + } + } + else if(guibutton.id == 3) + { + int selection = scrollList.getSelection(); + + if(selection != -1) + { + Frequency freq = privateMode ? tileEntity.privateCache.get(selection) : tileEntity.publicCache.get(selection); + + if(tileEntity != null) + { + ArrayList data = new ArrayList(); + data.add(1); + data.add(freq.name); + data.add(freq.publicFreq); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + else { + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DEL_FREQ, freq)); + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, null)); + } + + scrollList.selected = -1; + } + } + + updateButtons(); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX-(width-xSize)/2); + int yAxis = (mouseY-(height-ySize)/2); + + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.owner != null ? tileEntity.owner : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040); + + fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040); + + fontRendererObj.drawString(" " + (tileEntity.getFrequency() != null ? tileEntity.getFrequency().name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979); + fontRendererObj.drawString(" " + (tileEntity.getFrequency() != null ? getSecurity(tileEntity.getFrequency()) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979); + + String str = LangUtils.localize("gui.set") + ":"; + renderScaledText(str, 27, 104, 0x404040, 20); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(resource); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width-xSize)/2; + int guiHeight = (height-ySize)/2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 137 && xAxis <= 148 && yAxis >= 103 && yAxis <= 114) + { + drawTexturedModalRect(guiWidth + 137, guiHeight + 103, xSize, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 137, guiHeight + 103, xSize, 11, 11, 11); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + + frequencyField.drawTextBox(); + } +} diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java new file mode 100644 index 000000000..a7b5720d8 --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -0,0 +1,184 @@ +package mekanism.client.gui; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.Coord4D; +import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiHeatInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.inventory.container.ContainerResistiveHeater; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.TileEntityResistiveHeater; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiResistiveHeater extends GuiMekanism +{ + public TileEntityResistiveHeater tileEntity; + + private GuiTextField energyUsageField; + + public GuiResistiveHeater(InventoryPlayer inventory, TileEntityResistiveHeater tentity) + { + super(tentity, new ContainerResistiveHeater(inventory, tentity)); + tileEntity = tentity; + + guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 164, 15)); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 14, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyUsage); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, TemperatureUnit.KELVIN); + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); + } + + @Override + public void initGui() + { + super.initGui(); + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + String prevEnergyUsage = energyUsageField != null ? energyUsageField.getText() : ""; + + energyUsageField = new GuiTextField(fontRendererObj, guiWidth + 49, guiHeight + 52, 66, 11); + energyUsageField.setMaxStringLength(7); + energyUsageField.setEnableBackgroundDrawing(false); + energyUsageField.setText(prevEnergyUsage); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); + + renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.temperature, TemperatureUnit.AMBIENT), 50, 25, 0x00CD00, 76); + renderScaledText(LangUtils.localize("gui.usage") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.energyUsage), 50, 41, 0x00CD00, 76); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 116 && xAxis <= 126 && yAxis >= 51 && yAxis <= 61) + { + drawTexturedModalRect(guiWidth + 116, guiHeight + 51, xSize, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 116, guiHeight + 51, xSize, 11, 11, 11); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + + energyUsageField.drawTextBox(); + } + + private void setEnergyUsage() + { + if(!energyUsageField.getText().isEmpty()) + { + int toUse = Integer.parseInt(energyUsageField.getText()); + + ArrayList data = new ArrayList(); + data.add(toUse); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + + energyUsageField.setText(""); + } + } + + @Override + public void updateScreen() + { + super.updateScreen(); + + energyUsageField.updateCursorCounter(); + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + energyUsageField.mouseClicked(mouseX, mouseY, button); + + if(button == 0) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 116 && xAxis <= 126 && yAxis >= 51 && yAxis <= 61) + { + setEnergyUsage(); + SoundHandler.playSound("gui.button.press"); + } + } + } + + @Override + public void keyTyped(char c, int i) + { + if(!energyUsageField.isFocused() || i == Keyboard.KEY_ESCAPE) + { + super.keyTyped(c, i); + } + + if(energyUsageField.isFocused() && i == Keyboard.KEY_RETURN) + { + setEnergyUsage(); + return; + } + + if(Character.isDigit(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + { + energyUsageField.textboxKeyTyped(c, i); + } + } +} diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index 87a50e929..3a9788e68 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -12,11 +12,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiRobitCrafting extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index 99e08d862..8c80615e3 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -12,11 +12,12 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiRobitInventory extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 46150562d..fee95ce54 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -14,12 +14,13 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiRobitMain extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index f3d6c0ea2..c2e7e49f5 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -22,13 +22,14 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.Unpooled; +import org.apache.commons.io.Charsets; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import org.apache.commons.io.Charsets; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiRobitRepair extends GuiMekanism implements ICrafting diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index f726f402a..5cffa4297 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -7,21 +7,21 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index f9c7e58c8..71671ef29 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -4,8 +4,8 @@ import java.util.List; import mekanism.api.MekanismConfig.usage; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java index 5bafb5387..14804e516 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java @@ -2,13 +2,13 @@ package mekanism.client.gui; import mekanism.api.gas.GasTank; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index 8cd7af810..5094eed59 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -14,11 +14,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiTFilterSelect extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index a0e819736..39edcc2f4 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -22,13 +22,14 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiTItemStackFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index f87a43e4e..f5c7e199e 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -24,13 +24,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiTMaterialFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index 9682810e9..fac53de45 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -25,13 +25,14 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiTOreDictFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java index b2db78cf1..0d157ea00 100644 --- a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java @@ -1,9 +1,15 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiHeatInfo; import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.util.LangUtils; @@ -41,6 +47,14 @@ public class GuiThermalEvaporationController extends GuiMekanism return tileEntity.outputTank; } }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"), 152, 13)); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String loss = UnitDisplayUtils.getDisplayShort(tileEntity.totalLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + loss + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java new file mode 100644 index 000000000..d8ae6623f --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -0,0 +1,166 @@ +package mekanism.client.gui; + +import java.util.List; + +import mekanism.api.MekanismConfig.general; +import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiBoilerTab; +import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiHeatInfo; +import mekanism.client.gui.element.GuiRateBar; +import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.content.boiler.SynchronizedBoilerData; +import mekanism.common.inventory.container.ContainerFilter; +import mekanism.common.tile.TileEntityBoilerCasing; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraftforge.fluids.FluidStack; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiThermoelectricBoiler extends GuiMekanism +{ + public TileEntityBoilerCasing tileEntity; + + public GuiThermoelectricBoiler(InventoryPlayer inventory, TileEntityBoilerCasing tentity) + { + super(tentity, new ContainerFilter(inventory, tentity)); + tileEntity = tentity; + guiElements.add(new GuiBoilerTab(this, tileEntity, BoilerTab.STAT, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"))); + guiElements.add(new GuiRateBar(this, new IRateInfoHandler() + { + @Override + public String getTooltip() + { + return LangUtils.localize("gui.boilRate") + ": " + tileEntity.structure.lastBoilRate + " mB/t"; + } + + @Override + public double getLevel() + { + return (double)tileEntity.structure.lastBoilRate/(double)tileEntity.structure.lastMaxBoil; + } + }, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"), 24, 13)); + guiElements.add(new GuiRateBar(this, new IRateInfoHandler() + { + @Override + public String getTooltip() + { + return LangUtils.localize("gui.maxBoil") + ": " + tileEntity.structure.lastMaxBoil + " mB/t"; + } + + @Override + public double getLevel() + { + double cap = (tileEntity.structure.superheatingElements*general.superheatingHeatTransfer) / SynchronizedBoilerData.getHeatEnthalpy(); + return (double)tileEntity.structure.lastMaxBoil/cap; + } + }, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"), 144, 13)); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String loss = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + loss + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"))); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 5, 0x404040); + + renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.structure.temperature, TemperatureUnit.AMBIENT), 43, 30, 0x00CD00, 90); + renderScaledText(LangUtils.localize("gui.boilRate") + ": " + tileEntity.structure.lastBoilRate + " mB/t", 43, 39, 0x00CD00, 90); + renderScaledText(LangUtils.localize("gui.maxBoil") + ": " + tileEntity.structure.lastMaxBoil + " mB/t", 43, 48, 0x00CD00, 90); + + if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72) + { + drawCreativeTabHoveringText(tileEntity.structure.waterStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.waterStored) + ": " + tileEntity.structure.waterStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis); + } + + if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14 && yAxis <= 72) + { + drawCreativeTabHoveringText(tileEntity.structure.steamStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.steamStored) + ": " + tileEntity.structure.steamStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis); + } + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + if(tileEntity.getScaledWaterLevel(58) > 0) + { + displayGauge(7, 14, tileEntity.getScaledWaterLevel(58), tileEntity.structure.waterStored); + } + + if(tileEntity.getScaledSteamLevel(58) > 0) + { + displayGauge(153, 14, tileEntity.getScaledSteamLevel(58), tileEntity.structure.steamStored); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } + + public void displayGauge(int xPos, int yPos, int scale, FluidStack fluid) + { + if(fluid == null) + { + return; + } + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + int start = 0; + + while(true) + { + int renderRemaining = 0; + + if(scale > 16) + { + renderRemaining = 16; + scale -= 16; + } + else { + renderRemaining = scale; + scale = 0; + } + + mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); + drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); + start+=16; + + if(renderRemaining == 0 || scale == 0) + { + break; + } + } + + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png")); + drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, 0, 16, 54); + } +} diff --git a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java new file mode 100644 index 000000000..24d2b24b8 --- /dev/null +++ b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java @@ -0,0 +1,117 @@ +package mekanism.client.gui.element; + +import mekanism.api.Coord4D; +import mekanism.client.gui.IGuiWrapper; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiBoilerTab extends GuiElement +{ + private TileEntity tileEntity; + private BoilerTab tabType; + private int yPos; + + public GuiBoilerTab(IGuiWrapper gui, TileEntity tile, BoilerTab type, int y, ResourceLocation def) + { + super(type.getResource(), gui, def); + + tileEntity = tile; + tabType = type; + yPos = y; + } + + @Override + public Rectangle4i getBounds(int guiWidth, int guiHeight) + { + return new Rectangle4i(guiWidth - 26, guiHeight + yPos, 26, 26); + } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + guiObj.drawTexturedRect(guiWidth - 26, guiHeight + yPos, 0, 0, 26, 26); + + if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) + { + guiObj.drawTexturedRect(guiWidth - 21, guiHeight + yPos+4, 26, 0, 18, 18); + } + else { + guiObj.drawTexturedRect(guiWidth - 21, guiHeight + yPos+4, 26, 18, 18, 18); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + mc.renderEngine.bindTexture(RESOURCE); + + if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) + { + displayTooltip(tabType.getDesc(), xAxis, yAxis); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) + { + if(button == 0) + { + if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) + { + tabType.openGui(tileEntity); + SoundHandler.playSound("gui.button.press"); + } + } + } + + public static enum BoilerTab + { + MAIN("GuiGasesTab.png", 54, "gui.main"), + STAT("GuiStatsTab.png", 55, "gui.stats"); + + private String path; + private int guiId; + private String desc; + + private BoilerTab(String s, int id, String s1) + { + path = s; + guiId = id; + desc = s1; + } + + public ResourceLocation getResource() + { + return MekanismUtils.getResource(ResourceType.GUI_ELEMENT, path); + } + + public void openGui(TileEntity tile) + { + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tile), 0, guiId)); + } + + public String getDesc() + { + return LangUtils.localize(desc); + } + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 4c6e1420e..8cbcfad14 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -2,8 +2,6 @@ package mekanism.client.gui.element; import java.util.List; -import org.lwjgl.opengl.GL11; - import mekanism.client.gui.IGuiWrapper; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; @@ -11,6 +9,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -135,6 +136,11 @@ public abstract class GuiElement public abstract void preMouseClicked(int xAxis, int yAxis, int button); public abstract void mouseClicked(int xAxis, int yAxis, int button); + + public static interface IInfoHandler + { + public List getInfo(); + } public static class Rectangle4i { diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java index 532f5a2f9..fb4bc730c 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java @@ -36,6 +36,11 @@ public class GuiEnergyGauge extends GuiGauge @Override public int getScaledLevel() { + if(infoHandler.getEnergyStorage().getEnergy() == Double.MAX_VALUE) + { + return height-2; + } + return (int)(infoHandler.getEnergyStorage().getEnergy()*(height-2) / infoHandler.getEnergyStorage().getMaxEnergy()); } diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index f658cfbce..85781de0a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -32,11 +32,6 @@ public class GuiEnergyInfo extends GuiElement return new Rectangle4i(guiWidth - 26, guiHeight + 138, 26, 26); } - public static interface IInfoHandler - { - public List getInfo(); - } - @Override public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) { @@ -59,7 +54,7 @@ public class GuiEnergyInfo extends GuiElement info.add(s); } - info.add(LangUtils.localize("gui.unit") + ": " + general.activeType); + info.add(LangUtils.localize("gui.unit") + ": " + general.energyUnit); displayTooltips(info, xAxis, yAxis); } } @@ -72,7 +67,10 @@ public class GuiEnergyInfo extends GuiElement { if(button == 0) { - general.activeType = EnergyType.values()[(general.activeType.ordinal()+1)%EnergyType.values().length]; + if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160) + { + general.energyUnit = EnergyType.values()[(general.energyUnit.ordinal()+1)%EnergyType.values().length]; + } } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index c6e2c09d4..a4f74baef 100644 --- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -1,5 +1,7 @@ package mekanism.client.gui.element; +import java.util.Arrays; + import mekanism.api.Coord4D; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.GuiMekanism; @@ -18,9 +20,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidTank; -import org.lwjgl.input.Keyboard; -import java.util.Arrays; +import org.lwjgl.input.Keyboard; public class GuiFluidGauge extends GuiGauge { @@ -58,7 +59,7 @@ public class GuiFluidGauge extends GuiGauge { TileEntity tile = ((GuiMekanism)guiObj).getTileEntity(); - if(tile instanceof ITankManager) + if(tile instanceof ITankManager && ((ITankManager)tile).getTanks() != null) { int index = Arrays.asList(((ITankManager)tile).getTanks()).indexOf(infoHandler.getTank()); diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index 72a6431bb..4a72182a6 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -1,5 +1,7 @@ package mekanism.client.gui.element; +import java.util.Arrays; + import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; @@ -16,9 +18,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.input.Keyboard; -import java.util.Arrays; +import org.lwjgl.input.Keyboard; public class GuiGasGauge extends GuiGauge { @@ -56,7 +57,7 @@ public class GuiGasGauge extends GuiGauge { TileEntity tile = ((GuiMekanism)guiObj).getTileEntity(); - if(tile instanceof ITankManager) + if(tile instanceof ITankManager && ((ITankManager)tile).getTanks() != null) { int index = Arrays.asList(((ITankManager)tile).getTanks()).indexOf(infoHandler.getTank()); diff --git a/src/main/java/mekanism/client/gui/element/GuiGraph.java b/src/main/java/mekanism/client/gui/element/GuiGraph.java new file mode 100644 index 000000000..4fbd0f4b2 --- /dev/null +++ b/src/main/java/mekanism/client/gui/element/GuiGraph.java @@ -0,0 +1,152 @@ +package mekanism.client.gui.element; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.client.gui.IGuiWrapper; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiGraph extends GuiElement +{ + public int xPosition; + public int yPosition; + + public int xSize; + public int ySize; + + public int currentScale = 10; + public boolean fixedScale = false; + + public List graphData = new ArrayList(); + + public GraphDataHandler dataHandler; + + public GuiGraph(IGuiWrapper gui, ResourceLocation def, int x, int y, int sizeX, int sizeY, GraphDataHandler handler) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiGraph.png"), gui, def); + + xPosition = x; + yPosition = y; + + xSize = sizeX; + ySize = sizeY; + + dataHandler = handler; + } + + public void enableFixedScale(int scale) + { + fixedScale = true; + currentScale = scale; + } + + public void addData(int data) + { + if(graphData.size() == xSize) + { + graphData.remove(0); + } + + graphData.add(data); + + if(!fixedScale) + { + for(int i : graphData) + { + if(i > currentScale) + { + currentScale = i; + } + } + } + } + + @Override + public Rectangle4i getBounds(int guiWidth, int guiHeight) + { + return new Rectangle4i(guiWidth + xPosition, guiHeight + yPosition, xSize, ySize); + } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + drawBlack(guiWidth, guiHeight); + drawGraph(guiWidth, guiHeight); + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + if(xAxis >= xPosition && xAxis <= xPosition+xSize && yAxis >= yPosition && yAxis <= yPosition+ySize) + { + int height = ySize-(yAxis-yPosition); + int scaled = (int)(((double)height/(double)ySize)*currentScale); + + displayTooltip(dataHandler.getDataDisplay(scaled), xAxis, yAxis); + } + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) {} + + public void drawBlack(int guiWidth, int guiHeight) + { + int xDisplays = xSize/10 + (xSize%10 > 0 ? 1 : 0); + int yDisplays = ySize/10 + (ySize%10 > 0 ? 1 : 0); + + for(int yIter = 0; yIter < yDisplays; yIter++) + { + for(int xIter = 0; xIter < xDisplays; xIter++) + { + int width = (xSize%10 > 0 && xIter == xDisplays-1 ? xSize%10 : 10); + int height = (ySize%10 > 0 && yIter == yDisplays-1 ? ySize%10 : 10); + + guiObj.drawTexturedRect(guiWidth + xPosition + (xIter*10), guiHeight + yPosition + (yIter*10), 0, 0, width, height); + } + } + } + + public void drawGraph(int guiWidth, int guiHeight) + { + for(int i = 0; i < graphData.size(); i++) + { + int data = Math.min(currentScale, graphData.get(i)); + int relativeHeight = (int)(((double)data/(double)currentScale)*ySize); + + guiObj.drawTexturedRect(guiWidth + xPosition + i, guiHeight + yPosition + (ySize-relativeHeight), 10, 0, 1, 1); + + int displays = (relativeHeight-1)/10 + ((relativeHeight-1)%10 > 0 ? 1 : 0); + + for(int iter = 0; iter < displays; iter++) + { + MekanismRenderer.blendOn(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.2F + (0.8F*((float)i/(float)graphData.size()))); + int height = ((relativeHeight-1)%10 > 0 && iter == displays-1 ? (relativeHeight-1)%10 : 10); + guiObj.drawTexturedRect(guiWidth + xPosition + i, guiHeight + yPosition + (ySize-(iter*10)) - 10 + (10-height), 11, 0, 1, height); + MekanismRenderer.blendOff(); + } + } + } + + public static interface GraphDataHandler + { + public String getDataDisplay(int data); + } +} diff --git a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java new file mode 100644 index 000000000..41d335736 --- /dev/null +++ b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java @@ -0,0 +1,76 @@ +package mekanism.client.gui.element; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.MekanismConfig.general; +import mekanism.api.util.UnitDisplayUtils.TempType; +import mekanism.client.gui.IGuiWrapper; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiHeatInfo extends GuiElement +{ + public IInfoHandler infoHandler; + + public GuiHeatInfo(IInfoHandler handler, IGuiWrapper gui, ResourceLocation def) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiHeatInfo.png"), gui, def); + + infoHandler = handler; + } + + @Override + public Rectangle4i getBounds(int guiWidth, int guiHeight) + { + return new Rectangle4i(guiWidth - 26, guiHeight + 138, 26, 26); + } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + guiObj.drawTexturedRect(guiWidth - 26, guiHeight + 112, 0, 0, 26, 26); + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + if(xAxis >= -21 && xAxis <= -3 && yAxis >= 116 && yAxis <= 134) + { + List info = new ArrayList(); + + for(String s : infoHandler.getInfo()) + { + info.add(s); + } + + info.add(LangUtils.localize("gui.unit") + ": " + general.tempUnit); + displayTooltips(info, xAxis, yAxis); + } + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) + { + if(button == 0) + { + if(xAxis >= -21 && xAxis <= -3 && yAxis >= 116 && yAxis <= 134) + { + general.tempUnit = TempType.values()[(general.tempUnit.ordinal()+1)%TempType.values().length]; + } + } + } +} diff --git a/src/main/java/mekanism/client/gui/element/GuiScrollList.java b/src/main/java/mekanism/client/gui/element/GuiScrollList.java index f7a34f79d..0e8648359 100644 --- a/src/main/java/mekanism/client/gui/element/GuiScrollList.java +++ b/src/main/java/mekanism/client/gui/element/GuiScrollList.java @@ -100,7 +100,7 @@ public class GuiScrollList extends GuiElement { for(int xIter = 0; xIter < xDisplays; xIter++) { - int width = (xSize%10 > 0 && xIter == xDisplays ? xSize%10 : 10); + int width = (xSize%10 > 0 && xIter == xDisplays-1 ? xSize%10 : 10); guiObj.drawTexturedRect(guiWidth + xPosition + (xIter*10), guiHeight + yPosition + (yIter*10), 0, 0, width, 10); } } @@ -116,7 +116,7 @@ public class GuiScrollList extends GuiElement for(int xIter = 0; xIter < xDisplays; xIter++) { - int width = (xSize%10 > 0 && xIter == xDisplays ? xSize%10 : 10); + int width = (xSize%10 > 0 && xIter == xDisplays-1 ? xSize%10 : 10); guiObj.drawTexturedRect(guiWidth + xPosition + (xIter*10), guiHeight + yPosition + (index-scroll)*10, 0, 10, width, 10); } } diff --git a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java index 12d500cc2..55083bec4 100644 --- a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java +++ b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java index a9ba4be4b..c312595f5 100644 --- a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java +++ b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/client/model/ModelBalloon.java b/src/main/java/mekanism/client/model/ModelBalloon.java index 20f474d95..e468fb8b4 100644 --- a/src/main/java/mekanism/client/model/ModelBalloon.java +++ b/src/main/java/mekanism/client/model/ModelBalloon.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.api.EnumColor; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelBalloon extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java index 2758b10e2..37473256e 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java index fce9839e7..bd1b22f0c 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index 881177eec..8f7963913 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelChemicalInfuser extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index 331ef28a8..339fabe6b 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelChemicalOxidizer extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index 5877174c3..e6950886a 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 645752840..20e85e7b5 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -1,336 +1,491 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class ModelDigitalMiner extends ModelBase +public class ModelDigitalMiner extends ModelBase { - ModelRenderer Base; - ModelRenderer Back; - ModelRenderer Panel; - ModelRenderer PanelStem; - ModelRenderer KeyboardStem; - ModelRenderer Keyboard; - ModelRenderer LaserBase; - ModelRenderer LegRight; - ModelRenderer UpperLegRight; - ModelRenderer ToeTopRight1; - ModelRenderer ToeTopRight2; - ModelRenderer ToeRight1; - ModelRenderer LegHoldRight1; - ModelRenderer LegHoldRight2; - ModelRenderer FootBaseRight; - ModelRenderer ToeRight2; - ModelRenderer FootBaseLeft; - ModelRenderer UpperLegLeft; - ModelRenderer LegHoldLeft1; - ModelRenderer ToeTopLeft2; - ModelRenderer ToeTopLeft1; - ModelRenderer LegHoldLeft2; - ModelRenderer ToeLeft1; - ModelRenderer ToeLeft2; - ModelRenderer LegLeft; - ModelRenderer RightAxil; - ModelRenderer RightBackUpperLeg; - ModelRenderer RightBackLowerLeg; - ModelRenderer RightBackFoot; - ModelRenderer LeftAxil; - ModelRenderer LeftBackUpperLeg; - ModelRenderer LeftBackLowerLeg; - ModelRenderer LeftBackFoot; - ModelRenderer Laser1; - ModelRenderer Laser2; - ModelRenderer Laser3; - ModelRenderer Laser4; + ModelRenderer keyboard; + ModelRenderer keyboardBottom; + ModelRenderer keyboardSupportExt1; + ModelRenderer keyboardSupportExt2; + ModelRenderer keyboardSupport1; + ModelRenderer keyboardSupport2; + ModelRenderer monitor1back; + ModelRenderer monitor2back; + ModelRenderer monitor3back; + ModelRenderer monitorBar1; + ModelRenderer monitorBar2; + ModelRenderer led1; + ModelRenderer led2; + ModelRenderer led3; + ModelRenderer monitorMount1; + ModelRenderer monitorMount2; + ModelRenderer frame1; + ModelRenderer frame3; + ModelRenderer plate5; + ModelRenderer bracket1; + ModelRenderer bracket2; + ModelRenderer bracket3; + ModelRenderer bracket4; + ModelRenderer bracket5; + ModelRenderer bracket6; + ModelRenderer bracket7; + ModelRenderer bracket8; + ModelRenderer bracketPlate1; + ModelRenderer bracketPlate2; + ModelRenderer bracketPlate3; + ModelRenderer bracketPlate4; + ModelRenderer supportBeam1; + ModelRenderer supportBeam2; + ModelRenderer supportBeam3; + ModelRenderer supportBeam4; + ModelRenderer foot1; + ModelRenderer foot2; + ModelRenderer foot3; + ModelRenderer foot4; + ModelRenderer core; + ModelRenderer powerCable1a; + ModelRenderer powerCable1b; + ModelRenderer powerCable2; + ModelRenderer powerCable3; + ModelRenderer powerConnector1; + ModelRenderer powerConnector2a; + ModelRenderer powerConnector2b; + ModelRenderer powerCpnnector3a; + ModelRenderer powerConnector3b; + ModelRenderer frame2a; + ModelRenderer frame2b; + ModelRenderer frame2c; + ModelRenderer frame2d; + ModelRenderer monitor1; + ModelRenderer monitor2; + ModelRenderer monitor3; - public ModelDigitalMiner() + public ModelDigitalMiner() { textureWidth = 256; - textureHeight = 256; + textureHeight = 128; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 18, 22, 20); - Base.setRotationPoint(-8F, -8F, -10F); - Base.setTextureSize(256, 256); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Back = new ModelRenderer(this, 77, 0); - Back.addBox(0F, 0F, 0F, 17, 20, 18); - Back.setRotationPoint(7F, -7F, -9F); - Back.setTextureSize(256, 256); - Back.mirror = true; - setRotation(Back, 0F, 0F, 0F); - Panel = new ModelRenderer(this, 0, 43); - Panel.addBox(-2F, -8F, -7.5F, 2, 12, 15); - Panel.setRotationPoint(-13F, 2F, 0F); - Panel.setTextureSize(256, 256); - Panel.mirror = true; - setRotation(Panel, 0F, 0F, -0.2478574F); - PanelStem = new ModelRenderer(this, 0, 71); - PanelStem.addBox(-7F, 0F, 0F, 7, 4, 4); - PanelStem.setRotationPoint(-7F, -2F, -2F); - PanelStem.setTextureSize(256, 256); - PanelStem.mirror = true; - setRotation(PanelStem, 0F, 0F, -0.2230717F); - KeyboardStem = new ModelRenderer(this, 0, 80); - KeyboardStem.addBox(-7F, 0F, -2F, 7, 1, 4); - KeyboardStem.setRotationPoint(-7F, 8F, 0F); - KeyboardStem.setTextureSize(256, 256); - KeyboardStem.mirror = true; - setRotation(KeyboardStem, 0F, 0F, -0.3965719F); - Keyboard = new ModelRenderer(this, 0, 86); - Keyboard.addBox(-5F, 0F, -5F, 5, 1, 10); - Keyboard.setRotationPoint(-12F, 10.5F, 0F); - Keyboard.setTextureSize(256, 256); - Keyboard.mirror = true; - setRotation(Keyboard, 0F, 0F, -0.2230717F); - LaserBase = new ModelRenderer(this, 0, 98); - LaserBase.addBox(0F, 0F, 0F, 10, 5, 10); - LaserBase.setRotationPoint(-5F, 12F, -5F); - LaserBase.setTextureSize(256, 256); - LaserBase.mirror = true; - setRotation(LaserBase, 0F, 0F, 0F); - LegRight = new ModelRenderer(this, 0, 114); - LegRight.addBox(0F, 0F, 0F, 6, 26, 4); - LegRight.setRotationPoint(-3F, -4F, -23F); - LegRight.setTextureSize(256, 256); - LegRight.mirror = true; - setRotation(LegRight, 0F, 0F, 0F); - UpperLegRight = new ModelRenderer(this, 21, 114); - UpperLegRight.addBox(0F, 0F, 0F, 4, 5, 13); - UpperLegRight.setRotationPoint(-2F, 0F, -22F); - UpperLegRight.setTextureSize(256, 256); - UpperLegRight.mirror = true; - setRotation(UpperLegRight, 0F, 0F, 0F); - ToeTopRight1 = new ModelRenderer(this, 21, 134); - ToeTopRight1.addBox(0F, 0F, 0F, 3, 1, 3); - ToeTopRight1.setRotationPoint(-4F, 19F, -20.5F); - ToeTopRight1.setTextureSize(256, 256); - ToeTopRight1.mirror = true; - setRotation(ToeTopRight1, 0F, 0F, 0F); - ToeTopRight2 = new ModelRenderer(this, 21, 134); - ToeTopRight2.addBox(0F, 0F, 0F, 3, 1, 3); - ToeTopRight2.setRotationPoint(1.5F, 19F, -20.5F); - ToeTopRight2.setTextureSize(256, 256); - ToeTopRight2.mirror = true; - setRotation(ToeTopRight2, 0F, 0F, 0F); - ToeRight1 = new ModelRenderer(this, 35, 134); - ToeRight1.addBox(0F, 0F, 0F, 3, 6, 3); - ToeRight1.setRotationPoint(1.5F, 22F, -20.5F); - ToeRight1.setTextureSize(256, 256); - ToeRight1.mirror = true; - setRotation(ToeRight1, 1.047198F, 0.3490659F, 0F); - LegHoldRight1 = new ModelRenderer(this, 0, 146); - LegHoldRight1.addBox(0F, 0F, 0F, 2, 3, 12); - LegHoldRight1.setRotationPoint(2F, 2F, -18F); - LegHoldRight1.setTextureSize(256, 256); - LegHoldRight1.mirror = true; - setRotation(LegHoldRight1, 0.6543436F, 0F, 0F); - LegHoldRight2 = new ModelRenderer(this, 0, 146); - LegHoldRight2.addBox(0F, 0F, 0F, 2, 3, 12); - LegHoldRight2.setRotationPoint(-4F, 2F, -18F); - LegHoldRight2.setTextureSize(256, 256); - LegHoldRight2.mirror = true; - setRotation(LegHoldRight2, 0.6543436F, 0F, 0F); - FootBaseRight = new ModelRenderer(this, 0, 162); - FootBaseRight.addBox(0F, 0F, 0F, 8, 2, 7); - FootBaseRight.setRotationPoint(-4F, 22F, -24F); - FootBaseRight.setTextureSize(256, 256); - FootBaseRight.mirror = true; - setRotation(FootBaseRight, 0F, 0F, 0F); - ToeRight2 = new ModelRenderer(this, 35, 134); - ToeRight2.addBox(0F, 0F, 0F, 3, 6, 3); - ToeRight2.setRotationPoint(-4.5F, 22F, -20.5F); - ToeRight2.setTextureSize(256, 256); - ToeRight2.mirror = true; - setRotation(ToeRight2, 1.047198F, -0.3490659F, 0F); - FootBaseLeft = new ModelRenderer(this, 0, 178); - FootBaseLeft.addBox(0F, 0F, 0F, 8, 2, 7); - FootBaseLeft.setRotationPoint(-4F, 22F, 17F); - FootBaseLeft.setTextureSize(256, 256); - FootBaseLeft.mirror = true; - setRotation(FootBaseLeft, 0F, 0F, 0F); - UpperLegLeft = new ModelRenderer(this, 0, 189); - UpperLegLeft.addBox(0F, 0F, 0F, 4, 5, 13); - UpperLegLeft.setRotationPoint(-2F, 0F, 9F); - UpperLegLeft.setTextureSize(256, 256); - UpperLegLeft.mirror = true; - setRotation(UpperLegLeft, 0F, 0F, 0F); - LegHoldLeft1 = new ModelRenderer(this, 0, 208); - LegHoldLeft1.addBox(0F, 0F, -12F, 2, 3, 12); - LegHoldLeft1.setRotationPoint(2F, 2F, 18F); - LegHoldLeft1.setTextureSize(256, 256); - LegHoldLeft1.mirror = true; - setRotation(LegHoldLeft1, -0.6543414F, 0F, 0F); - ToeTopLeft2 = new ModelRenderer(this, 31, 178); - ToeTopLeft2.addBox(0F, 0F, 0F, 3, 1, 3); - ToeTopLeft2.setRotationPoint(1.5F, 19F, 17.5F); - ToeTopLeft2.setTextureSize(256, 256); - ToeTopLeft2.mirror = true; - setRotation(ToeTopLeft2, 0F, 0F, 0F); - ToeTopLeft1 = new ModelRenderer(this, 31, 178); - ToeTopLeft1.addBox(0F, 0F, 0F, 3, 1, 3); - ToeTopLeft1.setRotationPoint(-4F, 19F, 17.5F); - ToeTopLeft1.setTextureSize(256, 256); - ToeTopLeft1.mirror = true; - setRotation(ToeTopLeft1, 0F, 0F, 0F); - LegHoldLeft2 = new ModelRenderer(this, 0, 208); - LegHoldLeft2.addBox(0F, 0F, -12F, 2, 3, 12); - LegHoldLeft2.setRotationPoint(-4F, 2F, 18F); - LegHoldLeft2.setTextureSize(256, 256); - LegHoldLeft2.mirror = true; - setRotation(LegHoldLeft2, -0.6543414F, 0F, 0F); - ToeLeft1 = new ModelRenderer(this, 44, 178); - ToeLeft1.addBox(0F, 0F, -3F, 3, 6, 3); - ToeLeft1.setRotationPoint(1.5F, 22F, 20.5F); - ToeLeft1.setTextureSize(256, 256); - ToeLeft1.mirror = true; - setRotation(ToeLeft1, -1.047198F, -0.3490659F, 0F); - ToeLeft2 = new ModelRenderer(this, 44, 178); - ToeLeft2.addBox(0F, 0F, -3F, 3, 6, 3); - ToeLeft2.setRotationPoint(-4.5F, 22F, 20.5F); - ToeLeft2.setTextureSize(256, 256); - ToeLeft2.mirror = true; - setRotation(ToeLeft2, -1.047198F, 0.3490659F, 0F); - LegLeft = new ModelRenderer(this, 35, 189); - LegLeft.addBox(0F, 0F, 0F, 6, 26, 4); - LegLeft.setRotationPoint(-3F, -4F, 19F); - LegLeft.setTextureSize(256, 256); - LegLeft.mirror = true; - setRotation(LegLeft, 0F, 0F, 0F); - RightAxil = new ModelRenderer(this, 78, 43); - RightAxil.addBox(0F, 0F, 0F, 4, 4, 6); - RightAxil.setRotationPoint(17F, 7F, -15F); - RightAxil.setTextureSize(256, 256); - RightAxil.mirror = true; - setRotation(RightAxil, 0F, 0F, 0F); - RightBackUpperLeg = new ModelRenderer(this, 78, 54); - RightBackUpperLeg.addBox(-2.5F, -3F, 0F, 5, 12, 1); - RightBackUpperLeg.setRotationPoint(19F, 9F, -15.95556F); - RightBackUpperLeg.setTextureSize(256, 256); - RightBackUpperLeg.mirror = true; - setRotation(RightBackUpperLeg, 0F, 0F, 0F); - RightBackLowerLeg = new ModelRenderer(this, 78, 68); - RightBackLowerLeg.addBox(-2F, 7F, -0.5F, 4, 6, 2); - RightBackLowerLeg.setRotationPoint(19F, 9F, -16F); - RightBackLowerLeg.setTextureSize(256, 256); - RightBackLowerLeg.mirror = true; - setRotation(RightBackLowerLeg, 0F, 0F, 0F); - RightBackFoot = new ModelRenderer(this, 99, 43); - RightBackFoot.addBox(-3F, 0F, -2.5F, 8, 2, 5); - RightBackFoot.setRotationPoint(19F, 22F, -15.5F); - RightBackFoot.setTextureSize(256, 256); - RightBackFoot.mirror = true; - setRotation(RightBackFoot, 0F, 0F, 0F); - LeftAxil = new ModelRenderer(this, 78, 80); - LeftAxil.addBox(0F, 0F, 0F, 4, 4, 6); - LeftAxil.setRotationPoint(17F, 7F, 9F); - LeftAxil.setTextureSize(256, 256); - LeftAxil.mirror = true; - setRotation(LeftAxil, 0F, 0F, 0F); - LeftBackUpperLeg = new ModelRenderer(this, 78, 91); - LeftBackUpperLeg.addBox(-2.5F, -3F, 0F, 5, 12, 1); - LeftBackUpperLeg.setRotationPoint(19F, 9F, 15.04444F); - LeftBackUpperLeg.setTextureSize(256, 256); - LeftBackUpperLeg.mirror = true; - setRotation(LeftBackUpperLeg, 0F, 0F, 0F); - LeftBackLowerLeg = new ModelRenderer(this, 78, 105); - LeftBackLowerLeg.addBox(-2F, 7F, -0.5F, 4, 6, 2); - LeftBackLowerLeg.setRotationPoint(19F, 9F, 15F); - LeftBackLowerLeg.setTextureSize(256, 256); - LeftBackLowerLeg.mirror = true; - setRotation(LeftBackLowerLeg, 0F, 0F, 0F); - LeftBackFoot = new ModelRenderer(this, 99, 80); - LeftBackFoot.addBox(-3F, 0F, -2.5F, 8, 2, 5); - LeftBackFoot.setRotationPoint(19F, 22F, 15.5F); - LeftBackFoot.setTextureSize(256, 256); - LeftBackFoot.mirror = true; - setRotation(LeftBackFoot, 0F, 0F, 0F); - Laser1 = new ModelRenderer(this, 35, 43); - Laser1.addBox(0F, 0F, 0F, 2, 4, 2); - Laser1.setRotationPoint(2.5F, 17F, 2.5F); - Laser1.setTextureSize(256, 256); - Laser1.mirror = true; - setRotation(Laser1, 0F, 0F, 0F); - Laser2 = new ModelRenderer(this, 35, 43); - Laser2.addBox(0F, 0F, 0F, 2, 4, 2); - Laser2.setRotationPoint(2.5F, 17F, -4.5F); - Laser2.setTextureSize(256, 256); - Laser2.mirror = true; - setRotation(Laser2, 0F, 0F, 0F); - Laser3 = new ModelRenderer(this, 35, 43); - Laser3.addBox(0F, 0F, 0F, 2, 4, 2); - Laser3.setRotationPoint(-4.5F, 17F, 2.5F); - Laser3.setTextureSize(256, 256); - Laser3.mirror = true; - setRotation(Laser3, 0F, 0F, 0F); - Laser4 = new ModelRenderer(this, 35, 43); - Laser4.addBox(0F, 0F, 0F, 2, 4, 2); - Laser4.setRotationPoint(-4.5F, 17F, -4.5F); - Laser4.setTextureSize(256, 256); - Laser4.mirror = true; - setRotation(Laser4, 0F, 0F, 0F); + keyboard = new ModelRenderer(this, 120, 20); + keyboard.addBox(0F, -3F, -1F, 10, 5, 1); + keyboard.setRotationPoint(-5F, 14F, -5F); + keyboard.setTextureSize(256, 128); + keyboard.mirror = true; + setRotation(keyboard, -1.082104F, 0.0174533F, 0F); + keyboardBottom = new ModelRenderer(this, 120, 26); + keyboardBottom.addBox(0F, -2.5F, -0.5F, 8, 4, 1); + keyboardBottom.setRotationPoint(-4F, 14F, -5F); + keyboardBottom.setTextureSize(256, 128); + keyboardBottom.mirror = true; + setRotation(keyboardBottom, -0.9075712F, 0F, 0F); + keyboardSupportExt1 = new ModelRenderer(this, 138, 26); + keyboardSupportExt1.addBox(0F, 0F, -1F, 1, 1, 1); + keyboardSupportExt1.setRotationPoint(2F, 14F, -5F); + keyboardSupportExt1.setTextureSize(256, 128); + keyboardSupportExt1.mirror = true; + setRotation(keyboardSupportExt1, 0F, 0F, 0F); + keyboardSupportExt2 = new ModelRenderer(this, 138, 26); + keyboardSupportExt2.addBox(0F, 0F, -1F, 1, 1, 1); + keyboardSupportExt2.setRotationPoint(-3F, 14F, -5F); + keyboardSupportExt2.setTextureSize(256, 128); + keyboardSupportExt2.mirror = true; + setRotation(keyboardSupportExt2, 0F, 0F, 0F); + keyboardSupport1 = new ModelRenderer(this, 142, 20); + keyboardSupport1.addBox(0F, -1F, 0F, 1, 2, 4); + keyboardSupport1.setRotationPoint(-3F, 14F, -5F); + keyboardSupport1.setTextureSize(256, 128); + keyboardSupport1.mirror = true; + setRotation(keyboardSupport1, 0F, 0F, 0F); + keyboardSupport2 = new ModelRenderer(this, 142, 20); + keyboardSupport2.addBox(0F, -1F, 0F, 1, 2, 4); + keyboardSupport2.setRotationPoint(2F, 14F, -5F); + keyboardSupport2.setTextureSize(256, 128); + keyboardSupport2.mirror = true; + setRotation(keyboardSupport2, 0F, 0F, 0F); + monitor1back = new ModelRenderer(this, 88, 32); + monitor1back.addBox(-13F, -3F, 0F, 12, 6, 1); + monitor1back.setRotationPoint(-8F, 3F, -3F); + monitor1back.setTextureSize(256, 128); + monitor1back.mirror = true; + setRotation(monitor1back, 0.0872665F, -0.2094395F, 0F); + monitor2back = new ModelRenderer(this, 88, 32); + monitor2back.addBox(0F, -4F, 0F, 12, 6, 1); + monitor2back.setRotationPoint(-6F, 4F, -3F); + monitor2back.setTextureSize(256, 128); + monitor2back.mirror = true; + setRotation(monitor2back, 0.0872665F, 0F, 0F); + monitor3back = new ModelRenderer(this, 88, 32); + monitor3back.addBox(1F, -3F, 0F, 12, 6, 1); + monitor3back.setRotationPoint(8F, 3F, -3F); + monitor3back.setTextureSize(256, 128); + monitor3back.mirror = true; + setRotation(monitor3back, 0.0872665F, 0.2094395F, 0F); + monitorBar1 = new ModelRenderer(this, 114, 36); + monitorBar1.addBox(-3.5F, -2F, -0.2F, 4, 2, 1); + monitorBar1.setRotationPoint(-6F, 4F, -3F); + monitorBar1.setTextureSize(256, 128); + monitorBar1.mirror = true; + setRotation(monitorBar1, 0.0872665F, -0.0523599F, 0F); + monitorBar2 = new ModelRenderer(this, 114, 36); + monitorBar2.addBox(0.5F, -2F, -0.2F, 4, 2, 1); + monitorBar2.setRotationPoint(5F, 4F, -3F); + monitorBar2.setTextureSize(256, 128); + monitorBar2.mirror = true; + setRotation(monitorBar2, 0.0872665F, 0.0523599F, 0F); + led1 = new ModelRenderer(this, 0, 0); + led1.addBox(-2F, 4.5F, -1.9F, 1, 1, 1); + led1.setRotationPoint(-8F, 3F, -3F); + led1.setTextureSize(256, 128); + led1.mirror = true; + setRotation(led1, 0.0872665F, -0.2094395F, 0F); + led2 = new ModelRenderer(this, 0, 0); + led2.addBox(12F, 4.466667F, -1.9F, 1, 1, 1); + led2.setRotationPoint(-7F, 3F, -3F); + led2.setTextureSize(256, 128); + led2.mirror = true; + setRotation(led2, 0.0872665F, 0F, 0F); + led3 = new ModelRenderer(this, 0, 0); + led3.addBox(12F, 4.5F, -1.9F, 1, 1, 1); + led3.setRotationPoint(8F, 3F, -3F); + led3.setTextureSize(256, 128); + led3.mirror = true; + setRotation(led3, 0.0872665F, 0.2094395F, 0F); + monitorMount1 = new ModelRenderer(this, 114, 32); + monitorMount1.addBox(0F, -1F, 0F, 2, 2, 2); + monitorMount1.setRotationPoint(-4F, 3F, -3F); + monitorMount1.setTextureSize(256, 128); + monitorMount1.mirror = true; + setRotation(monitorMount1, 0F, 0F, 0F); + monitorMount2 = new ModelRenderer(this, 114, 32); + monitorMount2.addBox(0F, -1F, 0F, 2, 2, 2); + monitorMount2.setRotationPoint(2F, 3F, -3F); + monitorMount2.setTextureSize(256, 128); + monitorMount2.mirror = true; + setRotation(monitorMount2, 0F, 0F, 0F); + frame1 = new ModelRenderer(this, 0, 0); + frame1.addBox(0F, 0F, 0F, 32, 29, 12); + frame1.setRotationPoint(-16F, -8F, -1F); + frame1.setTextureSize(256, 128); + frame1.mirror = true; + setRotation(frame1, 0F, 0F, 0F); + frame3 = new ModelRenderer(this, 0, 0); + frame3.addBox(0F, 0F, 0F, 32, 29, 12); + frame3.setRotationPoint(-16F, -8F, 28F); + frame3.setTextureSize(256, 128); + frame3.mirror = true; + setRotation(frame3, 0F, 0F, 0F); + plate5 = new ModelRenderer(this, 88, 90); + plate5.addBox(0F, 0F, 0F, 32, 5, 15); + plate5.setRotationPoint(-16F, 16F, 12F); + plate5.setTextureSize(256, 128); + plate5.mirror = true; + setRotation(plate5, 0F, 0F, 0F); + bracket1 = new ModelRenderer(this, 16, 85); + bracket1.addBox(0F, 0F, 0F, 5, 5, 2); + bracket1.setRotationPoint(-21F, -5F, 0F); + bracket1.setTextureSize(256, 128); + bracket1.mirror = true; + setRotation(bracket1, 0F, 0F, 0F); + bracket2 = new ModelRenderer(this, 16, 85); + bracket2.addBox(0F, 0F, 0F, 5, 5, 2); + bracket2.setRotationPoint(-21F, -5F, 8F); + bracket2.setTextureSize(256, 128); + bracket2.mirror = true; + setRotation(bracket2, 0F, 0F, 0F); + bracket3 = new ModelRenderer(this, 16, 85); + bracket3.addBox(0F, 0F, 0F, 5, 5, 2); + bracket3.setRotationPoint(-21F, -5F, 29F); + bracket3.setTextureSize(256, 128); + bracket3.mirror = true; + setRotation(bracket3, 0F, 0F, 0F); + bracket4 = new ModelRenderer(this, 16, 85); + bracket4.addBox(0F, 0F, 0F, 5, 5, 2); + bracket4.setRotationPoint(-21F, -5F, 37F); + bracket4.setTextureSize(256, 128); + bracket4.mirror = true; + setRotation(bracket4, 0F, 0F, 0F); + bracket5 = new ModelRenderer(this, 16, 85); + bracket5.addBox(0F, 0F, 0F, 5, 5, 2); + bracket5.setRotationPoint(16F, -5F, 0F); + bracket5.setTextureSize(256, 128); + bracket5.mirror = true; + setRotation(bracket5, 0F, 0F, 0F); + bracket5.mirror = false; + bracket6 = new ModelRenderer(this, 16, 85); + bracket6.addBox(0F, 0F, 0F, 5, 5, 2); + bracket6.setRotationPoint(16F, -5F, 8F); + bracket6.setTextureSize(256, 128); + bracket6.mirror = true; + setRotation(bracket6, 0F, 0F, 0F); + bracket7 = new ModelRenderer(this, 16, 85); + bracket7.addBox(0F, 0F, 0F, 5, 5, 2); + bracket7.setRotationPoint(16F, -5F, 29F); + bracket7.setTextureSize(256, 128); + bracket7.mirror = true; + setRotation(bracket7, 0F, 0F, 0F); + bracket8 = new ModelRenderer(this, 16, 85); + bracket8.addBox(0F, 0F, 0F, 5, 5, 2); + bracket8.setRotationPoint(16F, -5F, 37F); + bracket8.setTextureSize(256, 128); + bracket8.mirror = true; + setRotation(bracket8, 0F, 0F, 0F); + bracket8.mirror = false; + bracketPlate1 = new ModelRenderer(this, 30, 85); + bracketPlate1.addBox(0F, 0F, 0F, 1, 5, 6); + bracketPlate1.setRotationPoint(-17F, -5F, 2F); + bracketPlate1.setTextureSize(256, 128); + bracketPlate1.mirror = true; + setRotation(bracketPlate1, 0F, 0F, 0F); + bracketPlate2 = new ModelRenderer(this, 30, 85); + bracketPlate2.addBox(0F, 0F, 0F, 1, 5, 6); + bracketPlate2.setRotationPoint(-17F, -5F, 31F); + bracketPlate2.setTextureSize(256, 128); + bracketPlate2.mirror = true; + setRotation(bracketPlate2, 0F, 0F, 0F); + bracketPlate3 = new ModelRenderer(this, 30, 85); + bracketPlate3.addBox(0F, 0F, 0F, 1, 5, 6); + bracketPlate3.setRotationPoint(16F, -5F, 2F); + bracketPlate3.setTextureSize(256, 128); + bracketPlate3.mirror = true; + setRotation(bracketPlate3, 0F, 0F, 0F); + bracketPlate4 = new ModelRenderer(this, 30, 85); + bracketPlate4.addBox(0F, 0F, 0F, 1, 5, 6); + bracketPlate4.setRotationPoint(16F, -5F, 31F); + bracketPlate4.setTextureSize(256, 128); + bracketPlate4.mirror = true; + setRotation(bracketPlate4, 0F, 0F, 0F); + supportBeam1 = new ModelRenderer(this, 0, 85); + supportBeam1.addBox(0F, 0F, 0F, 4, 28, 8); + supportBeam1.setRotationPoint(-22F, -6F, 1F); + supportBeam1.setTextureSize(256, 128); + supportBeam1.mirror = true; + setRotation(supportBeam1, 0F, 0F, 0F); + supportBeam2 = new ModelRenderer(this, 0, 85); + supportBeam2.addBox(0F, 0F, 0F, 4, 28, 8); + supportBeam2.setRotationPoint(-22F, -6F, 30F); + supportBeam2.setTextureSize(256, 128); + supportBeam2.mirror = true; + setRotation(supportBeam2, 0F, 0F, 0F); + supportBeam3 = new ModelRenderer(this, 0, 85); + supportBeam3.addBox(0F, 0F, 0F, 4, 28, 8); + supportBeam3.setRotationPoint(18F, -6F, 1F); + supportBeam3.setTextureSize(256, 128); + supportBeam3.mirror = true; + setRotation(supportBeam3, 0F, 0F, 0F); + supportBeam4 = new ModelRenderer(this, 0, 85); + supportBeam4.addBox(0F, 0F, 0F, 4, 28, 8); + supportBeam4.setRotationPoint(18F, -6F, 30F); + supportBeam4.setTextureSize(256, 128); + supportBeam4.mirror = true; + setRotation(supportBeam4, 0F, 0F, 0F); + supportBeam4.mirror = false; + foot1 = new ModelRenderer(this, 44, 85); + foot1.addBox(0F, 0F, 0F, 7, 2, 10); + foot1.setRotationPoint(-23F, 22F, 0F); + foot1.setTextureSize(256, 128); + foot1.mirror = true; + setRotation(foot1, 0F, 0F, 0F); + foot2 = new ModelRenderer(this, 44, 85); + foot2.addBox(0F, 0F, 0F, 7, 2, 10); + foot2.setRotationPoint(-23F, 22F, 29F); + foot2.setTextureSize(256, 128); + foot2.mirror = true; + setRotation(foot2, 0F, 0F, 0F); + foot3 = new ModelRenderer(this, 44, 85); + foot3.addBox(0F, 0F, 0F, 7, 2, 10); + foot3.setRotationPoint(16F, 22F, 29F); + foot3.setTextureSize(256, 128); + foot3.mirror = true; + setRotation(foot3, 0F, 0F, 0F); + foot4 = new ModelRenderer(this, 44, 85); + foot4.addBox(0F, 0F, 0F, 7, 2, 10); + foot4.setRotationPoint(16F, 22F, 0F); + foot4.setTextureSize(256, 128); + foot4.mirror = true; + setRotation(foot4, 0F, 0F, 0F); + core = new ModelRenderer(this, 0, 41); + core.addBox(0F, 0F, 0F, 30, 27, 17); + core.setRotationPoint(-15F, -7F, 11F); + core.setTextureSize(256, 128); + core.mirror = true; + setRotation(core, 0F, 0F, 0F); + powerCable1a = new ModelRenderer(this, 88, 39); + powerCable1a.addBox(0F, 0F, 0F, 6, 2, 11); + powerCable1a.setRotationPoint(-3F, 20F, 2F); + powerCable1a.setTextureSize(256, 128); + powerCable1a.mirror = true; + setRotation(powerCable1a, 0F, 0F, 0F); + powerCable1b = new ModelRenderer(this, 94, 52); + powerCable1b.addBox(0F, 0F, 0F, 6, 3, 6); + powerCable1b.setRotationPoint(-3F, 20F, 13F); + powerCable1b.setTextureSize(256, 128); + powerCable1b.mirror = true; + setRotation(powerCable1b, 0F, 0F, 0F); + powerCable2 = new ModelRenderer(this, 42, 109); + powerCable2.addBox(0F, 0F, 0F, 9, 6, 6); + powerCable2.setRotationPoint(14F, 13F, 13F); + powerCable2.setTextureSize(256, 128); + powerCable2.mirror = true; + setRotation(powerCable2, 0F, 0F, 0F); + powerCable3 = new ModelRenderer(this, 42, 109); + powerCable3.addBox(0F, 0F, 0F, 9, 6, 6); + powerCable3.setRotationPoint(-23F, 13F, 13F); + powerCable3.setTextureSize(256, 128); + powerCable3.mirror = true; + setRotation(powerCable3, 0F, 0F, 0F); + powerConnector1 = new ModelRenderer(this, 94, 61); + powerConnector1.addBox(0F, 0F, 0F, 8, 1, 8); + powerConnector1.setRotationPoint(-4F, 23F, 12F); + powerConnector1.setTextureSize(256, 128); + powerConnector1.mirror = true; + setRotation(powerConnector1, 0F, 0F, 0F); + powerConnector2a = new ModelRenderer(this, 24, 105); + powerConnector2a.addBox(0F, 0F, 0F, 1, 8, 8); + powerConnector2a.setRotationPoint(23F, 12F, 12F); + powerConnector2a.setTextureSize(256, 128); + powerConnector2a.mirror = true; + setRotation(powerConnector2a, 0F, 0F, 0F); + powerConnector2b = new ModelRenderer(this, 24, 105); + powerConnector2b.addBox(0F, 0F, 0F, 1, 8, 8); + powerConnector2b.setRotationPoint(16F, 12F, 12F); + powerConnector2b.setTextureSize(256, 128); + powerConnector2b.mirror = true; + setRotation(powerConnector2b, 0F, 0F, 0F); + powerCpnnector3a = new ModelRenderer(this, 24, 105); + powerCpnnector3a.addBox(0F, 0F, 0F, 1, 8, 8); + powerCpnnector3a.setRotationPoint(-24F, 12F, 12F); + powerCpnnector3a.setTextureSize(256, 128); + powerCpnnector3a.mirror = true; + setRotation(powerCpnnector3a, 0F, 0F, 0F); + powerConnector3b = new ModelRenderer(this, 24, 105); + powerConnector3b.addBox(0F, 0F, 0F, 1, 8, 8); + powerConnector3b.setRotationPoint(-17F, 12F, 12F); + powerConnector3b.setTextureSize(256, 128); + powerConnector3b.mirror = true; + setRotation(powerConnector3b, 0F, 0F, 0F); + frame2a = new ModelRenderer(this, 88, 0); + frame2a.addBox(0F, 0F, 0F, 32, 5, 15); + frame2a.setRotationPoint(-16F, -8F, 12F); + frame2a.setTextureSize(256, 128); + frame2a.mirror = true; + setRotation(frame2a, 0F, 0F, 0F); + frame2b = new ModelRenderer(this, 126, 50); + frame2b.addBox(0F, 0F, 0F, 32, 5, 15); + frame2b.setRotationPoint(-16F, -2F, 12F); + frame2b.setTextureSize(256, 128); + frame2b.mirror = true; + setRotation(frame2b, 0F, 0F, 0F); + frame2c = new ModelRenderer(this, 126, 50); + frame2c.addBox(0F, 0F, 0F, 32, 5, 15); + frame2c.setRotationPoint(-16F, 4F, 12F); + frame2c.setTextureSize(256, 128); + frame2c.mirror = true; + setRotation(frame2c, 0F, 0F, 0F); + frame2d = new ModelRenderer(this, 88, 70); + frame2d.addBox(0F, 0F, 0F, 32, 5, 15); + frame2d.setRotationPoint(-16F, 10F, 12F); + frame2d.setTextureSize(256, 128); + frame2d.mirror = true; + setRotation(frame2d, 0F, 0F, 0F); + monitor1 = new ModelRenderer(this, 88, 20); + monitor1.addBox(-14F, -5F, -2F, 14, 10, 2); + monitor1.setRotationPoint(-8F, 3F, -3F); + monitor1.setTextureSize(256, 128); + monitor1.mirror = true; + setRotation(monitor1, 0.0872665F, -0.2094395F, 0F); + monitor2 = new ModelRenderer(this, 88, 20); + monitor2.addBox(0F, -5F, -2F, 14, 10, 2); + monitor2.setRotationPoint(-7F, 3F, -3F); + monitor2.setTextureSize(256, 128); + monitor2.mirror = true; + setRotation(monitor2, 0.0872665F, 0F, 0F); + monitor3 = new ModelRenderer(this, 88, 20); + monitor3.addBox(0F, -5F, -2F, 14, 10, 2); + monitor3.setRotationPoint(8F, 3F, -3F); + monitor3.setTextureSize(256, 128); + monitor3.mirror = true; + setRotation(monitor3, 0.0872665F, 0.2094395F, 0F); } - public void render(float size, boolean on) + public void render(float size, boolean on) { - Base.render(size); - Back.render(size); - + keyboard.render(size); + keyboardBottom.render(size); + keyboardSupportExt1.render(size); + keyboardSupportExt2.render(size); + keyboardSupport1.render(size); + keyboardSupport2.render(size); + monitor1back.render(size); + monitor2back.render(size); + monitor3back.render(size); + monitorBar1.render(size); + monitorBar2.render(size); + if(on) { MekanismRenderer.glowOn(); } - - Panel.render(size); - + + led1.render(size); + led2.render(size); + led3.render(size); + + monitor1.render(size); + monitor2.render(size); + monitor3.render(size); + if(on) { MekanismRenderer.glowOff(); } - - PanelStem.render(size); - KeyboardStem.render(size); - Keyboard.render(size); - LaserBase.render(size); - LegRight.render(size); - UpperLegRight.render(size); - ToeTopRight1.render(size); - ToeTopRight2.render(size); - ToeRight1.render(size); - LegHoldRight1.render(size); - LegHoldRight2.render(size); - FootBaseRight.render(size); - ToeRight2.render(size); - FootBaseLeft.render(size); - UpperLegLeft.render(size); - LegHoldLeft1.render(size); - ToeTopLeft2.render(size); - ToeTopLeft1.render(size); - LegHoldLeft2.render(size); - ToeLeft1.render(size); - ToeLeft2.render(size); - LegLeft.render(size); - RightAxil.render(size); - RightBackUpperLeg.render(size); - RightBackLowerLeg.render(size); - RightBackFoot.render(size); - LeftAxil.render(size); - LeftBackUpperLeg.render(size); - LeftBackLowerLeg.render(size); - LeftBackFoot.render(size); - Laser1.render(size); - Laser2.render(size); - Laser3.render(size); - Laser4.render(size); + + monitorMount1.render(size); + monitorMount2.render(size); + frame1.render(size); + frame3.render(size); + plate5.render(size); + bracket1.render(size); + bracket2.render(size); + bracket3.render(size); + bracket4.render(size); + bracket5.render(size); + bracket6.render(size); + bracket7.render(size); + bracket8.render(size); + bracketPlate1.render(size); + bracketPlate2.render(size); + bracketPlate3.render(size); + bracketPlate4.render(size); + supportBeam1.render(size); + supportBeam2.render(size); + supportBeam3.render(size); + supportBeam4.render(size); + foot1.render(size); + foot2.render(size); + foot3.render(size); + foot4.render(size); + core.render(size); + powerCable1a.render(size); + powerCable1b.render(size); + powerCable2.render(size); + powerCable3.render(size); + powerConnector1.render(size); + powerConnector2a.render(size); + powerConnector2b.render(size); + powerCpnnector3a.render(size); + powerConnector3b.render(size); + frame2a.render(size); + frame2b.render(size); + frame2c.render(size); + frame2d.render(size); } - private void setRotation(ModelRenderer model, float x, float y, float z) + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index 8a7de3a7f..79505ad46 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelPortableTank.java b/src/main/java/mekanism/client/model/ModelFluidTank.java similarity index 93% rename from src/main/java/mekanism/client/model/ModelPortableTank.java rename to src/main/java/mekanism/client/model/ModelFluidTank.java index 2f96347ea..06da24981 100644 --- a/src/main/java/mekanism/client/model/ModelPortableTank.java +++ b/src/main/java/mekanism/client/model/ModelFluidTank.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - +import mekanism.common.Tier.FluidTankTier; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class ModelPortableTank extends ModelBase +public class ModelFluidTank extends ModelBase { ModelRenderer Base; ModelRenderer PoleFL; @@ -21,7 +21,7 @@ public class ModelPortableTank extends ModelBase ModelRenderer RightGlass; ModelRenderer LeftGlass; - public ModelPortableTank() + public ModelFluidTank() { textureWidth = 128; textureHeight = 128; @@ -88,7 +88,7 @@ public class ModelPortableTank extends ModelBase setRotation(LeftGlass, 0F, 0F, 0F); } - public void render(float size) + public void render(float size, FluidTankTier tier) { Base.render(size); PoleFL.render(size); @@ -98,6 +98,7 @@ public class ModelPortableTank extends ModelBase Top.render(size); MekanismRenderer.blendOn(); + MekanismRenderer.color(tier.getBaseTier().getColor()); FrontGlass.render(size); BackGlass.render(size); RightGlass.render(size); diff --git a/src/main/java/mekanism/client/model/ModelGasMask.java b/src/main/java/mekanism/client/model/ModelGasMask.java index 2f104d9f0..2854a10f5 100644 --- a/src/main/java/mekanism/client/model/ModelGasMask.java +++ b/src/main/java/mekanism/client/model/ModelGasMask.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelGasMask extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelJetpack.java b/src/main/java/mekanism/client/model/ModelJetpack.java index 56739c2bf..8d6bb589c 100644 --- a/src/main/java/mekanism/client/model/ModelJetpack.java +++ b/src/main/java/mekanism/client/model/ModelJetpack.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelJetpack extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java index 31d110140..ac329f046 100644 --- a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java +++ b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelRobit.java b/src/main/java/mekanism/client/model/ModelRobit.java index 505d5f118..a73c480e8 100644 --- a/src/main/java/mekanism/client/model/ModelRobit.java +++ b/src/main/java/mekanism/client/model/ModelRobit.java @@ -1,15 +1,15 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelRobit extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java index da2c80d1d..d759c00f4 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -2,11 +2,12 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelSeismicVibrator extends ModelBase { diff --git a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java index e93a2c995..536a86cfc 100644 --- a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java @@ -1,6 +1,10 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Point; +import java.awt.Rectangle; import java.util.Collection; import java.util.List; @@ -8,11 +12,11 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; @@ -31,8 +35,6 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public abstract class AdvancedMachineRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java index 878e01077..5fe5f3879 100644 --- a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java @@ -1,5 +1,9 @@ package mekanism.client.nei; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.gui; + import java.util.HashSet; import java.util.List; import java.util.Set; @@ -14,9 +18,6 @@ import net.minecraftforge.fluids.FluidStack; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; -import static codechicken.lib.gui.GuiDraw.gui; public abstract class BaseRecipeHandler extends TemplateRecipeHandler implements IGuiWrapper { diff --git a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java index 8ceda4b9a..e9e56e0ac 100644 --- a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java @@ -1,15 +1,19 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Rectangle; import java.util.Collection; import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.recipe.machines.ChanceMachineRecipe; @@ -23,9 +27,6 @@ import org.lwjgl.opengl.GL11; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public abstract class ChanceMachineRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java index e11247265..f0040b32a 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java @@ -1,6 +1,10 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Point; +import java.awt.Rectangle; import java.util.Collection; import java.util.List; @@ -21,8 +25,6 @@ import codechicken.nei.NEIClientConfig; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class ChemicalInfuserRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 7bd17aeb0..e94cb15cf 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -9,6 +9,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiChemicalInjectionChamber; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.InjectionRecipe; import mekanism.common.util.LangUtils; @@ -49,18 +50,31 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe { List fuels = new ArrayList(); fuels.addAll(OreDictionary.getOres("dustSulfur")); - fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("sulfuricAcid"))); + + for(GasTankTier tier : GasTankTier.values()) + { + fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("sulfuricAcid"))); + } + return fuels; } else if(gasType == GasRegistry.getGas("water")) { - return ListUtils.asList(MekanismUtils.getFullGasTank(GasRegistry.getGas("water"))); + for(GasTankTier tier : GasTankTier.values()) + { + return ListUtils.asList(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("water"))); + } } else if(gasType == GasRegistry.getGas("hydrogenChloride")) { List fuels = new ArrayList(); fuels.addAll(OreDictionary.getOres("dustSalt")); - fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("hydrogenChloride"))); + + for(GasTankTier tier : GasTankTier.values()) + { + fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("hydrogenChloride"))); + } + return fuels; } diff --git a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java index 731042785..6f5b877c5 100644 --- a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java @@ -14,9 +14,9 @@ import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; diff --git a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java index 565ae0d47..cb5a27450 100644 --- a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java @@ -7,7 +7,6 @@ import java.awt.Point; import java.awt.Rectangle; import java.util.Collection; import java.util.List; -import java.util.Map; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElectrolyticSeparator; @@ -16,11 +15,11 @@ import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; diff --git a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java index daff7b57b..d9551fae2 100644 --- a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java @@ -1,15 +1,18 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Rectangle; import java.util.Collection; import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.recipe.machines.BasicMachineRecipe; @@ -22,8 +25,6 @@ import org.lwjgl.opengl.GL11; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public abstract class MachineRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java b/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java index 7eae53fb9..229831a5b 100644 --- a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java +++ b/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java @@ -1,10 +1,8 @@ package mekanism.client.nei; import mekanism.client.gui.GuiMekanism; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; - import codechicken.nei.guihook.IContainerSlotClickHandler; public class MekanismSlotClickHandler implements IContainerSlotClickHandler diff --git a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java index c4d9c8ddb..cecb68de5 100644 --- a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java +++ b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java @@ -16,8 +16,8 @@ import mekanism.client.gui.GuiPRC; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiRotaryCondensentrator; -import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.client.gui.GuiSolarNeutronActivator; +import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java index ba320a47d..4dbb1484b 100644 --- a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java @@ -17,11 +17,11 @@ import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; diff --git a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java index 0643f41dd..db1e61bca 100644 --- a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -7,8 +7,9 @@ import java.util.List; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.util.ListUtils; -import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.PurificationRecipe; import mekanism.common.util.LangUtils; @@ -53,7 +54,10 @@ public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandl { if(gasType == GasRegistry.getGas("oxygen")) { - return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(GasRegistry.getGas("oxygen"))); + for(GasTankTier tier : GasTankTier.values()) + { + return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("oxygen"))); + } } return new ArrayList(); diff --git a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java index 8f99dc790..03afb2ae3 100644 --- a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java @@ -1,6 +1,11 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Point; +import java.awt.Rectangle; import java.util.List; import mekanism.api.gas.Gas; @@ -10,7 +15,6 @@ import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.common.ObfuscatedNames; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidStack; @@ -22,10 +26,6 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - public class RotaryCondensentratorRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java b/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java index d62fe0da1..f7d2b88c2 100644 --- a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java @@ -10,15 +10,12 @@ import java.util.List; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiSolarNeutronActivator; -import mekanism.client.nei.RotaryCondensentratorRecipeHandler.CachedIORecipe; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.SolarNeutronRecipe; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java b/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java index e53294d23..bf924aae7 100644 --- a/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java @@ -7,7 +7,6 @@ import java.awt.Point; import java.awt.Rectangle; import java.util.Collection; import java.util.List; -import java.util.Map; import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.common.ObfuscatedNames; diff --git a/src/main/java/mekanism/client/render/ColourTemperature.java b/src/main/java/mekanism/client/render/ColourTemperature.java index 979d2f8e7..8d8f74e89 100644 --- a/src/main/java/mekanism/client/render/ColourTemperature.java +++ b/src/main/java/mekanism/client/render/ColourTemperature.java @@ -3,7 +3,6 @@ package mekanism.client.render; //import java.util.HashMap; // //import mekanism.api.IHeatTransfer; -// //import codechicken.lib.colour.ColourRGBA; public class ColourTemperature// extends ColourRGBA diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 5f513bfcf..7491c3e41 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -15,8 +15,9 @@ import mekanism.api.infuse.InfuseType; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDynamicTank; -import mekanism.client.render.tileentity.RenderPortableTank; +import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; +import mekanism.client.render.tileentity.RenderThermoelectricBoiler; import mekanism.common.ObfuscatedNames; import mekanism.common.base.ISpecialBounds; import mekanism.common.util.MekanismUtils; @@ -68,6 +69,8 @@ public class MekanismRenderer public static TextureAtlasSprite energyIcon; public static TextureAtlasSprite heatIcon; + public static float GAS_RENDER_BASE = 0.2F; + public static Map overlays = new HashMap(); private static float lightmapLastX; @@ -124,7 +127,6 @@ public class MekanismRenderer GasRegistry.getGas("deuterium").setIcon(event.map,"mekanism:blocks/LiquidDeuterium"); GasRegistry.getGas("tritium").setIcon(event.map,"mekanism:blocks/LiquidTritium"); GasRegistry.getGas("fusionFuelDT").setIcon(event.map,"mekanism:blocks/LiquidDT"); - GasRegistry.getGas("steam").setIcon(event.map,"mekanism:blocks/LiquidSteam"); GasRegistry.getGas("lithium").setIcon(event.map,"mekanism:blocks/LiquidLithium"); for(Gas gas : GasRegistry.getRegisteredGasses()) diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index c693751f6..006ee6c0d 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -10,7 +10,6 @@ import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityDigitalMiner; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.init.Blocks; diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index 2ada1da3c..bc1cd44b5 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -7,18 +7,18 @@ import mekanism.client.model.ModelJetpack; import mekanism.client.model.ModelScubaTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelCustomArmor extends ModelBiped { diff --git a/src/main/java/mekanism/client/render/RenderGlowPanel.java b/src/main/java/mekanism/client/render/RenderGlowPanel.java index 9bbdb9ad1..0b3b491d4 100644 --- a/src/main/java/mekanism/client/render/RenderGlowPanel.java +++ b/src/main/java/mekanism/client/render/RenderGlowPanel.java @@ -7,10 +7,8 @@ import mekanism.api.EnumColor; import mekanism.common.multipart.PartGlowPanel; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import codechicken.lib.colour.Colour; import codechicken.lib.colour.ColourRGBA; import codechicken.lib.lighting.LightModel; diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 7a0a58d00..cbaf98e6e 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -9,6 +9,7 @@ import mekanism.api.MekanismAPI; import mekanism.api.Pos3D; import mekanism.client.render.particle.EntityJetpackFlameFX; import mekanism.client.render.particle.EntityJetpackSmokeFX; +import mekanism.client.render.particle.EntityScubaBubbleFX; import mekanism.common.Mekanism; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemJetpack; @@ -31,8 +32,6 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javafx.geometry.Pos; - @SideOnly(Side.CLIENT) public class RenderTickHandler { @@ -123,11 +122,11 @@ public class RenderTickHandler float random = (rand.nextFloat() - 0.5F) * 0.1F; - Pos3D vLeft = new Pos3D(-0.43, -0.55, -0.54).rotateYaw(p.renderYawOffset); + Pos3D vLeft = new Pos3D(-0.43, -0.55, -0.54).rotatePitch(p.isSneaking() ? 25 : 0).rotateYaw(p.renderYawOffset); - Pos3D vRight = new Pos3D(0.43, -0.55, -0.54).rotateYaw(p.renderYawOffset); + Pos3D vRight = new Pos3D(0.43, -0.55, -0.54).rotatePitch(p.isSneaking() ? 25 : 0).rotateYaw(p.renderYawOffset); - Pos3D vCenter = new Pos3D((rand.nextFloat() - 0.5F) * 0.4F, -0.86, -0.30).rotateYaw(p.renderYawOffset); + Pos3D vCenter = new Pos3D((rand.nextFloat() - 0.5F) * 0.4F, -0.86, -0.30).rotatePitch(p.isSneaking() ? 25 : 0).rotateYaw(p.renderYawOffset); Pos3D rLeft = vLeft.scale(random); Pos3D rRight = vRight.clone().scale(random); @@ -153,6 +152,38 @@ public class RenderTickHandler } } + synchronized(Mekanism.gasmaskOn) + { + if(world.getWorldTime() % 4 == 0) + { + for(String s : Mekanism.gasmaskOn) + { + EntityPlayer p = mc.theWorld.getPlayerEntityByName(s); + + if(p == null || !p.isInWater()) + { + continue; + } + + Pos3D playerPos = new Pos3D(p); + + if(p != mc.thePlayer) + { + playerPos.translate(0, 1.7, 0); + } + + float xRand = (rand.nextFloat() - 0.5F) * 0.08F; + float yRand = (rand.nextFloat() - 0.5F) * 0.05F; + + Pos3D vec = new Pos3D(0.4, 0.4, 0.4).multiply(new Pos3D(p.getLook(90))).translate(0, -0.2, 0); + Pos3D motion = vec.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); + + Pos3D v = playerPos.clone().translate(vec); + spawnAndSetParticle("bubble", world, v.xPos, v.yPos, v.zPos, motion.xPos, motion.yPos + 0.2, motion.zPos); + } + } + } + if(world.getWorldTime() % 4 == 0) { for(EntityPlayer p : world.playerEntities) @@ -219,6 +250,10 @@ public class RenderTickHandler { fx = new EntityJetpackSmokeFX(world, x, y, z, velX, velY, velZ); } + else if(s.equals("bubble")) + { + fx = new EntityScubaBubbleFX(world, x, y, z, velX, velY, velZ); + } mc.effectRenderer.addEffect(fx); } diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index d1c8252d0..febae0e19 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -20,13 +20,11 @@ import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.client.model.ModelSeismicVibrator; import mekanism.client.render.MekanismRenderer; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.AdvancedModelLoader; @@ -108,10 +106,10 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.DIGITAL_MINER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.2F, -0.3F, 0.0F); + GL11.glRotatef(-180F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.35F, 0.1F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); - digitalMiner.render(0.03125F, false); + digitalMiner.render(0.022F, false); } else if(type == MachineType.ROTARY_CONDENSENTRATOR) { diff --git a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java index 769dad675..8b5676399 100644 --- a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java @@ -2,9 +2,7 @@ package mekanism.client.render.block; import mekanism.client.ClientProxy; import mekanism.client.render.MekanismRenderer; -import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java index 0676e396e..871ff161e 100644 --- a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java +++ b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java @@ -2,7 +2,6 @@ package mekanism.client.render.block; import mekanism.client.render.CTM; import mekanism.common.CTMData; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/mekanism/client/render/entity/RenderBalloon.java b/src/main/java/mekanism/client/render/entity/RenderBalloon.java index 692afb64d..38e367ebd 100644 --- a/src/main/java/mekanism/client/render/entity/RenderBalloon.java +++ b/src/main/java/mekanism/client/render/entity/RenderBalloon.java @@ -5,17 +5,17 @@ import mekanism.client.model.ModelBalloon; import mekanism.common.entity.EntityBalloon; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderBalloon extends Render { diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index c53e5f17c..603246ce6 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -2,26 +2,20 @@ package mekanism.client.render.entity; import mekanism.client.render.MekanismRenderer; import mekanism.common.entity.EntityFlame; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderFlame extends Render { - public RenderFlame(RenderManager renderManager) - { - super(renderManager); - } - @Override public void doRender(EntityFlame entity, double x, double y, double z, float f, float partialTick) { diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index e90cde0fe..9c514f7a4 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -9,11 +9,12 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderObsidianTNTPrimed extends Render { diff --git a/src/main/java/mekanism/client/render/entity/RenderRobit.java b/src/main/java/mekanism/client/render/entity/RenderRobit.java index 5c54675f3..074f96e21 100644 --- a/src/main/java/mekanism/client/render/entity/RenderRobit.java +++ b/src/main/java/mekanism/client/render/entity/RenderRobit.java @@ -4,7 +4,6 @@ import mekanism.client.model.ModelRobit; import mekanism.common.entity.EntityRobit; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 3f70637f9..5846eff23 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -19,12 +19,11 @@ public class ItemRenderingHandler// implements IItemRenderer public ModelScubaTank scubaTank = new ModelScubaTank(); public ModelFreeRunners freeRunners = new ModelFreeRunners(); public ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler(); - public ModelPortableTank portableTank = new ModelPortableTank(); public ModelFlamethrower flamethrower = new ModelFlamethrower(); private final RenderBalloon balloonRenderer = new RenderBalloon(); private final RenderBin binRenderer = (RenderBin)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityBin.class); - private final RenderPortableTank portableTankRenderer = (RenderPortableTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityPortableTank.class); + private final RenderFluidTank portableTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityFluidTank.class); private final RenderItem renderItem = (RenderItem)RenderManager.instance.getEntityClassRenderObject(EntityItem.class); @Override @@ -96,18 +95,16 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glPopMatrix(); } - else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.BasicBlock2 && item.getItemDamage() == 3) + else if(BasicType.get(item) == BasicType.INDUCTION_CELL || BasicType.get(item) == BasicType.INDUCTION_PROVIDER) { MekanismRenderer.renderCustomItem((RenderBlocks)data[0], item); } - else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.BasicBlock2 && item.getItemDamage() == 4) + else if(BasicType.get(item) == BasicType.BIN) { + GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); MekanismRenderer.renderCustomItem((RenderBlocks)data[0], item); - } - else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.BasicBlock && item.getItemDamage() == 6) - { - RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], MekanismBlocks.BasicBlock, item.getItemDamage(), ClientProxy.BASIC_RENDER_ID); - + GL11.glRotatef(-270, 0.0F, 1.0F, 0.0F); + if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()* / == null) { return; @@ -228,7 +225,8 @@ public class ItemRenderingHandler// implements IItemRenderer else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank) { GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank.png")); + BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); @@ -441,15 +439,16 @@ public class ItemRenderingHandler// implements IItemRenderer flamethrower.render(0.0625F); GL11.glPopMatrix(); } - else if(MachineType.get(item) == MachineType.PORTABLE_TANK) + else if(MachineType.get(item) == MachineType.FLUID_TANK) { GL11.glPushMatrix(); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PortableTank.png")); - + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank.png")); ItemBlockMachine itemMachine = (ItemBlockMachine)item.getItem(); + float targetScale = (float)(itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).amount : 0)/itemMachine.getCapacity(item); + FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(item).ordinal()]; Fluid fluid = itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).getFluid() : null; - portableTankRenderer.render(fluid, itemMachine.getPrevScale(item), false, null, -0.5, -0.5, -0.5); + portableTankRenderer.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5); GL11.glPopMatrix(); } else { diff --git a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java new file mode 100644 index 000000000..468f7bd1a --- /dev/null +++ b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java @@ -0,0 +1,41 @@ +package mekanism.client.render.particle; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityBubbleFX; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.World; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class EntityScubaBubbleFX extends EntityBubbleFX +{ + private static Minecraft mc = FMLClientHandler.instance().getClient(); + + public EntityScubaBubbleFX(World world, double posX, double posY, double posZ, double velX, double velY, double velZ) + { + super(world, posX, posY, posZ, velX, velY, velZ); + + particleScale = (rand.nextFloat()*0.2F)+0.5F; + particleMaxAge *= 2; + } + + @Override + public void onUpdate() + { + super.onUpdate(); + + particleAge++; + } + + @Override + public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) + { + if(particleAge > 0) + { + particleAlpha = Math.min(1, (particleAge+p_70539_2_)/20F); + super.renderParticle(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_); + } + } +} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 826e67b96..7b4762898 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -1,8 +1,8 @@ package mekanism.client.render.tileentity; import mekanism.api.Coord4D; +import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityBin; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.OpenGlHelper; @@ -12,11 +12,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderBin extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index 7e2ef3a34..b745f1019 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelChargepad; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderChargepad extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index 0d770ce48..86d71f00a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java index 520532f1a..50154778e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderChemicalDissolutionChamber extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java index cce03dd89..7f3f3fe75 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java @@ -11,7 +11,6 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index 848c0b647..31f056843 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -11,7 +11,6 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java index c7b5f5e4e..a1c5cb10b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java @@ -4,7 +4,6 @@ import mekanism.client.model.ModelChemicalWasher; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index b0215f075..5bd58efb8 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -10,18 +10,18 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntityDynamicTank; - import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderDynamicTank extends TileEntitySpecialRenderer { @@ -55,7 +55,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java index 6a22c40a7..50b1c576c 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderElectricPump extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index 69f3587e7..886f89579 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelElectrolyticSeparator; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 2f8772120..fefaed0dd 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -8,14 +8,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderEnergyCube extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java similarity index 82% rename from src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java rename to src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java index 08694e601..e65d41689 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java @@ -3,40 +3,41 @@ package mekanism.client.render.tileentity; import java.util.HashMap; import java.util.Map; -import mekanism.client.model.ModelPortableTank; +import mekanism.client.model.ModelFluidTank; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.Tier.FluidTankTier; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) -public class RenderPortableTank extends TileEntitySpecialRenderer +public class RenderFluidTank extends TileEntitySpecialRenderer { private static Map cachedCenterFluids = new HashMap(); private static Map cachedValveFluids = new HashMap(); private static int stages = 1400; - private ModelPortableTank model = new ModelPortableTank(); + private ModelFluidTank model = new ModelFluidTank(); @Override - public void renderTileEntityAt(TileEntityPortableTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) + public void renderTileEntityAt(TileEntityFluidTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) { Fluid fluid = tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid() : null; - render(fluid, tileEntity.prevScale, tileEntity.isActive, tileEntity.valve > 0 ? tileEntity.valveFluid : null, x, y, z); + render(tileEntity.tier, fluid, tileEntity.prevScale, tileEntity.isActive, tileEntity.valve > 0 ? tileEntity.valveFluid : null, x, y, z); } - public void render(Fluid fluid, float fluidScale, boolean active, Fluid valveFluid, double x, double y, double z) + public void render(FluidTankTier tier, Fluid fluid, float fluidScale, boolean active, Fluid valveFluid, double x, double y, double z) { if(fluid != null && fluidScale > 0) { @@ -52,7 +53,7 @@ public class RenderPortableTank extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index 0e5026244..c616aeb18 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -7,11 +7,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderGasTank extends TileEntitySpecialRenderer { @@ -22,7 +23,7 @@ public class RenderGasTank extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tileEntity.tier.getBaseTier().getName() + ".png")); switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ { @@ -36,6 +37,6 @@ public class RenderGasTank extends TileEntitySpecialRenderer model.render(0.0625F); GL11.glPopMatrix(); - //TODOMekanismRenderer.machineRenderer.renderAModelAt(tileEntity, x, y, z, partialTick); + //TODO MekanismRenderer.machineRenderer.renderAModelAt(tileEntity, x, y, z, partialTick); } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java index 278864bef..2b43080fc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderLaserAmplifier extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java index 9e4a07dcc..12625eba3 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java @@ -5,7 +5,6 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java index 430d5de43..170eab85b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderLogisticalSorter extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java index 00a6078bc..a3ae06833 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderPressurizedReactionChamber extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index be4694f8d..66bccc4a2 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -5,14 +5,14 @@ import mekanism.common.Mekanism; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderSeismicVibrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java index bd0faaef2..b9ee8d93d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java @@ -10,7 +10,6 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.MekanismBlocks; import mekanism.common.tile.TileEntityTeleporter; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java index 01a03328e..9de25af44 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java @@ -9,17 +9,17 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntityThermalEvaporationController; - import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderThermalEvaporationController extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java new file mode 100644 index 000000000..106761c66 --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -0,0 +1,354 @@ +package mekanism.client.render.tileentity; + +import java.util.HashMap; +import java.util.Map; + +import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.MekanismRenderer.DisplayInteger; +import mekanism.client.render.MekanismRenderer.Model3D; +import mekanism.client.render.tileentity.RenderDynamicTank.RenderData; +import mekanism.client.render.tileentity.RenderDynamicTank.ValveRenderData; +import mekanism.common.content.tank.SynchronizedTankData.ValveData; +import mekanism.common.content.tank.TankUpdateProtocol; +import mekanism.common.tile.TileEntityBoilerCasing; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer +{ + private static Map cachedLowerFluids = new HashMap(); + private static Map cachedUpperFluids = new HashMap(); + private static Map cachedValveFluids = new HashMap(); + + private Fluid STEAM = FluidRegistry.getFluid("steam"); + private Fluid WATER = FluidRegistry.WATER; + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityBoilerCasing)tileEntity, x, y, z, partialTick); + } + + public void renderAModelAt(TileEntityBoilerCasing tileEntity, double x, double y, double z, float partialTick) + { + if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.renderLocation != null && tileEntity.structure.upperRenderLocation != null) + { + if(tileEntity.structure.waterStored != null && tileEntity.structure.waterStored.amount != 0) + { + RenderData data = new RenderData(); + + data.location = tileEntity.structure.renderLocation; + data.height = (tileEntity.structure.upperRenderLocation.yCoord-1)-tileEntity.structure.renderLocation.yCoord; + data.length = tileEntity.structure.volLength; + data.width = tileEntity.structure.volWidth; + + bindTexture(MekanismRenderer.getBlocksTexture()); + + if(data.location != null && data.height >= 1 && tileEntity.structure.waterStored.getFluid() != null) + { + push(); + + GL11.glTranslated(getX(data.location.xCoord), getY(data.location.yCoord), getZ(data.location.zCoord)); + + MekanismRenderer.glowOn(tileEntity.structure.waterStored.getFluid().getLuminosity()); + MekanismRenderer.colorFluid(tileEntity.structure.waterStored.getFluid()); + + DisplayInteger[] displayList = getLowerDisplay(data, tileEntity.structure.waterStored.getFluid(), tileEntity.getWorldObj()); + + if(tileEntity.structure.waterStored.getFluid().isGaseous()) + { + GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.waterStored.amount / (float)tileEntity.clientWaterCapacity)+MekanismRenderer.GAS_RENDER_BASE)); + displayList[getStages(data.height)-1].render(); + } + else { + displayList[Math.min(getStages(data.height)-1, (int)(tileEntity.prevWaterScale*((float)getStages(data.height)-1)))].render(); + } + + MekanismRenderer.glowOff(); + MekanismRenderer.resetColor(); + + pop(); + + for(ValveData valveData : tileEntity.valveViewing) + { + push(); + + GL11.glTranslated(getX(valveData.location.xCoord), getY(valveData.location.yCoord), getZ(valveData.location.zCoord)); + + MekanismRenderer.glowOn(tileEntity.structure.waterStored.getFluid().getLuminosity()); + + getValveDisplay(ValveRenderData.get(data, valveData), tileEntity.structure.waterStored.getFluid(), tileEntity.getWorldObj()).render(); + + MekanismRenderer.glowOff(); + MekanismRenderer.resetColor(); + + pop(); + } + } + } + + if(tileEntity.structure.steamStored != null && tileEntity.structure.steamStored.amount != 0) + { + RenderData data = new RenderData(); + + data.location = tileEntity.structure.upperRenderLocation; + data.height = (tileEntity.structure.renderLocation.yCoord+tileEntity.structure.volHeight-2)-(tileEntity.structure.upperRenderLocation.yCoord); + data.length = tileEntity.structure.volLength; + data.width = tileEntity.structure.volWidth; + + bindTexture(MekanismRenderer.getBlocksTexture()); + + if(data.location != null && data.height >= 1 && tileEntity.structure.steamStored.getFluid() != null) + { + push(); + + GL11.glTranslated(getX(data.location.xCoord), getY(data.location.yCoord), getZ(data.location.zCoord)); + + MekanismRenderer.glowOn(tileEntity.structure.steamStored.getFluid().getLuminosity()); + MekanismRenderer.colorFluid(tileEntity.structure.steamStored.getFluid()); + + DisplayInteger display = getUpperDisplay(data, tileEntity.structure.steamStored.getFluid(), tileEntity.getWorldObj()); + + GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.steamStored.amount / (float)tileEntity.clientSteamCapacity)+MekanismRenderer.GAS_RENDER_BASE)); + display.render(); + + MekanismRenderer.glowOff(); + MekanismRenderer.resetColor(); + + pop(); + } + } + } + } + + private void pop() + { + GL11.glPopAttrib(); + GL11.glPopMatrix(); + } + + private void push() + { + GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + } + + private DisplayInteger[] getLowerDisplay(RenderData data, Fluid fluid, World world) + { + if(cachedLowerFluids.containsKey(data)) + { + return cachedLowerFluids.get(data); + } + + Model3D toReturn = new Model3D(); + toReturn.baseBlock = Blocks.water; + toReturn.setTexture(fluid.getIcon()); + + final int stages = getStages(data.height); + DisplayInteger[] displays = new DisplayInteger[stages]; + + cachedLowerFluids.put(data, displays); + + for(int i = 0; i < stages; i++) + { + displays[i] = DisplayInteger.createAndStart(); + + if(fluid.getIcon() != null) + { + toReturn.minX = 0 + .01; + toReturn.minY = 0 + .01; + toReturn.minZ = 0 + .01; + + toReturn.maxX = data.length - .01; + toReturn.maxY = ((float)i/(float)stages)*data.height - .01; + toReturn.maxZ = data.width - .01; + + MekanismRenderer.renderObject(toReturn); + } + + GL11.glEndList(); + } + + return displays; + } + + private DisplayInteger getUpperDisplay(RenderData data, Fluid fluid, World world) + { + if(cachedUpperFluids.containsKey(data)) + { + return cachedUpperFluids.get(data); + } + + Model3D toReturn = new Model3D(); + toReturn.baseBlock = Blocks.water; + toReturn.setTexture(fluid.getIcon()); + + final int stages = getStages(data.height); + DisplayInteger display = DisplayInteger.createAndStart(); + + cachedUpperFluids.put(data, display); + + if(STEAM.getIcon() != null) + { + toReturn.minX = 0 + .01; + toReturn.minY = 0 + .01; + toReturn.minZ = 0 + .01; + + toReturn.maxX = data.length - .01; + toReturn.maxY = data.height - .01; + toReturn.maxZ = data.width - .01; + + MekanismRenderer.renderObject(toReturn); + } + + GL11.glEndList(); + + return display; + } + + private DisplayInteger getValveDisplay(ValveRenderData data, Fluid fluid, World world) + { + if(cachedValveFluids.containsKey(data)) + { + return cachedValveFluids.get(data); + } + + Model3D toReturn = new Model3D(); + toReturn.baseBlock = Blocks.water; + toReturn.setTexture(fluid.getFlowingIcon()); + + DisplayInteger display = DisplayInteger.createAndStart(); + + cachedValveFluids.put(data, display); + + switch(data.side) + { + case DOWN: + { + toReturn.minX = .3; + toReturn.minY = 1 + .01; + toReturn.minZ = .3; + + toReturn.maxX = .7; + toReturn.maxY = 1.4 + .1; + toReturn.maxZ = .7; + break; + } + case UP: + { + toReturn.minX = .3; + toReturn.minY = -(data.height-2) - .01; + toReturn.minZ = .3; + + toReturn.maxX = .7; + toReturn.maxY = -.01; + toReturn.maxZ = .7; + break; + } + case NORTH: + { + toReturn.minX = .3; + toReturn.minY = -(getValveFluidHeight(data)) + .01; + toReturn.minZ = 1 + .02; + + toReturn.maxX = .7; + toReturn.maxY = .7; + toReturn.maxZ = 1.4; + break; + } + case SOUTH: + { + toReturn.minX = .3; + toReturn.minY = -(getValveFluidHeight(data)) + .01; + toReturn.minZ = -.4; + + toReturn.maxX = .7; + toReturn.maxY = .7; + toReturn.maxZ = -.02; + break; + } + case WEST: + { + toReturn.minX = 1 + .02; + toReturn.minY = -(getValveFluidHeight(data)) + .01; + toReturn.minZ = .3; + + toReturn.maxX = 1.4; + toReturn.maxY = .7; + toReturn.maxZ = .7; + break; + } + case EAST: + { + toReturn.minX = -.4; + toReturn.minY = -(getValveFluidHeight(data)) + .01; + toReturn.minZ = .3; + + toReturn.maxX = -.02; + toReturn.maxY = .7; + toReturn.maxZ = .7; + break; + } + default: + { + break; + } + } + + if(fluid.getFlowingIcon() != null) + { + MekanismRenderer.renderObject(toReturn); + } + + display.endList(); + + return display; + } + + private int getValveFluidHeight(ValveRenderData data) + { + return data.valveLocation.yCoord - data.location.yCoord; + } + + private int getStages(int height) + { + return height*(TankUpdateProtocol.FLUID_PER_TANK/10); + } + + private double getX(int x) + { + return x - TileEntityRendererDispatcher.staticPlayerX; + } + + private double getY(int y) + { + return y - TileEntityRendererDispatcher.staticPlayerY; + } + + private double getZ(int z) + { + return z - TileEntityRendererDispatcher.staticPlayerZ; + } + + public static void resetDisplayInts() + { + cachedLowerFluids.clear(); + cachedUpperFluids.clear(); + cachedValveFluids.clear(); + } +} diff --git a/src/main/java/mekanism/client/sound/FlamethrowerSound.java b/src/main/java/mekanism/client/sound/FlamethrowerSound.java index f4df9cac7..701916f93 100644 --- a/src/main/java/mekanism/client/sound/FlamethrowerSound.java +++ b/src/main/java/mekanism/client/sound/FlamethrowerSound.java @@ -1,7 +1,6 @@ package mekanism.client.sound; import mekanism.client.ClientTickHandler; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/sound/GasMaskSound.java b/src/main/java/mekanism/client/sound/GasMaskSound.java index 8032bbae4..6f14abd22 100644 --- a/src/main/java/mekanism/client/sound/GasMaskSound.java +++ b/src/main/java/mekanism/client/sound/GasMaskSound.java @@ -2,7 +2,6 @@ package mekanism.client.sound; import mekanism.client.ClientTickHandler; import mekanism.common.item.ItemGasMask; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/sound/JetpackSound.java b/src/main/java/mekanism/client/sound/JetpackSound.java index aced97a31..dce0a8363 100644 --- a/src/main/java/mekanism/client/sound/JetpackSound.java +++ b/src/main/java/mekanism/client/sound/JetpackSound.java @@ -2,7 +2,6 @@ package mekanism.client.sound; import mekanism.client.ClientTickHandler; import mekanism.common.item.ItemJetpack; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/sound/Sound.java b/src/main/java/mekanism/client/sound/Sound.java index 39cf75e48..d3d660ab4 100644 --- a/src/main/java/mekanism/client/sound/Sound.java +++ b/src/main/java/mekanism/client/sound/Sound.java @@ -1,7 +1,6 @@ package mekanism.client.sound; import mekanism.api.MekanismConfig.client; - import net.minecraft.client.audio.ISound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index 599be46a4..1c25d5064 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -5,7 +5,6 @@ import java.util.Map; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.ITickableSound; diff --git a/src/main/java/mekanism/client/voice/VoiceClient.java b/src/main/java/mekanism/client/voice/VoiceClient.java index 121b77d0c..a95bf7a21 100644 --- a/src/main/java/mekanism/client/voice/VoiceClient.java +++ b/src/main/java/mekanism/client/voice/VoiceClient.java @@ -7,14 +7,13 @@ import java.io.DataOutputStream; import java.net.ConnectException; import java.net.Socket; +import javax.sound.sampled.AudioFormat; + import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.sound.sampled.AudioFormat; - @SideOnly(Side.CLIENT) public class VoiceClient extends Thread { diff --git a/src/main/java/mekanism/client/voice/VoiceInput.java b/src/main/java/mekanism/client/voice/VoiceInput.java index c4c75734a..61132f25c 100644 --- a/src/main/java/mekanism/client/voice/VoiceInput.java +++ b/src/main/java/mekanism/client/voice/VoiceInput.java @@ -1,16 +1,15 @@ package mekanism.client.voice; -import mekanism.client.MekanismKeyHandler; -import mekanism.common.Mekanism; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.TargetDataLine; +import mekanism.client.MekanismKeyHandler; +import mekanism.common.Mekanism; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class VoiceInput extends Thread { diff --git a/src/main/java/mekanism/client/voice/VoiceOutput.java b/src/main/java/mekanism/client/voice/VoiceOutput.java index 76f50f2f8..9d8e43d82 100644 --- a/src/main/java/mekanism/client/voice/VoiceOutput.java +++ b/src/main/java/mekanism/client/voice/VoiceOutput.java @@ -1,14 +1,13 @@ package mekanism.client.voice; -import mekanism.common.Mekanism; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.SourceDataLine; +import mekanism.common.Mekanism; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class VoiceOutput extends Thread { diff --git a/src/main/java/mekanism/common/BoxBlacklistParser.java b/src/main/java/mekanism/common/BoxBlacklistParser.java index d83fca4fa..0a18aafe7 100644 --- a/src/main/java/mekanism/common/BoxBlacklistParser.java +++ b/src/main/java/mekanism/common/BoxBlacklistParser.java @@ -8,7 +8,6 @@ import java.io.FileWriter; import java.io.IOException; import mekanism.api.MekanismAPI; - import net.minecraft.block.Block; public final class BoxBlacklistParser diff --git a/src/main/java/mekanism/common/CTMData.java b/src/main/java/mekanism/common/CTMData.java index 738e1f680..12145e20e 100644 --- a/src/main/java/mekanism/common/CTMData.java +++ b/src/main/java/mekanism/common/CTMData.java @@ -6,10 +6,8 @@ package mekanism.common; // //import mekanism.api.Coord4D; //import mekanism.client.render.block.TextureSubmap; -// //import net.minecraft.block.Block; //import net.minecraft.client.renderer.texture.IIconRegister; -//import net.minecraft.util.EnumFacing; //import net.minecraft.util.IIcon; //import net.minecraft.world.IBlockAccess; //import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/CTMTextureData.java b/src/main/java/mekanism/common/CTMTextureData.java index 18da3ab6e..6603892cd 100644 --- a/src/main/java/mekanism/common/CTMTextureData.java +++ b/src/main/java/mekanism/common/CTMTextureData.java @@ -1,7 +1,6 @@ package mekanism.common; //import mekanism.client.render.block.TextureSubmap; -// //import net.minecraft.client.renderer.texture.IIconRegister; //import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 1fccf1c36..c5da7a6ec 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -11,15 +11,12 @@ import mekanism.common.frequency.FrequencyManager; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; import net.minecraft.command.CommandBase; -import net.minecraft.command.CommandException; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; -import com.mojang.authlib.GameProfile; - public class CommandMekanism extends CommandBase { @Override diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index be3e39137..91eef4268 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -9,10 +9,14 @@ import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.item.ItemScubaTank; import mekanism.common.util.MekanismUtils; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MathHelper; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; @@ -70,7 +74,10 @@ public class CommonPlayerTickHandler } else if(player.motionY < 0) { - player.motionY = Math.min(player.motionY + 0.15D, 0); + if(!isOnGround(player)) + { + player.motionY = Math.min(player.motionY + 0.15D, 0); + } } } else { @@ -80,7 +87,10 @@ public class CommonPlayerTickHandler } else if(Mekanism.keyMap.has(player, KeySync.DESCEND)) { - player.motionY = Math.max(player.motionY - 0.15D, -0.2D); + if(!isOnGround(player)) + { + player.motionY = Math.max(player.motionY - 0.15D, -0.2D); + } } } } @@ -107,14 +117,36 @@ public class CommonPlayerTickHandler if(received != null) { player.setAir(player.getAir()+received.amount); - - if(player.getAir() == max) + } + + if(player.getAir() == max) + { + for(Object obj : player.getActivePotionEffects()) { - player.clearActivePotions(); + if(obj instanceof PotionEffect) + { + for(int i = 0; i < 9; i++) + { + ((PotionEffect)obj).onUpdate(player); + } + } } } } } + + public static boolean isOnGround(EntityPlayer player) + { + int x = MathHelper.floor_double(player.posX); + int y = (int)Math.round(player.posY-player.yOffset - 1); + int z = MathHelper.floor_double(player.posZ); + + Block b = player.worldObj.getBlock(x, y, z); + AxisAlignedBB box = b.getCollisionBoundingBoxFromPool(player.worldObj, x, y, z); + AxisAlignedBB playerBox = player.boundingBox.copy().offset(0, -0.01, 0); + + return box != null && playerBox.intersectsWith(box); + } public boolean isJetpackOn(EntityPlayer player) { @@ -134,6 +166,15 @@ public class CommonPlayerTickHandler } else if(jetpack.getMode(stack) == JetpackMode.HOVER) { + if((!Mekanism.keyMap.has(player, KeySync.ASCEND) && !Mekanism.keyMap.has(player, KeySync.DESCEND)) || (Mekanism.keyMap.has(player, KeySync.ASCEND) && Mekanism.keyMap.has(player, KeySync.DESCEND))) + { + return !player.onGround; + } + else if(Mekanism.keyMap.has(player, KeySync.DESCEND)) + { + return !player.onGround; + } + return true; } } diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 0699d9e1c..943e929f4 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -6,7 +6,6 @@ import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index f54686f87..556989964 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -33,7 +33,9 @@ import mekanism.common.inventory.container.ContainerElectrolyticSeparator; import mekanism.common.inventory.container.ContainerEnergyCube; import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.inventory.container.ContainerFilter; +import mekanism.common.inventory.container.ContainerFluidTank; import mekanism.common.inventory.container.ContainerFluidicPlenisher; +import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.inventory.container.ContainerInductionMatrix; import mekanism.common.inventory.container.ContainerLaserAmplifier; @@ -42,7 +44,8 @@ import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.inventory.container.ContainerOredictionificator; import mekanism.common.inventory.container.ContainerPRC; -import mekanism.common.inventory.container.ContainerPortableTank; +import mekanism.common.inventory.container.ContainerQuantumEntangloporter; +import mekanism.common.inventory.container.ContainerResistiveHeater; import mekanism.common.inventory.container.ContainerRobitCrafting; import mekanism.common.inventory.container.ContainerRobitInventory; import mekanism.common.inventory.container.ContainerRobitMain; @@ -50,9 +53,9 @@ import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.inventory.container.ContainerSeismicVibrator; -import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; import mekanism.common.inventory.container.ContainerTeleporter; +import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.inventory.container.ContainerUpgradeManagement; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; @@ -60,6 +63,8 @@ import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBin; +import mekanism.common.tile.TileEntityBoilerCasing; +import mekanism.common.tile.TileEntityBoilerValve; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.tile.TileEntityChemicalCrystallizer; @@ -83,7 +88,9 @@ import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; @@ -99,15 +106,16 @@ import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; -import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; -import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; +import mekanism.common.tile.TileEntityThermalEvaporationController; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -183,7 +191,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer"); GameRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator"); GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber"); - GameRegistry.registerTileEntity(TileEntityPortableTank.class, "PortableTank"); + GameRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank"); //TODO rename GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); //GameRegistry.registerTileEntity(TileEntityLaser.class, "Laser"); GameRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier"); @@ -196,6 +204,9 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); + GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); + GameRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing"); + GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); } public void handleTeleporterUpdate(PortableTeleporterMessage message) {} @@ -275,6 +286,9 @@ public class CommonProxy implements IGuiProvider general.evaporationTempMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationTempMultiplier", 0.1D).getDouble(); general.evaporationSolarMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationSolarMultiplier", 0.2D).getDouble(); general.evaporationMaxTemp = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationMaxTemp", 3000D).getDouble(); + general.energyPerHeat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerHeat", 1000D).getDouble(); + general.maxEnergyPerSteam = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxEnergyPerSteam", 100D).getDouble(); + general.superheatingHeatTransfer = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SuperheatingHeatTransfer", 10000D).getDouble(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); @@ -285,19 +299,19 @@ public class CommonProxy implements IGuiProvider { if(s.trim().equalsIgnoreCase("j") || s.trim().equalsIgnoreCase("joules")) { - general.activeType = EnergyType.J; + general.energyUnit = EnergyType.J; } else if(s.trim().equalsIgnoreCase("rf") || s.trim().equalsIgnoreCase("te") || s.trim().equalsIgnoreCase("thermal expansion")) { - general.activeType = EnergyType.RF; + general.energyUnit = EnergyType.RF; } else if(s.trim().equalsIgnoreCase("eu") || s.trim().equalsIgnoreCase("ic2")) { - general.activeType = EnergyType.EU; + general.energyUnit = EnergyType.EU; } else if(s.trim().equalsIgnoreCase("mj") || s.trim().equalsIgnoreCase("bc") || s.trim().equalsIgnoreCase("buildcraft")) { - general.activeType = EnergyType.MJ; + general.energyUnit = EnergyType.MJ; } } @@ -361,6 +375,7 @@ public class CommonProxy implements IGuiProvider usage.laserUsage = Mekanism.configuration.get("usage", "LaserUsage", 5000D).getDouble(); usage.gasCentrifugeUsage = Mekanism.configuration.get("usage", "GasCentrifugeUsage", 100D).getDouble(); usage.heavyWaterElectrolysisUsage = Mekanism.configuration.get("usage", "HeavyWaterElectrolysisUsage", 800D).getDouble(); + usage.formulaicAssemblicatorUsage = Mekanism.configuration.get("usage", "FormulaicAssemblicatorUsage", 100D).getDouble(); //TODO: Tier.loadConfig(); @@ -509,7 +524,7 @@ public class CommonProxy implements IGuiProvider case 40: return new ContainerPRC(player.inventory, (TileEntityPRC)tileEntity); case 41: - return new ContainerPortableTank(player.inventory, (TileEntityPortableTank)tileEntity); + return new ContainerFluidTank(player.inventory, (TileEntityFluidTank)tileEntity); case 42: return new ContainerFluidicPlenisher(player.inventory, (TileEntityFluidicPlenisher)tileEntity); case 43: @@ -519,7 +534,7 @@ public class CommonProxy implements IGuiProvider case 45: return new ContainerLaserTractorBeam(player.inventory, (TileEntityLaserTractorBeam)tileEntity); case 46: - return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); + return new ContainerQuantumEntangloporter(player.inventory, (TileEntityQuantumEntangloporter)tileEntity); case 47: return new ContainerSolarNeutronActivator(player.inventory, (TileEntitySolarNeutronActivator)tileEntity); case 48: @@ -532,6 +547,14 @@ public class CommonProxy implements IGuiProvider return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); case 52: return new ContainerOredictionificator(player.inventory, (TileEntityOredictionificator)tileEntity); + case 53: + return new ContainerResistiveHeater(player.inventory, (TileEntityResistiveHeater)tileEntity); + case 54: + return new ContainerFilter(player.inventory, (TileEntityContainerBlock)tileEntity); + case 55: + return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); + case 56: + return new ContainerFormulaicAssemblicator(player.inventory, (TileEntityFormulaicAssemblicator)tileEntity); } return null; diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index e51495044..58f045584 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -9,10 +9,10 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.api.energy.EnergyStack; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -128,6 +128,7 @@ public class EnergyNetwork extends DynamicNetwork { diff --git a/src/main/java/mekanism/common/HashList.java b/src/main/java/mekanism/common/HashList.java index 92ea046aa..603732633 100644 --- a/src/main/java/mekanism/common/HashList.java +++ b/src/main/java/mekanism/common/HashList.java @@ -3,8 +3,6 @@ package mekanism.common; import java.util.ArrayList; import java.util.Iterator; -import mekanism.common.content.transporter.TransporterFilter; - public class HashList implements Iterable { private ArrayList list = new ArrayList(256); diff --git a/src/main/java/mekanism/common/HeatNetwork.java b/src/main/java/mekanism/common/HeatNetwork.java index 2f4eb7b10..babc9752a 100644 --- a/src/main/java/mekanism/common/HeatNetwork.java +++ b/src/main/java/mekanism/common/HeatNetwork.java @@ -6,7 +6,9 @@ import java.util.Set; import mekanism.api.IHeatTransfer; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; - +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.common.multipart.MultipartTransmitter; +import mekanism.common.util.MekanismUtils; import net.minecraftforge.fml.common.FMLCommonHandler; public class HeatNetwork extends DynamicNetwork @@ -41,13 +43,13 @@ public class HeatNetwork extends DynamicNetwork @Override public String getStoredInfo() { - return meanTemp + "K above ambient"; + return MekanismUtils.getTemperatureDisplay(meanTemp, TemperatureUnit.KELVIN) + " above ambient"; } @Override public String getFlowInfo() { - return heatTransferred + " transferred to acceptors, " + heatLost + " lost to environment, " + (heatTransferred + heatLost == 0 ? "" : heatTransferred / (heatTransferred + heatLost) * 100 + "% efficiency"); + return MekanismUtils.getTemperatureDisplay(heatTransferred, TemperatureUnit.KELVIN) + " transferred to acceptors, " + MekanismUtils.getTemperatureDisplay(heatLost, TemperatureUnit.KELVIN) + " lost to environment, " + (heatTransferred + heatLost == 0 ? "" : heatTransferred / (heatTransferred + heatLost) * 100 + "% efficiency"); } @Override @@ -75,9 +77,9 @@ public class HeatNetwork extends DynamicNetwork { for(IGridTransmitter transmitter : transmitters) { - if(transmitter instanceof IHeatTransfer) + if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer) { - IHeatTransfer heatTransmitter = (IHeatTransfer)transmitter; + IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart(); double[] d = heatTransmitter.simulateHeat(); newHeatTransferred += d[0]; newHeatLost += d[1]; @@ -86,9 +88,9 @@ public class HeatNetwork extends DynamicNetwork for(IGridTransmitter transmitter : transmitters) { - if(transmitter instanceof IHeatTransfer) + if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer) { - IHeatTransfer heatTransmitter = (IHeatTransfer)transmitter; + IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart(); newSumTemp += heatTransmitter.applyTemperatureChange(); } } diff --git a/src/main/java/mekanism/common/InventoryNetwork.java b/src/main/java/mekanism/common/InventoryNetwork.java index 161dcf35e..3a533b294 100644 --- a/src/main/java/mekanism/common/InventoryNetwork.java +++ b/src/main/java/mekanism/common/InventoryNetwork.java @@ -12,7 +12,6 @@ import mekanism.api.EnumColor; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.content.transporter.TransporterManager; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index c37d40580..ef77bc3c9 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -33,8 +33,11 @@ import mekanism.client.model.item.EnergyCubeItemModel; import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.FluidNetwork.FluidTransferEvent; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.BinTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; +import mekanism.common.Tier.FluidTankTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; import mekanism.common.base.IChunkLoadHandler; @@ -42,8 +45,8 @@ import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IModule; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.chunkloading.ChunkManager; -import mekanism.common.content.boiler.BoilerManager; import mekanism.common.content.boiler.SynchronizedBoilerData; +import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.content.matrix.SynchronizedMatrixData; import mekanism.common.content.tank.SynchronizedTankData; import mekanism.common.content.transporter.PathfinderCache; @@ -71,18 +74,17 @@ import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.SmeltingRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; -import mekanism.common.tile.TileEntityBoilerCasing; -import mekanism.common.tile.TileEntityBoilerValve; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; -import mekanism.common.tile.TileEntityEntangledBlock; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityPressureDisperser; +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationValve; -import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.util.MekanismUtils; import mekanism.common.voice.VoiceServerManager; import mekanism.common.world.GenHandler; @@ -180,12 +182,15 @@ public class Mekanism /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); public static MultiblockManager matrixManager = new MultiblockManager("inductionMatrix"); - public static MultiblockManager boilerManager = new BoilerManager("thermoelectricBoiler"); + public static MultiblockManager boilerManager = new MultiblockManager("thermoelectricBoiler"); /** FrequencyManagers for various networks */ - public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class); + public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class, "Teleporter"); public static Map privateTeleporters = new HashMap(); + public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, "Entangloporter"); + public static Map privateEntangloporters = new HashMap(); + /** Mekanism creative tab */ public static CreativeTabMekanism tabMekanism = new CreativeTabMekanism(); @@ -322,9 +327,6 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), "AEA", "ACA", " O ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian" )); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(), - "PPP", "PDP", "PPP", Character.valueOf('P'), "ingotOsmium", Character.valueOf('D'), "dustIron" - )); BlockStateMachine.MachineType.METALLURGIC_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 8), "IFI", "ROR", "IFI", Character.valueOf('I'), "ingotIron", Character.valueOf('F'), Blocks.furnace, Character.valueOf('R'), "dustRedstone", Character.valueOf('O'), "ingotOsmium" )); @@ -382,19 +384,16 @@ public class Mekanism BlockStateMachine.MachineType.LOGISTICAL_SORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 15), "IPI", "ICI", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('P'), Blocks.piston, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) )); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 6), - "SSS", "SCS", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - )); BlockStateMachine.MachineType.DIGITAL_MINER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 4), "ACA", "SES", "TIT", Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('S'), new ItemStack(MekanismBlocks.MachineBlock, 1, 15), Character.valueOf('E'), MekanismItems.Robit.getUnchargedItem(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore )); BlockStateMachine.MachineType.ROTARY_CONDENSENTRATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 0), - "GCG", "tEI", "GCG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), - Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 11) + "GCG", "tEI", "GCG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), + Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC) )); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Jetpack.getEmptyItem(), - "SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank() + "SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC) )); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Dictionary), "C", "B", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), Items.book @@ -406,10 +405,10 @@ public class Mekanism " C ", "ATA", "SSS", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('S'), "ingotSteel" )); BlockStateMachine.MachineType.CHEMICAL_OXIDIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 1), - "ACA", "ERG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('A'), MekanismItems.EnrichedAlloy + "ACA", "ERG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('E'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('A'), MekanismItems.EnrichedAlloy )); BlockStateMachine.MachineType.CHEMICAL_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 2), - "ACA", "GRG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('A'), MekanismItems.EnrichedAlloy + "ACA", "GRG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy )); BlockStateMachine.MachineType.CHEMICAL_INJECTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 3), "RCR", "GPG", "RCR", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('R'), "alloyElite", Character.valueOf('G'), "ingotGold", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 9) @@ -439,13 +438,13 @@ public class Mekanism " S ", "SCS", " S ", Character.valueOf('C'), "ingotCopper", Character.valueOf('S'), "ingotSteel" )); BlockStateMachine.MachineType.CHEMICAL_DISSOLUTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 6), - "CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy + "CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy )); BlockStateMachine.MachineType.CHEMICAL_WASHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 7), - "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) + "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) )); BlockStateMachine.MachineType.CHEMICAL_CRYSTALLIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 8), - "CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) + "CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) )); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.FreeRunners.getUnchargedItem(), "C C", "A A", "T T", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem() @@ -453,7 +452,7 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.ArmoredJetpack.getEmptyItem(), "D D", "BSB", " J ", Character.valueOf('D'), "dustDiamond", Character.valueOf('B'), "ingotBronze", Character.valueOf('S'), "blockSteel", Character.valueOf('J'), MekanismItems.Jetpack.getEmptyItem() )); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterCard), + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ConfigurationCard), " A ", "ACA", " A ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) )); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.SeismicReader.getUnchargedItem(), @@ -463,12 +462,9 @@ public class Mekanism "TLT", "CIC", "TTT", Character.valueOf('T'), "ingotTin", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) )); BlockStateMachine.MachineType.PRESSURIZED_REACTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 10), - "TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), + "TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0), Character.valueOf('F'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9) )); - BlockStateMachine.MachineType.PORTABLE_TANK.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 11), - "III", "GCG", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - )); BlockStateMachine.MachineType.FLUIDIC_PLENISHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 12), "TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) )); @@ -476,7 +472,7 @@ public class Mekanism "O O", "OSO", "O O", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "stickWood" )); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Flamethrower.getEmptyItem(), - "TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED) + "TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED) )); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.GaugeDropper.getEmptyItem(), " O ", "G G", "GGG", Character.valueOf('O'), "ingotOsmium", Character.valueOf('G'), "paneGlass" @@ -523,6 +519,18 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 5), "ACA", "CIC", "ACA", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('C'), "ingotCopper", Character.valueOf('A'), "alloyBasic" )); + MachineType.RESISTIVE_HEATER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 4), new Object[] { + "CRC", "RHR", "CEC", Character.valueOf('C'), "ingotTin", Character.valueOf('R'), "dustRedstone", Character.valueOf('H'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 5), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() + }));; + MachineType.QUANTUM_ENTANGLOPORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 0), new Object[] { + "OCO", "ATA", "OCO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismItems.TeleportationCore + })); + MachineType.FORMULAIC_ASSEMBLICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 5), new Object[] { + "STS", "BIB", "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), Blocks.crafting_table, Character.valueOf('B'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('C'), Blocks.chest + })); + CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.CraftingFormula), new Object[] { + Items.paper, MekanismUtils.getControlCircuit(BaseTier.BASIC) + })); //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), @@ -538,6 +546,48 @@ public class Mekanism "ATA", "dEd", "ATA", Character.valueOf('A'), "alloyUltimate", Character.valueOf('d'), "gemDiamond", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE) )); + //Gas Tank Recipes + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), new Object[] { + "APA", "P P", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyBasic" + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ADVANCED), new Object[] { + "APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ELITE), new Object[] { + "APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyElite", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.ADVANCED) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ULTIMATE), new Object[] { + "APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.ELITE) + })); + + //Fluid Tank Recipes + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC), new Object[] { + "AIA", "I I", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyBasic" + })); + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ADVANCED), new Object[] { + "AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC) + })); + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE), new Object[] { + "AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyElite", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.ADVANCED) + })); + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ULTIMATE), new Object[] { + "AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE) + })); + + //Bin recipes + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.BASIC), new Object[] { + "SCS", "A A", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), "alloyBasic" + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.ADVANCED), new Object[] { + "SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('A'), "alloyAdvanced", Character.valueOf('B'), MekanismUtils.getBin(BinTier.BASIC) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.ELITE), new Object[] { + "SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('A'), "alloyElite", Character.valueOf('B'), MekanismUtils.getBin(BinTier.ADVANCED) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.ULTIMATE), new Object[] { + "SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('B'), MekanismUtils.getBin(BinTier.ELITE) + })); + //Induction Cell recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.BASIC), "LTL", "TET", "LTL", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), Character.valueOf('L'), "dustLithium" @@ -1118,11 +1168,10 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityCardboardBox.class, "CardboardBox"); GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "SalinationValve"); //TODO rename GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "SalinationTank"); //TODO rename - GameRegistry.registerTileEntity(TileEntityEntangledBlock.class, "EntangledBlock"); + GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter"); GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement"); - GameRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing"); - GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); + GameRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator"); GameRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser"); GameRegistry.registerTileEntity(TileEntityLaser.class, "Laser"); @@ -1165,6 +1214,7 @@ public class Mekanism activeVibrators.clear(); worldTickHandler.resetRegenChunks(); privateTeleporters.clear(); + privateEntangloporters.clear(); //Reset consistent managers MultiblockManager.reset(); @@ -1183,6 +1233,9 @@ public class Mekanism @EventHandler public void preInit(FMLPreInitializationEvent event) { + //Register tier information + Tier.init(); + File config = event.getSuggestedConfigurationFile(); //Set the mod's configuration @@ -1213,10 +1266,10 @@ public class Mekanism GasRegistry.register(new Gas("deuterium")).registerFluid(); GasRegistry.register(new Gas("tritium")).registerFluid(); GasRegistry.register(new Gas("fusionFuelDT")).registerFluid(); - GasRegistry.register(new Gas("steam")).registerFluid(); GasRegistry.register(new Gas("lithium")).registerFluid(); FluidRegistry.registerFluid(new Fluid("heavyWater", new ResourceLocation("mekanism:heavy_water"), new ResourceLocation("mekanism:heavy_water"))); + FluidRegistry.registerFluid(new Fluid("steam").setGaseous(true)); for(Resource resource : Resource.values()) { diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 452d2fb90..5b3587228 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -1,6 +1,10 @@ package mekanism.common; -import mekanism.common.Tier.EnergyCubeTier; +import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOCK_1; +import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOCK_2; +import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1; +import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; +import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_3; import mekanism.common.block.BlockBasic; import mekanism.common.block.BlockBounding; import mekanism.common.block.BlockCardboardBox; @@ -25,7 +29,6 @@ import mekanism.common.item.ItemBlockGasTank; import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemBlockOre; import mekanism.common.item.ItemBlockPlastic; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemModelMesher; @@ -40,12 +43,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOCK_1; -import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOCK_2; -import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1; -import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; -import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_3; - @ObjectHolder("Mekanism") public class MekanismBlocks { diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index e2dca7f93..e1af7a891 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -4,8 +4,10 @@ import mekanism.common.item.ItemAlloy; import mekanism.common.item.ItemAtomicDisassembler; import mekanism.common.item.ItemBalloon; import mekanism.common.item.ItemClump; +import mekanism.common.item.ItemConfigurationCard; import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemControlCircuit; +import mekanism.common.item.ItemCraftingFormula; import mekanism.common.item.ItemCrystal; import mekanism.common.item.ItemDictionary; import mekanism.common.item.ItemDirtyDust; @@ -13,7 +15,6 @@ import mekanism.common.item.ItemDust; import mekanism.common.item.ItemElectricBow; import mekanism.common.item.ItemEnergized; import mekanism.common.item.ItemFactoryInstaller; -import mekanism.common.item.ItemFilterCard; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemGasMask; @@ -79,7 +80,8 @@ public class MekanismItems public static final ItemSeismicReader SeismicReader = (ItemSeismicReader)new ItemSeismicReader().setUnlocalizedName("SeismicReader"); public static final Item Dictionary = new ItemDictionary().setUnlocalizedName("Dictionary"); public static final ItemGaugeDropper GaugeDropper = (ItemGaugeDropper)new ItemGaugeDropper().setUnlocalizedName("GaugeDropper"); - public static final Item FilterCard = new ItemFilterCard().setUnlocalizedName("FilterCard"); + public static final Item ConfigurationCard = new ItemConfigurationCard().setUnlocalizedName("ConfigurationCard"); + public static final Item CraftingFormula = new ItemCraftingFormula().setUnlocalizedName("CraftingFormula"); // public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); // public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel"); public static final ItemScubaTank ScubaTank = (ItemScubaTank)new ItemScubaTank().setUnlocalizedName("ScubaTank"); @@ -150,7 +152,8 @@ public class MekanismItems GameRegistry.registerItem(Crystal, "Crystal"); GameRegistry.registerItem(FreeRunners, "FreeRunners"); GameRegistry.registerItem(ArmoredJetpack, "ArmoredJetpack"); - GameRegistry.registerItem(FilterCard, "FilterCard"); + GameRegistry.registerItem(ConfigurationCard, "ConfigurationCard"); + GameRegistry.registerItem(CraftingFormula, "CraftingFormula"); GameRegistry.registerItem(SeismicReader, "SeismicReader"); GameRegistry.registerItem(Substrate, "Substrate"); GameRegistry.registerItem(Polyethene, "Polyethene"); diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index 4367bc098..1badf146d 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.util.ItemInfo; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/common/RobitAIFollow.java b/src/main/java/mekanism/common/RobitAIFollow.java index 5e3fece8e..7e2a66338 100644 --- a/src/main/java/mekanism/common/RobitAIFollow.java +++ b/src/main/java/mekanism/common/RobitAIFollow.java @@ -1,7 +1,6 @@ package mekanism.common; import mekanism.common.entity.EntityRobit; - import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.pathfinding.PathNavigateGround; diff --git a/src/main/java/mekanism/common/RobitAIPickup.java b/src/main/java/mekanism/common/RobitAIPickup.java index 6cebc91b4..b6a478e1b 100644 --- a/src/main/java/mekanism/common/RobitAIPickup.java +++ b/src/main/java/mekanism/common/RobitAIPickup.java @@ -4,7 +4,6 @@ import java.util.Iterator; import java.util.List; import mekanism.common.entity.EntityRobit; - import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.pathfinding.PathNavigate; diff --git a/src/main/java/mekanism/common/SideData.java b/src/main/java/mekanism/common/SideData.java index 7a82f00f9..68a174dcc 100644 --- a/src/main/java/mekanism/common/SideData.java +++ b/src/main/java/mekanism/common/SideData.java @@ -64,6 +64,11 @@ public class SideData Object[] tanks = manager.getTanks(); List infos = new ArrayList(); + if(tanks == null) + { + return infos.toArray(new FluidTankInfo[] {}); + } + for(int slot : availableSlots) { if(slot <= tanks.length-1 && tanks[slot] instanceof IFluidTank) @@ -79,7 +84,7 @@ public class SideData { Object[] tanks = manager.getTanks(); - if(tanks.length < 1 || !(tanks[0] instanceof GasTank)) + if(tanks == null || tanks.length < 1 || !(tanks[0] instanceof GasTank)) { return null; } diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index bf6cd3539..31d38931f 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -1,6 +1,10 @@ package mekanism.common; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.List; + import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; @@ -14,6 +18,10 @@ import net.minecraft.util.ResourceLocation; */ public final class Tier { + private static List tierTypes = new ArrayList(); + + private static boolean initiated = false; + /** The default tiers used in Mekanism. * @author aidancbrady */ @@ -55,24 +63,25 @@ public final class Tier } } - /** - * The tiers used by the Energy Cube and their corresponding values. - * @author aidancbrady - * - */ - public static enum EnergyCubeTier implements IStringSerializable + public static enum EnergyCubeTier implements ITier, IStringSerializable { BASIC(2000000, 800), ADVANCED(8000000, 3200), ELITE(32000000, 12800), ULTIMATE(128000000, 51200), - CREATIVE(Integer.MAX_VALUE, Integer.MAX_VALUE); + CREATIVE(Double.MAX_VALUE, Double.MAX_VALUE); public double maxEnergy; private double baseMaxEnergy; public double output; private double baseOutput; + + private EnergyCubeTier(double max, double out) + { + baseMaxEnergy = maxEnergy = max; + baseOutput = output = out; + } public static EnergyCubeTier getFromName(String tierName) { @@ -87,35 +96,42 @@ public final class Tier return BASIC; } - protected void loadConfig() + @Override + public void loadConfig() { - maxEnergy = Mekanism.configuration.get("tier", getBaseTier().getName() + "EnergyCubeMaxEnergy", baseMaxEnergy).getDouble(); - output = Mekanism.configuration.get("tier", getBaseTier().getName() + "EnergyCubeOutput", baseOutput).getDouble(); + if(this != CREATIVE) + { + maxEnergy = Mekanism.configuration.get("tier", getBaseTier().getName() + "EnergyCubeMaxEnergy", baseMaxEnergy).getDouble(); + output = Mekanism.configuration.get("tier", getBaseTier().getName() + "EnergyCubeOutput", baseOutput).getDouble(); + } } - protected void readConfig(ByteBuf dataStream) + @Override + public void readConfig(ByteBuf dataStream) { - maxEnergy = dataStream.readDouble(); - output = dataStream.readDouble(); + if(this != CREATIVE) + { + maxEnergy = dataStream.readDouble(); + output = dataStream.readDouble(); + } } - protected void writeConfig(ByteBuf dataStream) + @Override + public void writeConfig(ByteBuf dataStream) { - dataStream.writeDouble(maxEnergy); - dataStream.writeDouble(output); + if(this != CREATIVE) + { + dataStream.writeDouble(maxEnergy); + dataStream.writeDouble(output); + } } + @Override public BaseTier getBaseTier() { return BaseTier.values()[ordinal()]; } - private EnergyCubeTier(double max, double out) - { - baseMaxEnergy = maxEnergy = max; - baseOutput = output = out; - } - @Override public String getName() { @@ -123,7 +139,7 @@ public final class Tier } } - public static enum InductionCellTier + public static enum InductionCellTier implements ITier { BASIC(1E9D), ADVANCED(8E9D), @@ -133,33 +149,37 @@ public final class Tier public double maxEnergy; private double baseMaxEnergy; + private InductionCellTier(double max) + { + baseMaxEnergy = maxEnergy = max; + } + + @Override public BaseTier getBaseTier() { return BaseTier.values()[ordinal()]; } - protected void loadConfig() + @Override + public void loadConfig() { maxEnergy = Mekanism.configuration.get("tier", getBaseTier().getName() + "InductionCellMaxEnergy", baseMaxEnergy).getDouble(); } - protected void readConfig(ByteBuf dataStream) + @Override + public void readConfig(ByteBuf dataStream) { maxEnergy = dataStream.readDouble(); } - protected void writeConfig(ByteBuf dataStream) + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeDouble(maxEnergy); } - - private InductionCellTier(double max) - { - baseMaxEnergy = maxEnergy = max; - } } - public static enum InductionProviderTier + public static enum InductionProviderTier implements ITier { BASIC(64000), ADVANCED(512000), @@ -169,37 +189,36 @@ public final class Tier public double output; private double baseOutput; + private InductionProviderTier(double out) + { + baseOutput = output = out; + } + + @Override public BaseTier getBaseTier() { return BaseTier.values()[ordinal()]; } - protected void loadConfig() + @Override + public void loadConfig() { output = Mekanism.configuration.get("tier", getBaseTier().getName() + "InductionProviderOutput", baseOutput).getDouble(); } - protected void readConfig(ByteBuf dataStream) + @Override + public void readConfig(ByteBuf dataStream) { output = dataStream.readDouble(); } - protected void writeConfig(ByteBuf dataStream) + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeDouble(output); } - - private InductionProviderTier(double out) - { - baseOutput = output = out; - } } - /** - * The tiers used by the Factory and their corresponding values. - * @author aidancbrady - * - */ public static enum FactoryTier { BASIC(3, new ResourceLocation("mekanism", "gui/factory/GuiBasicFactory.png")), @@ -234,24 +253,13 @@ public final class Tier guiLocation = gui; } } - - /** - * The tiers used by Universal Cables and their corresponding values. - * @author aidancbrady - * - */ /* - public static enum CableTier + public static enum CableTier implements ITier { BASIC(3200, TransmitterType.UNIVERSAL_CABLE_BASIC), ADVANCED(12800, TransmitterType.UNIVERSAL_CABLE_ADVANCED), ELITE(64000, TransmitterType.UNIVERSAL_CABLE_ELITE), ULTIMATE(320000, TransmitterType.UNIVERSAL_CABLE_ULTIMATE); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public int cableCapacity; private int baseCapacity; @@ -265,17 +273,26 @@ public final class Tier type = transmitterType; } - protected void loadConfig() + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { cableCapacity = Mekanism.configuration.get("tier", getBaseTier().getName() + "CableCapacity", baseCapacity).getInt(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { cableCapacity = dataStream.readInt(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeInt(cableCapacity); } @@ -294,24 +311,12 @@ public final class Tier } } - */ -/** - * The tiers used by Mechanical Pipes and their corresponding values. - * @author unpairedbracket - * - *//* - - public static enum PipeTier + public static enum PipeTier implements ITier { BASIC(1000, 100, TransmitterType.MECHANICAL_PIPE_BASIC), ADVANCED(4000, 400, TransmitterType.MECHANICAL_PIPE_ADVANCED), ELITE(16000, 1600, TransmitterType.MECHANICAL_PIPE_ELITE), ULTIMATE(64000, 6400, TransmitterType.MECHANICAL_PIPE_ULTIMATE); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public int pipeCapacity; private int baseCapacity; @@ -328,20 +333,29 @@ public final class Tier type = transmitterType; } - - protected void loadConfig() + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { pipeCapacity = Mekanism.configuration.get("tier", getBaseTier().getName() + "PipeCapacity", baseCapacity).getInt(); pipePullAmount = Mekanism.configuration.get("tier", getBaseTier().getName() + "PipePullAmount", basePull).getInt(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { pipeCapacity = dataStream.readInt(); pipePullAmount = dataStream.readInt(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeInt(pipeCapacity); dataStream.writeInt(pipePullAmount); @@ -360,25 +374,13 @@ public final class Tier return BASIC; } } - - */ -/** - * The tiers used by Pressurized Tubes and their corresponding values. - * @author AidanBrady - * - *//* - public static enum TubeTier + public static enum TubeTier implements ITier { BASIC(256, 64, TransmitterType.PRESSURIZED_TUBE_BASIC), ADVANCED(1024, 256, TransmitterType.PRESSURIZED_TUBE_ADVANCED), ELITE(4096, 1024, TransmitterType.PRESSURIZED_TUBE_ELITE), ULTIMATE(16384, 4096, TransmitterType.PRESSURIZED_TUBE_ULTIMATE); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public int tubeCapacity; private int baseCapacity; @@ -395,20 +397,29 @@ public final class Tier type = transmitterType; } - - protected void loadConfig() + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { tubeCapacity = Mekanism.configuration.get("tier", getBaseTier().getName() + "TubeCapacity", baseCapacity).getInt(); tubePullAmount = Mekanism.configuration.get("tier", getBaseTier().getName() + "TubePullAmount", basePull).getInt(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { tubeCapacity = dataStream.readInt(); tubePullAmount = dataStream.readInt(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeInt(tubeCapacity); dataStream.writeInt(tubePullAmount); @@ -428,24 +439,12 @@ public final class Tier } } - */ -/** - * The tiers used by Logistical Transporters and their corresponding values. - * @author AidanBrady - * - *//* - - public static enum TransporterTier + public static enum TransporterTier implements ITier { BASIC(1, 5, TransmitterType.LOGISTICAL_TRANSPORTER_BASIC), ADVANCED(16, 10, TransmitterType.LOGISTICAL_TRANSPORTER_ADVANCED), ELITE(32, 20, TransmitterType.LOGISTICAL_TRANSPORTER_ELITE), ULTIMATE(64, 50, TransmitterType.LOGISTICAL_TRANSPORTER_ULTIMATE); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public int pullAmount; private int basePull; @@ -462,20 +461,29 @@ public final class Tier type = transmitterType; } - - protected void loadConfig() + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { pullAmount = Mekanism.configuration.get("tier", getBaseTier().getName() + "TransporterPullAmount", basePull).getInt(); speed = Mekanism.configuration.get("tier", getBaseTier().getName() + "TransporterSpeed", baseSpeed).getInt(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { pullAmount = dataStream.readInt(); speed = dataStream.readInt(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeInt(pullAmount); dataStream.writeInt(speed); @@ -495,17 +503,12 @@ public final class Tier } } - public static enum ConductorTier + public static enum ConductorTier implements ITier { - BASIC(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_BASIC), - ADVANCED(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ADVANCED), - ELITE(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ELITE), - ULTIMATE(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ULTIMATE); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } + BASIC(5, 1, 10, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_BASIC), + ADVANCED(5, 1, 400, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ADVANCED), + ELITE(5, 1, 8000, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ELITE), + ULTIMATE(5, 1, 100000, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ULTIMATE); public double inverseConduction; private double baseConduction; @@ -530,22 +533,31 @@ public final class Tier type = transmitterType; } - - protected void loadConfig() + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { inverseConduction = Mekanism.configuration.get("tier", getBaseTier().getName() + "ConductorInverseConduction", baseConduction).getDouble(); inverseHeatCapacity = Mekanism.configuration.get("tier", getBaseTier().getName() + "ConductorHeatCapacity", baseHeatCapacity).getDouble(); inverseConductionInsulation = Mekanism.configuration.get("tier", getBaseTier().getName() + "ConductorConductionInsulation", baseConductionInsulation).getDouble(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { inverseConduction = dataStream.readDouble(); inverseHeatCapacity = dataStream.readDouble(); inverseConductionInsulation = dataStream.readDouble(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeDouble(inverseConduction); dataStream.writeDouble(inverseHeatCapacity); @@ -566,44 +578,174 @@ public final class Tier } } + public static enum FluidTankTier implements ITier + { + BASIC(14000, 400), + ADVANCED(28000, 800), + ELITE(56000, 1600), + ULTIMATE(112000, 3200); + + public int storage; + private int baseStorage; + + public int output; + private int baseOutput; + + private FluidTankTier(int s, int o) + { + baseStorage = storage = s; + baseOutput = output = o; + } + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() + { + storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "FluidTankStorage", baseStorage).getInt(); + output = Mekanism.configuration.get("tier", getBaseTier().getName() + "FluidTankOutput", baseOutput).getInt(); + } + + @Override + public void readConfig(ByteBuf dataStream) + { + storage = dataStream.readInt(); + output = dataStream.readInt(); + } + + @Override + public void writeConfig(ByteBuf dataStream) + { + dataStream.writeInt(storage); + dataStream.writeInt(output); + } + } + + public static enum GasTankTier implements ITier + { + BASIC(64000, 256), + ADVANCED(128000, 512), + ELITE(256000, 1028), + ULTIMATE(512000, 2056); + + public int storage; + private int baseStorage; + + public int output; + private int baseOutput; + + private GasTankTier(int s, int o) + { + baseStorage = storage = s; + baseOutput = output = o; + } + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() + { + storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "GasTankStorage", baseStorage).getInt(); + output = Mekanism.configuration.get("tier", getBaseTier().getName() + "GasTankOutput", baseOutput).getInt(); + } + + @Override + public void readConfig(ByteBuf dataStream) + { + storage = dataStream.readInt(); + output = dataStream.readInt(); + } + + @Override + public void writeConfig(ByteBuf dataStream) + { + dataStream.writeInt(storage); + dataStream.writeInt(output); + } + } + + public static enum BinTier implements ITier + { + BASIC(4096), + ADVANCED(8192), + ELITE(32768), + ULTIMATE(262144); + + public int storage; + private int baseStorage; + + private BinTier(int s) + { + baseStorage = storage = s; + } + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() + { + storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "BinStorage", baseStorage).getInt(); + } + + @Override + public void readConfig(ByteBuf dataStream) + { + storage = dataStream.readInt(); + } + + @Override + public void writeConfig(ByteBuf dataStream) + { + dataStream.writeInt(storage); + } + } +*/ + + public static void init() + { +/* + if(initiated) + { + return; + } +*/ + + for(Class c : Tier.class.getDeclaredClasses()) + { + if(c.isEnum()) + { + try { + for(Object obj : c.getEnumConstants()) + { + if(obj instanceof ITier) + { + tierTypes.add((ITier)obj); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + initiated = true; + } + public static void loadConfig() { - for(CableTier tier : CableTier.values()) - { - tier.loadConfig(); - } - - for(InductionCellTier tier : InductionCellTier.values()) - { - tier.loadConfig(); - } - - for(InductionProviderTier tier : InductionProviderTier.values()) - { - tier.loadConfig(); - } - - for(EnergyCubeTier tier : EnergyCubeTier.values()) - { - tier.loadConfig(); - } - - for(PipeTier tier : PipeTier.values()) - { - tier.loadConfig(); - } - - for(TubeTier tier : TubeTier.values()) - { - tier.loadConfig(); - } - - for(TransporterTier tier : TransporterTier.values()) - { - tier.loadConfig(); - } - - for(ConductorTier tier : ConductorTier.values()) + for(ITier tier : tierTypes) { tier.loadConfig(); } @@ -611,92 +753,29 @@ public final class Tier public static void readConfig(ByteBuf dataStream) { - for(CableTier tier : CableTier.values()) - { - tier.readConfig(dataStream); - } - - for(InductionCellTier tier : InductionCellTier.values()) - { - tier.readConfig(dataStream); - } - - for(InductionProviderTier tier : InductionProviderTier.values()) - { - tier.readConfig(dataStream); - } - - for(EnergyCubeTier tier : EnergyCubeTier.values()) - { - tier.readConfig(dataStream); - } - - for(PipeTier tier : PipeTier.values()) - { - tier.readConfig(dataStream); - } - - for(TubeTier tier : TubeTier.values()) - { - tier.readConfig(dataStream); - } - - for(TransporterTier tier : TransporterTier.values()) - { - tier.readConfig(dataStream); - } - - for(ConductorTier tier : ConductorTier.values()) + for(ITier tier : tierTypes) { tier.readConfig(dataStream); } } -*/ - + public static void writeConfig(ByteBuf dataStream) { -/* - for(CableTier tier : CableTier.values()) - { - tier.writeConfig(dataStream); - } -*/ - - for(InductionCellTier tier : InductionCellTier.values()) + for(ITier tier : tierTypes) { tier.writeConfig(dataStream); } + } + + public static interface ITier + { + public BaseTier getBaseTier(); - for(InductionProviderTier tier : InductionProviderTier.values()) - { - tier.writeConfig(dataStream); - } + public void loadConfig(); - for(EnergyCubeTier tier : EnergyCubeTier.values()) - { - tier.writeConfig(dataStream); - } + public void readConfig(ByteBuf dataStream); -/* - for(PipeTier tier : PipeTier.values()) - { - tier.writeConfig(dataStream); - } - - for(TubeTier tier : TubeTier.values()) - { - tier.writeConfig(dataStream); - } - - for(TransporterTier tier : TransporterTier.values()) - { - tier.writeConfig(dataStream); - } - - for(ConductorTier tier : ConductorTier.values()) - { - tier.writeConfig(dataStream); - } + public void writeConfig(ByteBuf dataStream); */ } } diff --git a/src/main/java/mekanism/common/asm/LoadingHook.java b/src/main/java/mekanism/common/asm/LoadingHook.java index 02271d486..2bcba9285 100644 --- a/src/main/java/mekanism/common/asm/LoadingHook.java +++ b/src/main/java/mekanism/common/asm/LoadingHook.java @@ -2,9 +2,8 @@ package mekanism.common.asm; import java.util.Map; -import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; - import codechicken.core.launch.DepLoader; +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; public class LoadingHook implements IFMLLoadingPlugin { diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 7d9a2400a..fa24542e9 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -1,15 +1,13 @@ package mekanism.common.base; +import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.util.MekanismUtils; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; - import cofh.api.energy.IEnergyReceiver; -import ic2.api.energy.tile.IEnergySink; public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { @@ -105,7 +103,10 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public double transferEnergyToAcceptor(EnumFacing side, double amount) { - return fromRF(acceptor.receiveEnergy(side, toRF(amount), false)); + int needed = acceptor.getMaxEnergyStored(side)-acceptor.getEnergyStored(side); + int transferred = acceptor.receiveEnergy(side, Math.min(needed, toRF(amount)), false); + + return fromRF(transferred); } @Override @@ -137,7 +138,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public boolean needsEnergy(EnumFacing side) { - return acceptor.getMaxEnergyStored(side) - acceptor.getEnergyStored(side) > 0 || acceptor.receiveEnergy(side, 1, true) > 0; + return acceptor.receiveEnergy(side, 1, true) > 0; } public int toRF(double joules) @@ -163,7 +164,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public double transferEnergyToAcceptor(EnumFacing side, double amount) { - return amount - fromEU(acceptor.injectEnergy(side, toEU(amount), 0)); + return amount - fromEU(acceptor.injectEnergy(side, Math.min(acceptor.getDemandedEnergy(), toEU(amount)), 0)); } @Override diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index fe28120af..092ad8bf4 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -1,23 +1,22 @@ package mekanism.common.base; -import cofh.api.energy.IEnergyHandler; -import net.minecraftforge.fml.common.Optional.Interface; -import net.minecraftforge.fml.common.Optional.InterfaceList; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; -import mekanism.api.IFilterAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.integration.IComputerIntegration; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import cofh.api.energy.IEnergyHandler; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; @InterfaceList({ - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), - @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore") + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), }) -public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyHandler, IComputerIntegration, IFilterAccess +public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyHandler, IComputerIntegration, ISpecialConfigData { public int[] getBoundSlots(Coord4D location, EnumFacing side); diff --git a/src/main/java/mekanism/common/base/IEjector.java b/src/main/java/mekanism/common/base/IEjector.java deleted file mode 100644 index 8c9529621..000000000 --- a/src/main/java/mekanism/common/base/IEjector.java +++ /dev/null @@ -1,22 +0,0 @@ -package mekanism.common.base; - -import mekanism.api.EnumColor; - -import net.minecraft.util.EnumFacing; - -public interface IEjector -{ - public void outputItems(); - - public EnumColor getOutputColor(); - - public void setOutputColor(EnumColor color); - - public EnumColor getInputColor(EnumFacing side); - - public void setInputColor(EnumFacing side, EnumColor color); - - public boolean hasStrictInput(); - - public void setStrictInput(boolean strict); -} diff --git a/src/main/java/mekanism/common/base/IElectricChest.java b/src/main/java/mekanism/common/base/IElectricChest.java index 9448b41d7..f1861fb52 100644 --- a/src/main/java/mekanism/common/base/IElectricChest.java +++ b/src/main/java/mekanism/common/base/IElectricChest.java @@ -50,18 +50,4 @@ public interface IElectricChest * @return authenticated value */ public boolean getLocked(ItemStack itemStack); - - /** - * Sets the 'open' value of this electric chest to a new value. - * @param itemStack - electric chest ItemStack - * @param open - new value - */ - public void setOpen(ItemStack itemStack, boolean open); - - /** - * Retrieves the 'open' value of this electric chest. - * @param itemStack - electric chest ItemStack - * @return open value - */ - public boolean getOpen(ItemStack itemStack); } diff --git a/src/main/java/mekanism/common/base/IEnergyCube.java b/src/main/java/mekanism/common/base/IEnergyCube.java index de2c866fe..3858a86db 100644 --- a/src/main/java/mekanism/common/base/IEnergyCube.java +++ b/src/main/java/mekanism/common/base/IEnergyCube.java @@ -1,7 +1,6 @@ package mekanism.common.base; import mekanism.common.Tier.EnergyCubeTier; - import net.minecraft.item.ItemStack; /** diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index c7fb8a079..bfe8737d2 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -1,24 +1,24 @@ package mekanism.common.base; -import cofh.api.energy.IEnergyHandler; -import net.minecraftforge.fml.common.Optional.Interface; -import net.minecraftforge.fml.common.Optional.InterfaceList; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import ic2.api.tile.IEnergyStorage; + +import java.util.EnumSet; + import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import net.minecraft.inventory.IInventory; import net.minecraft.util.EnumFacing; - -import java.util.EnumSet; +import cofh.api.energy.IEnergyHandler; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"), - @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"), - @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore"), + @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2") }) public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter, IInventory { diff --git a/src/main/java/mekanism/common/base/ILogisticalTransporter.java b/src/main/java/mekanism/common/base/ILogisticalTransporter.java index fe12c078c..597d20e56 100644 --- a/src/main/java/mekanism/common/base/ILogisticalTransporter.java +++ b/src/main/java/mekanism/common/base/ILogisticalTransporter.java @@ -7,7 +7,6 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.InventoryNetwork; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/base/IModule.java b/src/main/java/mekanism/common/base/IModule.java index fe3583491..41c83c629 100644 --- a/src/main/java/mekanism/common/base/IModule.java +++ b/src/main/java/mekanism/common/base/IModule.java @@ -1,11 +1,11 @@ package mekanism.common.base; +import io.netty.buffer.ByteBuf; + import java.io.IOException; import mekanism.common.Version; -import io.netty.buffer.ByteBuf; - /** * Implement in your main class if your mod happens to be completely reliant on Mekanism, or in other words, is a Mekanism module. * @author aidancbrady diff --git a/src/main/java/mekanism/common/base/ISideConfiguration.java b/src/main/java/mekanism/common/base/ISideConfiguration.java index f2bdab645..578a8bcbe 100644 --- a/src/main/java/mekanism/common/base/ISideConfiguration.java +++ b/src/main/java/mekanism/common/base/ISideConfiguration.java @@ -1,6 +1,7 @@ package mekanism.common.base; import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.tile.component.TileComponentEjector; import net.minecraft.util.EnumFacing; @@ -27,5 +28,5 @@ public interface ISideConfiguration * Gets this machine's ejector. * @return */ - public IEjector getEjector(); + public TileComponentEjector getEjector(); } diff --git a/src/main/java/mekanism/common/base/ITierItem.java b/src/main/java/mekanism/common/base/ITierItem.java new file mode 100644 index 000000000..31912c6d8 --- /dev/null +++ b/src/main/java/mekanism/common/base/ITierItem.java @@ -0,0 +1,11 @@ +package mekanism.common.base; + +import mekanism.common.Tier.BaseTier; +import net.minecraft.item.ItemStack; + +public interface ITierItem +{ + public BaseTier getBaseTier(ItemStack stack); + + public void setBaseTier(ItemStack stack, BaseTier tier); +} diff --git a/src/main/java/mekanism/common/base/ITileComponent.java b/src/main/java/mekanism/common/base/ITileComponent.java index 315f360c8..af623bd7a 100644 --- a/src/main/java/mekanism/common/base/ITileComponent.java +++ b/src/main/java/mekanism/common/base/ITileComponent.java @@ -1,11 +1,11 @@ package mekanism.common.base; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public interface ITileComponent { public void tick(); diff --git a/src/main/java/mekanism/common/base/ITileNetwork.java b/src/main/java/mekanism/common/base/ITileNetwork.java index 156f9213f..7c3c9f0f7 100644 --- a/src/main/java/mekanism/common/base/ITileNetwork.java +++ b/src/main/java/mekanism/common/base/ITileNetwork.java @@ -1,9 +1,9 @@ package mekanism.common.base; -import java.util.ArrayList; - import io.netty.buffer.ByteBuf; +import java.util.ArrayList; + /** * Internal interface used for blocks that send data between clients and the server * @author AidanBrady diff --git a/src/main/java/mekanism/common/base/ITransporterTile.java b/src/main/java/mekanism/common/base/ITransporterTile.java index 2d030d5fa..7ddf2d38d 100644 --- a/src/main/java/mekanism/common/base/ITransporterTile.java +++ b/src/main/java/mekanism/common/base/ITransporterTile.java @@ -4,7 +4,6 @@ package mekanism.common.base; import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.ITransmitterTile; import mekanism.common.InventoryNetwork; - import net.minecraft.inventory.IInventory; public interface ITransporterTile extends ITransmitterTile, IBlockableConnection diff --git a/src/main/java/mekanism/common/base/IUpgradeItem.java b/src/main/java/mekanism/common/base/IUpgradeItem.java index c3f485c98..ec33efa5a 100644 --- a/src/main/java/mekanism/common/base/IUpgradeItem.java +++ b/src/main/java/mekanism/common/base/IUpgradeItem.java @@ -1,7 +1,6 @@ package mekanism.common.base; import mekanism.common.Upgrade; - import net.minecraft.item.ItemStack; public interface IUpgradeItem diff --git a/src/main/java/mekanism/common/base/SoundWrapper.java b/src/main/java/mekanism/common/base/SoundWrapper.java index a2de95df5..6041ddc1a 100644 --- a/src/main/java/mekanism/common/base/SoundWrapper.java +++ b/src/main/java/mekanism/common/base/SoundWrapper.java @@ -1,10 +1,10 @@ package mekanism.common.base; -import net.minecraft.util.ResourceLocation; import mekanism.client.sound.IResettableSound; import mekanism.client.sound.ISoundSource; import mekanism.client.sound.SoundHandler; import mekanism.client.sound.TileSound; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 0fdbf9adf..41236bed6 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -9,6 +9,7 @@ import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; +import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateBasic; import mekanism.common.block.states.BlockStateBasic.BasicBlock; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; @@ -26,7 +27,11 @@ import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityPressureDisperser; +import mekanism.common.tile.TileEntityStructuralGlass; +import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationController; +import mekanism.common.tile.TileEntityThermalEvaporationValve; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -141,13 +146,17 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus @Override public IIcon getIcon(ItemStack stack, int side) { - if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 3) + if(BasicType.get(stack) == BasicType.BIN) { - return icons[3][((ItemBlockBasic)stack.getItem()).getTier(stack).ordinal()]; + return binIcons[((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()][side]; } - else if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 4) + else if(BasicType.get(stack) == BasicType.INDUCTION_CELL) { - return icons[4][((ItemBlockBasic)stack.getItem()).getTier(stack).ordinal()]; + return icons[3][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()]; + } + else if(BasicType.get(stack) == BasicType.INDUCTION_PROVIDER) + { + return icons[4][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()]; } return getIcon(side, stack.getItemDamage()); @@ -201,9 +210,16 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus icons[3][0] = register.registerIcon("mekanism:CoalBlock"); icons[4][0] = register.registerIcon("mekanism:RefinedGlowstone"); icons[5][0] = register.registerIcon("mekanism:SteelBlock"); + icons[6][0] = register.registerIcon(ICON_BASE); - MekanismRenderer.loadDynamicTextures(register, "Bin", icons[6], DefIcon.getActivePair(register.registerIcon("mekanism:BinSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinTop"), 0), new DefIcon(register.registerIcon("mekanism:BinTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "BinBasic", binIcons[0], DefIcon.getActivePair(register.registerIcon("mekanism:BinBasicSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:BinBasicTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "BinAdvanced", binIcons[1], DefIcon.getActivePair(register.registerIcon("mekanism:BinAdvancedSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:BinAdvancedTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "BinElite", binIcons[2], DefIcon.getActivePair(register.registerIcon("mekanism:BinEliteSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:BinEliteTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "BinUltimate", binIcons[3], DefIcon.getActivePair(register.registerIcon("mekanism:BinUltimateSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:BinUltimateTopOn"), 6)); icons[7][0] = ctms[7][0].mainTextureData.icon; icons[8][0] = register.registerIcon("mekanism:SteelCasing"); @@ -268,10 +284,10 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus switch(meta) { case 6: - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); + TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(pos); boolean active = MekanismUtils.isActive(world, pos); - return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; + return binIcons[tileEntity.tier.ordinal()][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; case 14: TileEntityThermalEvaporationController tileEntity1 = (TileEntityThermalEvaporationController)world.getTileEntity(pos); @@ -314,8 +330,6 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus case BASIC_BLOCK_1: switch(meta) { - case 6: - return icons[meta][side]; case 14: if(side == 2) { @@ -353,12 +367,13 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus { case INDUCTION_CELL: case INDUCTION_PROVIDER: + case BIN: for(BaseTier tier : BaseTier.values()) { if(tier.isObtainable()) { ItemStack stack = new ItemStack(item, 1, type.meta); - ((ItemBlockBasic)stack.getItem()).setTier(stack, tier); + ((ItemBlockBasic)stack.getItem()).setBaseTier(stack, tier); list.add(stack); } } @@ -517,7 +532,7 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus return true; } - if(bin.getItemCount() < bin.MAX_STORAGE) + if(bin.getItemCount() < bin.tier.storage) { if(bin.addTicks == 0 && entityplayer.getCurrentEquippedItem() != null) { @@ -534,7 +549,7 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus for(int i = 0; i < inv.length; i++) { - if(bin.getItemCount() == bin.MAX_STORAGE) + if(bin.getItemCount() == bin.tier.storage) { break; } @@ -842,8 +857,9 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(pos); InventoryBin inv = new InventoryBin(ret); + ((ITierItem)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier()); inv.setItemCount(tileEntity.getItemCount()); - + if(tileEntity.getItemCount() > 0) { inv.setItemType(tileEntity.itemType); @@ -852,12 +868,12 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus else if(type == BasicBlockType.INDUCTION_CELL) { TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(pos); - ((ItemBlockBasic)ret.getItem()).setTier(ret, tileEntity.tier.getBaseTier()); + ((ItemBlockBasic)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier()); } else if(type == BasicBlockType.INDUCTION_PROVIDER) { TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(pos); - ((ItemBlockBasic)ret.getItem()).setTier(ret, tileEntity.tier.getBaseTier()); + ((ItemBlockBasic)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier()); } TileEntity tileEntity = world.getTileEntity(pos); diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index aac40beb4..6280cd56b 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -1,6 +1,7 @@ package mekanism.common.block; -import mekanism.common.block.states.BlockStateBounding; +import java.util.Random; + import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import net.minecraft.block.Block; @@ -17,8 +18,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import java.util.Random; - public class BlockBounding extends Block { public BlockBounding() diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index a194e96fa..69953ffa0 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -6,7 +6,6 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.item.ItemBlockCardboardBox; import mekanism.common.tile.TileEntityCardboardBox; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 789c515cb..fbd494a04 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -3,9 +3,6 @@ package mekanism.common.block; import java.util.List; import java.util.Random; -import buildcraft.api.tools.IToolWrench; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; @@ -21,7 +18,6 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; - import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -38,6 +34,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import buildcraft.api.tools.IToolWrench; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Block class for handling multiple energy cube block IDs. @@ -214,6 +213,7 @@ public class BlockEnergyCube extends BlockContainer tileEntity.setFacing((short)change); world.notifyNeighborsOfStateChange(pos, this); + return true; } } diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index a5694b98d..5b2a9355e 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -6,6 +6,7 @@ import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ITierItem; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; @@ -104,12 +105,15 @@ public class BlockGasTank extends BlockContainer } if(MekanismUtils.isBCWrench(tool)) + { ((IToolWrench)tool).wrenchUsed(entityplayer, pos); + } int change = tileEntity.facing.rotateY().ordinal(); tileEntity.setFacing((short)change); world.notifyNeighborsOfStateChange(pos, this); + return true; } } @@ -122,6 +126,7 @@ public class BlockGasTank extends BlockContainer return true; } } + return false; } @@ -199,6 +204,9 @@ public class BlockGasTank extends BlockContainer { TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos); ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank); + + ITierItem tierItem = (ITierItem)itemStack.getItem(); + tierItem.setBaseTier(itemStack, tileEntity.tier.getBaseTier()); IGasItem storageTank = (IGasItem)itemStack.getItem(); storageTank.setGas(itemStack, tileEntity.gasTank.getGas()); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 8b46e26e4..a2ac542c2 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -10,6 +10,7 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IElectricChest; @@ -21,6 +22,7 @@ import mekanism.common.base.ISpecialBounds; import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; +import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateBasic.BasicBlock; import mekanism.common.block.states.BlockStateFacing; @@ -40,7 +42,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -110,15 +112,17 @@ import net.minecraftforge.fml.relauncher.SideOnly; * 1:8: Chemical Crystallizer * 1:9: Seismic Vibrator * 1:10: Pressurized Reaction Chamber - * 1:11: Portable Tank + * 1:11: Fluid Tank * 1:12: Fluidic Plenisher * 1:13: Laser * 1:14: Laser Amplifier * 1:15: Laser Tractor Beam - * 2:0: Entangled Block + * 2:0: Quantum Entangloporter * 2:1: Solar Neutron Activator * 2:2: Ambient Accumulator * 2:3: Oredictionificator + * 2:4: Resistive Heater + * 2:5: Formulaic Assemblicator * * @author AidanBrady * @@ -236,8 +240,10 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou MekanismRenderer.loadDynamicTextures(register, MachineType.PRECISION_SAWMILL.name, icons[5], def); break; case MACHINE_BLOCK_3: - icons[0][0] = register.registerIcon("mekanism:AmbientAccumulator"); + icons[0][0] = BASE_ICON; icons[2][0] = BASE_ICON; + icons[4][0] = BASE_ICON; + icons[5][0] = BASE_ICON; MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:OredictionificatorSide"))); break; } @@ -328,6 +334,11 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou TileEntityTeleporter teleporter = (TileEntityTeleporter)tileEntity; teleporter.owner = placer.getName(); } + else if(tileEntity instanceof TileEntityQuantumEntangloporter) + { + TileEntityQuantumEntangloporter entangloporter = (TileEntityQuantumEntangloporter)tileEntity; + entangloporter.owner = entityliving.getCommandSenderName(); + } if(tileEntity instanceof IBoundingBlock) { @@ -534,19 +545,24 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou } break; - case PORTABLE_TANK: - list.add(new ItemStack(item, 1, type.meta)); + case FLUID_TANK: + ItemBlockMachine itemMachine = (ItemBlockMachine)item; + + for(FluidTankTier tier : FluidTankTier.values()) + { + ItemStack stack = new ItemStack(item, 1, type.meta); + itemMachine.setBaseTier(stack, tier.getBaseTier()); + list.add(stack); + } if(general.prefilledPortableTanks) { - ItemBlockMachine itemMachine = (ItemBlockMachine)item; - for(Fluid f : FluidRegistry.getRegisteredFluids().values()) { try { //Prevent bad IDs ItemStack filled = new ItemStack(item, 1, type.meta); + itemMachine.setBaseTier(filled, BaseTier.ULTIMATE); itemMachine.setFluidStack(new FluidStack(f, itemMachine.getCapacity(filled)), filled); - itemMachine.setPrevScale(filled, 1); list.add(filled); } catch(Exception e) {} } @@ -639,10 +655,10 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou return true; } break; - case PORTABLE_TANK: + case FLUID_TANK: if(entityplayer.getCurrentEquippedItem() != null && FluidContainerRegistry.isContainer(entityplayer.getCurrentEquippedItem())) { - if(manageInventory(entityplayer, (TileEntityPortableTank)tileEntity)) + if(manageInventory(entityplayer, (TileEntityFluidTank)tileEntity)) { entityplayer.inventory.markDirty(); return true; @@ -674,6 +690,26 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.teleporter.noAccess"))); } + return true; + } + case QUANTUM_ENTANGLOPORTER: + if(!entityplayer.isSneaking()) + { + TileEntityQuantumEntangloporter teleporter = (TileEntityQuantumEntangloporter)tileEntity; + + if(teleporter.owner == null) + { + teleporter.owner = entityplayer.getCommandSenderName(); + } + + if(teleporter.owner.equals(entityplayer.getCommandSenderName()) || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) + { + entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); + } + else { + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.entangloporter.noAccess"))); + } + return true; } default: @@ -774,7 +810,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou return world.setBlockToAir(pos); } - private boolean manageInventory(EntityPlayer player, TileEntityPortableTank tileEntity) + private boolean manageInventory(EntityPlayer player, TileEntityFluidTank tileEntity) { ItemStack itemStack = player.getCurrentEquippedItem(); @@ -928,6 +964,12 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou { itemStack.setTagCompound(new NBTTagCompound()); } + + if(tileEntity instanceof TileEntityFluidTank) + { + ITierItem tierItem = (ITierItem)itemStack.getItem(); + tierItem.setBaseTier(itemStack, ((TileEntityFluidTank)tileEntity).tier.getBaseTier()); + } if(tileEntity instanceof IUpgradeTile) { @@ -1053,7 +1095,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou case CHARGEPAD: setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.06F, 1.0F); break; - case PORTABLE_TANK: + case FLUID_TANK: setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 1.0F, 0.875F); break; default: @@ -1065,6 +1107,8 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou @Override public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { + setBlockBoundsBasedOnState(world, x, y, z); + if(world.getTileEntity(pos) instanceof TileEntityChargepad) { return null; @@ -1084,7 +1128,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou case CHARGEPAD: case ELECTRIC_CHEST: return false; - case PORTABLE_TANK: + case FLUID_TANK: return side == EnumFacing.UP || side == EnumFacing.DOWN; default: return true; diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index 57e690848..ab067512a 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -3,7 +3,6 @@ package mekanism.common.block; import mekanism.common.Mekanism; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.tile.TileEntityObsidianTNT; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index b30f7ceb8..7aee3d3df 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -6,7 +6,6 @@ import mekanism.common.Mekanism; import mekanism.common.block.states.BlockStateOre; import mekanism.common.block.states.BlockStateOre.EnumOreType; import mekanism.common.block.states.BlockStatePlastic; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index e8069e9c3..2c79e1167 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -6,7 +6,6 @@ import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.block.states.BlockStatePlastic; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index c4ed20e22..3b9116f69 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -4,7 +4,6 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; - import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/mekanism/common/block/BlockSalt.java b/src/main/java/mekanism/common/block/BlockSalt.java index b552569d2..3a19af49a 100644 --- a/src/main/java/mekanism/common/block/BlockSalt.java +++ b/src/main/java/mekanism/common/block/BlockSalt.java @@ -4,7 +4,6 @@ import java.util.Random; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index 6439bdba7..31ea0849d 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -146,10 +146,12 @@ public class BlockStateMachine extends BlockStateFacing LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false, always, false), LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false, always, true), LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false, always, true), - ENTANGLED_BLOCK(MachineBlock.MACHINE_BLOCK_3, 0, "EntangledBlock", 46, TileEntityEntangledBlock.class, true, false, false, Plane.HORIZONTAL, true), + QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "EntangledBlock", 46, TileEntityEntangledBlock.class, true, false, false, Plane.HORIZONTAL, true), SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false, Plane.HORIZONTAL, true), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false, never, true), - OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false, Plane.HORIZONTAL, true); + OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false, Plane.HORIZONTAL, true), + RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false), + FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true); public MachineBlock typeBlock; public int meta; @@ -306,7 +308,7 @@ public class BlockStateMachine extends BlockStateFacing return usage.seismicVibratorUsage; case PRESSURIZED_REACTION_CHAMBER: return usage.pressurizedReactionBaseUsage; - case PORTABLE_TANK: + case FLUID_TANK: return 0; case FLUIDIC_PLENISHER: return usage.fluidicPlenisherUsage; @@ -316,14 +318,19 @@ public class BlockStateMachine extends BlockStateFacing return 0; case LASER_TRACTOR_BEAM: return 0; - case ENTANGLED_BLOCK: + case QUANTUM_ENTANGLOPORTER: return 0; case SOLAR_NEUTRON_ACTIVATOR: return 0; case AMBIENT_ACCUMULATOR: return 0; + case RESISTIVE_HEATER: + return 100; + case FORMULAIC_ASSEMBLICATOR: + return usage.formulaicAssemblicatorUsage; default: return 0; + } } diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java new file mode 100644 index 000000000..79b4a5278 --- /dev/null +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -0,0 +1,104 @@ +package mekanism.common.content.assemblicator; + +import mekanism.api.util.StackUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.RecipeUtils; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; + +public class RecipeFormula +{ + private InventoryCrafting dummy = MekanismUtils.getDummyCraftingInv(); + + public ItemStack[] input = new ItemStack[9]; + + public RecipeFormula(ItemStack[] inv) + { + this(inv, 0); + } + + public RecipeFormula(ItemStack[] inv, int start) + { + for(int i = 0; i < 9; i++) + { + input[i] = StackUtils.size(inv[start+i], 1); + } + } + + private void resetToRecipe() + { + for(int i = 0; i < 9; i++) + { + dummy.setInventorySlotContents(i, input[i]); + } + } + + public boolean matches(World world, ItemStack[] input, int start) + { + resetToRecipe(); + + IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + + for(int i = 0; i < 9; i++) + { + dummy.setInventorySlotContents(i, input[start+i]); + } + + IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + + return origRecipe == newRecipe; + } + + public boolean isIngredientInPos(World world, ItemStack stack, int i) + { + resetToRecipe(); + + IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + dummy.setInventorySlotContents(i, stack); + IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + + return origRecipe == newRecipe; + } + + public boolean isIngredient(World world, ItemStack stack) + { + resetToRecipe(); + + IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + + for(int i = 0; i < 9; i++) + { + dummy.setInventorySlotContents(i, stack); + + IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + + if(origRecipe == newRecipe) + { + return true; + } + + dummy.setInventorySlotContents(i, input[i]); + } + + return false; + } + + public boolean isValidFormula(World world) + { + return getRecipe(world) != null; + } + + public IRecipe getRecipe(World world) + { + resetToRecipe(); + + return RecipeUtils.getRecipeFromGrid(dummy, world); + } + + public boolean isFormulaEqual(World world, RecipeFormula formula) + { + return formula.getRecipe(world) == getRecipe(world); + } +} diff --git a/src/main/java/mekanism/common/content/boiler/BoilerCache.java b/src/main/java/mekanism/common/content/boiler/BoilerCache.java index ced5d0b7c..d74696e7d 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerCache.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerCache.java @@ -1,96 +1,61 @@ package mekanism.common.content.boiler; import mekanism.common.multiblock.MultiblockCache; -import mekanism.common.util.FluidContainerUtils.ContainerEditMode; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.FluidStack; public class BoilerCache extends MultiblockCache { - public ItemStack[] inventory = new ItemStack[2]; - public FluidStack water; public FluidStack steam; - - public ContainerEditMode editMode = ContainerEditMode.BOTH; + + public double temperature; @Override public void apply(SynchronizedBoilerData data) { - data.inventory = inventory; data.waterStored = water; data.steamStored = steam; - data.editMode = editMode; + data.temperature = temperature; } @Override public void sync(SynchronizedBoilerData data) { - inventory = data.inventory; water = data.waterStored; steam = data.steamStored; - editMode = data.editMode; + temperature = data.temperature; } @Override public void load(NBTTagCompound nbtTags) { - editMode = ContainerEditMode.values()[nbtTags.getInteger("editMode")]; - - NBTTagList tagList = nbtTags.getTagList("Items", NBT.TAG_COMPOUND); - inventory = new ItemStack[2]; - - for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) - { - NBTTagCompound tagCompound = (NBTTagCompound)tagList.getCompoundTagAt(tagCount); - byte slotID = tagCompound.getByte("Slot"); - - if(slotID >= 0 && slotID < 2) - { - inventory[slotID] = ItemStack.loadItemStackFromNBT(tagCompound); - } - } - if(nbtTags.hasKey("cachedWater")) { water = FluidStack.loadFluidStackFromNBT(nbtTags.getCompoundTag("cachedWater")); } + if(nbtTags.hasKey("cachedSteam")) { steam = FluidStack.loadFluidStackFromNBT(nbtTags.getCompoundTag("cachedSteam")); } + + temperature = nbtTags.getDouble("temperature"); } @Override public void save(NBTTagCompound nbtTags) { - nbtTags.setInteger("editMode", editMode.ordinal()); - - NBTTagList tagList = new NBTTagList(); - - for(int slotCount = 0; slotCount < 2; slotCount++) - { - if(inventory[slotCount] != null) - { - NBTTagCompound tagCompound = new NBTTagCompound(); - tagCompound.setByte("Slot", (byte)slotCount); - inventory[slotCount].writeToNBT(tagCompound); - tagList.appendTag(tagCompound); - } - } - - nbtTags.setTag("Items", tagList); - if(water != null) { nbtTags.setTag("cachedWater", water.writeToNBT(new NBTTagCompound())); } + if(steam != null) { nbtTags.setTag("cachedSteam", steam.writeToNBT(new NBTTagCompound())); } + + nbtTags.setDouble("temperature", temperature); } } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerManager.java b/src/main/java/mekanism/common/content/boiler/BoilerManager.java deleted file mode 100644 index 1952ae4b6..000000000 --- a/src/main/java/mekanism/common/content/boiler/BoilerManager.java +++ /dev/null @@ -1,94 +0,0 @@ -package mekanism.common.content.boiler; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; - -import mekanism.api.Coord4D; -import mekanism.common.multiblock.MultiblockCache; -import mekanism.common.multiblock.MultiblockManager; -import mekanism.common.tile.TileEntityMultiblock; -import mekanism.common.tile.TileEntityBoilerCasing; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -/** - * Created by ben on 09/01/15. - */ -public class BoilerManager extends MultiblockManager -{ - public BoilerManager(String s) - { - super(s); - } - - public void tickSelf(World world) - { - ArrayList idsToKill = new ArrayList(); - HashMap> tilesToKill = new HashMap>(); - - for(Map.Entry> entry : inventories.entrySet()) - { - String inventoryID = entry.getKey(); - - HashSet boilers = new HashSet(); - - for(Coord4D obj : entry.getValue().locations) - { - if(obj.dimensionId == world.provider.getDimensionId() && obj.exists(world)) - { - TileEntity tileEntity = obj.getTileEntity(world); - - if(!(tileEntity instanceof TileEntityMultiblock) || ((TileEntityMultiblock)tileEntity).getManager() != this || (getStructureId(((TileEntityMultiblock)tileEntity)) != null && getStructureId(((TileEntityMultiblock)tileEntity)) != inventoryID)) - { - if(!tilesToKill.containsKey(inventoryID)) - { - tilesToKill.put(inventoryID, new HashSet()); - } - - tilesToKill.get(inventoryID).add(obj); - } - else if(tileEntity instanceof TileEntityBoilerCasing) - { - ((TileEntityBoilerCasing)tileEntity).simulateHeat(); - boilers.add((TileEntityBoilerCasing) tileEntity); - } - } - } - - if(!boilers.isEmpty()) - { - SynchronizedBoilerData data = boilers.iterator().next().getSynchronizedData(); - - if(data != null) - { - boilers.iterator().next().getSynchronizedData().applyTemperatureChange(); - } - - for (TileEntityBoilerCasing boiler : boilers) - { - boiler.applyTemperatureChange(); - } - } - - if(entry.getValue().locations.isEmpty()) - { - idsToKill.add(inventoryID); - } - } - - for(Map.Entry> entry : tilesToKill.entrySet()) - { - for(Coord4D obj : entry.getValue()) - { - inventories.get(entry.getKey()).locations.remove(obj); - } - } - - for(String inventoryID : idsToKill) - { - inventories.remove(inventoryID); - } - } -} diff --git a/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java b/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java index 3e99ab2a0..32086fd6f 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java @@ -1,7 +1,6 @@ package mekanism.common.content.boiler; import mekanism.common.tile.TileEntityBoilerCasing; - import net.minecraftforge.fluids.FluidStack; public class BoilerSteamTank extends BoilerTank @@ -17,9 +16,15 @@ public class BoilerSteamTank extends BoilerTank return steamBoiler.structure != null ? steamBoiler.structure.steamStored : null; } + @Override public void setFluid(FluidStack stack) { steamBoiler.structure.steamStored = stack; } - + + @Override + public int getCapacity() + { + return steamBoiler.structure != null ? steamBoiler.structure.steamVolume*BoilerUpdateProtocol.STEAM_PER_TANK : 0; + } } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerTank.java b/src/main/java/mekanism/common/content/boiler/BoilerTank.java index 01eab0d98..a08564595 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerTank.java @@ -1,10 +1,9 @@ package mekanism.common.content.boiler; import mekanism.api.Coord4D; -import mekanism.common.content.boiler.SynchronizedBoilerData.ValveData; +import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.util.MekanismUtils; - import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; @@ -20,12 +19,6 @@ public abstract class BoilerTank implements IFluidTank public abstract void setFluid(FluidStack stack); - @Override - public int getCapacity() - { - return steamBoiler.structure != null ? steamBoiler.structure.volume * BoilerUpdateProtocol.WATER_PER_TANK : 0; - } - @Override public int fill(FluidStack resource, boolean doFill) { @@ -48,9 +41,7 @@ public abstract class BoilerTank implements IFluidTank if(resource.amount > 0 && doFill) { MekanismUtils.saveChunk(steamBoiler); - updateValveData(true); - steamBoiler.sendPacketToRenderer(); - updateValveData(false); + updateValveData(); } return resource.amount; @@ -65,9 +56,7 @@ public abstract class BoilerTank implements IFluidTank if(getCapacity() > 0 && doFill) { MekanismUtils.saveChunk(steamBoiler); - updateValveData(true); - steamBoiler.sendPacketToRenderer(); - updateValveData(false); + updateValveData(); } return getCapacity(); @@ -91,9 +80,7 @@ public abstract class BoilerTank implements IFluidTank if(resource.amount > 0 && doFill) { MekanismUtils.saveChunk(steamBoiler); - updateValveData(true); - steamBoiler.sendPacketToRenderer(); - updateValveData(false); + updateValveData(); } return resource.amount; @@ -107,9 +94,7 @@ public abstract class BoilerTank implements IFluidTank if(space > 0 && doFill) { MekanismUtils.saveChunk(steamBoiler); - updateValveData(true); - steamBoiler.sendPacketToRenderer(); - updateValveData(false); + updateValveData(); } return space; @@ -119,7 +104,7 @@ public abstract class BoilerTank implements IFluidTank return 0; } - public void updateValveData(boolean value) + public void updateValveData() { if(steamBoiler.structure != null) { @@ -127,7 +112,7 @@ public abstract class BoilerTank implements IFluidTank { if(data.location.equals(Coord4D.get(steamBoiler))) { - data.serverFluid = value; + data.onTransfer(); } } } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index a86c1ede4..d6decafde 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -5,10 +5,9 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; -import mekanism.common.content.boiler.SynchronizedBoilerData.ValveData; +import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; @@ -80,7 +79,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol } //Find a single disperser contained within this multiblock - Coord4D initDisperser = dispersers.iterator().next(); + final Coord4D initDisperser = dispersers.iterator().next(); //Ensure that a full horizontal plane of dispersers exist, surrounding the found disperser Coord4D pos = new Coord4D(structure.renderLocation.getX(), initDisperser.getY(), structure.renderLocation.getZ(), pointer.getWorld().provider.getDimensionId()); @@ -106,13 +105,16 @@ public class BoilerUpdateProtocol extends UpdateProtocol return false; } - structure.superheatingElements = new NodeCounter(new NodeChecker() { - @Override - public boolean isValid(Coord4D coord) - { - return coord.getTileEntity(pointer.getWorld()) instanceof TileEntitySuperheatingElement; - } - }).calculate(elements.iterator().next()); + if(elements.size() > 0) + { + structure.superheatingElements = new NodeCounter(new NodeChecker() { + @Override + public boolean isValid(Coord4D coord) + { + return coord.getTileEntity(pointer.getWorld()) instanceof TileEntitySuperheatingElement; + } + }).calculate(elements.iterator().next()); + } if(elements.size() > structure.superheatingElements) { @@ -145,11 +147,20 @@ public class BoilerUpdateProtocol extends UpdateProtocol return false; } + //Gradle build requires these fields to be final + final Coord4D renderLocation = structure.renderLocation.clone(); + final int volLength = structure.volLength; + final int volWidth = structure.volWidth; + structure.waterVolume = new NodeCounter(new NodeChecker() { @Override - public boolean isValid(Coord4D coord) + public final boolean isValid(Coord4D coord) { return coord.getY() < initDisperser.getY() && (coord.isAirBlock(pointer.getWorld()) || isViableNode(coord)); + return coord.yCoord >= renderLocation.yCoord-1 && coord.yCoord < initDisperser.yCoord && + coord.xCoord >= renderLocation.xCoord && coord.xCoord < renderLocation.xCoord+volLength && + coord.zCoord >= renderLocation.zCoord && coord.zCoord < renderLocation.zCoord+volWidth && + (coord.isAirBlock(pointer.getWorldObj()) || isViableNode(coord.xCoord, coord.yCoord, coord.zCoord)); } }).calculate(initAir); @@ -159,9 +170,11 @@ public class BoilerUpdateProtocol extends UpdateProtocol return false; } - int steamHeight = (structure.renderLocation.getY()+structure.volHeight)-initDisperser.getY(); + int steamHeight = (structure.renderLocation.getY()+structure.volHeight-2)-initDisperser.getY(); structure.steamVolume = structure.volWidth*structure.volLength*steamHeight; + structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, initDisperser.yCoord+1, structure.renderLocation.zCoord); + return true; } @@ -206,15 +219,8 @@ public class BoilerUpdateProtocol extends UpdateProtocol { ((BoilerCache)cache).steam.amount += ((BoilerCache)merge).steam.amount; } - - List rejects = StackUtils.getMergeRejects(((BoilerCache)cache).inventory, ((BoilerCache)merge).inventory); - - if(!rejects.isEmpty()) - { - rejectedItems.addAll(rejects); - } - - StackUtils.merge(((BoilerCache)cache).inventory, ((BoilerCache)merge).inventory); + + ((BoilerCache)cache).temperature = Math.max(((BoilerCache)cache).temperature, ((BoilerCache)merge).temperature); } @Override diff --git a/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java b/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java index 78f8757da..ec1aab932 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java @@ -1,7 +1,6 @@ package mekanism.common.content.boiler; import mekanism.common.tile.TileEntityBoilerCasing; - import net.minecraftforge.fluids.FluidStack; public class BoilerWaterTank extends BoilerTank @@ -17,9 +16,15 @@ public class BoilerWaterTank extends BoilerTank return steamBoiler.structure != null ? steamBoiler.structure.waterStored : null; } + @Override public void setFluid(FluidStack stack) { steamBoiler.structure.waterStored = stack; } - + + @Override + public int getCapacity() + { + return steamBoiler.structure != null ? steamBoiler.structure.waterVolume*BoilerUpdateProtocol.WATER_PER_TANK : 0; + } } diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index 0849ee8dc..4db66943e 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -5,26 +5,36 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; +import mekanism.api.MekanismConfig.general; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.multiblock.SynchronizedData; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class SynchronizedBoilerData extends SynchronizedData implements IHeatTransfer { + public static double CASING_INSULATION_COEFFICIENT = 1; + public static double CASING_INVERSE_CONDUCTION_COEFFICIENT = 1; + public static double BASE_BOIL_TEMP = 100-(TemperatureUnit.AMBIENT.zeroOffset-TemperatureUnit.CELSIUS.zeroOffset); + public FluidStack waterStored; + public FluidStack prevWater; public FluidStack steamStored; + public FluidStack prevSteam; + + public double lastEnvironmentLoss; + public int lastBoilRate; + public int lastMaxBoil; public double temperature; public double heatToAbsorb; - public double heatCapacity = 0.000001; - - public double enthalpyOfVaporization = 10; + public double heatCapacity = 1000; public int superheatingElements; @@ -35,8 +45,55 @@ public class SynchronizedBoilerData extends SynchronizedData valves = new HashSet(); + + /** + * @return how much heat energy is needed to convert one unit of water into steam + */ + public static double getHeatEnthalpy() + { + return general.maxEnergyPerSteam/general.energyPerHeat; + } + + public double getHeatAvailable() + { + double heatAvailable = (temperature-BASE_BOIL_TEMP)*locations.size(); + return Math.min(heatAvailable, superheatingElements*general.superheatingHeatTransfer); + } + + public boolean needsRenderUpdate() + { + if((waterStored == null && prevWater != null) || (waterStored != null && prevWater == null)) + { + return true; + } + + if(waterStored != null && prevWater != null) + { + if((waterStored.getFluid() != prevWater.getFluid()) || (waterStored.amount != prevWater.amount)) + { + return true; + } + } + + if((steamStored == null && prevSteam != null) || (steamStored != null && prevSteam == null)) + { + return true; + } + + if(steamStored != null && prevSteam != null) + { + if((steamStored.getFluid() != prevSteam.getFluid()) || (steamStored.amount != prevSteam.amount)) + { + return true; + } + } + + return false; + } @Override public ItemStack[] getInventory() @@ -53,57 +110,36 @@ public class SynchronizedBoilerData extends SynchronizedData= 100 + IHeatTransfer.AMBIENT_TEMP && waterStored != null) - { - int amountToBoil = (int)Math.floor(heatToAbsorb / enthalpyOfVaporization); - amountToBoil = Math.min(amountToBoil, waterStored.amount); - waterStored.amount -= amountToBoil; - - if(steamStored == null) - { - steamStored = new FluidStack(FluidRegistry.getFluid("steam"), amountToBoil); - } - else { - steamStored.amount += amountToBoil; - } - - heatToAbsorb -= amountToBoil * enthalpyOfVaporization; - } - - heatToAbsorb *= 0.8; + temperature += heatToAbsorb / locations.size(); + heatToAbsorb = 0; return temperature; } @@ -119,26 +155,4 @@ public class SynchronizedBoilerData extends SynchronizedData } @Override - protected void onFormed() + protected boolean canForm(SynchronizedMatrixData structure) { for(Coord4D coord : innerNodes) { @@ -85,14 +85,16 @@ public class MatrixUpdateProtocol extends UpdateProtocol if(tile instanceof TileEntityInductionCell) { - structureFound.cells.add(coord); - structureFound.storageCap += ((TileEntityInductionCell)tile).tier.maxEnergy; + structure.cells.add(coord); + structure.storageCap += ((TileEntityInductionCell)tile).tier.maxEnergy; } else if(tile instanceof TileEntityInductionProvider) { - structureFound.providers.add(coord); - structureFound.transferCap += ((TileEntityInductionProvider)tile).tier.output; + structure.providers.add(coord); + structure.transferCap += ((TileEntityInductionProvider)tile).tier.output; } } + + return true; } } diff --git a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java index 8808c0ef6..25428cc5f 100644 --- a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java +++ b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java @@ -1,15 +1,14 @@ package mekanism.common.content.miner; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class MItemStackFilter extends MinerFilter { public ItemStack itemType; diff --git a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java index 3121a5de8..327a368ff 100644 --- a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java +++ b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java @@ -1,10 +1,11 @@ package mekanism.common.content.miner; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.content.transporter.Finder.MaterialFinder; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -12,8 +13,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class MMaterialFilter extends MinerFilter { public ItemStack materialItem; diff --git a/src/main/java/mekanism/common/content/miner/MModIDFilter.java b/src/main/java/mekanism/common/content/miner/MModIDFilter.java index 8af8abc1a..00dccb392 100644 --- a/src/main/java/mekanism/common/content/miner/MModIDFilter.java +++ b/src/main/java/mekanism/common/content/miner/MModIDFilter.java @@ -1,16 +1,15 @@ package mekanism.common.content.miner; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.ModIDFinder; - import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class MModIDFilter extends MinerFilter { public String modID; diff --git a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java index 322cef314..d43635789 100644 --- a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java +++ b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java @@ -1,16 +1,15 @@ package mekanism.common.content.miner; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.OreDictFinder; - import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class MOreDictFilter extends MinerFilter { public String oreDictName; diff --git a/src/main/java/mekanism/common/content/miner/MinerFilter.java b/src/main/java/mekanism/common/content/miner/MinerFilter.java index d9e2b7999..433eda34a 100644 --- a/src/main/java/mekanism/common/content/miner/MinerFilter.java +++ b/src/main/java/mekanism/common/content/miner/MinerFilter.java @@ -1,15 +1,14 @@ package mekanism.common.content.miner; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public abstract class MinerFilter { public ItemStack replaceStack; diff --git a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java index 5ef212f12..b9d8f0278 100644 --- a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java +++ b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java @@ -8,8 +8,6 @@ import mekanism.common.multiblock.SynchronizedData; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; public class SynchronizedTankData extends SynchronizedData diff --git a/src/main/java/mekanism/common/content/tank/TankCache.java b/src/main/java/mekanism/common/content/tank/TankCache.java index cb2a1b1cd..eb23200c4 100644 --- a/src/main/java/mekanism/common/content/tank/TankCache.java +++ b/src/main/java/mekanism/common/content/tank/TankCache.java @@ -2,7 +2,6 @@ package mekanism.common.content.tank; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java index 0e6c9a8ec..721c7d240 100644 --- a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java @@ -15,7 +15,6 @@ import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; - import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; diff --git a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java b/src/main/java/mekanism/common/content/teleportation/SharedInventory.java deleted file mode 100644 index 2166bc572..000000000 --- a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java +++ /dev/null @@ -1,131 +0,0 @@ -package mekanism.common.content.teleportation; - -import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import mekanism.api.gas.GasTank; -import mekanism.api.gas.IGasHandler; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - -public class SharedInventory implements IStrictEnergyStorage, IFluidHandler, IGasHandler -{ - public String name; - - public double storedEnergy; - public double MAX_ENERGY = 1000; - public FluidTank storedFluid; - public GasTank storedGas; - public ItemStack storedItem; - - public SharedInventory(String freq) - { - name = freq; - - storedEnergy = 0; - storedFluid = new FluidTank(1000); - storedGas = new GasTank(1000); - storedItem = null; - } - - @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) - { - return storedFluid.fill(resource, doFill); - } - - @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) - { - if(resource.isFluidEqual(storedFluid.getFluid())) - { - return storedFluid.drain(resource.amount, doDrain); - } - - return null; - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) - { - return storedFluid.drain(maxDrain, doDrain); - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid) - { - return storedFluid.getFluid() == null || fluid == storedFluid.getFluid().getFluid(); - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - return storedFluid.getFluid() == null || fluid == storedFluid.getFluid().getFluid(); - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) - { - return new FluidTankInfo[]{new FluidTankInfo(storedFluid)}; - } - - @Override - public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) - { - return storedGas.receive(stack, doTransfer); - } - - @Override - public int receiveGas(EnumFacing side, GasStack stack) - { - return receiveGas(side, stack, true); - } - - @Override - public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) - { - return storedGas.draw(amount, doTransfer); - } - - @Override - public GasStack drawGas(EnumFacing side, int amount) - { - return drawGas(side, amount, true); - } - - @Override - public boolean canReceiveGas(EnumFacing side, Gas type) - { - return storedGas.getGasType() == null || type == storedGas.getGasType(); - } - - @Override - public boolean canDrawGas(EnumFacing side, Gas type) - { - return storedGas.getGasType() == null || type == storedGas.getGasType(); - } - - @Override - public double getEnergy() - { - return storedEnergy; - } - - @Override - public void setEnergy(double energy) - { - storedEnergy = Math.max(0, Math.min(energy, MAX_ENERGY)); - } - - @Override - public double getMaxEnergy() - { - return MAX_ENERGY; - } -} diff --git a/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java b/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java deleted file mode 100644 index 0c8a7a5a8..000000000 --- a/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java +++ /dev/null @@ -1,67 +0,0 @@ -package mekanism.common.content.teleportation; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; - -import mekanism.api.gas.GasRegistry; -import mekanism.api.gas.GasStack; - -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class SharedInventoryManager -{ - public static HashMap inventories = new HashMap(); - - public static SharedInventory getInventory(String frequency) - { - if(frequency.length() <= 0) - { - return null; - } - - SharedInventory inv = inventories.get(frequency); - - if(inv == null) - { - inv = new SharedInventory(frequency); - - inventories.put(frequency, inv); - } - - if(frequency.startsWith("creative.")) - { - Iterator creativeFreqs = Arrays.asList(frequency.substring(9).split("\\.")).iterator(); - while(creativeFreqs.hasNext()) - { - String type = creativeFreqs.next(); - if(type.equals("energy")) - { - inv.MAX_ENERGY = Integer.MAX_VALUE; - inv.setEnergy(Integer.MAX_VALUE); - } - else if(type.equals("fluid") && creativeFreqs.hasNext()) - { - String fluidType = creativeFreqs.next(); - if(FluidRegistry.isFluidRegistered(fluidType)) - { - inv.storedFluid.setCapacity(Integer.MAX_VALUE); - inv.storedFluid.setFluid(new FluidStack(FluidRegistry.getFluid(fluidType), Integer.MAX_VALUE)); - } - } - else if(type.equals("gas") && creativeFreqs.hasNext()) - { - String gasType = creativeFreqs.next(); - if(GasRegistry.containsGas(gasType)) - { - inv.storedGas.setMaxGas(Integer.MAX_VALUE); - inv.storedGas.setGas(new GasStack(GasRegistry.getGas(gasType), Integer.MAX_VALUE)); - } - } - } - } - - return inv; - } -} diff --git a/src/main/java/mekanism/common/content/transporter/Finder.java b/src/main/java/mekanism/common/content/transporter/Finder.java index 2afe51af6..f4f13981f 100644 --- a/src/main/java/mekanism/common/content/transporter/Finder.java +++ b/src/main/java/mekanism/common/content/transporter/Finder.java @@ -4,7 +4,6 @@ import java.util.List; import mekanism.api.util.StackUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java index 05ff8c865..6d897158c 100644 --- a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java +++ b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import mekanism.api.Coord4D; - import net.minecraft.util.EnumFacing; public class PathfinderCache diff --git a/src/main/java/mekanism/common/content/transporter/StackSearcher.java b/src/main/java/mekanism/common/content/transporter/StackSearcher.java index a09e6068d..002f75f6d 100644 --- a/src/main/java/mekanism/common/content/transporter/StackSearcher.java +++ b/src/main/java/mekanism/common/content/transporter/StackSearcher.java @@ -2,7 +2,6 @@ package mekanism.common.content.transporter; import mekanism.api.util.StackUtils; import mekanism.common.util.InventoryUtils; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -19,13 +18,14 @@ public class StackSearcher { theInventory = InventoryUtils.checkChestInv(inventory); side = direction; + if(!(theInventory instanceof ISidedInventory)) { i = inventory.getSizeInventory(); - } - else - { + } + else { slots = ((ISidedInventory)theInventory).getSlotsForFace(side.getOpposite()); + if(slots != null) { i = slots.length; @@ -149,7 +149,4 @@ public class StackSearcher return null; } - - - } diff --git a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java index 91e029d09..4c262820f 100644 --- a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java @@ -1,12 +1,11 @@ package mekanism.common.content.transporter; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.content.transporter.Finder.ItemStackFinder; -import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index cfbe0e2a5..26a3064da 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -1,14 +1,13 @@ package mekanism.common.content.transporter; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.content.transporter.Finder.MaterialFinder; -import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java index 40d3d77ea..3574c4873 100644 --- a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java @@ -1,12 +1,11 @@ package mekanism.common.content.transporter; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.ModIDFinder; -import mekanism.common.util.InventoryUtils; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java index 432d102f1..de9a922d6 100644 --- a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java @@ -1,12 +1,11 @@ package mekanism.common.content.transporter; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.OreDictFinder; -import mekanism.common.util.InventoryUtils; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java index 925504919..514e44846 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java @@ -7,12 +7,9 @@ import java.util.Arrays; import java.util.List; import mekanism.api.EnumColor; -import mekanism.common.util.InventoryUtils; import mekanism.common.util.TransporterUtils; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; public abstract class TransporterFilter { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index e4164c87c..82a0a8a4e 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -153,12 +153,30 @@ public class TransporterManager if(inSlot == null) { - copy.inventory[i] = toInsert; - return; + if(toInsert.stackSize <= inv.getInventoryStackLimit()) + { + copy.inventory[i] = toInsert; + return; + } + else { + int rejects = toInsert.stackSize - inv.getInventoryStackLimit(); + + ItemStack toSet = toInsert.copy(); + toSet.stackSize = inv.getInventoryStackLimit(); + + ItemStack remains = toInsert.copy(); + remains.stackSize = rejects; + + copy.inventory[i] = toSet; + + toInsert = remains; + } } - else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inv.getInventoryStackLimit()) + else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inv.getInventoryStackLimit())) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + int max = Math.min(inSlot.getMaxStackSize(), inv.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) { ItemStack toSet = toInsert.copy(); toSet.stackSize += inSlot.stackSize; @@ -167,10 +185,10 @@ public class TransporterManager return; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; ItemStack toSet = toInsert.copy(); - toSet.stackSize = inSlot.getMaxStackSize(); + toSet.stackSize = max; ItemStack remains = toInsert.copy(); remains.stackSize = rejects; @@ -224,12 +242,30 @@ public class TransporterManager if(inSlot == null) { - copy.inventory[slotID] = toInsert; - return; + if(toInsert.stackSize <= inv.getInventoryStackLimit()) + { + copy.inventory[slotID] = toInsert; + return; + } + else { + int rejects = toInsert.stackSize - inv.getInventoryStackLimit(); + + ItemStack toSet = toInsert.copy(); + toSet.stackSize = inv.getInventoryStackLimit(); + + ItemStack remains = toInsert.copy(); + remains.stackSize = rejects; + + copy.inventory[slotID] = toSet; + + toInsert = remains; + } } - else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inv.getInventoryStackLimit()) + else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inv.getInventoryStackLimit())) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + int max = Math.min(inSlot.getMaxStackSize(), inv.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) { ItemStack toSet = toInsert.copy(); toSet.stackSize += inSlot.stackSize; @@ -238,10 +274,10 @@ public class TransporterManager return; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; ItemStack toSet = toInsert.copy(); - toSet.stackSize = inSlot.getMaxStackSize(); + toSet.stackSize = max; ItemStack remains = toInsert.copy(); remains.stackSize = rejects; @@ -324,18 +360,35 @@ public class TransporterManager ItemStack inSlot = copy.inventory[i]; - if(inSlot == null || toInsert == null) + if(toInsert == null) { return null; } - else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) + else if(inSlot == null) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + if(toInsert.stackSize <= inventory.getInventoryStackLimit()) { return null; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = toInsert.stackSize - inventory.getInventoryStackLimit(); + + if(rejects < toInsert.stackSize) + { + toInsert = StackUtils.size(toInsert, rejects); + } + } + } + else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) + { + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) + { + return null; + } + else { + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; if(rejects < toInsert.stackSize) { @@ -381,23 +434,40 @@ public class TransporterManager } ItemStack inSlot = copy.inventory[slotID]; - - if(inSlot == null) + + if(toInsert == null) { return null; } - else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) + else if(inSlot == null) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + if(toInsert.stackSize <= inventory.getInventoryStackLimit()) { return null; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = toInsert.stackSize - inventory.getInventoryStackLimit(); + + if(rejects < toInsert.stackSize) + { + toInsert = StackUtils.size(toInsert, rejects); + } + } + } + else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) + { + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) + { + return null; + } + else { + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; if(rejects < toInsert.stackSize) { - toInsert = MekanismUtils.size(toInsert, rejects); + toInsert = StackUtils.size(toInsert, rejects); } } } diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index ff1dd74ae..27db83a6f 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -1,9 +1,9 @@ package mekanism.common.entity; -import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; + +import java.util.UUID; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; @@ -18,8 +18,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; - -import java.util.UUID; +import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index cad2618c6..9c91b4a4e 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -1,7 +1,9 @@ package mekanism.common.entity; -import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; import io.netty.buffer.ByteBuf; + +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; @@ -17,12 +19,15 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.util.EnumFacing; - -import java.util.List; +import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; public class EntityFlame extends Entity implements IEntityAdditionalSpawnData { diff --git a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java index 5a145e8c9..e6d92dd5d 100644 --- a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java +++ b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java @@ -1,7 +1,6 @@ package mekanism.common.entity; import mekanism.api.MekanismConfig.general; - import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index cf49f6467..6274f7006 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -1,5 +1,8 @@ package mekanism.common.entity; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; + import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; @@ -17,7 +20,7 @@ import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemRobit; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; - +import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAILookIdle; @@ -40,9 +43,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.util.Constants; -import net.minecraftforge.fml.common.Optional.Interface; - import cofh.api.energy.IEnergyContainerItem; +import net.minecraftforge.fml.common.Optional.Interface; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index aad4814c1..d07a4fa75 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -28,17 +28,21 @@ public class FrequencyManager private String owner; + private String name; + private Class frequencyClass; - public FrequencyManager(Class c) + public FrequencyManager(Class c, String n) { frequencyClass = c; + name = n; + managers.add(this); } - public FrequencyManager(Class c, String s) + public FrequencyManager(Class c, String n, String s) { - this(c); + this(c, n); owner = s; } @@ -173,9 +177,9 @@ public class FrequencyManager } } - public static FrequencyManager loadOnly(World world, String owner, Class freqClass) + public static FrequencyManager loadOnly(World world, String owner, Class freqClass, String n) { - FrequencyManager manager = new FrequencyManager(freqClass); + FrequencyManager manager = new FrequencyManager(freqClass, n); String name = manager.getName(); FrequencyDataHandler handler = (FrequencyDataHandler)world.getPerWorldStorage().loadData(FrequencyDataHandler.class, name); @@ -282,7 +286,7 @@ public class FrequencyManager try { for(int i = 0; i < size; i++) { - Frequency freq = frequencyClass.newInstance(); + Frequency freq = frequencyClass.getConstructor(new Class[] {ByteBuf.class}).newInstance(dataStream); freq.read(dataStream); ret.add(freq); } @@ -295,7 +299,7 @@ public class FrequencyManager public String getName() { - return owner != null ? owner + "FrequencyHandler" : "FrequencyHandler"; + return owner != null ? (owner + "_" + name + "FrequencyHandler") : (name + "FrequencyHandler"); } public static void reset() diff --git a/src/main/java/mekanism/common/integration/CCPeripheral.java b/src/main/java/mekanism/common/integration/CCPeripheral.java index d77caf444..3d69d3085 100644 --- a/src/main/java/mekanism/common/integration/CCPeripheral.java +++ b/src/main/java/mekanism/common/integration/CCPeripheral.java @@ -1,15 +1,15 @@ package mekanism.common.integration; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.api.peripheral.IPeripheralProvider; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; /** * Created by aidancbrady on 7/20/15. diff --git a/src/main/java/mekanism/common/integration/IC2ItemManager.java b/src/main/java/mekanism/common/integration/IC2ItemManager.java index 5c4031437..04d2c1539 100644 --- a/src/main/java/mekanism/common/integration/IC2ItemManager.java +++ b/src/main/java/mekanism/common/integration/IC2ItemManager.java @@ -1,13 +1,11 @@ package mekanism.common.integration; +import ic2.api.item.IElectricItemManager; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import ic2.api.item.IElectricItemManager; - public class IC2ItemManager implements IElectricItemManager { public IEnergizedItem energizedItem; diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 9d6741903..0079f2405 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -1,10 +1,14 @@ package mekanism.common.integration; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.Optional.Method; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import dan200.computercraft.api.ComputerCraftAPI; -import ic2.api.recipe.*; +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeInputOreDict; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; + +import java.util.List; +import java.util.Map; + import li.cil.oc.api.Driver; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; @@ -16,9 +20,10 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import java.util.List; -import java.util.Map; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.Optional.Method; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import dan200.computercraft.api.ComputerCraftAPI; /** * Hooks for Mekanism. Use to grab items or blocks out of different mods. diff --git a/src/main/java/mekanism/common/integration/OCDriver.java b/src/main/java/mekanism/common/integration/OCDriver.java index 18e857e77..28afd23e0 100644 --- a/src/main/java/mekanism/common/integration/OCDriver.java +++ b/src/main/java/mekanism/common/integration/OCDriver.java @@ -1,5 +1,8 @@ package mekanism.common.integration; +import java.util.Arrays; +import java.util.Locale; + import li.cil.oc.api.Network; import li.cil.oc.api.driver.NamedBlock; import li.cil.oc.api.machine.Arguments; @@ -12,9 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import java.util.Arrays; -import java.util.Locale; - /** * Created by aidancbrady on 7/20/15. */ diff --git a/src/main/java/mekanism/common/inventory/InventoryBin.java b/src/main/java/mekanism/common/inventory/InventoryBin.java index 979bfd1c6..d3c0688ab 100644 --- a/src/main/java/mekanism/common/inventory/InventoryBin.java +++ b/src/main/java/mekanism/common/inventory/InventoryBin.java @@ -1,15 +1,14 @@ package mekanism.common.inventory; import mekanism.api.util.StackUtils; -import mekanism.common.item.ItemBlockBasic; - +import mekanism.common.Tier.BinTier; +import mekanism.common.base.ITierItem; +import mekanism.common.block.BlockBasic.BasicType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class InventoryBin { - public final int MAX_STORAGE = 4096; - public ItemStack bin; public InventoryBin(ItemStack stack) @@ -45,23 +44,23 @@ public class InventoryBin public ItemStack add(ItemStack stack) { - if(isValid(stack) && getItemCount() != MAX_STORAGE) + if(isValid(stack) && getItemCount() != getMaxStorage()) { if(getItemType() == null) { setItemType(stack); } - if(getItemCount() + stack.stackSize <= MAX_STORAGE) + if(getItemCount() + stack.stackSize <= getMaxStorage()) { setItemCount(getItemCount() + stack.stackSize); return null; } else { ItemStack rejects = getItemType().copy(); - rejects.stackSize = (getItemCount()+stack.stackSize) - MAX_STORAGE; + rejects.stackSize = (getItemCount()+stack.stackSize) - getMaxStorage(); - setItemCount(MAX_STORAGE); + setItemCount(getMaxStorage()); return rejects; } @@ -77,7 +76,7 @@ public class InventoryBin return false; } - if(stack.getItem() instanceof ItemBlockBasic && stack.getItemDamage() == 6) + if(BasicType.get(stack) == BasicType.BIN) { return false; } @@ -94,6 +93,11 @@ public class InventoryBin return true; } + + public int getMaxStorage() + { + return BinTier.values()[((ITierItem)bin.getItem()).getBaseTier(bin).ordinal()].storage; + } public int getItemCount() { diff --git a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java index 32281ff90..c09693f99 100644 --- a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java @@ -1,8 +1,6 @@ package mekanism.common.inventory; -import mekanism.common.base.IElectricChest; import mekanism.common.base.ISustainedInventory; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.ItemStack; @@ -47,22 +45,12 @@ public class InventoryElectricChest extends InventoryBasic public void openInventory(EntityPlayer player) { read(); - - if(getStack() != null) - { - ((IElectricChest)getStack().getItem()).setOpen(getStack(), true); - } } @Override public void closeInventory(EntityPlayer player) { write(); - - if(getStack() != null) - { - ((IElectricChest)getStack().getItem()).setOpen(getStack(), false); - } } public void write() diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index 02958e1d1..cd8b22f0c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -7,7 +7,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java index 46c6cc195..b2a2db59a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java @@ -6,7 +6,6 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java index 206a0c1e8..1dd32d5ff 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java @@ -6,7 +6,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java index 5a1777755..6f471c1c6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java @@ -7,7 +7,6 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java index 8f6b74090..634d69128 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -5,7 +5,6 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java index 41963c468..7eea1d294 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java @@ -7,7 +7,6 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java index 5f96934fd..041deeea2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java @@ -6,7 +6,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java index 9e1cfa3d6..bb64f0c33 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java @@ -3,7 +3,6 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -28,19 +27,19 @@ public class ContainerDigitalMiner extends Container addSlotToContainer(new SlotDischarge(tentity, 27, 152, 6)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 148 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 148 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 206)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 206)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java index cb35a9e83..1e593a531 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java @@ -1,12 +1,12 @@ package mekanism.common.inventory.container; +import invtweaks.api.container.ChestContainer; import mekanism.common.base.IElectricChest; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.inventory.slot.SlotElectricChest; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -14,8 +14,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import invtweaks.api.container.ChestContainer; - @ChestContainer(isLargeChest=true) public class ContainerElectricChest extends Container { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java index ecf46c8d7..1cea3ef0e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -6,7 +6,6 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java index aabd28d65..851728cef 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java @@ -4,7 +4,6 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java index 7187362e8..3ef39d7ca 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java @@ -7,7 +7,6 @@ import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java index bae833563..bd797683e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java @@ -1,11 +1,11 @@ package mekanism.common.inventory.container; +import ic2.api.item.IElectricItem; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; @@ -13,8 +13,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import ic2.api.item.IElectricItem; - public class ContainerEnergyCube extends Container { private TileEntityEnergyCube tileEntity; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java index 82c56e0c9..f381aafec 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.container; import mekanism.common.tile.TileEntityContainerBlock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java similarity index 91% rename from src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java rename to src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java index 440a09415..3c4027868 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java @@ -1,8 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; -import mekanism.common.tile.TileEntityPortableTank; - +import mekanism.common.tile.TileEntityFluidTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -10,11 +9,11 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; -public class ContainerPortableTank extends Container +public class ContainerFluidTank extends Container { - private TileEntityPortableTank tileEntity; + private TileEntityFluidTank tileEntity; - public ContainerPortableTank(InventoryPlayer inventory, TileEntityPortableTank tentity) + public ContainerFluidTank(InventoryPlayer inventory, TileEntityFluidTank tentity) { tileEntity = tentity; addSlotToContainer(new Slot(tentity, 0, 146, 19)); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java index ee35910f3..9510596fc 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java @@ -4,7 +4,6 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java new file mode 100644 index 000000000..f9e4c74a0 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java @@ -0,0 +1,201 @@ +package mekanism.common.inventory.container; + +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.inventory.slot.SlotOutput; +import mekanism.common.inventory.slot.SlotSpecific; +import mekanism.common.item.ItemCraftingFormula; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; +import mekanism.common.util.ChargeUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ContainerFormulaicAssemblicator extends Container +{ + private TileEntityFormulaicAssemblicator tileEntity; + + public ContainerFormulaicAssemblicator(InventoryPlayer inventory, TileEntityFormulaicAssemblicator tentity) + { + tileEntity = tentity; + addSlotToContainer(new SlotDischarge(tentity, 1, 152, 76)); + addSlotToContainer(new SlotSpecific(tentity, 2, 6, 26, ItemCraftingFormula.class)); + + int slotY; + + for(slotY = 0; slotY < 2; slotY++) + { + for(int slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(tentity, slotX + slotY * 9 + 3, 8 + slotX * 18, 98 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 3; slotX++) + { + addSlotToContainer(new Slot(tentity, slotX + slotY * 3 + 27, 26 + slotX * 18, 17 + slotY * 18) { + @Override + public boolean isItemValid(ItemStack stack) + { + return !tileEntity.autoMode; + } + + @Override + public boolean canTakeStack(EntityPlayer player) + { + return !tileEntity.autoMode; + } + + @SideOnly(Side.CLIENT) + public boolean func_111238_b() + { + return !tileEntity.autoMode; + } + }); + } + } + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 2; slotX++) + { + addSlotToContainer(new SlotOutput(tentity, slotX + slotY * 2 + 21, 116 + slotX * 18, 17 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 148 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 206)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(ChargeUtils.canBeDischarged(slotStack)) + { + if(slotID != 0) + { + if(!mergeItemStack(slotStack, 0, 1, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) + { + return null; + } + } + } + else if(slotStack.getItem() instanceof ItemCraftingFormula) + { + if(slotID != 1) + { + if(!mergeItemStack(slotStack, 1, 2, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) + { + return null; + } + } + } + else if(slotID >= 2 && slotID <= 19) + { + if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) + { + return null; + } + } + else if(tileEntity.formula == null || tileEntity.formula.isIngredient(tileEntity.getWorldObj(), slotStack)) + { + if(!mergeItemStack(slotStack, 2, 20, false)) + { + return null; + } + } + else { + if(slotID >= 34 && slotID <= 60) + { + if(!mergeItemStack(slotStack, 61, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 60) + { + if(!mergeItemStack(slotStack, 34, 60, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) + { + return null; + } + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java index 981333608..ec318d728 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java @@ -3,7 +3,6 @@ package mekanism.common.inventory.container; import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityGasTank; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerNull.java b/src/main/java/mekanism/common/inventory/container/ContainerNull.java index 799670a59..765a0fa85 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerNull.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerNull.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.container; import mekanism.common.tile.TileEntityContainerBlock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java b/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java index 62fac82ee..596e2b496 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java @@ -1,10 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; -import mekanism.common.recipe.RecipeHandler; -import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.tile.TileEntityOredictionificator; -import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java index f67dfefa7..9cd5e6b45 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java @@ -5,7 +5,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java new file mode 100644 index 000000000..e43016c93 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java @@ -0,0 +1,102 @@ +package mekanism.common.inventory.container; + +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerQuantumEntangloporter extends Container +{ + private TileEntityQuantumEntangloporter tileEntity; + + public ContainerQuantumEntangloporter(InventoryPlayer inventory, TileEntityQuantumEntangloporter tentity) + { + tileEntity = tentity; + + int slotX; + + for(slotX = 0; slotX < 3; slotX++) + { + for(int slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 148 + slotX * 18)); + } + } + + for(slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 206)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(slotID >= 0 && slotID <= 26) + { + if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 26) + { + if(!mergeItemStack(slotStack, 0, 26, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) + { + return null; + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java new file mode 100644 index 000000000..2f67947f6 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java @@ -0,0 +1,124 @@ +package mekanism.common.inventory.container; + +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.tile.TileEntityResistiveHeater; +import mekanism.common.util.ChargeUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerResistiveHeater extends Container +{ + private TileEntityResistiveHeater tileEntity; + + public ContainerResistiveHeater(InventoryPlayer inventory, TileEntityResistiveHeater tentity) + { + tileEntity = tentity; + addSlotToContainer(new SlotDischarge(tentity, 0, 15, 35)); + + int slotY; + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(ChargeUtils.canBeDischarged(slotStack)) + { + if(slotID != 0) + { + if(!mergeItemStack(slotStack, 0, 1, false)) + { + return null; + } + } + else if(slotID == 0) + { + if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) + { + return null; + } + } + } + else { + if(slotID >= 1 && slotID <= 27) + { + if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 27) + { + if(!mergeItemStack(slotStack, 1, 27, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) + { + return null; + } + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java index a5ee9bfc3..d5d7325ae 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java index 4c3660a6c..1420cf2fe 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java @@ -2,7 +2,6 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index 6c1667ea8..03d155cea 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java index 070bf6c70..d71553f84 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java @@ -6,7 +6,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java index 481e0b180..8abf8b2b8 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java @@ -3,7 +3,6 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java b/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java index 234f573b1..ec49f36cd 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java @@ -1,17 +1,13 @@ package mekanism.common.inventory.container; import mekanism.api.gas.IGasItem; -import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; -import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntitySolarNeutronActivator; -import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; public class ContainerSolarNeutronActivator extends Container { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java index b082c0503..40e323c84 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java @@ -3,7 +3,6 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java b/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java index 1cc6bb278..64df9f269 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java @@ -2,7 +2,6 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityThermalEvaporationController; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java index 455671a61..46b7a0615 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java @@ -4,7 +4,6 @@ import mekanism.common.base.IUpgradeItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.tile.TileEntityContainerBlock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java b/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java index b843e3a6d..6d210b45f 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java @@ -2,7 +2,6 @@ package mekanism.common.inventory.slot; import mekanism.common.base.IElectricChest; import mekanism.common.block.states.BlockStateMachine; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java b/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java index b860ff6b6..370bcc29e 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.slot; import mekanism.common.util.ChargeUtils; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java b/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java index 97b75d886..3b2882ee4 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.slot; import mekanism.common.base.IUpgradeItem; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java b/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java index a2348dd38..eed145d7b 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java @@ -5,7 +5,6 @@ import java.util.Collections; import mekanism.api.gas.Gas; import mekanism.api.gas.IGasItem; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 80c3d7fe8..215477552 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -1,5 +1,7 @@ package mekanism.common.item; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; @@ -19,8 +21,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraft.util.EnumFacing; -import java.util.List; - public class ItemBalloon extends ItemMekanism { public ItemBalloon() diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 228c800e4..48725a28c 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -13,8 +13,10 @@ import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.BinTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; +import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.inventory.InventoryBin; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -69,7 +71,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; * @author AidanBrady * */ -public class ItemBlockBasic extends ItemBlock implements IEnergizedItem +public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierItem { public Block metaBlock; @@ -94,7 +96,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem public ItemStack getUnchargedCell(InductionCellTier tier) { ItemStack stack = new ItemStack(MekanismBlocks.BasicBlock2, 1, 3); - setTier(stack, tier.getBaseTier()); + setBaseTier(stack, tier.getBaseTier()); return stack; } @@ -102,12 +104,13 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem public ItemStack getUnchargedProvider(InductionProviderTier tier) { ItemStack stack = new ItemStack(MekanismBlocks.BasicBlock2, 1, 4); - setTier(stack, tier.getBaseTier()); + setBaseTier(stack, tier.getBaseTier()); return stack; } - public BaseTier getTier(ItemStack itemstack) + @Override + public BaseTier getBaseTier(ItemStack itemstack) { if(itemstack.getTagCompound() == null) { @@ -117,7 +120,8 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem return BaseTier.values()[itemstack.getTagCompound().getInteger("tier")]; } - public void setTier(ItemStack itemstack, BaseTier tier) + @Override + public void setBaseTier(ItemStack itemstack, BaseTier tier) { if(itemstack.getTagCompound() == null) { @@ -164,13 +168,13 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem } else if(type == BasicBlockType.INDUCTION_CELL) { - InductionCellTier tier = InductionCellTier.values()[getTier(itemstack).ordinal()]; + InductionCellTier tier = InductionCellTier.values()[getBaseTier(itemstack).ordinal()]; list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.maxEnergy)); } else if(type == BasicBlockType.INDUCTION_PROVIDER) { - InductionProviderTier tier = InductionProviderTier.values()[getTier(itemstack).ordinal()]; + InductionProviderTier tier = InductionProviderTier.values()[getBaseTier(itemstack).ordinal()]; list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.outputRate") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.output)); } @@ -203,11 +207,6 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem return true; } - if(stack.getTagCompound() == null || !stack.getTagCompound().hasKey("newCount")) - { - return true; - } - return false; } */ @@ -221,9 +220,12 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem { return null; } + + int newCount = stack.stackTagCompound.getInteger("newCount"); + stack.stackTagCompound.removeTag("newCount"); ItemStack ret = stack.copy(); - ret.getTagCompound().setInteger("itemCount", stack.getTagCompound().getInteger("newCount")); + ret.getTagCompound().setInteger("itemCount", newCount); return ret; } @@ -244,6 +246,8 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem { TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(pos); InventoryBin inv = new InventoryBin(stack); + + tileEntity.tier = BinTier.values()[getBaseTier(stack).ordinal()]; if(inv.getItemType() != null) { @@ -255,7 +259,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem else if(type == BasicBlockType.INDUCTION_CELL) { TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(pos); - tileEntity.tier = InductionCellTier.values()[getTier(stack).ordinal()]; + tileEntity.tier = InductionCellTier.values()[getBaseTier(stack).ordinal()]; if(!world.isRemote) { @@ -265,7 +269,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem else if(type == BasicBlockType.INDUCTION_PROVIDER) { TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(pos); - tileEntity.tier = InductionProviderTier.values()[getTier(stack).ordinal()]; + tileEntity.tier = InductionProviderTier.values()[getBaseTier(stack).ordinal()]; if(!world.isRemote) { @@ -293,9 +297,9 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem { String name = getUnlocalizedName() + "." + BasicBlockType.get(itemstack).name; - if(type == BasicBlockType.INDUCTION_CELL || type == BasicBlockType.INDUCTION_PROVIDER) + if(type == BasicBlockType.BIN || type == BasicBlockType.INDUCTION_CELL || type == BasicBlockType.INDUCTION_PROVIDER) { - name += getTier(itemstack).getName(); + name += getBaseTier(itemstack).getName(); } return name; @@ -352,7 +356,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem { if(BasicBlockType.get(itemStack) == BasicBlockType.INDUCTION_CELL) { - return InductionCellTier.values()[getTier(itemStack).ordinal()].maxEnergy; + return InductionCellTier.values()[getBaseTier(itemStack).ordinal()].maxEnergy; } return 0; @@ -375,10 +379,4 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem { return false; } - - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return true; - } } diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index acf4610cc..6de2b50d3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -43,8 +43,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @InterfaceList({ - @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IEnergyCube, ISpecialElectricItem, ISustainedInventory, IEnergyContainerItem { @@ -79,6 +78,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE ItemStack stack = new ItemStack(this); setEnergyCubeTier(stack, tier); stack.setItemDamage(100); + return stack; } @@ -207,16 +207,13 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE return 0; } - double electricityStored = itemStack.getTagCompound().getDouble("electricity"); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); - - return electricityStored; + return electricityStored = itemStack.getTagCompound().getDouble("electricity"); } @Override public void setEnergy(ItemStack itemStack, double amount) { - if(getEnergyCubeTier(itemStack) == EnergyCubeTier.CREATIVE && amount != Integer.MAX_VALUE) + if(getEnergyCubeTier(itemStack) == EnergyCubeTier.CREATIVE && amount != Double.MAX_VALUE) { return; } @@ -228,7 +225,6 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); itemStack.getTagCompound().setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); } @Override @@ -261,14 +257,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy* general.FROM_TE, energyNeeded); + double toReceive = Math.min(energy*general.FROM_TE, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive* general.TO_TE); + return (int)Math.round(toReceive*general.TO_TE); } return 0; @@ -280,14 +276,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy* general.FROM_TE), energyRemaining); + double toSend = Math.min((energy*general.FROM_TE), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend* general.TO_TE); + return (int)Math.round(toSend*general.TO_TE); } return 0; @@ -296,19 +292,25 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @Override public int getEnergyStored(ItemStack theItem) { - return (int)(getEnergy(theItem)* general.TO_TE); + return (int)(getEnergy(theItem)*general.TO_TE); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)(getMaxEnergy(theItem)* general.TO_TE); + return (int)(getMaxEnergy(theItem)*general.TO_TE); } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-(getEnergy(stack)/getMaxEnergy(stack)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 5700bb127..cf38f40c5 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -1,8 +1,11 @@ package mekanism.common.item; +import java.util.ArrayList; import java.util.List; +import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -10,7 +13,11 @@ import mekanism.api.gas.IGasItem; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; +import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ITierItem; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; @@ -28,7 +35,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory +public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem { public Block metaBlock; @@ -44,8 +51,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI metaBlock = block; setHasSubtypes(true); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } @@ -58,7 +63,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public String getUnlocalizedName(ItemStack itemstack) { - return getUnlocalizedName() + "." + "GasTank"; + return LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getName() + ".name"); } @Override @@ -69,9 +74,16 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(place) { TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos); + tileEntity.tier = GasTankTier.values()[getBaseTier(stack).ordinal()]; + tileEntity.gasTank.setMaxGas(tileEntity.tier.storage); tileEntity.gasTank.setGas(getGas(stack)); ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); + + if(!world.isRemote) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + } } return place; @@ -99,12 +111,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } } - @Override - public void onCreated(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - itemstack = getEmptyItem(); - } - @Override public GasStack getGas(ItemStack itemstack) { @@ -113,17 +119,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI return null; } - GasStack stored = GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); - - if(stored == null) - { - itemstack.setItemDamage(100); - } - else { - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100)))); - } - - return stored; + return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); } @Override @@ -136,55 +132,80 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(stack == null || stack.amount == 0) { - itemstack.setItemDamage(100); itemstack.getTagCompound().removeTag("stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100)))); itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); } } - public ItemStack getEmptyItem() + public ItemStack getEmptyItem(GasTankTier tier) { ItemStack empty = new ItemStack(this); + setBaseTier(empty, tier.getBaseTier()); setGas(empty, null); - empty.setItemDamage(100); + return empty; } @Override public void getSubItems(Item item, CreativeTabs tabs, List list) { - ItemStack empty = new ItemStack(this); - setGas(empty, null); - empty.setItemDamage(100); - list.add(empty); + for(GasTankTier tier : GasTankTier.values()) + { + ItemStack empty = new ItemStack(this); + setBaseTier(empty, tier.getBaseTier()); + setGas(empty, null); + list.add(empty); + } for(Gas type : GasRegistry.getRegisteredGasses()) { if(type.isVisible()) { ItemStack filled = new ItemStack(this); + setBaseTier(filled, BaseTier.ULTIMATE); setGas(filled, new GasStack(type, ((IGasItem)filled.getItem()).getMaxGas(filled))); list.add(filled); } } } + + @Override + public BaseTier getBaseTier(ItemStack itemstack) + { + if(itemstack.stackTagCompound == null) + { + return BaseTier.BASIC; + } + + return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")]; + } + + @Override + public void setBaseTier(ItemStack itemstack, BaseTier tier) + { + if(itemstack.stackTagCompound == null) + { + itemstack.setTagCompound(new NBTTagCompound()); + } + + itemstack.stackTagCompound.setInteger("tier", tier.ordinal()); + } @Override public int getMaxGas(ItemStack itemstack) { - return MAX_GAS; + return GasTankTier.values()[getBaseTier(itemstack).ordinal()].storage; } @Override public int getRate(ItemStack itemstack) { - return TRANSFER_RATE; + return GasTankTier.values()[getBaseTier(itemstack).ordinal()].output; } @Override @@ -269,8 +290,14 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index b8c7757a6..940eac0e9 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -17,6 +17,7 @@ import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.Upgrade; import mekanism.common.base.IElectricChest; import mekanism.common.base.IFactory; @@ -26,6 +27,7 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; +import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateMachine; @@ -37,7 +39,7 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.tile.TileEntityFactory; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -110,14 +112,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; * 2:1: Solar Neutron Activator * 2:2: Ambient Accumulator * 2:3: Oredictionificator + * 2:4: Resistive Heater + * 2:5: Formulaic Assemblicator * @author AidanBrady * */ @InterfaceList({ - @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) -public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem +public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem, ITierItem { public Block metaBlock; @@ -163,6 +166,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return tier.getLocalizedName() + " " + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); } + else if(type == MachineType.FLUID_TANK) + { + return LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getName() + ".name"); + } return super.getItemStackDisplayName(itemstack); } @@ -175,7 +182,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - if(type == BlockStateMachine.MachineType.PORTABLE_TANK) + if(type == BlockStateMachine.MachineType.FLUID_TANK) { FluidStack fluidStack = getFluidStack(itemstack); @@ -201,7 +208,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.locked") + ": " + EnumColor.GREY + LangUtils.transYesNo(getLocked(itemstack))); } - if(type == BlockStateMachine.MachineType.PORTABLE_TANK) + if(type == BlockStateMachine.MachineType.FLUID_TANK) { list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + EnumColor.GREY + LangUtils.transYesNo(getBucketMode(itemstack))); } @@ -211,7 +218,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); } - if(hasTank(itemstack) && type != BlockStateMachine.MachineType.PORTABLE_TANK) + if(hasTank(itemstack) && type != BlockStateMachine.MachineType.FLUID_TANK) { FluidStack fluidStack = getFluidStack(itemstack); @@ -246,7 +253,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { MachineType type = BlockStateMachine.MachineType.get(stack); - if(type == BlockStateMachine.MachineType.PORTABLE_TANK && getBucketMode(stack)) + if(type == BlockStateMachine.MachineType.FLUID_TANK && getBucketMode(stack)) { return false; } @@ -292,6 +299,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); + if(tileEntity instanceof TileEntityFluidTank) + { + TileEntityFluidTank tile = (TileEntityFluidTank)tileEntity; + tile.tier = FluidTankTier.values()[getBaseTier(stack).ordinal()]; + tile.fluidTank.setCapacity(tile.tier.storage); + } + if(tileEntity instanceof IUpgradeTile) { if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("upgrades")) @@ -447,18 +461,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } - else if(type == BlockStateMachine.MachineType.PORTABLE_TANK) - { - if(world != null && !world.isRemote) - { - float targetScale = (float)(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0)/TileEntityPortableTank.MAX_FLUID; - - if(Math.abs(getPrevScale(itemstack) - targetScale) > 0.01) - { - setPrevScale(itemstack, (9*getPrevScale(itemstack) + targetScale)/10); - } - } - } } @Override @@ -530,7 +532,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } - else if(type == BlockStateMachine.MachineType.PORTABLE_TANK && getBucketMode(itemstack)) + else if(type == BlockStateMachine.MachineType.FLUID_TANK && getBucketMode(itemstack)) { MovingObjectPosition pos = getMovingObjectPositionFromPlayer(world, entityplayer, !entityplayer.isSneaking()); @@ -559,7 +561,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) { - int needed = TileEntityPortableTank.MAX_FLUID-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); + int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); if(fluid.amount > needed) { @@ -720,7 +722,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec MachineType type = BlockStateMachine.MachineType.get((ItemStack)data[0]); - return type == BlockStateMachine.MachineType.ELECTRIC_PUMP || type == BlockStateMachine.MachineType.PORTABLE_TANK || type == BlockStateMachine.MachineType.FLUIDIC_PLENISHER; + return type == BlockStateMachine.MachineType.ELECTRIC_PUMP || type == BlockStateMachine.MachineType.FLUID_TANK || type == BlockStateMachine.MachineType.FLUIDIC_PLENISHER; } @Override @@ -788,48 +790,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return itemStack.getTagCompound().getBoolean("locked"); } - - @Override - public void setOpen(ItemStack itemStack, boolean open) - { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setBoolean("open", open); - } - - @Override - public boolean getOpen(ItemStack itemStack) - { - if(itemStack.getTagCompound() == null) - { - return false; - } - - return itemStack.getTagCompound().getBoolean("open"); - } - - public void setPrevScale(ItemStack itemStack, float prevLidAngle) - { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setFloat("prevScale", prevLidAngle); - } - - public float getPrevScale(ItemStack itemStack) - { - if(itemStack.getTagCompound() == null) - { - return 0.0F; - } - - return itemStack.getTagCompound().getFloat("prevScale"); - } public void setBucketMode(ItemStack itemStack, boolean bucketMode) { @@ -953,12 +913,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return (int)(getMaxEnergy(theItem) * general.TO_TE); } - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return true; - } - @Override @Method(modid = "IC2") public IElectricItemManager getManager(ItemStack itemStack) @@ -989,13 +943,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public int getCapacity(ItemStack container) { - return TileEntityPortableTank.MAX_FLUID; + return FluidTankTier.values()[getBaseTier(container).ordinal()].storage; } @Override public int fill(ItemStack container, FluidStack resource, boolean doFill) { - if(BlockStateMachine.MachineType.get(container) == BlockStateMachine.MachineType.PORTABLE_TANK && resource != null) + if(BlockStateMachine.MachineType.get(container) == BlockStateMachine.MachineType.FLUID_TANK && resource != null) { FluidStack stored = getFluidStack(container); int toFill; @@ -1007,10 +961,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(stored == null) { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID); + toFill = Math.min(resource.amount, getCapacity(container)); } else { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID-stored.amount); + toFill = Math.min(resource.amount, getCapacity(container)-stored.amount); } if(doFill) @@ -1028,7 +982,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { - if(BlockStateMachine.MachineType.get(container) == BlockStateMachine.MachineType.PORTABLE_TANK) + if(BlockStateMachine.MachineType.get(container) == BlockStateMachine.MachineType.FLUID_TANK) { FluidStack stored = getFluidStack(container); @@ -1048,4 +1002,26 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return null; } + + @Override + public BaseTier getBaseTier(ItemStack itemstack) + { + if(itemstack.stackTagCompound == null) + { + return BaseTier.BASIC; + } + + return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")]; + } + + @Override + public void setBaseTier(ItemStack itemstack, BaseTier tier) + { + if(itemstack.stackTagCompound == null) + { + itemstack.setTagCompound(new NBTTagCompound()); + } + + itemstack.stackTagCompound.setInteger("tier", tier.ordinal()); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index a378d607a..162b7c660 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; @@ -9,6 +7,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemBlockPlastic extends ItemBlock { diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java new file mode 100644 index 000000000..ce4af3e1a --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -0,0 +1,184 @@ +package mekanism.common.item; + +import java.util.List; + +import mekanism.api.EnumColor; +import mekanism.api.IConfigCardAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.IRedstoneControl.RedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.LangUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraft.world.World; + +public class ItemConfigurationCard extends ItemMekanism +{ + public ItemConfigurationCard() + { + super(); + + setMaxStackSize(1); + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + { + super.addInformation(itemstack, entityplayer, list, flag); + + list.add(EnumColor.GREY + LangUtils.localize("gui.data") + ": " + EnumColor.INDIGO + LangUtils.localize(getDataType(itemstack))); + } + + @Override + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) + { + if(!world.isRemote) + { + TileEntity tileEntity = world.getTileEntity(x, y, z); + + if(tileEntity instanceof IConfigCardAccess) + { + if(player.isSneaking()) + { + NBTTagCompound data = getBaseData(tileEntity); + + if(tileEntity instanceof ISpecialConfigData) + { + data = ((ISpecialConfigData)tileEntity).getConfigurationData(data); + } + + if(data != null) + { + data.setString("dataType", getNameFromTile(tileEntity)); + setData(stack, data); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurationCard.got").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(data.getString("dataType")) + EnumColor.GREY))); + } + + return true; + } + else if(getData(stack) != null) + { + if(getNameFromTile(tileEntity).equals(getDataType(stack))) + { + setBaseData(getData(stack), tileEntity); + + if(tileEntity instanceof ISpecialConfigData) + { + ((ISpecialConfigData)tileEntity).setConfigurationData(getData(stack)); + } + + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + LangUtils.localize("tooltip.configurationCard.set").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); + setData(stack, null); + } + else { + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.configurationCard.unequal") + ".")); + } + + return true; + } + } + } + + return false; + } + + private NBTTagCompound getBaseData(TileEntity tile) + { + NBTTagCompound nbtTags = new NBTTagCompound(); + + if(tile instanceof IRedstoneControl) + { + nbtTags.setInteger("controlType", ((IRedstoneControl)tile).getControlType().ordinal()); + } + + if(tile instanceof ISideConfiguration) + { + ((ISideConfiguration)tile).getConfig().write(nbtTags); + ((ISideConfiguration)tile).getEjector().write(nbtTags); + } + + return nbtTags; + } + + private void setBaseData(NBTTagCompound nbtTags, TileEntity tile) + { + if(tile instanceof IRedstoneControl) + { + ((IRedstoneControl)tile).setControlType(RedstoneControl.values()[nbtTags.getInteger("controlType")]); + } + + if(tile instanceof ISideConfiguration) + { + ((ISideConfiguration)tile).getConfig().read(nbtTags); + ((ISideConfiguration)tile).getEjector().read(nbtTags); + } + } + + private String getNameFromTile(TileEntity tile) + { + String ret = Integer.toString(tile.hashCode()); + + if(tile instanceof TileEntityContainerBlock) + { + ret = tile.getBlockType().getUnlocalizedName() + "." + ((TileEntityContainerBlock)tile).fullName + ".name"; + } + + if(tile instanceof ISpecialConfigData) + { + ret = ((ISpecialConfigData)tile).getDataType(); + } + + return ret; + } + + public void setData(ItemStack itemstack, NBTTagCompound data) + { + if(itemstack.stackTagCompound == null) + { + itemstack.setTagCompound(new NBTTagCompound()); + } + + if(data != null) + { + itemstack.stackTagCompound.setTag("data", data); + } + else { + itemstack.stackTagCompound.removeTag("data"); + } + } + + public NBTTagCompound getData(ItemStack itemstack) + { + if(itemstack.stackTagCompound == null) + { + return null; + } + + NBTTagCompound data = itemstack.stackTagCompound.getCompoundTag("data"); + + if(data.hasNoTags()) + { + return null; + } + else { + return itemstack.stackTagCompound.getCompoundTag("data"); + } + } + + public String getDataType(ItemStack itemstack) + { + NBTTagCompound data = getData(itemstack); + + if(data != null) + { + return data.getString("dataType"); + } + + return "gui.none"; + } +} diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 3fffd4e4d..a3d22ca8d 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -40,8 +40,7 @@ import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @InterfaceList({ - @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"), - @Interface(iface = "cofh.api.item.IToolHammer", modid = "CoFHCore") + @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft") }) public class ItemConfigurator extends ItemEnergized implements IMekWrench, IToolWrench, IToolHammer { @@ -297,6 +296,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool CONFIGURATE_FLUIDS("configurate", "(" + TransmissionType.FLUID.localize() + ")", EnumColor.BRIGHT_GREEN, true), CONFIGURATE_GASES("configurate", "(" + TransmissionType.GAS.localize() + ")", EnumColor.BRIGHT_GREEN, true), CONFIGURATE_ENERGY("configurate", "(" + TransmissionType.ENERGY.localize() + ")", EnumColor.BRIGHT_GREEN, true), + CONFIGURATE_HEAT("configurate", "(" + TransmissionType.HEAT.localize() + ")", EnumColor.BRIGHT_GREEN, true), EMPTY("empty", "", EnumColor.DARK_RED, false), ROTATE("rotate", "", EnumColor.YELLOW, false), WRENCH("wrench", "", EnumColor.PINK, false); @@ -341,6 +341,8 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool return TransmissionType.GAS; case CONFIGURATE_ENERGY: return TransmissionType.ENERGY; + case CONFIGURATE_HEAT: + return TransmissionType.HEAT; default: return null; } diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java index 8bf0e9eaa..e2138c4a4 100644 --- a/src/main/java/mekanism/common/item/ItemControlCircuit.java +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -1,8 +1,11 @@ package mekanism.common.item; -import mekanism.common.Mekanism; -import mekanism.common.Tier.BaseTier; +import java.util.List; +import mekanism.common.Tier.BaseTier; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ItemControlCircuit extends ItemMekanism @@ -11,7 +14,6 @@ public class ItemControlCircuit extends ItemMekanism { super(); setHasSubtypes(true); - setCreativeTab(Mekanism.tabMekanism); } /* diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java new file mode 100644 index 000000000..846aaafef --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -0,0 +1,205 @@ +package mekanism.common.item; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.EnumColor; +import mekanism.common.util.LangUtils; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.Constants.NBT; +import codechicken.lib.inventory.InventoryUtils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemCraftingFormula extends ItemMekanism +{ + public IIcon[] icons = new IIcon[3]; + + public ItemCraftingFormula() + { + super(); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister register) + { + icons[0] = register.registerIcon("mekanism:CraftingFormula"); + icons[1] = register.registerIcon("mekanism:CraftingFormulaInvalid"); + icons[2] = register.registerIcon("mekanism:CraftingFormulaEncoded"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(ItemStack stack, int pass) + { + return getInventory(stack) == null ? icons[0] : (isInvalid(stack) ? icons[1] : icons[2]); + } + + @Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() + { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + { + ItemStack[] inv = getInventory(itemstack); + + if(inv != null) + { + addIngredientDetails(inv, list); + } + } + + private void addIngredientDetails(ItemStack[] inv, List list) + { + List stacks = new ArrayList(); + + for(ItemStack stack : inv) + { + if(stack != null) + { + boolean found = false; + + for(ItemStack iterStack : stacks) + { + if(InventoryUtils.canStack(stack, iterStack)) + { + iterStack.stackSize += stack.stackSize; + found = true; + } + } + + if(!found) + { + stacks.add(stack); + } + } + } + + list.add(EnumColor.GREY + LangUtils.localize("tooltip.ingredients") + ":"); + + for(ItemStack stack : stacks) + { + list.add(EnumColor.GREY + " - " + stack.getDisplayName() + " (" + stack.stackSize + ")"); + } + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + { + if(player.isSneaking() && !world.isRemote) + { + setInventory(stack, null); + setInvalid(stack, false); + + ((EntityPlayerMP)player).sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory()); + + return stack; + } + + return stack; + } + + @Override + public int getItemStackLimit(ItemStack stack) + { + return getInventory(stack) != null ? 1 : 64; + } + + @Override + public String getItemStackDisplayName(ItemStack stack) + { + if(getInventory(stack) == null) + { + return super.getItemStackDisplayName(stack); + } + + return super.getItemStackDisplayName(stack) + " " + (isInvalid(stack) ? EnumColor.DARK_RED + "(" + LangUtils.localize("tooltip.invalid") + : EnumColor.DARK_GREEN + "(" + LangUtils.localize("tooltip.encoded")) + ")"; + } + + public boolean isInvalid(ItemStack stack) + { + if(stack.stackTagCompound == null) + { + return false; + } + + return stack.stackTagCompound.getBoolean("invalid"); + } + + public void setInvalid(ItemStack stack, boolean invalid) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setBoolean("invalid", invalid); + } + + public ItemStack[] getInventory(ItemStack stack) + { + if(stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("Items")) + { + return null; + } + + NBTTagList tagList = stack.stackTagCompound.getTagList("Items", NBT.TAG_COMPOUND); + ItemStack[] inventory = new ItemStack[9]; + + for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) + { + NBTTagCompound tagCompound = tagList.getCompoundTagAt(tagCount); + byte slotID = tagCompound.getByte("Slot"); + + if(slotID >= 0 && slotID < 9) + { + inventory[slotID] = ItemStack.loadItemStackFromNBT(tagCompound); + } + } + + return inventory; + } + + public void setInventory(ItemStack stack, ItemStack[] inv) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + if(inv == null) + { + stack.stackTagCompound.removeTag("Items"); + return; + } + + NBTTagList tagList = new NBTTagList(); + + for(int slotCount = 0; slotCount < 9; slotCount++) + { + if(inv[slotCount] != null) + { + NBTTagCompound tagCompound = new NBTTagCompound(); + tagCompound.setByte("Slot", (byte)slotCount); + inv[slotCount].writeToNBT(tagCompound); + tagList.appendTag(tagCompound); + } + } + + stack.stackTagCompound.setTag("Items", tagList); + } +} diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index 71002c511..cc589df93 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -2,7 +2,6 @@ package mekanism.common.item; import mekanism.common.Mekanism; import mekanism.common.Resource; - import net.minecraft.item.ItemStack; public class ItemDirtyDust extends ItemMekanism diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index ff620cf4f..a870d43ad 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -1,5 +1,8 @@ package mekanism.common.item; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + import java.util.List; import mekanism.api.EnumColor; @@ -14,16 +17,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cofh.api.energy.IEnergyContainerItem; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; -import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; @InterfaceList({ - @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem { @@ -35,10 +35,20 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec super(); MAX_ELECTRICITY = maxElectricity; setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } + + @Override + public boolean showDurabilityBar(ItemStack stack) + { + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-(getEnergy(stack)/getMaxEnergy(stack)); + } @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) @@ -48,16 +58,13 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec public ItemStack getUnchargedItem() { - ItemStack stack = new ItemStack(this); - stack.setItemDamage(100); - return stack; + return new ItemStack(this); } @Override public void getSubItems(Item item, CreativeTabs tabs, List list) { ItemStack discharged = new ItemStack(this); - discharged.setItemDamage(100); list.add(discharged); ItemStack charged = new ItemStack(this); setEnergy(charged, ((IEnergizedItem)charged.getItem()).getMaxEnergy(charged)); @@ -114,10 +121,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec return 0; } - double electricityStored = itemStack.getTagCompound().getDouble("electricity"); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); - - return electricityStored; + return itemStack.getTagCompound().getDouble("electricity"); } @Override @@ -130,7 +134,6 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); itemStack.getTagCompound().setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); } @Override @@ -207,12 +210,6 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec return (int)Math.round(getMaxEnergy(theItem)* general.TO_TE); } - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return false; - } - @Override @Method(modid = "IC2") public IElectricItemManager getManager(ItemStack itemStack) diff --git a/src/main/java/mekanism/common/item/ItemFilterCard.java b/src/main/java/mekanism/common/item/ItemFilterCard.java deleted file mode 100644 index fa18b7bcb..000000000 --- a/src/main/java/mekanism/common/item/ItemFilterCard.java +++ /dev/null @@ -1,121 +0,0 @@ -package mekanism.common.item; - -import java.util.List; - -import mekanism.api.EnumColor; -import mekanism.api.IFilterAccess; -import mekanism.common.util.LangUtils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -public class ItemFilterCard extends ItemMekanism -{ - public ItemFilterCard() - { - super(); - - setMaxStackSize(1); - } - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) - { - super.addInformation(itemstack, entityplayer, list, flag); - - list.add(EnumColor.GREY + LangUtils.localize("gui.data") + ": " + EnumColor.INDIGO + LangUtils.localize(getDataType(itemstack))); - } - - @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) - { - if(!world.isRemote) - { - TileEntity tileEntity = world.getTileEntity(pos); - - if(tileEntity instanceof IFilterAccess) - { - if(player.isSneaking()) - { - NBTTagCompound data = ((IFilterAccess)tileEntity).getFilterData(new NBTTagCompound()); - - if(data != null) - { - data.setString("dataType", ((IFilterAccess)tileEntity).getDataType()); - setData(stack, data); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.filterCard.got").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(data.getString("dataType")) + EnumColor.GREY))); - } - - return true; - } - else if(getData(stack) != null) - { - if(((IFilterAccess)tileEntity).getDataType().equals(getDataType(stack))) - { - ((IFilterAccess)tileEntity).setFilterData(getData(stack)); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + LangUtils.localize("tooltip.filterCard.set").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); - setData(stack, null); - } - else { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.filterCard.unequal") + ".")); - } - - return true; - } - } - } - - return false; - } - - public void setData(ItemStack itemstack, NBTTagCompound data) - { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - - if(data != null) - { - itemstack.getTagCompound().setTag("data", data); - } - else { - itemstack.getTagCompound().removeTag("data"); - } - } - - public NBTTagCompound getData(ItemStack itemstack) - { - if(itemstack.getTagCompound() == null) - { - return null; - } - - NBTTagCompound data = itemstack.getTagCompound().getCompoundTag("data"); - - if(data.hasNoTags()) - { - return null; - } - else { - return itemstack.getTagCompound().getCompoundTag("data"); - } - } - - public String getDataType(ItemStack itemstack) - { - NBTTagCompound data = getData(itemstack); - - if(data != null) - { - return data.getString("dataType"); - } - - return "gui.none"; - } -} diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index d9e1ccadb..660726b4a 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.List; + import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; @@ -14,8 +14,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import java.util.List; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemFlamethrower extends ItemMekanism implements IGasItem { @@ -25,8 +25,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { super(); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); } @Override @@ -118,23 +116,19 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem return null; } - GasStack stored = GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); - - if(stored == null) - { - itemstack.setItemDamage(100); - } - else { - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100)))); - } - - return stored; + return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } @Override @@ -147,14 +141,12 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem if(stack == null || stack.amount == 0) { - itemstack.setItemDamage(100); itemstack.getTagCompound().removeTag("stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100)))); itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); } } @@ -163,7 +155,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); return empty; } @@ -172,7 +163,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); list.add(empty); ItemStack filled = new ItemStack(this); diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 6941a756f..e1545c460 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -1,5 +1,8 @@ package mekanism.common.item; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + import java.util.List; import mekanism.api.EnumColor; @@ -23,19 +26,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import cofh.api.energy.IEnergyContainerItem; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; @InterfaceList({ - @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem { @@ -46,8 +46,6 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci { super(EnumHelper.addArmorMaterial("FRICTIONBOOTS", "frictionboots", 0, new int[] {0, 0, 0, 0}, 0), 0, 3); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } @@ -86,16 +84,13 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci public ItemStack getUnchargedItem() { - ItemStack charged = new ItemStack(this); - charged.setItemDamage(100); - return charged; + return new ItemStack(this); } @Override public void getSubItems(Item item, CreativeTabs tabs, List list) { ItemStack discharged = new ItemStack(this); - discharged.setItemDamage(100); list.add(discharged); ItemStack charged = new ItemStack(this); setEnergy(charged, ((IEnergizedItem)charged.getItem()).getMaxEnergy(charged)); @@ -152,10 +147,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci return 0; } - double electricityStored = itemStack.getTagCompound().getDouble("electricity"); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); - - return electricityStored; + return itemStack.getTagCompound().getDouble("electricity"); } @Override @@ -168,7 +160,6 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); itemStack.getTagCompound().setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); } @Override @@ -246,9 +237,15 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-(getEnergy(stack)/getMaxEnergy(stack)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index af1c8be2c..6f6fc758b 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -3,7 +3,6 @@ package mekanism.common.item; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; - import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 176916077..0305fe9b3 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -6,10 +6,10 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; -import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -19,6 +19,8 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidContainerItem { @@ -30,34 +32,12 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo { super(); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } - private void updateDamage(ItemStack stack) - { - GasStack gas = getGas_do(stack); - FluidStack fluid = getFluid_do(stack); - - if((gas == null || gas.amount == 0) && (fluid == null || fluid.amount == 0)) - { - stack.setItemDamage(100); - } - else if(gas != null && gas.amount > 0) - { - stack.setItemDamage((int)Math.max(1, (Math.abs((((float)gas.amount/getMaxGas(stack))*100)-100)))); - } - else if(fluid != null && fluid.amount > 0) - { - stack.setItemDamage((int)Math.max(1, (Math.abs((((float)fluid.amount/getCapacity(stack))*100)-100)))); - } - } - public ItemStack getEmptyItem() { ItemStack empty = new ItemStack(this); - empty.setItemDamage(100); setGas(empty, null); setFluid(empty, null); return empty; @@ -70,20 +50,38 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo } @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) + public boolean showDurabilityBar(ItemStack stack) + { + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + double gasRatio = ((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)CAPACITY); + double fluidRatio = ((getFluid(stack) != null ? (double)getFluid(stack).amount : 0D)/(double)CAPACITY); + + return 1D-Math.max(gasRatio, fluidRatio); + } + + @Override + public boolean onItemRightClick(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { if(player.isSneaking() && !world.isRemote) { setGas(stack, null); setFluid(stack, null); + + ((EntityPlayerMP)player).sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory()); - return true; + return stack; } - return false; + return stack; } @Override + @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { GasStack gasStack = getGas(itemstack); @@ -121,7 +119,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo @Override public FluidStack getFluid(ItemStack container) { - updateDamage(container); return getFluid_do(container); } @@ -139,8 +136,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo else { container.getTagCompound().setTag("fluidStack", stack.writeToNBT(new NBTTagCompound())); } - - updateDamage(container); } @Override @@ -162,10 +157,10 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo if(stored == null) { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID); + toFill = Math.min(resource.amount, CAPACITY); } else { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID-stored.amount); + toFill = Math.min(resource.amount, CAPACITY-stored.amount); } if(doFill) @@ -264,7 +259,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo @Override public GasStack getGas(ItemStack itemstack) { - updateDamage(itemstack); return getGas_do(itemstack); } @@ -286,8 +280,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo itemstack.getTagCompound().setTag("gasStack", gasStack.write(new NBTTagCompound())); } - - updateDamage(itemstack); } @Override @@ -295,10 +287,4 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo { return CAPACITY; } - - @Override - public boolean isMetadataSpecific(ItemStack itemstack) - { - return false; - } } diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index a2a311f3f..87c051013 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -3,7 +3,6 @@ package mekanism.common.item; import java.util.List; import mekanism.common.Mekanism; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 380f0dea6..1efd23468 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -176,12 +176,6 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); } - - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return false; - } public JetpackMode getMode(ItemStack stack) { diff --git a/src/main/java/mekanism/common/item/ItemMekanism.java b/src/main/java/mekanism/common/item/ItemMekanism.java index 4f95dc53f..cbcaf7267 100644 --- a/src/main/java/mekanism/common/item/ItemMekanism.java +++ b/src/main/java/mekanism/common/item/ItemMekanism.java @@ -1,7 +1,6 @@ package mekanism.common.item; import mekanism.common.Mekanism; - import net.minecraft.item.Item; public class ItemMekanism extends Item diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 1b9e80295..ed47dfad5 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -1,14 +1,10 @@ package mekanism.common.item; import mekanism.api.Coord4D; -import mekanism.api.EnumColor; import mekanism.common.Mekanism; -import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class ItemPortableTeleporter extends ItemEnergized diff --git a/src/main/java/mekanism/common/item/ItemProxy.java b/src/main/java/mekanism/common/item/ItemProxy.java index 55a3716a9..1a8ed9ad1 100644 --- a/src/main/java/mekanism/common/item/ItemProxy.java +++ b/src/main/java/mekanism/common/item/ItemProxy.java @@ -69,15 +69,18 @@ public class ItemProxy extends Item } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) + public void onUpdate(ItemStack stacks, World world, Entity entity, int j, boolean flag) { - if (par3Entity instanceof EntityPlayer) + if(entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) par3Entity; - for (int i = 0; i < player.inventory.mainInventory.length; i++) + EntityPlayer player = (EntityPlayer)entity; + + for(int i = 0; i < player.inventory.mainInventory.length; i++) { - if (player.inventory.mainInventory[i] != null && player.inventory.mainInventory[i].getItem() == this) - player.inventory.mainInventory[i] = null; + if(player.inventory.mainInventory[i] != null && player.inventory.mainInventory[i].getItem() == this) + { + player.inventory.mainInventory[i] = null; + } } } } diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index f50e0ae9e..127821159 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -220,12 +220,6 @@ public class ItemScubaTank extends ItemArmor implements IGasItem itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); } } - - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return false; - } public ItemStack getEmptyItem() { diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index d9ff36717..03930846b 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -9,11 +9,12 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + public class ItemUpgrade extends ItemMekanism implements IUpgradeItem { private Upgrade upgrade; diff --git a/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java b/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java index eda5c272a..279a6daf6 100644 --- a/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java @@ -1,7 +1,6 @@ package mekanism.common.multiblock; import mekanism.api.Coord4D; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/multiblock/MultiblockCache.java b/src/main/java/mekanism/common/multiblock/MultiblockCache.java index 3836889f8..09a636ba3 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockCache.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockCache.java @@ -3,7 +3,6 @@ package mekanism.common.multiblock; import java.util.HashSet; import mekanism.api.Coord4D; - import net.minecraft.nbt.NBTTagCompound; public abstract class MultiblockCache> diff --git a/src/main/java/mekanism/common/multiblock/SynchronizedData.java b/src/main/java/mekanism/common/multiblock/SynchronizedData.java index 3bbe41c24..982f65575 100644 --- a/src/main/java/mekanism/common/multiblock/SynchronizedData.java +++ b/src/main/java/mekanism/common/multiblock/SynchronizedData.java @@ -4,7 +4,6 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; - import net.minecraft.item.ItemStack; public abstract class SynchronizedData> diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index fd6775038..4c45665e0 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -577,6 +577,11 @@ public abstract class UpdateProtocol> { iterated.add(pos); + if(!checker.shouldContinue(iterated.size())) + { + return; + } + for(EnumFacing side : EnumFacing.VALUES) { Coord4D coord = pos.offset(side); @@ -601,8 +606,13 @@ public abstract class UpdateProtocol> } } - public static interface NodeChecker + public static abstract class NodeChecker { - public boolean isValid(Coord4D coord); + public abstract boolean isValid(final Coord4D coord); + + public boolean shouldContinue(int iterated) + { + return true; + } } } diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index dc08212c1..c26831f21 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -1,13 +1,7 @@ package mekanism.common.multipart; -import codechicken.lib.vec.BlockCoord; -import codechicken.lib.vec.Vector3; -import codechicken.microblock.HollowMicroblock; -import codechicken.multipart.JItemMultiPart; -import codechicken.multipart.TMultiPart; -import codechicken.multipart.TileMultipart; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.List; + import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; @@ -19,8 +13,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.List; +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.HollowMicroblock; +import codechicken.multipart.JItemMultiPart; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemGlowPanel extends JItemMultiPart { diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index 4bca268b9..33ef790bc 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -1,5 +1,7 @@ package mekanism.common.multipart; +import java.util.Collection; + import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -10,8 +12,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.Collection; - public class MultipartTransmitter> extends Transmitter { public PartTransmitter containingPart; diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index 4f163883f..3082a0445 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -1,12 +1,13 @@ package mekanism.common.multipart; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.Tier.TransporterTier; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.LangUtils; @@ -15,7 +16,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import io.netty.buffer.ByteBuf; public class PartDiversionTransporter extends PartLogisticalTransporter { diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 79f376f70..b1af8e81b 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -6,16 +6,12 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.RenderGlowPanel; import mekanism.common.MekanismItems; - import net.minecraft.client.particle.EffectRenderer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Cuboid6; @@ -30,6 +26,8 @@ import codechicken.multipart.JNormalOcclusion; import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIconHitEffects { diff --git a/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java b/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java index 45cc74fd3..266196094 100644 --- a/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java @@ -1,7 +1,5 @@ package mekanism.common.multipart; -import mekanism.common.Tier.TransporterTier; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java index bba2e1d22..3a812fab7 100644 --- a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java +++ b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java @@ -121,9 +121,13 @@ public class PartThermodynamicConductor extends PartTransmitter implements IStrictEnergyAcceptor, IEnergyHandler { public Tier.CableTier tier; @@ -177,6 +171,7 @@ public class PartUniversalCable extends PartTransmitter { @Override diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 3c991f493..2325cf3ad 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -50,7 +50,7 @@ public class PacketConfigSync implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index b13e605b9..3a84c5077 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -1,5 +1,7 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.api.Coord4D; @@ -19,7 +21,6 @@ import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityDigitalMiner; - import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -33,8 +34,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; - public class PacketDigitalMinerGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketElectricBowState.java b/src/main/java/mekanism/common/network/PacketElectricBowState.java index 9ea81b74a..09f373869 100644 --- a/src/main/java/mekanism/common/network/PacketElectricBowState.java +++ b/src/main/java/mekanism/common/network/PacketElectricBowState.java @@ -1,16 +1,14 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemElectricBow; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; - import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketElectricBowState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketElectricChest.java b/src/main/java/mekanism/common/network/PacketElectricChest.java index 1f77f27e5..503ca85dc 100644 --- a/src/main/java/mekanism/common/network/PacketElectricChest.java +++ b/src/main/java/mekanism/common/network/PacketElectricChest.java @@ -1,5 +1,6 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; @@ -10,7 +11,6 @@ import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -19,8 +19,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketElectricChest implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java index 2d7fbaac4..39ec246e3 100644 --- a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java +++ b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java @@ -1,8 +1,5 @@ package mekanism.common.network; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; @@ -10,6 +7,9 @@ import mekanism.common.item.ItemFlamethrower; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketFlamethrowerData implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index 2ffed3254..befb833ca 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -1,19 +1,17 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketJetpackData implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketKey.java b/src/main/java/mekanism/common/network/PacketKey.java index 5e3d8e144..8b1a4afc9 100644 --- a/src/main/java/mekanism/common/network/PacketKey.java +++ b/src/main/java/mekanism/common/network/PacketKey.java @@ -1,15 +1,13 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketKey.KeyMessage; - import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketKey implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index 94bc41b53..1219e9c71 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -1,5 +1,6 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.client.gui.GuiLogisticalSorter; import mekanism.client.gui.GuiTFilterSelect; @@ -14,7 +15,6 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityLogisticalSorter; - import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -28,8 +28,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; - public class PacketLogisticalSorterGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketPortableTankState.java b/src/main/java/mekanism/common/network/PacketPortableTankState.java index cad2d1928..ed928953d 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTankState.java +++ b/src/main/java/mekanism/common/network/PacketPortableTankState.java @@ -1,16 +1,14 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage; - import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketPortableTankState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index bf2af08fd..ac5094549 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -1,10 +1,10 @@ package mekanism.common.network; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; @@ -22,9 +22,10 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class PacketPortableTeleporter implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketPortalFX.java b/src/main/java/mekanism/common/network/PacketPortalFX.java index be656aa37..d4312ea36 100644 --- a/src/main/java/mekanism/common/network/PacketPortalFX.java +++ b/src/main/java/mekanism/common/network/PacketPortalFX.java @@ -1,19 +1,18 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; + import java.util.Random; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.network.PacketPortalFX.PortalFXMessage; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumParticleTypes; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketPortalFX implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRedstoneControl.java b/src/main/java/mekanism/common/network/PacketRedstoneControl.java index 33e62770f..2de7922e1 100644 --- a/src/main/java/mekanism/common/network/PacketRedstoneControl.java +++ b/src/main/java/mekanism/common/network/PacketRedstoneControl.java @@ -1,19 +1,17 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.network.PacketRedstoneControl.RedstoneControlMessage; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketRedstoneControl implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java index 2c27a69c6..a33f99669 100644 --- a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java +++ b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java @@ -1,20 +1,18 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.Upgrade; import mekanism.common.base.IUpgradeTile; import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage; import mekanism.common.tile.TileEntityBasicBlock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketRemoveUpgrade implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRobit.java b/src/main/java/mekanism/common/network/PacketRobit.java index b50eabf63..e3ab12169 100644 --- a/src/main/java/mekanism/common/network/PacketRobit.java +++ b/src/main/java/mekanism/common/network/PacketRobit.java @@ -1,17 +1,15 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketRobit.RobitMessage; - import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketRobit implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketScubaTankData.java b/src/main/java/mekanism/common/network/PacketScubaTankData.java index 6a828d470..90a95c670 100644 --- a/src/main/java/mekanism/common/network/PacketScubaTankData.java +++ b/src/main/java/mekanism/common/network/PacketScubaTankData.java @@ -1,18 +1,16 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketScubaTankData implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index 08979b9f3..ebb68f7a8 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -1,10 +1,11 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; + import java.util.Collection; import java.util.HashSet; import mekanism.api.Coord4D; -import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.api.gas.Gas; import mekanism.api.gas.GasNetwork; import mekanism.api.gas.GasRegistry; @@ -17,8 +18,8 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.EnergyNetwork; import mekanism.common.FluidNetwork; import mekanism.common.PacketHandler; +import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; @@ -29,8 +30,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketTransmitterUpdate implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java index b366c9c2a..23d62a74e 100644 --- a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java +++ b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java @@ -1,16 +1,14 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; - import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - public class PacketWalkieTalkieState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index 6d59771b7..2a0558367 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -1,10 +1,9 @@ package mekanism.common.recipe; import mekanism.common.MekanismItems; +import mekanism.common.block.BlockBasic.BasicType; import mekanism.common.inventory.InventoryBin; -import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemProxy; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -41,7 +40,7 @@ public class BinRecipe implements IRecipe return false; } - return itemStack.getItem() instanceof ItemBlockBasic && itemStack.getItemDamage() == 6 && itemStack.stackSize == 1; + return BasicType.get(itemStack) == BasicType.BIN && itemStack.stackSize <= 1; } @Override @@ -101,7 +100,7 @@ public class BinRecipe implements IRecipe } binInv.add(addStack); - + return bin; } else { diff --git a/src/main/java/mekanism/common/recipe/inputs/ChemicalPairInput.java b/src/main/java/mekanism/common/recipe/inputs/ChemicalPairInput.java index fa802e627..7be009fdf 100644 --- a/src/main/java/mekanism/common/recipe/inputs/ChemicalPairInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/ChemicalPairInput.java @@ -1,8 +1,8 @@ package mekanism.common.recipe.inputs; -import net.minecraft.nbt.NBTTagCompound; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; +import net.minecraft.nbt.NBTTagCompound; /** * An input of gasses for recipe use. diff --git a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java index f983270b3..06ca6782e 100644 --- a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java @@ -5,7 +5,6 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public abstract class AdvancedMachineRecipe> extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/BasicMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/BasicMachineRecipe.java index 3c3d8ed25..e2f628edb 100644 --- a/src/main/java/mekanism/common/recipe/machines/BasicMachineRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/BasicMachineRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public abstract class BasicMachineRecipe> extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java index bb374fdf2..159a2d1ab 100644 --- a/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ChanceOutput; - import net.minecraft.item.ItemStack; public abstract class ChanceMachineRecipe> extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/CombinerRecipe.java b/src/main/java/mekanism/common/recipe/machines/CombinerRecipe.java index 783fff799..2f889fa0c 100644 --- a/src/main/java/mekanism/common/recipe/machines/CombinerRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/CombinerRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class CombinerRecipe extends AdvancedMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/CrusherRecipe.java b/src/main/java/mekanism/common/recipe/machines/CrusherRecipe.java index 284217df1..c40937eb3 100644 --- a/src/main/java/mekanism/common/recipe/machines/CrusherRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/CrusherRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class CrusherRecipe extends BasicMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/CrystallizerRecipe.java b/src/main/java/mekanism/common/recipe/machines/CrystallizerRecipe.java index 6c0d1f91c..5122ca0c3 100644 --- a/src/main/java/mekanism/common/recipe/machines/CrystallizerRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/CrystallizerRecipe.java @@ -4,7 +4,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class CrystallizerRecipe extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/DissolutionRecipe.java b/src/main/java/mekanism/common/recipe/machines/DissolutionRecipe.java index eb073ce3d..9d36ac30d 100644 --- a/src/main/java/mekanism/common/recipe/machines/DissolutionRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/DissolutionRecipe.java @@ -4,7 +4,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.GasOutput; - import net.minecraft.item.ItemStack; public class DissolutionRecipe extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/EnrichmentRecipe.java b/src/main/java/mekanism/common/recipe/machines/EnrichmentRecipe.java index bca882977..a54df895d 100644 --- a/src/main/java/mekanism/common/recipe/machines/EnrichmentRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/EnrichmentRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class EnrichmentRecipe extends BasicMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java b/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java index 37e86e76c..80c5c22b6 100644 --- a/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class InjectionRecipe extends AdvancedMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java b/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java index f1d24ff6d..1c8a4b6d7 100644 --- a/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class OsmiumCompressorRecipe extends AdvancedMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/OxidationRecipe.java b/src/main/java/mekanism/common/recipe/machines/OxidationRecipe.java index 6fd5a59ae..636592260 100644 --- a/src/main/java/mekanism/common/recipe/machines/OxidationRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/OxidationRecipe.java @@ -4,7 +4,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.GasOutput; - import net.minecraft.item.ItemStack; public class OxidationRecipe extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java b/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java index 2d44b0336..0ff2e97cc 100644 --- a/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java @@ -4,7 +4,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.PressurizedInput; import mekanism.common.recipe.outputs.PressurizedOutput; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/common/recipe/machines/PurificationRecipe.java b/src/main/java/mekanism/common/recipe/machines/PurificationRecipe.java index a07a5a9eb..d7859e08d 100644 --- a/src/main/java/mekanism/common/recipe/machines/PurificationRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/PurificationRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class PurificationRecipe extends AdvancedMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/SawmillRecipe.java b/src/main/java/mekanism/common/recipe/machines/SawmillRecipe.java index 581a999c4..ca7817bff 100644 --- a/src/main/java/mekanism/common/recipe/machines/SawmillRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/SawmillRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ChanceOutput; - import net.minecraft.item.ItemStack; public class SawmillRecipe extends ChanceMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/SeparatorRecipe.java b/src/main/java/mekanism/common/recipe/machines/SeparatorRecipe.java index aaf737f5b..1719d31c1 100644 --- a/src/main/java/mekanism/common/recipe/machines/SeparatorRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/SeparatorRecipe.java @@ -4,7 +4,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.FluidInput; import mekanism.common.recipe.outputs.ChemicalPairOutput; - import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/common/recipe/machines/SmeltingRecipe.java b/src/main/java/mekanism/common/recipe/machines/SmeltingRecipe.java index c762e9ce8..77e650956 100644 --- a/src/main/java/mekanism/common/recipe/machines/SmeltingRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/SmeltingRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class SmeltingRecipe extends BasicMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/WasherRecipe.java b/src/main/java/mekanism/common/recipe/machines/WasherRecipe.java index ad58eb662..e7a28a4f6 100644 --- a/src/main/java/mekanism/common/recipe/machines/WasherRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/WasherRecipe.java @@ -6,7 +6,6 @@ import mekanism.common.recipe.inputs.FluidInput; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.outputs.GasOutput; import mekanism.common.tile.TileEntityChemicalWasher; - import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/common/recipe/outputs/ChemicalPairOutput.java b/src/main/java/mekanism/common/recipe/outputs/ChemicalPairOutput.java index 627921ffd..a5e621e86 100644 --- a/src/main/java/mekanism/common/recipe/outputs/ChemicalPairOutput.java +++ b/src/main/java/mekanism/common/recipe/outputs/ChemicalPairOutput.java @@ -1,8 +1,8 @@ package mekanism.common.recipe.outputs; -import net.minecraft.nbt.NBTTagCompound; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; +import net.minecraft.nbt.NBTTagCompound; /** * An input of gasses for recipe use. diff --git a/src/main/java/mekanism/common/recipe/outputs/GasOutput.java b/src/main/java/mekanism/common/recipe/outputs/GasOutput.java index d304bd1f0..7d35459e3 100644 --- a/src/main/java/mekanism/common/recipe/outputs/GasOutput.java +++ b/src/main/java/mekanism/common/recipe/outputs/GasOutput.java @@ -1,8 +1,8 @@ package mekanism.common.recipe.outputs; -import net.minecraft.nbt.NBTTagCompound; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; +import net.minecraft.nbt.NBTTagCompound; public class GasOutput extends MachineOutput { diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index e3347efea..9d665b897 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -1,14 +1,8 @@ package mekanism.common.tile; -import cofh.api.energy.IEnergyHandler; - -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.fml.common.Optional.Interface; -import net.minecraftforge.fml.common.Optional.InterfaceList; -import net.minecraftforge.fml.common.Optional.Method; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; -import mekanism.api.IFilterAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.base.IAdvancedBoundingBlock; import mekanism.common.integration.IComputerIntegration; @@ -22,12 +16,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import cofh.api.energy.IEnergyHandler; +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; @InterfaceList({ - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), - @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore") + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2") }) -public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock implements ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IEnergyHandler, IComputerIntegration, IFilterAccess +public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock implements ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IEnergyHandler, IComputerIntegration, ISpecialConfigData { @Override public int getSizeInventory() @@ -232,7 +230,6 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "CoFHCore") public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { if(getInv() == null) @@ -244,7 +241,6 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "CoFHCore") public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { if(getInv() == null) @@ -256,7 +252,6 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "CoFHCore") public boolean canConnectEnergy(EnumFacing from) { if(getInv() == null) @@ -268,7 +263,6 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "CoFHCore") public int getEnergyStored(EnumFacing from) { if(getInv() == null) @@ -280,7 +274,6 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "CoFHCore") public int getMaxEnergyStored(EnumFacing from) { if(getInv() == null) @@ -445,25 +438,25 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public NBTTagCompound getFilterData(NBTTagCompound nbtTags) + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) { if(getInv() == null) { return new NBTTagCompound(); } - return getInv().getFilterData(nbtTags); + return getInv().getConfigurationData(nbtTags); } @Override - public void setFilterData(NBTTagCompound nbtTags) + public void setConfigurationData(NBTTagCompound nbtTags) { if(getInv() == null) { return; } - getInv().setFilterData(nbtTags); + getInv().setConfigurationData(nbtTags); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index dc6339176..15fa5402a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -68,11 +68,11 @@ public abstract class TileEntityAdvancedElectricMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl +public abstract class TileEntityBasicMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess { /** How much energy this machine uses per tick, un-upgraded. */ public double BASE_ENERGY_PER_TICK; @@ -283,7 +288,7 @@ public abstract class TileEntityBasicMachine, } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 9ede02c06..772868fa9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.api.Coord4D; @@ -8,6 +10,7 @@ import mekanism.api.Range4D; import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.Tier.BinTier; import mekanism.common.base.IActiveState; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.ITransporterTile; @@ -28,9 +31,9 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; -import net.minecraftforge.fml.common.Optional.Interface; import io.netty.buffer.ByteBuf; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; +import net.minecraftforge.fml.common.Optional.Interface; @Interface(iface = "powercrystals.minefactoryreloaded.api.IDeepStorageUnit", modid = "MineFactoryReloaded") public class TileEntityBin extends TileEntityBasicBlock implements ISidedInventory, IActiveState, IDeepStorageUnit, IConfigurable, ITickable @@ -46,8 +49,8 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento public int delayTicks; public int cacheCount; - - public final int MAX_STORAGE = 4096; + + public BinTier tier = BinTier.BASIC; public ItemStack itemType; @@ -71,7 +74,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } int count = getItemCount(); - int remain = MAX_STORAGE-count; + int remain = tier.storage-count; if(remain >= itemType.getMaxStackSize()) { @@ -119,23 +122,23 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento public ItemStack add(ItemStack stack) { - if(isValid(stack) && getItemCount() != MAX_STORAGE) + if(isValid(stack) && getItemCount() != tier.storage) { if(itemType == null) { setItemType(stack); } - if(getItemCount() + stack.stackSize <= MAX_STORAGE) + if(getItemCount() + stack.stackSize <= tier.storage) { setItemCount(getItemCount() + stack.stackSize); return null; } else { ItemStack rejects = itemType.copy(); - rejects.stackSize = (getItemCount()+stack.stackSize) - MAX_STORAGE; + rejects.stackSize = (getItemCount()+stack.stackSize) - tier.storage; - setItemCount(MAX_STORAGE); + setItemCount(tier.storage); return rejects; } @@ -228,6 +231,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento nbtTags.setBoolean("isActive", isActive); nbtTags.setInteger("itemCount", cacheCount); + nbtTags.setInteger("tier", tier.ordinal()); if(bottomStack != null) { @@ -252,6 +256,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento isActive = nbtTags.getBoolean("isActive"); cacheCount = nbtTags.getInteger("itemCount"); + tier = BinTier.values()[nbtTags.getInteger("tier")]; bottomStack = ItemStack.loadItemStackFromNBT(nbtTags.getCompoundTag("bottomStack")); topStack = ItemStack.loadItemStackFromNBT(nbtTags.getCompoundTag("topStack")); @@ -269,6 +274,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento data.add(isActive); data.add(getItemCount()); + data.add(tier.ordinal()); if(getItemCount() > 0) { @@ -285,6 +291,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento isActive = dataStream.readBoolean(); clientAmount = dataStream.readInt(); + tier = BinTier.values()[dataStream.readInt()]; if(clientAmount > 0) { @@ -426,7 +433,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento @Override public String getName() { - return LangUtils.localize("tile.BasicBlock.Bin.name"); + return LangUtils.localize(getBlockType().getUnlocalizedName() + ".Bin" + tier.getBaseTier().getName() + ".name"); } @Override @@ -590,7 +597,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento @Override public int getMaxStoredCount() { - return MAX_STORAGE; + return tier.storage; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 0a7527432..927e0eb1e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -4,8 +4,8 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; +import java.util.HashSet; +import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; @@ -15,38 +15,30 @@ import mekanism.common.base.IFluidContainerManager; import mekanism.common.content.boiler.BoilerCache; import mekanism.common.content.boiler.BoilerUpdateProtocol; import mekanism.common.content.boiler.SynchronizedBoilerData; -import mekanism.common.content.boiler.SynchronizedBoilerData.ValveData; +import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; -import mekanism.common.util.HeatUtils; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fml.common.network.ByteBufUtils; public class TileEntityBoilerCasing extends TileEntityMultiblock implements IFluidContainerManager, IHeatTransfer { - /** A client-sided and server-sided map of valves on this tank's structure, used on the client for rendering fluids. */ - public Map valveViewing = new HashMap(); + /** A client-sided set of valves on this tank's structure that are currently active, used on the client for rendering fluids. */ + public Set valveViewing = new HashSet(); /** The capacity this tank has on the client-side. */ public int clientWaterCapacity; public int clientSteamCapacity; public float prevWaterScale; - public float prevSteamScale; - - public EnumFacing innerSide; - - public double temperature; - public double heatToAbsorb; - public double invHeatCapacity = 5; public TileEntityBoilerCasing() { @@ -68,34 +60,19 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0) - { - valveViewing.put(data, valveViewing.get(data)-1); - } - } - float targetScale = (float)(structure.waterStored != null ? structure.waterStored.amount : 0)/clientWaterCapacity; if(Math.abs(prevWaterScale - targetScale) > 0.01) { prevWaterScale = (9*prevWaterScale + targetScale)/10; } - - targetScale = (float)(structure.steamStored != null ? structure.steamStored.amount : 0)/clientSteamCapacity; - - if(Math.abs(prevSteamScale - targetScale) > 0.01) - { - prevSteamScale = (9*prevSteamScale+ targetScale)/10; - } } if(!clientHasStructure || !isRendering) { - for(ValveData data : valveViewing.keySet()) + for(ValveData data : valveViewing) { - TileEntityDynamicTank tileEntity = (TileEntityDynamicTank)data.location.getTileEntity(worldObj); + TileEntityBoilerCasing tileEntity = (TileEntityBoilerCasing)data.location.getTileEntity(worldObj); if(tileEntity != null) { @@ -111,169 +88,94 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0) + { + data.activeTicks--; + } + + if(data.activeTicks > 0 != data.prevActive) + { + needsValveUpdate = true; + } + + data.prevActive = data.activeTicks > 0; + } + + if(needsValveUpdate || structure.needsRenderUpdate()) + { + sendPacketToRenderer(); + } + + double[] d = structure.simulateHeat(); + structure.applyTemperatureChange(); + structure.lastEnvironmentLoss = d[1]; + + if(structure.temperature >= SynchronizedBoilerData.BASE_BOIL_TEMP && structure.waterStored != null) + { + int steamAmount = structure.steamStored != null ? structure.steamStored.amount : 0; + double heatAvailable = structure.getHeatAvailable(); + + structure.lastMaxBoil = (int)Math.floor(heatAvailable / SynchronizedBoilerData.getHeatEnthalpy()); + + int amountToBoil = Math.min(structure.lastMaxBoil, structure.waterStored.amount); + amountToBoil = Math.min(amountToBoil, (structure.steamVolume*BoilerUpdateProtocol.STEAM_PER_TANK)-steamAmount); + structure.waterStored.amount -= amountToBoil; + + if(structure.steamStored == null) + { + structure.steamStored = new FluidStack(FluidRegistry.getFluid("steam"), amountToBoil); + } + else { + structure.steamStored.amount += amountToBoil; + } + + structure.temperature -= (amountToBoil*SynchronizedBoilerData.getHeatEnthalpy())/structure.locations.size(); + structure.lastBoilRate = amountToBoil; + } + else { + structure.lastBoilRate = 0; + structure.lastMaxBoil = 0; + } + + structure.prevWater = structure.waterStored; + structure.prevSteam = structure.steamStored; + + MekanismUtils.saveChunk(this); + } } } } - - public void manageInventory() + + @Override + public boolean onActivate(EntityPlayer player) { - int max = structure.volume * BoilerUpdateProtocol.WATER_PER_TANK; - - if(structure.inventory[0] != null) + if(!player.isSneaking() && structure != null) { - if(structure.inventory[0].getItem() instanceof IFluidContainerItem) - { - if(structure.editMode == ContainerEditMode.FILL && structure.waterStored != null) - { - int prev = structure.waterStored.amount; - - structure.waterStored.amount -= FluidContainerUtils.insertFluid(structure.waterStored, structure.inventory[0]); - - if(prev == structure.waterStored.amount || structure.waterStored.amount == 0) - { - if(structure.inventory[1] == null) - { - structure.inventory[1] = structure.inventory[0].copy(); - structure.inventory[0] = null; - - markDirty(); - } - } - - if(structure.waterStored.amount == 0) - { - structure.waterStored = null; - } - } - else if(structure.editMode == ContainerEditMode.EMPTY) - { - if(structure.waterStored != null) - { - FluidStack received = FluidContainerUtils.extractFluid(max-structure.waterStored.amount, structure.inventory[0], structure.waterStored.getFluid()); - - if(received != null) - { - structure.waterStored.amount += received.amount; - } - } - else { - structure.waterStored = FluidContainerUtils.extractFluid(max, structure.inventory[0], null); - } - - int newStored = structure.waterStored != null ? structure.waterStored.amount : 0; - - if(((IFluidContainerItem)structure.inventory[0].getItem()).getFluid(structure.inventory[0]) == null || newStored == max) - { - if(structure.inventory[1] == null) - { - structure.inventory[1] = structure.inventory[0].copy(); - structure.inventory[0] = null; - - markDirty(); - } - } - } - } - else if(FluidContainerRegistry.isEmptyContainer(structure.inventory[0]) && (structure.editMode == ContainerEditMode.BOTH || structure.editMode == ContainerEditMode.FILL)) - { - if(structure.waterStored != null && structure.waterStored.amount >= FluidContainerRegistry.BUCKET_VOLUME) - { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(structure.waterStored, structure.inventory[0]); - - if(filled != null) - { - if(structure.inventory[1] == null || (structure.inventory[1].isItemEqual(filled) && structure.inventory[1].stackSize+1 <= filled.getMaxStackSize())) - { - structure.inventory[0].stackSize--; - - if(structure.inventory[0].stackSize <= 0) - { - structure.inventory[0] = null; - } - - if(structure.inventory[1] == null) - { - structure.inventory[1] = filled; - } - else { - structure.inventory[1].stackSize++; - } - - markDirty(); - - structure.waterStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - - if(structure.waterStored.amount == 0) - { - structure.waterStored = null; - } - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } - } - } - } - else if(FluidContainerRegistry.isFilledContainer(structure.inventory[0]) && (structure.editMode == ContainerEditMode.BOTH || structure.editMode == ContainerEditMode.EMPTY)) - { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(structure.inventory[0]); - - if((structure.waterStored == null && itemFluid.amount <= max) || structure.waterStored.amount+itemFluid.amount <= max) - { - if(structure.waterStored != null && !structure.waterStored.isFluidEqual(itemFluid)) - { - return; - } - - ItemStack containerItem = structure.inventory[0].getItem().getContainerItem(structure.inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(structure.inventory[1] == null || (structure.inventory[1].isItemEqual(containerItem) && structure.inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) - { - structure.inventory[0] = null; - - if(structure.inventory[1] == null) - { - structure.inventory[1] = containerItem; - } - else { - structure.inventory[1].stackSize++; - } - - filled = true; - } - } - else { - structure.inventory[0].stackSize--; - - if(structure.inventory[0].stackSize == 0) - { - structure.inventory[0] = null; - } - - filled = true; - } - - if(filled) - { - if(structure.waterStored == null) - { - structure.waterStored = itemFluid.copy(); - } - else { - structure.waterStored.amount += itemFluid.amount; - } - - markDirty(); - } - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } - } + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + player.openGui(Mekanism.instance, 54, worldObj, xCoord, yCoord, zCoord); + + return true; } + + return false; } @Override @@ -307,41 +209,56 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock toSend = new HashSet(); + + for(ValveData valveData : structure.valves) + { + if(valveData.activeTicks > 0) + { + toSend.add(valveData); + } + } + + data.add(toSend.size()); + + for(ValveData valveData : toSend) + { + valveData.location.write(data); + data.add(valveData.side.ordinal()); + } } } @@ -358,56 +275,51 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0) + TileEntityBoilerCasing tileEntity = (TileEntityBoilerCasing)data.location.getTileEntity(worldObj); + + if(tileEntity != null) { - continue; + tileEntity.clientHasStructure = true; } } - - valveViewing.put(data, viewingTicks); - - TileEntityBoilerCasing tileEntity = (TileEntityBoilerCasing)data.location.getTileEntity(worldObj); - - if(tileEntity != null) - { - tileEntity.clientHasStructure = true; - } } } } @@ -437,94 +349,57 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock= structure.upperRenderLocation.yCoord) + { + if(structure.steamStored != null && structure.steamStored.amount > 0) + { + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + TileEntity tile = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + + if(tile instanceof IFluidHandler && !(tile instanceof TileEntityBoilerValve)) + { + if(((IFluidHandler)tile).canFill(side.getOpposite(), structure.steamStored.getFluid())) + { + structure.steamStored.amount -= ((IFluidHandler)tile).fill(side.getOpposite(), structure.steamStored, true); + + if(structure.steamStored.amount <= 0) + { + structure.steamStored = null; + } + } + } + } + } + } + } + } @Override public FluidTankInfo[] getTankInfo(EnumFacing from) { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) ? new FluidTankInfo[] {waterTank.getInfo(), steamTank.getInfo()} : PipeUtils.EMPTY; + if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) + { + if(structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) + { + return new FluidTankInfo[] {steamTank.getInfo()}; + } + else { + return new FluidTankInfo[] {waterTank.getInfo()}; + } + } + + return PipeUtils.EMPTY; } @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - return waterTank.fill(resource, doFill); + if(structure != null && structure.upperRenderLocation != null && yCoord < structure.upperRenderLocation.yCoord) + { + return waterTank.fill(resource, doFill); + } + + return 0; } @Override public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if(structure != null && structure.steamStored != null) + if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) { - if(resource.getFluid() == structure.steamStored.getFluid()) + if(structure.steamStored != null) { - return steamTank.drain(resource.amount, doDrain); + if(resource.getFluid() == structure.steamStored.getFluid()) + { + return steamTank.drain(resource.amount, doDrain); + } } } @@ -52,7 +106,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { - if(structure != null) + if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) { return steamTank.drain(maxDrain, doDrain); } @@ -63,12 +117,22 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public boolean canFill(EnumFacing from, Fluid fluid) { - return true; + if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) + { + return structure.upperRenderLocation != null && yCoord < structure.upperRenderLocation.yCoord; + } + + return false; } @Override public boolean canDrain(EnumFacing from, Fluid fluid) { - return true; + if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) + { + return structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord; + } + + return false; } } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index 4531aa946..2436d3e48 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.api.Coord4D; @@ -8,14 +10,11 @@ import mekanism.common.Mekanism; import mekanism.common.base.ITileNetwork; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; - import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import io.netty.buffer.ByteBuf; - public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork { public BlockPos mainPos = BlockPos.ORIGIN; diff --git a/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java b/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java index 0af79e453..0ac1468d2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java +++ b/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java @@ -1,7 +1,6 @@ package mekanism.common.tile; import mekanism.common.block.BlockCardboardBox.BlockData; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java index 1cdc96de7..0e36457df 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import java.util.Map; + import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.common.MekanismItems; @@ -18,8 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import java.util.Map; - public abstract class TileEntityChanceMachine> extends TileEntityBasicMachine { public TileEntityChanceMachine(String soundPath, String name, ResourceLocation location, double perTick, int ticksRequired, double maxEnergy) @@ -160,7 +160,7 @@ public abstract class TileEntityChanceMachine= FluidContainerRegistry.BUCKET_VOLUME) - { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(structure.fluidStored, structure.inventory[0]); - - if(filled != null) - { - if(structure.inventory[1] == null || (structure.inventory[1].isItemEqual(filled) && structure.inventory[1].stackSize+1 <= filled.getMaxStackSize())) - { - structure.inventory[0].stackSize--; - - if(structure.inventory[0].stackSize <= 0) - { - structure.inventory[0] = null; - } - - if(structure.inventory[1] == null) - { - structure.inventory[1] = filled; - } - else { - structure.inventory[1].stackSize++; - } - - markDirty(); - - structure.fluidStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - - if(structure.fluidStored.amount == 0) - { - structure.fluidStored = null; - } - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } - } - } + structure.fluidStored = FluidContainerUtils.handleRegistryItemFill(this, structure.inventory, structure.fluidStored, 0, 1); + + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); } else if(FluidContainerRegistry.isFilledContainer(structure.inventory[0]) && (structure.editMode == ContainerEditMode.BOTH || structure.editMode == ContainerEditMode.EMPTY)) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(structure.inventory[0]); - - if((structure.fluidStored == null && itemFluid.amount <= max) || structure.fluidStored.amount+itemFluid.amount <= max) - { - if(structure.fluidStored != null && !structure.fluidStored.isFluidEqual(itemFluid)) - { - return; - } - - ItemStack containerItem = structure.inventory[0].getItem().getContainerItem(structure.inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(structure.inventory[1] == null || (structure.inventory[1].isItemEqual(containerItem) && structure.inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) - { - structure.inventory[0] = null; - - if(structure.inventory[1] == null) - { - structure.inventory[1] = containerItem; - } - else { - structure.inventory[1].stackSize++; - } - - filled = true; - } - } - else { - structure.inventory[0].stackSize--; - - if(structure.inventory[0].stackSize == 0) - { - structure.inventory[0] = null; - } - - filled = true; - } - - if(filled) - { - if(structure.fluidStored == null) - { - structure.fluidStored = itemFluid.copy(); - } - else { - structure.fluidStored.amount += itemFluid.amount; - } - - markDirty(); - } - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } + structure.fluidStored = FluidContainerUtils.handleRegistryItemEmpty(this, structure.inventory, structure.fluidStored, needed, 0, 1, null); + + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index dcb70b3b1..34dd6b773 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -208,62 +208,57 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - @Method(modid = "CoFHCore") public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { if(getConsumingSides().contains(from)) { - double toAdd = (int)Math.min(getMaxEnergy()-getEnergy(), maxReceive* general.FROM_TE); + double toAdd = (int)Math.min(getMaxEnergy()-getEnergy(), maxReceive*general.FROM_TE); if(!simulate) { setEnergy(getEnergy() + toAdd); } - return (int)Math.round(toAdd* general.TO_TE); + return (int)Math.round(toAdd*general.TO_TE); } return 0; } @Override - @Method(modid = "CoFHCore") public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { if(getOutputtingSides().contains(from)) { - double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract* general.FROM_TE)); + double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_TE)); if(!simulate) { setEnergy(getEnergy() - toSend); } - return (int)Math.round(toSend* general.TO_TE); + return (int)Math.round(toSend*general.TO_TE); } return 0; } @Override - @Method(modid = "CoFHCore") public boolean canConnectEnergy(EnumFacing from) { return getConsumingSides().contains(from) || getOutputtingSides().contains(from); } @Override - @Method(modid = "CoFHCore") public int getEnergyStored(EnumFacing from) { - return (int)Math.round(getEnergy()* general.TO_TE); + return (int)Math.round(getEnergy()*general.TO_TE); } @Override - @Method(modid = "CoFHCore") public int getMaxEnergyStored(EnumFacing from) { - return (int)Math.round(getMaxEnergy()* general.TO_TE); + return (int)Math.round(getMaxEnergy()*general.TO_TE); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java index aa91233fc..f559517d0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java @@ -1,18 +1,17 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import io.netty.buffer.ByteBuf; - public class TileEntityElectricChest extends TileEntityElectricBlock { public static int[] INV; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java index fe24677ad..88cf26f04 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java @@ -39,12 +39,17 @@ public abstract class TileEntityElectricMachine= FluidContainerRegistry.BUCKET_VOLUME) + if(inventory[0].getItem() instanceof IFluidContainerItem) { - if(inventory[0].getItem() instanceof IFluidContainerItem) - { - int prev = fluidTank.getFluidAmount(); - - fluidTank.drain(FluidContainerUtils.insertFluid(fluidTank, inventory[0]), true); - - if(prev == fluidTank.getFluidAmount() || fluidTank.getFluidAmount() == 0) - { - if(inventory[1] == null) - { - inventory[1] = inventory[0].copy(); - inventory[0] = null; - - markDirty(); - } - } - } - else if(FluidContainerRegistry.isEmptyContainer(inventory[0])) - { - ItemStack tempStack = FluidContainerRegistry.fillFluidContainer(fluidTank.getFluid(), inventory[0]); - - if(tempStack != null) - { - if(inventory[1] == null) - { - fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); - - inventory[1] = tempStack; - inventory[0].stackSize--; - - if(inventory[0].stackSize <= 0) - { - inventory[0] = null; - } - - markDirty(); - } - else if(tempStack.isItemEqual(inventory[1]) && tempStack.getMaxStackSize() > inventory[1].stackSize) - { - fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); - - inventory[1].stackSize++; - inventory[0].stackSize--; - - if(inventory[0].stackSize <= 0) - { - inventory[0] = null; - } - - markDirty(); - } - } - } + FluidContainerUtils.handleContainerItemFill(this, fluidTank, 0, 1); + } + else if(FluidContainerRegistry.isEmptyContainer(inventory[0])) + { + FluidContainerUtils.handleRegistryItemFill(this, fluidTank, 0, 1); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 77a2e8b5c..078d0e3d5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -1,14 +1,29 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.MekanismConfig; import mekanism.api.Range4D; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.IGasItem; +import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; -import mekanism.common.base.*; +import mekanism.common.base.IActiveState; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; +import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -29,12 +44,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.EnumParticleTypes; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; -import java.util.ArrayList; -import java.util.List; - public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IFluidHandler, IComputerIntegration, ITubeConnection, ISustainedData, IGasHandler, IUpgradeTile, IUpgradeInfoHandler, ITankManager, IRedstoneControl, IActiveState { /** This separator's water slot. */ @@ -579,7 +598,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp nbtTags.setInteger("dumpRight", dumpRight.ordinal()); } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getWater", "getWaterNeeded", "getHydrogen", "getHydrogenNeeded", "getOxygen", "getOxygenNeeded"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getWater", "getWaterNeeded", "getHydrogen", "getHydrogenNeeded", "getOxygen", "getOxygenNeeded"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index cf9e85e74..75235eb58 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -12,7 +12,6 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.Tier.EnergyCubeTier; -import mekanism.common.base.IEjector; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.integration.IComputerIntegration; @@ -168,7 +167,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo return false; } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded"}; @Override public String[] getMethods() @@ -239,7 +238,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo @Override public void setEnergy(double energy) { - if(tier == EnergyCubeTier.CREATIVE && energy != Integer.MAX_VALUE) + if(tier == EnergyCubeTier.CREATIVE && energy != Double.MAX_VALUE) { return; } @@ -280,7 +279,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } diff --git a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java deleted file mode 100644 index 5de1d9a05..000000000 --- a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java +++ /dev/null @@ -1,199 +0,0 @@ -package mekanism.common.tile; - -import java.util.ArrayList; -import java.util.EnumSet; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import mekanism.api.gas.IGasHandler; -import mekanism.api.gas.ITubeConnection; -import mekanism.common.PacketHandler; -import mekanism.common.content.teleportation.SharedInventory; -import mekanism.common.content.teleportation.SharedInventoryManager; -import mekanism.common.util.CableUtils; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - -import io.netty.buffer.ByteBuf; - -public class TileEntityEntangledBlock extends TileEntityElectricBlock implements IFluidHandler, IGasHandler, ITubeConnection -{ - public SharedInventory sharedInventory; - - public static final EnumSet nothing = EnumSet.noneOf(EnumFacing.class); - - public TileEntityEntangledBlock() - { - super("Entangled", 0); - inventory = new ItemStack[0]; - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - CableUtils.emit(this); - } - - public void setInventory(String frequency) - { - sharedInventory = SharedInventoryManager.getInventory(frequency); - markDirty(); - } - - @Override - public void handlePacketData(ByteBuf dataStream) - { - if(!worldObj.isRemote) - { - switch(dataStream.readInt()) - { - case 0: - setInventory(PacketHandler.readString(dataStream)); - return; - } - } - - super.handlePacketData(dataStream); - setEnergy(dataStream.readDouble()); - } - - @Override - public ArrayList getNetworkedData(ArrayList data) - { - super.getNetworkedData(data); - data.add(getEnergy()); - return data; - } - - @Override - public EnumSet getOutputtingSides() - { - return sharedInventory == null ? nothing : EnumSet.of(EnumFacing.UP); - } - - @Override - public EnumSet getConsumingSides() - { - return sharedInventory == null ? nothing : EnumSet.complementOf(EnumSet.of(EnumFacing.UP)); - } - - @Override - public double getMaxOutput() - { - return sharedInventory == null ? 0 : 1000; - } - - @Override - public double getEnergy() - { - return sharedInventory == null ? 0 : sharedInventory.getEnergy(); - } - - @Override - public void setEnergy(double energy) - { - if(sharedInventory != null) - { - sharedInventory.setEnergy(energy); - } - } - - @Override - public double getMaxEnergy() - { - return sharedInventory == null ? 0 : sharedInventory.getMaxEnergy(); - } - - @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) - { - return sharedInventory == null ? 0 : sharedInventory.fill(from, resource, doFill); - } - - @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) - { - if(sharedInventory == null) - { - return null; - } - return sharedInventory.drain(from, resource, doDrain); - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) - { - if(sharedInventory == null) - { - return null; - } - return sharedInventory.drain(from, maxDrain, doDrain); - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid) - { - return sharedInventory != null && sharedInventory.canFill(from, fluid); - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - return sharedInventory != null && sharedInventory.canDrain(from, fluid); - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) - { - return sharedInventory == null ? new FluidTankInfo[0] : sharedInventory.getTankInfo(from); - } - - @Override - public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) - { - return sharedInventory == null ? 0 : sharedInventory.receiveGas(side, stack, doTransfer); - } - - @Override - public int receiveGas(EnumFacing side, GasStack stack) - { - return receiveGas(side, stack, true); - } - - @Override - public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) - { - return sharedInventory == null ? null : sharedInventory.drawGas(side, amount, doTransfer); - } - - @Override - public GasStack drawGas(EnumFacing side, int amount) - { - return drawGas(side, amount, true); - } - - @Override - public boolean canReceiveGas(EnumFacing side, Gas type) - { - return sharedInventory != null && sharedInventory.canReceiveGas(side, type); - } - - @Override - public boolean canDrawGas(EnumFacing side, Gas type) - { - return sharedInventory != null && sharedInventory.canDrawGas(side, type); - } - - @Override - public boolean canTubeConnect(EnumFacing side) - { - return sharedInventory != null; - } -} diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index c3d7796f7..77932516f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -8,6 +8,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; @@ -31,7 +32,6 @@ import mekanism.common.PacketHandler; import mekanism.common.SideData; import mekanism.common.Tier.FactoryTier; import mekanism.common.Upgrade; -import mekanism.common.base.IEjector; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; @@ -61,7 +61,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection +public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData { /** This Factory's tier. */ public FactoryTier tier; @@ -119,6 +119,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I public boolean sorting; public boolean upgraded; + + public double lastUsage; @SideOnly(Side.CLIENT) public SoundWrapper[] sounds; @@ -137,11 +139,12 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY, TransmissionType.GAS); configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); - configComponent.addOutput(TransmissionType.ITEM, new SideData("Energy", EnumColor.DARK_GREEN, new int[] {1})); - configComponent.addOutput(TransmissionType.ITEM, new SideData("Extra", EnumColor.PURPLE, new int[] {4})); configComponent.addOutput(TransmissionType.ITEM, new SideData("Input", EnumColor.DARK_RED, new int[] {5, 6, 7})); configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {8, 9, 10})); - configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0}); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Energy", EnumColor.DARK_GREEN, new int[] {1})); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Extra", EnumColor.PURPLE, new int[] {4})); + + configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 0, 0, 3, 1, 2}); configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0})); @@ -154,7 +157,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I upgradeComponent.setSupported(Upgrade.MUFFLING); ejectorComponent = new TileComponentEjector(this); - ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(4)); + ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); } public TileEntityFactory(FactoryTier type, MachineType machine) @@ -332,6 +335,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I else { recipeTicks = 0; } + + double prev = getEnergy(); secondaryEnergyThisTick = recipeType.fuelEnergyUpgrades() ? StatUtils.inversePoisson(secondaryEnergyPerTick) : (int)Math.ceil(secondaryEnergyPerTick); @@ -392,6 +397,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I infuseStored.type = null; } + lastUsage = prev-getEnergy(); prevEnergy = getEnergy(); } } @@ -770,6 +776,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I controlType = RedstoneControl.values()[dataStream.readInt()]; sorting = dataStream.readBoolean(); upgraded = dataStream.readBoolean(); + lastUsage = dataStream.readDouble(); infuseStored.amount = dataStream.readInt(); infuseStored.type = InfuseRegistry.get(PacketHandler.readString(dataStream)); @@ -869,6 +876,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I data.add(controlType.ordinal()); data.add(sorting); data.add(upgraded); + data.add(lastUsage); data.add(infuseStored.amount); if(infuseStored.type != null) @@ -912,7 +920,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I return tier.getBaseTier().getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getName(); } - private static final String[] methods = new String[] {"getStored", "getProgress", "facing", "canOperate", "getMaxEnergy", "getEnergyNeeded"}; + private static final String[] methods = new String[] {"getEnergy", "getProgress", "facing", "canOperate", "getMaxEnergy", "getEnergyNeeded"}; @Override public String[] getMethods() @@ -1073,7 +1081,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } @@ -1158,4 +1166,24 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I break; } } + + @Override + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) + { + nbtTags.setBoolean("sorting", sorting); + + return nbtTags; + } + + @Override + public void setConfigurationData(NBTTagCompound nbtTags) + { + sorting = nbtTags.getBoolean("sorting"); + } + + @Override + public String getDataType() + { + return tier.getBaseTier().getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getInventoryName(); + } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java similarity index 76% rename from src/main/java/mekanism/common/tile/TileEntityPortableTank.java rename to src/main/java/mekanism/common/tile/TileEntityFluidTank.java index c8985ad72..69bbdb49b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -9,6 +9,7 @@ import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IFluidContainerManager; import mekanism.common.base.ISustainedTank; @@ -17,6 +18,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -35,18 +37,18 @@ import net.minecraftforge.fml.common.network.ByteBufUtils; import java.util.ArrayList; -public class TileEntityPortableTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager +public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager { public boolean isActive; public boolean clientActive; - public static final int MAX_FLUID = 14000; - - public FluidTank fluidTank = new FluidTank(MAX_FLUID); + public FluidTank fluidTank; public ContainerEditMode editMode = ContainerEditMode.BOTH; + public FluidTankTier tier = FluidTankTier.BASIC; + public int updateDelay; public int prevAmount; @@ -58,10 +60,11 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements public boolean needsPacket; - public TileEntityPortableTank() + public TileEntityFluidTank() { - super("PortableTank"); + super("FluidTank"); + fluidTank = new FluidTank(tier.storage); inventory = new ItemStack[2]; } @@ -143,6 +146,12 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements } } + @Override + public String getInventoryName() + { + return LangUtils.localize("tile.FluidTank" + tier.getBaseTier().getName() + ".name"); + } + private void activeEmit() { if(fluidTank.getFluid() != null) @@ -151,7 +160,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements if(tileEntity instanceof IFluidHandler) { - FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(100, fluidTank.getFluidAmount())); + FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(tier.output, fluidTank.getFluidAmount())); fluidTank.drain(((IFluidHandler)tileEntity).fill(EnumFacing.UP, toDrain, true), true); } } @@ -165,121 +174,42 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { if(editMode == ContainerEditMode.FILL && fluidTank.getFluidAmount() > 0) { - int prev = fluidTank.getFluidAmount(); - - fluidTank.drain(FluidContainerUtils.insertFluid(fluidTank, inventory[0]), true); - - if(prev == fluidTank.getFluidAmount()) - { - if(inventory[1] == null) - { - inventory[1] = inventory[0].copy(); - inventory[0] = null; - - markDirty(); - } - } + FluidContainerUtils.handleContainerItemFill(this, fluidTank, 0, 1); } else if(editMode == ContainerEditMode.EMPTY) { - fluidTank.fill(FluidContainerUtils.extractFluid(fluidTank, inventory[0]), true); + FluidStack ret = FluidContainerUtils.handleContainerItemEmpty(this, inventory, fluidTank.getFluid(), getCurrentNeeded(), 0, 1, null); - if(((IFluidContainerItem)inventory[0].getItem()).getFluid(inventory[0]) == null || fluidTank.getFluidAmount() == fluidTank.getCapacity()) + if(ret != null) { - if(inventory[1] == null) + fluidTank.setFluid(new FluidStack(ret.getFluid(), Math.min(fluidTank.getCapacity(), ret.amount))); + + int rejects = Math.max(0, ret.amount - fluidTank.getCapacity()); + + if(rejects > 0) { - inventory[1] = inventory[0].copy(); - inventory[0] = null; - - markDirty(); + pushUp(new FluidStack(ret.getFluid(), rejects), true); } } } } else if(FluidContainerRegistry.isEmptyContainer(inventory[0]) && (editMode == ContainerEditMode.BOTH || editMode == ContainerEditMode.FILL)) { - if(fluidTank.getFluid() != null && fluidTank.getFluid().amount >= FluidContainerRegistry.BUCKET_VOLUME) - { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(fluidTank.getFluid(), inventory[0]); - - if(filled != null) - { - if(inventory[1] == null || (inventory[1].isItemEqual(filled) && inventory[1].stackSize+1 <= filled.getMaxStackSize())) - { - inventory[0].stackSize--; - - if(inventory[0].stackSize <= 0) - { - inventory[0] = null; - } - - if(inventory[1] == null) - { - inventory[1] = filled; - } - else { - inventory[1].stackSize++; - } - - fluidTank.drain(FluidContainerRegistry.getFluidForFilledItem(filled).amount, true); - } - } - } + FluidContainerUtils.handleRegistryItemFill(this, fluidTank, 0, 1); } else if(FluidContainerRegistry.isFilledContainer(inventory[0]) && (editMode == ContainerEditMode.BOTH || editMode == ContainerEditMode.EMPTY)) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); - int needed = getCurrentNeeded(); - - if((fluidTank.getFluid() == null && itemFluid.amount <= fluidTank.getCapacity()) || itemFluid.amount <= needed) + FluidStack ret = FluidContainerUtils.handleRegistryItemEmpty(this, inventory, fluidTank.getFluid(), getCurrentNeeded(), 0, 1, null); + + if(ret != null) { - if(fluidTank.getFluid() != null && !fluidTank.getFluid().isFluidEqual(itemFluid)) + fluidTank.setFluid(new FluidStack(ret.getFluid(), Math.min(fluidTank.getCapacity(), ret.amount))); + + int rejects = Math.max(0, ret.amount - fluidTank.getCapacity()); + + if(rejects > 0) { - return; - } - - ItemStack containerItem = inventory[0].getItem().getContainerItem(inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(inventory[1] == null || (inventory[1].isItemEqual(containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) - { - inventory[0] = null; - - if(inventory[1] == null) - { - inventory[1] = containerItem; - } - else { - inventory[1].stackSize++; - } - - filled = true; - } - } - else { - inventory[0].stackSize--; - - if(inventory[0].stackSize == 0) - { - inventory[0] = null; - } - - filled = true; - } - - if(filled) - { - int toFill = Math.min(needed, itemFluid.amount); - - fluidTank.fill(itemFluid, true); - - if(itemFluid.amount-toFill > 0) - { - pushUp(new FluidStack(itemFluid.getFluid(), itemFluid.amount-toFill), true); - } + pushUp(new FluidStack(ret.getFluid(), rejects), true); } } } @@ -290,7 +220,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { Coord4D up = Coord4D.get(this).offset(EnumFacing.UP); - if(up.getTileEntity(worldObj) instanceof TileEntityPortableTank) + if(up.getTileEntity(worldObj) instanceof TileEntityFluidTank) { IFluidHandler handler = (IFluidHandler)up.getTileEntity(worldObj); @@ -356,6 +286,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.writeToNBT(nbtTags); + nbtTags.setInteger("tier", tier.ordinal()); nbtTags.setBoolean("isActive", isActive); nbtTags.setInteger("editMode", editMode.ordinal()); @@ -370,11 +301,13 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.readFromNBT(nbtTags); + tier = FluidTankTier.values()[nbtTags.getInteger("tier")]; clientActive = isActive = nbtTags.getBoolean("isActive"); editMode = ContainerEditMode.values()[nbtTags.getInteger("editMode")]; if(nbtTags.hasKey("fluidTank")) { + fluidTank.setCapacity(tier.storage); fluidTank.readFromNBT(nbtTags.getCompoundTag("fluidTank")); } } @@ -384,6 +317,9 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.handlePacketData(dataStream); + tier = FluidTankTier.values()[dataStream.readInt()]; + fluidTank.setCapacity(tier.storage); + clientActive = dataStream.readBoolean(); valve = dataStream.readInt(); editMode = ContainerEditMode.values()[dataStream.readInt()]; @@ -417,10 +353,21 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements int needed = fluidTank.getCapacity()-fluidTank.getFluidAmount(); Coord4D top = Coord4D.get(this).offset(EnumFacing.UP); + TileEntity topTile = top.getTileEntity(worldObj); - if(top.getTileEntity(worldObj) instanceof TileEntityPortableTank) + if(topTile instanceof TileEntityFluidTank) { - needed += ((TileEntityPortableTank)top.getTileEntity(worldObj)).getCurrentNeeded(); + TileEntityFluidTank topTank = (TileEntityFluidTank)topTile; + + if(fluidTank.getFluid() != null && topTank.fluidTank.getFluid() != null) + { + if(fluidTank.getFluid().getFluid() != topTank.fluidTank.getFluid().getFluid()) + { + return needed; + } + } + + needed += topTank.getCurrentNeeded(); } return needed; @@ -431,6 +378,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.getNetworkedData(data); + data.add(tier.ordinal()); data.add(isActive); data.add(valve); data.add(editMode.ordinal()); @@ -561,7 +509,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { TileEntity tile = Coord4D.get(this).offset(EnumFacing.DOWN).getTileEntity(worldObj); - if(isActive && !(tile instanceof TileEntityPortableTank)) + if(isActive && !(tile instanceof TileEntityFluidTank)) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 629cf8d58..55a969f6f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -13,6 +13,7 @@ import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.common.Upgrade; +import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedTank; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; @@ -21,6 +22,7 @@ import mekanism.common.integration.IComputerIntegration; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; @@ -41,7 +43,7 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; -public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IComputerIntegration, IConfigurable, IFluidHandler, ISustainedTank, IUpgradeTile +public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IComputerIntegration, IConfigurable, IFluidHandler, ISustainedTank, IUpgradeTile, IRedstoneControl { public Set activeNodes = new HashSet(); public Set usedNodes = new HashSet(); @@ -63,6 +65,8 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen /** How many ticks this machine has been operating for. */ public int operatingTicks; + public RedstoneControl controlType = RedstoneControl.DISABLED; + private static EnumSet dirs = EnumSet.complementOf(EnumSet.of(EnumFacing.UP)); public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 3); @@ -82,73 +86,25 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen if(inventory[0] != null) { - if(inventory[0].getItem() instanceof IFluidContainerItem && ((IFluidContainerItem)inventory[0].getItem()).getFluid(inventory[0]) != null) + if(inventory[0].getItem() instanceof IFluidContainerItem) { - if(((IFluidContainerItem)inventory[0].getItem()).getFluid(inventory[0]).getFluid().canBePlacedInWorld()) - { - fluidTank.fill(FluidContainerUtils.extractFluid(fluidTank, inventory[0]), true); - - if(((IFluidContainerItem) inventory[0].getItem()).getFluid(inventory[0]) == null || fluidTank.getFluidAmount() == fluidTank.getCapacity()) + FluidContainerUtils.handleContainerItemEmpty(this, fluidTank, 0, 1, new FluidChecker() { + @Override + public boolean isValid(Fluid f) { - if(inventory[1] == null) - { - inventory[1] = inventory[0].copy(); - inventory[0] = null; - - markDirty(); - } + return f.canBePlacedInWorld(); } - } + }); } else if(FluidContainerRegistry.isFilledContainer(inventory[0])) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); - - if((fluidTank.getFluid() == null && itemFluid.amount <= fluidTank.getCapacity()) || fluidTank.getFluid().amount+itemFluid.amount <= fluidTank.getCapacity()) - { - if((fluidTank.getFluid() != null && !fluidTank.getFluid().isFluidEqual(itemFluid)) || !itemFluid.getFluid().canBePlacedInWorld()) + FluidContainerUtils.handleRegistryItemEmpty(this, fluidTank, 0, 1, new FluidChecker() { + @Override + public boolean isValid(Fluid f) { - return; + return f.canBePlacedInWorld(); } - - ItemStack containerItem = inventory[0].getItem().getContainerItem(inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(inventory[1] == null || (inventory[1].isItemEqual(containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) - { - inventory[0] = null; - - if(inventory[1] == null) - { - inventory[1] = containerItem; - } - else { - inventory[1].stackSize++; - } - - filled = true; - } - } - else { - inventory[0].stackSize--; - - if(inventory[0].stackSize == 0) - { - inventory[0] = null; - } - - filled = true; - } - - if(filled) - { - fluidTank.fill(itemFluid, true); - markDirty(); - } - } + }); } } @@ -281,6 +237,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen super.handlePacketData(dataStream); finishedCalc = dataStream.readBoolean(); + controlType = RedstoneControl.values()[dataStream.readInt()]; if(dataStream.readInt() == 1) { @@ -299,6 +256,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen super.getNetworkedData(data); data.add(finishedCalc); + data.add(controlType.ordinal()); if(fluidTank.getFluid() != null) { @@ -320,6 +278,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen nbtTags.setInteger("operatingTicks", operatingTicks); nbtTags.setBoolean("finishedCalc", finishedCalc); + nbtTags.setInteger("controlType", controlType.ordinal()); if(fluidTank.getFluid() != null) { @@ -360,6 +319,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen operatingTicks = nbtTags.getInteger("operatingTicks"); finishedCalc = nbtTags.getBoolean("finishedCalc"); + controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; if(nbtTags.hasKey("fluidTank")) { @@ -582,4 +542,22 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen break; } } + + @Override + public RedstoneControl getControlType() + { + return controlType; + } + + @Override + public void setControlType(RedstoneControl type) + { + controlType = type; + } + + @Override + public boolean canPulse() + { + return false; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java new file mode 100644 index 000000000..f80abd209 --- /dev/null +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -0,0 +1,682 @@ +package mekanism.common.tile; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.EnumColor; +import mekanism.api.IConfigCardAccess; +import mekanism.api.MekanismConfig.usage; +import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.StackUtils; +import mekanism.common.PacketHandler; +import mekanism.common.SideData; +import mekanism.common.Upgrade; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.IUpgradeTile; +import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.content.assemblicator.RecipeFormula; +import mekanism.common.item.ItemCraftingFormula; +import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.InventoryUtils; +import mekanism.common.util.MekanismUtils; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock implements ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess +{ + public InventoryCrafting dummyInv = MekanismUtils.getDummyCraftingInv(); + + public double BASE_ENERGY_PER_TICK = usage.metallurgicInfuserUsage; + + public double energyPerTick = BASE_ENERGY_PER_TICK; + + public int BASE_TICKS_REQUIRED = 40; + + public int ticksRequired = BASE_TICKS_REQUIRED; + + public int operatingTicks; + + public boolean autoMode = false; + + public boolean isRecipe = false; + + public int pulseOperations; + + public RecipeFormula formula; + + public RedstoneControl controlType = RedstoneControl.DISABLED; + + public TileComponentUpgrade upgradeComponent; + public TileComponentEjector ejectorComponent; + public TileComponentConfig configComponent; + + public TileEntityFormulaicAssemblicator() + { + super("FormulaicAssemblicator", MachineType.FORMULAIC_ASSEMBLICATOR.baseEnergy); + + configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY); + + configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Input", EnumColor.DARK_RED, + new int[] {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20})); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {21, 22, 23, 24, 25, 26})); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Energy", EnumColor.DARK_GREEN, new int[] {1})); + + configComponent.setConfig(TransmissionType.ITEM, new byte[] {0, 0, 0, 3, 1, 2}); + configComponent.setInputConfig(TransmissionType.ENERGY); + + inventory = new ItemStack[36]; + + upgradeComponent = new TileComponentUpgrade(this, 0); + + ejectorComponent = new TileComponentEjector(this); + ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); + } + + @Override + public void onUpdate() + { + super.onUpdate(); + + if(!worldObj.isRemote) + { + ChargeUtils.discharge(1, this); + + if(controlType != RedstoneControl.PULSE) + { + pulseOperations = 0; + } + else if(MekanismUtils.canFunction(this)) + { + pulseOperations++; + } + + if(inventory[2] != null && inventory[2].getItem() instanceof ItemCraftingFormula) + { + ItemCraftingFormula item = (ItemCraftingFormula)inventory[2].getItem(); + + if(item.getInventory(inventory[2]) != null && !item.isInvalid(inventory[2])) + { + RecipeFormula itemFormula = new RecipeFormula(item.getInventory(inventory[2])); + + if(itemFormula.isValidFormula(worldObj)) + { + if(formula != null && !formula.isFormulaEqual(worldObj, itemFormula)) + { + itemFormula = formula; + operatingTicks = 0; + } + else if(formula == null) + { + formula = itemFormula; + } + } + else { + formula = null; + item.setInvalid(inventory[2], true); + } + } + else { + formula = null; + } + } + else { + formula = null; + } + + if(autoMode && formula == null) + { + toggleAutoMode(); + } + + if(formula == null) + { + if(autoMode) + { + toggleAutoMode(); + } + + for(int i = 0; i < 9; i++) + { + dummyInv.setInventorySlotContents(i, inventory[27+i]); + } + + isRecipe = MekanismUtils.findMatchingRecipe(dummyInv, worldObj) != null; + } + else { + isRecipe = formula.matches(worldObj, inventory, 27); + } + + if(autoMode && formula != null && ((controlType == RedstoneControl.PULSE && pulseOperations > 0) || MekanismUtils.canFunction(this))) + { + boolean canOperate = true; + + if(!formula.matches(worldObj, inventory, 27)) + { + canOperate = moveItemsToGrid(); + } + + if(canOperate) + { + isRecipe = true; + + if(operatingTicks == ticksRequired) + { + if(doSingleCraft()) + { + operatingTicks = 0; + + if(pulseOperations > 0) + { + pulseOperations--; + } + } + } + else { + if(getEnergy() >= energyPerTick) + { + operatingTicks++; + setEnergy(getEnergy() - energyPerTick); + } + } + } + else { + operatingTicks = 0; + } + } + else { + operatingTicks = 0; + } + } + } + + private boolean doSingleCraft() + { + for(int i = 0; i < 9; i++) + { + dummyInv.setInventorySlotContents(i, inventory[27+i]); + } + + ItemStack output = MekanismUtils.findMatchingRecipe(dummyInv, worldObj); + + if(output != null && tryMoveToOutput(output, false)) + { + tryMoveToOutput(output, true); + + for(int i = 27; i <= 35; i++) + { + if(inventory[i] != null) + { + ItemStack stack = inventory[i]; + + inventory[i].stackSize--; + + if(inventory[i].stackSize == 0) + { + inventory[i] = null; + } + + if(stack.stackSize == 0 && stack.getItem().hasContainerItem(stack)) + { + ItemStack container = stack.getItem().getContainerItem(stack); + + if(container != null && container.isItemStackDamageable() && container.getItemDamage() > container.getMaxDamage()) + { + container = null; + } + + if(container != null && !stack.getItem().doesContainerItemLeaveCraftingGrid(stack)) + { + if(!stack.getItem().doesContainerItemLeaveCraftingGrid(stack)) + { + inventory[i] = container.copy(); + } + else { + boolean move = tryMoveToOutput(container.copy(), false); + + if(move) + { + tryMoveToOutput(container.copy(), true); + } + + inventory[i] = move ? null : container.copy(); + } + } + } + } + } + + if(formula != null) + { + moveItemsToGrid(); + } + + markDirty(); + + return true; + } + + return false; + } + + private boolean craftSingle() + { + if(formula != null) + { + boolean canOperate = true; + + if(!formula.matches(worldObj, inventory, 27)) + { + canOperate = moveItemsToGrid(); + } + + if(canOperate) + { + return doSingleCraft(); + } + } + else { + return doSingleCraft(); + } + + return false; + } + + private boolean moveItemsToGrid() + { + for(int i = 27; i <= 35; i++) + { + if(formula.isIngredientInPos(worldObj, inventory[i], i-27)) + { + continue; + } + + if(inventory[i] != null) + { + inventory[i] = tryMoveToInput(inventory[i]); + markDirty(); + + if(inventory[i] != null) + { + return false; + } + } + else { + boolean found = false; + + for(int j = 3; j <= 20; j++) + { + if(inventory[j] != null && formula.isIngredientInPos(worldObj, inventory[j], i-27)) + { + inventory[i] = StackUtils.size(inventory[j], 1); + inventory[j].stackSize--; + + if(inventory[j].stackSize == 0) + { + inventory[j] = null; + } + + markDirty(); + found = true; + + break; + } + } + + if(!found) + { + return false; + } + } + } + + return true; + } + + private void craftAll() + { + while(craftSingle()); + } + + private void moveItemsToInput(boolean forcePush) + { + for(int i = 27; i <= 35; i++) + { + if(inventory[i] != null && (forcePush || (formula != null && !formula.isIngredientInPos(worldObj, inventory[i], i-27)))) + { + inventory[i] = tryMoveToInput(inventory[i]); + } + } + } + + private void toggleAutoMode() + { + if(autoMode) + { + operatingTicks = 0; + autoMode = false; + } + else if(formula != null) + { + moveItemsToInput(false); + autoMode = true; + } + + markDirty(); + } + + private ItemStack tryMoveToInput(ItemStack stack) + { + stack = stack.copy(); + + for(int i = 3; i <= 20; i++) + { + if(inventory[i] == null) + { + inventory[i] = stack; + + return null; + } + else if(InventoryUtils.areItemsStackable(stack, inventory[i]) && inventory[i].stackSize < inventory[i].getMaxStackSize()) + { + int toUse = Math.min(stack.stackSize, inventory[i].getMaxStackSize()-inventory[i].stackSize); + + inventory[i].stackSize += toUse; + stack.stackSize -= toUse; + + if(stack.stackSize == 0) + { + return null; + } + } + } + + return stack; + } + + private boolean tryMoveToOutput(ItemStack stack, boolean doMove) + { + stack = stack.copy(); + + for(int i = 21; i <= 26; i++) + { + if(inventory[i] == null) + { + if(doMove) + { + inventory[i] = stack; + } + + return true; + } + else if(InventoryUtils.areItemsStackable(stack, inventory[i]) && inventory[i].stackSize < inventory[i].getMaxStackSize()) + { + int toUse = Math.min(stack.stackSize, inventory[i].getMaxStackSize()-inventory[i].stackSize); + + if(doMove) + { + inventory[i].stackSize += toUse; + } + + stack.stackSize -= toUse; + + if(stack.stackSize == 0) + { + return true; + } + } + } + + return false; + } + + private void encodeFormula() + { + if(inventory[2] != null && inventory[2].getItem() instanceof ItemCraftingFormula) + { + ItemCraftingFormula item = (ItemCraftingFormula)inventory[2].getItem(); + + if(item.getInventory(inventory[2]) == null) + { + RecipeFormula formula = new RecipeFormula(inventory, 27); + + if(formula.isValidFormula(worldObj)) + { + item.setInventory(inventory[2], formula.input); + } + } + } + } + + @Override + public boolean canSetFacing(int side) + { + return side != 0 && side != 1; + } + + @Override + public int[] getAccessibleSlotsFromSide(int side) + { + return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; + } + + @Override + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) + { + if(slotID == 1) + { + return ChargeUtils.canBeOutputted(itemstack, false); + } + else if(slotID >= 21 && slotID <= 26) + { + return true; + } + + return false; + } + + @Override + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + { + if(slotID >= 3 && slotID <= 20) + { + if(formula == null) + { + return true; + } + else { + return formula.isIngredient(worldObj, itemstack); + } + } + else if(slotID == 1) + { + return ChargeUtils.canBeDischarged(itemstack); + } + + return false; + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + autoMode = nbtTags.getBoolean("autoMode"); + operatingTicks = nbtTags.getInteger("operatingTicks"); + controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; + pulseOperations = nbtTags.getInteger("pulseOperations"); + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + nbtTags.setBoolean("autoMode", autoMode); + nbtTags.setInteger("operatingTicks", operatingTicks); + nbtTags.setInteger("controlType", controlType.ordinal()); + nbtTags.setInteger("pulseOperations", pulseOperations); + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + if(!worldObj.isRemote) + { + int type = dataStream.readInt(); + + if(type == 0) + { + toggleAutoMode(); + } + else if(type == 1) + { + encodeFormula(); + } + else if(type == 2) + { + craftSingle(); + } + else if(type == 3) + { + craftAll(); + } + else if(type == 4) + { + if(formula != null) + { + moveItemsToGrid(); + } + else { + moveItemsToInput(true); + } + } + + return; + } + + super.handlePacketData(dataStream); + + autoMode = dataStream.readBoolean(); + operatingTicks = dataStream.readInt(); + controlType = RedstoneControl.values()[dataStream.readInt()]; + isRecipe = dataStream.readBoolean(); + + if(dataStream.readBoolean()) + { + ItemStack[] inv = new ItemStack[9]; + + for(int i = 0; i < 9; i++) + { + if(dataStream.readBoolean()) + { + inv[i] = PacketHandler.readStack(dataStream); + } + } + + formula = new RecipeFormula(inv); + } + else { + formula = null; + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(autoMode); + data.add(operatingTicks); + data.add(controlType.ordinal()); + data.add(isRecipe); + + if(formula != null) + { + data.add(true); + + for(int i = 0; i < 9; i++) + { + if(formula.input[i] != null) + { + data.add(true); + data.add(formula.input[i]); + } + else { + data.add(false); + } + } + } + else { + data.add(false); + } + + return data; + } + + @Override + public RedstoneControl getControlType() + { + return controlType; + } + + @Override + public void setControlType(RedstoneControl type) + { + controlType = type; + MekanismUtils.saveChunk(this); + } + + @Override + public boolean canPulse() + { + return true; + } + + @Override + public TileComponentConfig getConfig() + { + return configComponent; + } + + @Override + public int getOrientation() + { + return facing; + } + + @Override + public TileComponentUpgrade getComponent() + { + return upgradeComponent; + } + + @Override + public TileComponentEjector getEjector() + { + return ejectorComponent; + } + + @Override + public void recalculateUpgradables(Upgrade upgrade) + { + super.recalculateUpgradables(upgrade); + + switch(upgrade) + { + case SPEED: + ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED); + case ENERGY: + energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK); + maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY); + default: + break; + } + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 7c1d6948e..882d1406b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -17,13 +17,14 @@ import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; -import mekanism.common.base.IEjector; +import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -37,17 +38,14 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH public enum GasMode { IDLE, - DUMPING, - DUMPING_EXCESS + DUMPING_EXCESS, + DUMPING } /** The type of gas stored in this tank. */ - public GasTank gasTank = new GasTank(MAX_GAS); - - public static final int MAX_GAS = 96000; - - /** How fast this tank can output gas. */ - public int output = 256; + public GasTank gasTank; + + public GasTankTier tier = GasTankTier.BASIC; public GasMode dumping; @@ -74,6 +72,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH configComponent.setIOConfig(TransmissionType.GAS); configComponent.setEjecting(TransmissionType.GAS, true); + gasTank = new GasTank(tier.storage); inventory = new ItemStack[2]; dumping = GasMode.IDLE; controlType = RedstoneControl.DISABLED; @@ -100,19 +99,19 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { if(configComponent.isEjecting(TransmissionType.GAS)) { - GasStack toSend = new GasStack(gasTank.getGas().getGas(), Math.min(gasTank.getStored(), output)); + GasStack toSend = new GasStack(gasTank.getGas().getGas(), Math.min(gasTank.getStored(), tier.output)); gasTank.draw(GasTransmission.emit(toSend, this, configComponent.getSidesForData(TransmissionType.GAS, facing, 2)), true); } } if(dumping == GasMode.DUMPING) { - gasTank.draw(8, true); + gasTank.draw(tier.storage/400, true); } - if(dumping == GasMode.DUMPING_EXCESS && gasTank.getNeeded() < output) + if(dumping == GasMode.DUMPING_EXCESS && gasTank.getNeeded() < tier.output) { - gasTank.draw(output-gasTank.getNeeded(), true); + gasTank.draw(tier.output-gasTank.getNeeded(), true); } int newGasAmount = gasTank.getStored(); @@ -125,6 +124,12 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH currentGasAmount = newGasAmount; } } + + @Override + public String getInventoryName() + { + return LangUtils.localize("tile.GasTank" + tier.getBaseTier().getName() + ".name"); + } @Override public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) @@ -226,6 +231,9 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } super.handlePacketData(dataStream); + + tier = GasTankTier.values()[dataStream.readInt()]; + gasTank.setMaxGas(tier.storage); if(dataStream.readBoolean()) { @@ -246,6 +254,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { super.readFromNBT(nbtTags); + tier = GasTankTier.values()[nbtTags.getInteger("tier")]; gasTank.read(nbtTags.getCompoundTag("gasTank")); dumping = GasMode.values()[nbtTags.getInteger("dumping")]; @@ -257,6 +266,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { super.writeToNBT(nbtTags); + nbtTags.setInteger("tier", tier.ordinal()); nbtTags.setTag("gasTank", gasTank.write(new NBTTagCompound())); nbtTags.setInteger("dumping", dumping.ordinal()); nbtTags.setInteger("controlType", controlType.ordinal()); @@ -266,6 +276,8 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); + + data.add(tier.ordinal()); if(gasTank.getGas() != null) { @@ -320,7 +332,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index 327acafd4..5360ccd9b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -180,7 +180,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock 0) { double firing = collectedEnergy; diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index c165fcb8f..abbf6d3e1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -1,16 +1,28 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.EnumSet; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.IFilterAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.Range4D; import mekanism.common.HashList; import mekanism.common.Mekanism; -import mekanism.common.base.*; +import mekanism.common.base.IActiveState; +import mekanism.common.base.ILogisticalTransporter; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITransporterTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.content.transporter.Finder.FirstFinder; -import mekanism.common.content.transporter.*; +import mekanism.common.content.transporter.InvStack; +import mekanism.common.content.transporter.StackSearcher; +import mekanism.common.content.transporter.TItemStackFilter; +import mekanism.common.content.transporter.TransporterFilter; +import mekanism.common.content.transporter.TransporterManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; @@ -25,10 +37,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants.NBT; import net.minecraft.util.EnumFacing; -import java.util.ArrayList; -import java.util.EnumSet; - -public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, IFilterAccess, ISustainedData +public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData { public HashList filters = new HashList(); @@ -580,10 +589,8 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public NBTTagCompound getFilterData(NBTTagCompound nbtTags) + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) { - nbtTags.setInteger("controlType", controlType.ordinal()); - if(color != null) { nbtTags.setInteger("color", TransporterUtils.colors.indexOf(color)); @@ -612,10 +619,8 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public void setFilterData(NBTTagCompound nbtTags) + public void setConfigurationData(NBTTagCompound nbtTags) { - controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; - if(nbtTags.hasKey("color")) { color = TransporterUtils.colors.get(nbtTags.getInteger("color")); @@ -640,7 +645,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen @Override public String getDataType() { - return "tooltip.filterCard.logisticalSorter"; + return getBlockType().getUnlocalizedName() + "." + fullName + ".name"; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 97ba1ceed..3cc953e58 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -7,6 +7,7 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.IConfigCardAccess; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; @@ -20,7 +21,6 @@ import mekanism.common.MekanismItems; import mekanism.common.PacketHandler; import mekanism.common.SideData; import mekanism.common.Upgrade; -import mekanism.common.base.IEjector; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; @@ -42,7 +42,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl +public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess { /** The maxiumum amount of infuse this machine can store. */ public int MAX_INFUSE = 1000; @@ -89,12 +89,12 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY); configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); - configComponent.addOutput(TransmissionType.ITEM, new SideData("Infuse", EnumColor.PURPLE, new int[] {1})); configComponent.addOutput(TransmissionType.ITEM, new SideData("Input", EnumColor.DARK_RED, new int[] {2})); configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {3})); configComponent.addOutput(TransmissionType.ITEM, new SideData("Energy", EnumColor.DARK_GREEN, new int[] {4})); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Infuse", EnumColor.PURPLE, new int[] {1})); - configComponent.setConfig(TransmissionType.ITEM, new byte[] {1, 0, 0, 4, 2, 3}); + configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 0, 0, 3, 1, 2}); configComponent.setInputConfig(TransmissionType.ENERGY); inventory = new ItemStack[5]; @@ -103,9 +103,9 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i upgradeComponent.setSupported(Upgrade.MUFFLING); ejectorComponent = new TileComponentEjector(this); - ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(3)); + ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); } - + @Override public void onUpdate() { @@ -228,10 +228,16 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i factory.upgradeComponent.readFrom(upgradeComponent); factory.upgradeComponent.setUpgradeSlot(0); factory.ejectorComponent.readFrom(ejectorComponent); - factory.ejectorComponent.setOutputData(TransmissionType.ITEM, factory.configComponent.getOutputs(TransmissionType.ITEM).get(4)); + factory.ejectorComponent.setOutputData(TransmissionType.ITEM, factory.configComponent.getOutputs(TransmissionType.ITEM).get(2)); factory.recipeType = type; factory.upgradeComponent.setSupported(Upgrade.GAS, type.fuelEnergyUpgrades()); + for(TransmissionType transmission : configComponent.transmissions) + { + factory.configComponent.setConfig(transmission, configComponent.getConfig(transmission)); + factory.configComponent.setEjecting(transmission, configComponent.isEjecting(transmission)); + } + //Infuser factory.infuseStored.amount = infuseStored.amount; factory.infuseStored.type = infuseStored.type; @@ -424,7 +430,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i return data; } - private static final String[] methods = new String[] {"getStored", "getProgress", "facing", "canOperate", "getMaxEnergy", "getEnergyNeeded", "getInfuse", "getInfuseNeeded"}; + private static final String[] methods = new String[] {"getEnergy", "getProgress", "facing", "canOperate", "getMaxEnergy", "getEnergyNeeded", "getInfuse", "getInfuseNeeded"}; @Override public String[] getMethods() @@ -540,7 +546,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 86dc2ac66..c29840bf3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -8,7 +8,6 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.multiblock.IMultiblock; -import mekanism.common.multiblock.IStructuralMultiblock; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.SynchronizedData; diff --git a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java index 3e29a9688..a7dba3064 100644 --- a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java @@ -68,7 +68,7 @@ public abstract class TileEntityNoisyElectricBlock extends TileEntityElectricBlo { if(this instanceof IUpgradeTile && ((IUpgradeTile)this).getComponent().supports(Upgrade.MUFFLING)) { - return 1F - (float)((IUpgradeTile)this).getComponent().getUpgrades(Upgrade.MUFFLING)/(float)Upgrade.MUFFLING.getMax(); + return Math.max(0.001F, 1F - (float)((IUpgradeTile)this).getComponent().getUpgrades(Upgrade.MUFFLING)/(float)Upgrade.MUFFLING.getMax()); } return 1F; diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 439b8a954..f5696b9d6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.IFilterAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.Range4D; import mekanism.common.HashList; import mekanism.common.Mekanism; @@ -28,7 +28,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.oredict.OreDictionary; -public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, IFilterAccess, ISustainedData +public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, ISpecialConfigData, ISustainedData { public static final int MAX_LENGTH = 24; @@ -313,10 +313,8 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public NBTTagCompound getFilterData(NBTTagCompound nbtTags) + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) { - nbtTags.setInteger("controlType", controlType.ordinal()); - NBTTagList filterTags = new NBTTagList(); for(OredictionificatorFilter filter : filters) @@ -335,10 +333,8 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public void setFilterData(NBTTagCompound nbtTags) + public void setConfigurationData(NBTTagCompound nbtTags) { - controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; - if(nbtTags.hasKey("filters")) { NBTTagList tagList = nbtTags.getTagList("filters", NBT.TAG_COMPOUND); @@ -353,7 +349,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple @Override public String getDataType() { - return "tooltip.filterCard.oredictionificator"; + return getBlockType().getUnlocalizedName() + "." + fullName + ".name"; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java index 03d13c6e1..45905d397 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java +++ b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -9,7 +9,6 @@ import mekanism.api.gas.GasStack; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.OsmiumCompressorRecipe; - import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 4bd6156aa..7eede878f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -1,9 +1,18 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.Map; + import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.usage; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; import mekanism.common.Upgrade; @@ -26,10 +35,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.*; - -import java.util.ArrayList; -import java.util.Map; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData, ITankManager { @@ -293,7 +304,7 @@ public class TileEntityPRC extends TileEntityBasicMachine publicCache = new ArrayList(); + public List privateCache = new ArrayList(); + + public static final EnumSet nothing = EnumSet.noneOf(ForgeDirection.class); + + public TileComponentEjector ejectorComponent; + public TileComponentConfig configComponent; + + public TileEntityQuantumEntangloporter() + { + super("QuantumEntangloporter", 0); + + configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.FLUID, TransmissionType.GAS, TransmissionType.ENERGY, TransmissionType.HEAT); + + for(TransmissionType type : TransmissionType.values()) + { + if(type != TransmissionType.HEAT) + { + configComponent.setIOConfig(type); + } + else { + configComponent.setInputConfig(type); + } + } + + inventory = new ItemStack[0]; + + configComponent.getOutputs(TransmissionType.ITEM).get(2).availableSlots = new int[] {0}; + configComponent.getOutputs(TransmissionType.FLUID).get(2).availableSlots = new int[] {0}; + configComponent.getOutputs(TransmissionType.GAS).get(2).availableSlots = new int[] {1}; + + ejectorComponent = new TileComponentEjector(this); + ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); + ejectorComponent.setOutputData(TransmissionType.FLUID, configComponent.getOutputs(TransmissionType.FLUID).get(2)); + ejectorComponent.setOutputData(TransmissionType.GAS, configComponent.getOutputs(TransmissionType.GAS).get(2)); + } + + @Override + public void onUpdate() + { + super.onUpdate(); + + if(!worldObj.isRemote) + { + if(configComponent.isEjecting(TransmissionType.ENERGY)) + { + CableUtils.emit(this); + } + + double[] loss = simulateHeat(); + applyTemperatureChange(); + + lastTransferLoss = loss[0]; + lastEnvironmentLoss = loss[1]; + + FrequencyManager manager = getManager(frequency); + Frequency lastFreq = frequency; + + if(manager != null) + { + if(frequency != null && !frequency.valid) + { + frequency = (InventoryFrequency)manager.validateFrequency(owner, Coord4D.get(this), frequency); + markDirty(); + } + + if(frequency != null) + { + frequency = (InventoryFrequency)manager.update(owner, Coord4D.get(this), frequency); + + if(frequency == null) + { + markDirty(); + } + } + } + else { + frequency = null; + + if(lastFreq != null) + { + markDirty(); + } + } + } + } + + private boolean hasFrequency() + { + return frequency != null && frequency.valid; + } + + @Override + public void invalidate() + { + super.invalidate(); + + if(!worldObj.isRemote) + { + if(frequency != null) + { + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + manager.deactivate(Coord4D.get(this)); + } + } + } + } + + @Override + public Frequency getFrequency() + { + return frequency; + } + + public FrequencyManager getManager(Frequency freq) + { + if(owner == null || freq == null) + { + return null; + } + + if(freq.isPublic()) + { + return Mekanism.publicEntangloporters; + } + else { + if(!Mekanism.privateEntangloporters.containsKey(owner)) + { + FrequencyManager manager = new FrequencyManager(InventoryFrequency.class, owner); + Mekanism.privateEntangloporters.put(owner, manager); + manager.createOrLoad(worldObj); + } + + return Mekanism.privateEntangloporters.get(owner); + } + } + + public void setFrequency(String name, boolean publicFreq) + { + if(name.equals(frequency)) + { + return; + } + + FrequencyManager manager = getManager(new InventoryFrequency(name, null).setPublic(publicFreq)); + manager.deactivate(Coord4D.get(this)); + + for(Frequency freq : manager.getFrequencies()) + { + if(freq.name.equals(name)) + { + frequency = (InventoryFrequency)freq; + frequency.activeCoords.add(Coord4D.get(this)); + + return; + } + } + + Frequency freq = new InventoryFrequency(name, owner).setPublic(publicFreq); + freq.activeCoords.add(Coord4D.get(this)); + manager.addFrequency(freq); + frequency = (InventoryFrequency)freq; + + MekanismUtils.saveChunk(this); + markDirty(); + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + if(nbtTags.hasKey("owner")) + { + owner = nbtTags.getString("owner"); + } + + if(nbtTags.hasKey("frequency")) + { + frequency = new InventoryFrequency(nbtTags.getCompoundTag("frequency")); + frequency.valid = false; + } + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + if(owner != null) + { + nbtTags.setString("owner", owner); + } + + if(frequency != null) + { + NBTTagCompound frequencyTag = new NBTTagCompound(); + frequency.write(frequencyTag); + nbtTags.setTag("frequency", frequencyTag); + } + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + if(!worldObj.isRemote) + { + int type = dataStream.readInt(); + + if(type == 0) + { + String name = PacketHandler.readString(dataStream); + boolean isPublic = dataStream.readBoolean(); + + setFrequency(name, isPublic); + } + else if(type == 1) + { + String freq = PacketHandler.readString(dataStream); + boolean isPublic = dataStream.readBoolean(); + + FrequencyManager manager = getManager(new InventoryFrequency(freq, null).setPublic(isPublic)); + + if(manager != null) + { + manager.remove(freq, owner); + } + } + + return; + } + + super.handlePacketData(dataStream); + + lastTransferLoss = dataStream.readDouble(); + lastEnvironmentLoss = dataStream.readDouble(); + + if(dataStream.readBoolean()) + { + owner = PacketHandler.readString(dataStream); + } + else { + owner = null; + } + + if(dataStream.readBoolean()) + { + frequency = new InventoryFrequency(dataStream); + } + else { + frequency = null; + } + + publicCache.clear(); + privateCache.clear(); + + int amount = dataStream.readInt(); + + for(int i = 0; i < amount; i++) + { + publicCache.add(new InventoryFrequency(dataStream)); + } + + amount = dataStream.readInt(); + + for(int i = 0; i < amount; i++) + { + privateCache.add(new InventoryFrequency(dataStream)); + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(lastTransferLoss); + data.add(lastEnvironmentLoss); + + if(owner != null) + { + data.add(true); + data.add(owner); + } + else { + data.add(false); + } + + if(frequency != null) + { + data.add(true); + frequency.write(data); + } + else { + data.add(false); + } + + data.add(Mekanism.publicEntangloporters.getFrequencies().size()); + + for(Frequency freq : Mekanism.publicEntangloporters.getFrequencies()) + { + freq.write(data); + } + + FrequencyManager manager = getManager(new InventoryFrequency(null, null).setPublic(false)); + + if(manager != null) + { + data.add(manager.getFrequencies().size()); + + for(Frequency freq : manager.getFrequencies()) + { + freq.write(data); + } + } + else { + data.add(0); + } + + return data; + } + + @Override + public EnumSet getOutputtingSides() + { + return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); + } + + @Override + public EnumSet getConsumingSides() + { + return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); + } + + @Override + public double getMaxOutput() + { + return !hasFrequency() ? 0 : InventoryFrequency.MAX_ENERGY; + } + + @Override + public double getEnergy() + { + return !hasFrequency() ? 0 : frequency.storedEnergy; + } + + @Override + public void setEnergy(double energy) + { + if(hasFrequency()) + { + frequency.storedEnergy = Math.min(InventoryFrequency.MAX_ENERGY, energy); + } + } + + @Override + public double getMaxEnergy() + { + return !hasFrequency() ? 0 : frequency.MAX_ENERGY; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + { + return !hasFrequency() ? 0 : frequency.storedFluid.fill(resource, doFill); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + { + if(hasFrequency() && resource.isFluidEqual(frequency.storedFluid.getFluid())) + { + return frequency.storedFluid.drain(resource.amount, doDrain); + } + + return null; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + { + if(hasFrequency()) + { + return frequency.storedFluid.drain(maxDrain, doDrain); + } + + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) + { + if(hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState == IOState.INPUT) + { + return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); + } + + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) + { + if(hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState == IOState.OUTPUT) + { + return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); + } + + return false; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) + { + if(hasFrequency()) + { + if(configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState != IOState.OFF) + { + return new FluidTankInfo[] {frequency.storedFluid.getInfo()}; + } + } + + return PipeUtils.EMPTY; + } + + @Override + public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + { + return !hasFrequency() ? 0 : frequency.storedGas.receive(stack, doTransfer); + } + + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + + @Override + public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + { + return !hasFrequency() ? null : frequency.storedGas.draw(amount, doTransfer); + } + + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + + @Override + public boolean canReceiveGas(ForgeDirection side, Gas type) + { + if(hasFrequency() && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState == IOState.INPUT) + { + return frequency.storedGas.getGasType() == null || type == frequency.storedGas.getGasType(); + } + + return false; + } + + @Override + public boolean canDrawGas(ForgeDirection side, Gas type) + { + if(hasFrequency() && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState == IOState.OUTPUT) + { + return frequency.storedGas.getGasType() == null || type == frequency.storedGas.getGasType(); + } + + return false; + } + + @Override + public boolean handleInventory() + { + return false; + } + + @Override + public int getSizeInventory() + { + return 1; + } + + @Override + public ItemStack getStackInSlot(int slotID) + { + return hasFrequency() && slotID == 0 ? frequency.storedItem : null; + } + + @Override + public void setInventorySlotContents(int slotID, ItemStack itemstack) + { + if(hasFrequency() && slotID == 0) + { + frequency.storedItem = itemstack; + + if(itemstack != null && itemstack.stackSize > getInventoryStackLimit()) + { + itemstack.stackSize = getInventoryStackLimit(); + } + } + } + + @Override + public double getTemp() + { + return hasFrequency() ? frequency.temperature : 0; + } + + @Override + public double getInverseConductionCoefficient() + { + return 1; + } + + @Override + public double getInsulationCoefficient(ForgeDirection side) + { + return 1000; + } + + @Override + public void transferHeatTo(double heat) + { + heatToAbsorb += heat; + } + + @Override + public double[] simulateHeat() + { + return HeatUtils.simulate(this); + } + + @Override + public double applyTemperatureChange() + { + if(hasFrequency()) + { + frequency.temperature += heatToAbsorb; + } + + heatToAbsorb = 0; + + return hasFrequency() ? frequency.temperature : 0; + } + + @Override + public boolean canConnectHeat(ForgeDirection side) + { + return hasFrequency() && configComponent.getOutput(TransmissionType.HEAT, side.ordinal(), facing).ioState != IOState.OFF; + } + + @Override + public IHeatTransfer getAdjacent(ForgeDirection side) + { + TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + + if(hasFrequency() && configComponent.getOutput(TransmissionType.HEAT, side.ordinal(), facing).ioState == IOState.INPUT) + { + if(adj instanceof IHeatTransfer) + { + return (IHeatTransfer)adj; + } + } + + return null; + } + + @Override + public boolean canInsertItem(int slotID, ItemStack itemstack, int side) + { + return hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState == IOState.INPUT; + } + + @Override + public int[] getAccessibleSlotsFromSide(int side) + { + if(hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState != IOState.OFF) + { + return new int[] {0}; + } + + return InventoryUtils.EMPTY; + } + + @Override + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) + { + return hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState == IOState.OUTPUT; + } + + @Override + public Object[] getTanks() + { + if(!hasFrequency()) + { + return null; + } + + return new Object[] {frequency.storedFluid, frequency.storedGas}; + } + + @Override + public TileComponentConfig getConfig() + { + return configComponent; + } + + @Override + public int getOrientation() + { + return facing; + } + + @Override + public TileComponentEjector getEjector() + { + return ejectorComponent; + } + + @Override + public boolean canTubeConnect(ForgeDirection side) + { + return frequency != null && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState != IOState.OFF; + } + + private static final String[] methods = new String[] {"setFrequency"}; + + @Override + public String[] getMethods() + { + return methods; + } + + @Override + public Object[] invoke(int method, Object[] arguments) throws Exception + { + switch(method) + { + case 0: + if(!(arguments[0] instanceof String) || !(arguments[1] instanceof Boolean)) + { + return new Object[] {"Invalid parameters."}; + } + + String freq = ((String)arguments[0]).trim(); + boolean isPublic = (Boolean)arguments[1]; + + setFrequency(freq, isPublic); + + return new Object[] {"Frequency set."}; + default: + throw new NoSuchMethodException(); + } + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java new file mode 100644 index 000000000..3442c4785 --- /dev/null +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -0,0 +1,344 @@ +package mekanism.common.tile; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.Coord4D; +import mekanism.api.IHeatTransfer; +import mekanism.api.MekanismConfig.general; +import mekanism.api.Range4D; +import mekanism.common.Mekanism; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.integration.IComputerIntegration; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.HeatUtils; +import mekanism.common.util.MekanismUtils; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + +public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl +{ + public double energyUsage = 100; + + public double temperature; + public double heatToAbsorb = 0; + + /** Whether or not this machine is in it's active state. */ + public boolean isActive; + + /** The client's current active state. */ + public boolean clientActive; + + /** How many ticks must pass until this block's active state can sync with the client. */ + public int updateDelay; + + public float soundScale = 1; + + public double lastTransferLoss; + public double lastEnvironmentLoss; + + public RedstoneControl controlType = RedstoneControl.DISABLED; + + public TileEntityResistiveHeater() + { + super("machine.resistiveheater", "ResistiveHeater", MachineType.RESISTIVE_HEATER.baseEnergy); + inventory = new ItemStack[1]; + } + + @Override + public void onUpdate() + { + super.onUpdate(); + + if(worldObj.isRemote && updateDelay > 0) + { + updateDelay--; + + if(updateDelay == 0 && clientActive != isActive) + { + isActive = clientActive; + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + } + } + + if(!worldObj.isRemote) + { + boolean packet = false; + + if(updateDelay > 0) + { + updateDelay--; + + if(updateDelay == 0 && clientActive != isActive) + { + packet = true; + } + } + + ChargeUtils.discharge(0, this); + + double toUse = 0; + + if(MekanismUtils.canFunction(this)) + { + toUse = Math.min(getEnergy(), energyUsage); + heatToAbsorb += toUse/general.energyPerHeat; + setEnergy(getEnergy() - toUse); + } + + setActive(toUse > 0); + + double[] loss = simulateHeat(); + applyTemperatureChange(); + + lastTransferLoss = loss[0]; + lastEnvironmentLoss = loss[1]; + + float newSoundScale = (float)Math.max(0, (toUse/1E5)); + + if(Math.abs(newSoundScale-soundScale) > 0.01) + { + packet = true; + } + + soundScale = newSoundScale; + + if(packet) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + } + } + } + + @Override + public boolean canSetFacing(int side) + { + return side != 0 && side != 1; + } + + @Override + public float getVolume() + { + return super.getVolume()*Math.max(0.001F, soundScale); + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + energyUsage = nbtTags.getDouble("energyUsage"); + temperature = nbtTags.getDouble("temperature"); + clientActive = isActive = nbtTags.getBoolean("isActive"); + controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; + + maxEnergy = energyUsage * 400; + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + nbtTags.setDouble("energyUsage", energyUsage); + nbtTags.setDouble("temperature", temperature); + nbtTags.setBoolean("isActive", isActive); + nbtTags.setInteger("controlType", controlType.ordinal()); + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + if(!worldObj.isRemote) + { + energyUsage = dataStream.readInt(); + maxEnergy = energyUsage * 400; + + return; + } + + super.handlePacketData(dataStream); + + energyUsage = dataStream.readDouble(); + temperature = dataStream.readDouble(); + clientActive = dataStream.readBoolean(); + maxEnergy = dataStream.readDouble(); + soundScale = dataStream.readFloat(); + controlType = RedstoneControl.values()[dataStream.readInt()]; + + lastTransferLoss = dataStream.readDouble(); + lastEnvironmentLoss = dataStream.readDouble(); + + if(updateDelay == 0 && clientActive != isActive) + { + updateDelay = general.UPDATE_DELAY; + isActive = clientActive; + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(energyUsage); + data.add(temperature); + data.add(isActive); + data.add(maxEnergy); + data.add(soundScale); + data.add(controlType.ordinal()); + + data.add(lastTransferLoss); + data.add(lastEnvironmentLoss); + + return data; + } + + @Override + public double getTemp() + { + return temperature; + } + + @Override + public double getInverseConductionCoefficient() + { + return 1; + } + + @Override + public double getInsulationCoefficient(ForgeDirection side) + { + return 1000; + } + + @Override + public void transferHeatTo(double heat) + { + heatToAbsorb += heat; + } + + @Override + public double[] simulateHeat() + { + return HeatUtils.simulate(this); + } + + @Override + public double applyTemperatureChange() + { + temperature += heatToAbsorb; + heatToAbsorb = 0; + + return temperature; + } + + @Override + public boolean canConnectHeat(ForgeDirection side) + { + return true; + } + + @Override + public IHeatTransfer getAdjacent(ForgeDirection side) + { + TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + + if(adj instanceof IHeatTransfer) + { + return (IHeatTransfer)adj; + } + + return null; + } + + @Override + public void setActive(boolean active) + { + isActive = active; + + if(clientActive != active && updateDelay == 0) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + + updateDelay = 10; + clientActive = active; + } + } + + @Override + public boolean getActive() + { + return isActive; + } + + @Override + public boolean renderUpdate() + { + return false; + } + + @Override + public boolean lightUpdate() + { + return true; + } + + private static final String[] methods = new String[] {"getEnergy", "getMaxEnergy", "getTemperature", "setEnergyUsage"}; + + @Override + public String[] getMethods() + { + return methods; + } + + @Override + public Object[] invoke(int method, Object[] arguments) throws Exception + { + switch(method) + { + case 0: + return new Object[] {getEnergy()}; + case 1: + return new Object[] {getMaxEnergy()}; + case 2: + return new Object[] {temperature}; + case 3: + if(arguments.length == 1) + { + if(arguments[0] instanceof Double) + { + temperature = (Double)arguments[0]; + } + } + + return new Object[] {"Invalid parameters."}; + default: + throw new NoSuchMethodException(); + } + } + + @Override + public RedstoneControl getControlType() + { + return controlType; + } + + @Override + public void setControlType(RedstoneControl type) + { + controlType = type; + } + + @Override + public boolean canPulse() + { + return false; + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index d946cee8d..2c9173592 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -19,9 +19,9 @@ import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; import mekanism.common.base.IActiveState; -import mekanism.common.base.ITankManager; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -128,52 +128,11 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp { if(inventory[2].getItem() instanceof IFluidContainerItem) { - int prev = fluidTank.getFluidAmount(); - - fluidTank.drain(FluidContainerUtils.insertFluid(fluidTank, inventory[2]), true); - - if(prev == fluidTank.getFluidAmount() || fluidTank.getFluidAmount() == 0) - { - if(inventory[3] == null) - { - inventory[3] = inventory[2].copy(); - inventory[2] = null; - - markDirty(); - } - } + FluidContainerUtils.handleContainerItemFill(this, fluidTank, 2, 3); } else if(FluidContainerRegistry.isEmptyContainer(inventory[2])) { - if(fluidTank.getFluid() != null && fluidTank.getFluid().amount >= FluidContainerRegistry.BUCKET_VOLUME) - { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(fluidTank.getFluid(), inventory[2]); - - if(filled != null) - { - if(inventory[3] == null || (inventory[3].isItemEqual(filled) && inventory[3].stackSize+1 <= filled.getMaxStackSize())) - { - inventory[2].stackSize--; - - if(inventory[2].stackSize <= 0) - { - inventory[2] = null; - } - - if(inventory[3] == null) - { - inventory[3] = filled; - } - else { - inventory[3].stackSize++; - } - - markDirty(); - - fluidTank.drain(FluidContainerRegistry.getFluidForFilledItem(filled).amount, true); - } - } - } + FluidContainerUtils.handleRegistryItemFill(this, fluidTank, 2, 3); } } @@ -221,68 +180,11 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp { if(inventory[2].getItem() instanceof IFluidContainerItem) { - fluidTank.fill(FluidContainerUtils.extractFluid(fluidTank, inventory[2]), true); - - if(((IFluidContainerItem)inventory[2].getItem()).getFluid(inventory[2]) == null || fluidTank.getFluidAmount() == fluidTank.getCapacity()) - { - if(inventory[3] == null) - { - inventory[3] = inventory[2].copy(); - inventory[2] = null; - - markDirty(); - } - } + FluidContainerUtils.handleContainerItemEmpty(this, fluidTank, 2, 3); } else if(FluidContainerRegistry.isFilledContainer(inventory[2])) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[2]); - - if((fluidTank.getFluid() == null && itemFluid.amount <= MAX_FLUID) || fluidTank.getFluid().amount+itemFluid.amount <= MAX_FLUID) - { - if(fluidTank.getFluid() != null && !fluidTank.getFluid().isFluidEqual(itemFluid)) - { - return; - } - - ItemStack containerItem = inventory[2].getItem().getContainerItem(inventory[2]); - - boolean filled = false; - - if(containerItem != null) - { - if(inventory[3] == null || (inventory[3].isItemEqual(containerItem) && inventory[3].stackSize+1 <= containerItem.getMaxStackSize())) - { - inventory[2] = null; - - if(inventory[3] == null) - { - inventory[3] = containerItem; - } - else { - inventory[3].stackSize++; - } - - filled = true; - } - } - else { - inventory[2].stackSize--; - - if(inventory[2].stackSize == 0) - { - inventory[2] = null; - } - - filled = true; - } - - if(filled) - { - fluidTank.fill(itemFluid, true); - markDirty(); - } - } + FluidContainerUtils.handleRegistryItemEmpty(this, fluidTank, 2, 3); } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index cf43ab7e2..30d50097c 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.EnumSet; @@ -14,13 +16,10 @@ import mekanism.common.block.states.BlockStateMachine; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import io.netty.buffer.ByteBuf; - public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl { public boolean isActive; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index f423f574a..1494c4014 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -16,9 +16,9 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; -import mekanism.common.base.ITankManager; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 7f5e91428..4c35be00a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -183,6 +183,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { frequency = freq; frequency.activeCoords.add(Coord4D.get(this)); + return; } } @@ -225,7 +226,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo return Mekanism.privateTeleporters.get(owner); } - return FrequencyManager.loadOnly(world, owner, Frequency.class); + return FrequencyManager.loadOnly(world, owner, Frequency.class, "Teleporter"); } @Override @@ -700,7 +701,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo return ChargeUtils.canBeOutputted(itemstack, false); } - private static final String[] methods = new String[] {"getStored", "canTeleport", "getMaxEnergy", "getEnergyNeeded", "teleport", "set"}; + private static final String[] methods = new String[] {"getEnergy", "canTeleport", "getMaxEnergy", "teleport", "setFrequency"}; @Override public String[] getMethods() @@ -720,11 +721,9 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo case 2: return new Object[] {getMaxEnergy()}; case 3: - return new Object[] {(getMaxEnergy()-getEnergy())}; - case 4: teleport(); return new Object[] {"Attempted to teleport."}; - case 5: + case 4: if(!(arguments[0] instanceof String) || !(arguments[1] instanceof Boolean)) { return new Object[] {"Invalid parameters."}; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 2f591e062..4b49d9f31 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -20,6 +20,8 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.FluidInput; import mekanism.common.recipe.machines.ThermalEvaporationRecipe; +import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -32,6 +34,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -73,6 +76,8 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva public float prevScale; + public float totalLoss = 0; + public TileEntityThermalEvaporationController() { super("ThermalEvaporationController"); @@ -221,98 +226,41 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva private void manageBuckets() { - if(inventory[2] != null) + if(inventory[2] != null && outputTank.getFluid() != null) { - if(outputTank.getFluid() != null && outputTank.getFluid().amount >= FluidContainerRegistry.BUCKET_VOLUME) + if(inventory[2].getItem() instanceof IFluidContainerItem) { - if(FluidContainerRegistry.isEmptyContainer(inventory[2])) - { - ItemStack tempStack = FluidContainerRegistry.fillFluidContainer(outputTank.getFluid(), inventory[2]); - - if(tempStack != null) - { - if(inventory[3] == null) - { - outputTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); - - inventory[3] = tempStack; - inventory[2].stackSize--; - - if(inventory[2].stackSize <= 0) - { - inventory[2] = null; - } - - markDirty(); - } - else if(tempStack.isItemEqual(inventory[3]) && tempStack.getMaxStackSize() > inventory[3].stackSize) - { - outputTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); - - inventory[3].stackSize++; - inventory[2].stackSize--; - - if(inventory[2].stackSize <= 0) - { - inventory[2] = null; - } - - markDirty(); - } - } - } + FluidContainerUtils.handleContainerItemFill(this, outputTank, 2, 3); + } + else if(FluidContainerRegistry.isEmptyContainer(inventory[2])) + { + FluidContainerUtils.handleRegistryItemFill(this, outputTank, 2, 3); } } if(structured) { - if(FluidContainerRegistry.isFilledContainer(inventory[0])) + if(inventory[0] != null) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); - - if((inputTank.getFluid() == null && itemFluid.amount <= getMaxFluid()) || inputTank.getFluid().amount+itemFluid.amount <= getMaxFluid()) + if(inventory[0].getItem() instanceof IFluidContainerItem) { - if(!hasRecipe(itemFluid.getFluid()) || (inputTank.getFluid() != null && !inputTank.getFluid().isFluidEqual(itemFluid))) - { - return; - } - - ItemStack containerItem = inventory[0].getItem().getContainerItem(inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(inventory[1] == null || (inventory[1].isItemEqual(containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) + FluidContainerUtils.handleContainerItemEmpty(this, inputTank, 0, 1, new FluidChecker() { + @Override + public boolean isValid(Fluid f) { - inventory[0] = null; - - if(inventory[1] == null) - { - inventory[1] = containerItem; - } - else { - inventory[1].stackSize++; - } - - filled = true; + return hasRecipe(f); } - } - else { - inventory[0].stackSize--; - - if(inventory[0].stackSize == 0) + }); + } + else if(FluidContainerRegistry.isFilledContainer(inventory[0])) + { + FluidContainerUtils.handleRegistryItemEmpty(this, inputTank, 0, 1, new FluidChecker() { + @Override + public boolean isValid(Fluid f) { - inventory[0] = null; + return hasRecipe(f); } - - filled = true; - } - - if(filled) - { - inputTank.fill(itemFluid, true); - } + }); } } } @@ -331,6 +279,12 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva float biome = biomeTemp-0.5F; float base = biome > 0 ? biome*20 : biomeTemp*40; + + if(Math.abs(temperature-base) < 0.001) + { + temperature = base; + } + float incr = (float)Math.sqrt(Math.abs(temperature-base))*(float)general.evaporationHeatDissipation; if(temperature > base) @@ -338,8 +292,17 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva incr = -incr; } + float prev = temperature; temperature = (float)Math.min(general.evaporationMaxTemp, temperature + incr/(float)height); + if(incr < 0) + { + totalLoss = prev-temperature; + } + else { + totalLoss = 0; + } + heatToAbsorb = 0; MekanismUtils.saveChunk(this); @@ -630,6 +593,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva biomeTemp = dataStream.readFloat(); isLeftOnFace = dataStream.readBoolean(); lastGain = dataStream.readFloat(); + totalLoss = dataStream.readFloat(); if(structured != prev) { @@ -684,6 +648,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva data.add(biomeTemp); data.add(isLeftOnFace); data.add(lastGain); + data.add(totalLoss); return data; } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java index 87da89c87..01e85ddcc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java @@ -1,6 +1,7 @@ package mekanism.common.tile; import mekanism.api.Coord4D; +import mekanism.api.IHeatTransfer; import mekanism.common.util.PipeUtils; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; @@ -8,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporationBlock implements IFluidHandler +public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporationBlock implements IFluidHandler, IHeatTransfer { public boolean prevMaster = false; @@ -95,4 +96,57 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat return new FluidTankInfo[] {new FluidTankInfo(controller.inputTank), new FluidTankInfo(controller.outputTank)}; } + + @Override + public double getTemp() + { + return 0; + } + + @Override + public double getInverseConductionCoefficient() + { + return 1; + } + + @Override + public double getInsulationCoefficient(ForgeDirection side) + { + return 0; + } + + @Override + public void transferHeatTo(double heat) + { + TileEntityThermalEvaporationController controller = getController(); + + if(controller != null) + { + controller.heatToAbsorb += heat; + } + } + + @Override + public double[] simulateHeat() + { + return new double[] {0, 0}; + } + + @Override + public double applyTemperatureChange() + { + return 0; + } + + @Override + public boolean canConnectHeat(ForgeDirection side) + { + return getController() != null; + } + + @Override + public IHeatTransfer getAdjacent(ForgeDirection side) + { + return null; + } } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index 560ce4b97..dc9735171 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -14,7 +14,6 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.GasTransmission; import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; -import mekanism.common.base.IEjector; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; import mekanism.common.base.ITileComponent; @@ -33,7 +32,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -public class TileComponentEjector implements ITileComponent, IEjector +public class TileComponentEjector implements ITileComponent { public TileEntityContainerBlock tileEntity; @@ -115,13 +114,16 @@ public class TileComponentEjector implements ITileComponent, IEjector SideData data = sideData.get(TransmissionType.GAS); List outputSides = getOutputSides(TransmissionType.GAS, data); - GasTank tank = (GasTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; - - if(tank.getStored() > 0) + if(((ITankManager)tileEntity).getTanks() != null) { - GasStack toEmit = tank.getGas().copy().withAmount(Math.min(GAS_OUTPUT, tank.getStored())); - int emit = GasTransmission.emit(toEmit, tileEntity, outputSides); - tank.draw(emit, true); + GasTank tank = (GasTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; + + if(tank.getStored() > 0) + { + GasStack toEmit = tank.getGas().copy().withAmount(Math.min(GAS_OUTPUT, tank.getStored())); + int emit = GasTransmission.emit(toEmit, tileEntity, outputSides); + tank.draw(emit, true); + } } } @@ -130,13 +132,16 @@ public class TileComponentEjector implements ITileComponent, IEjector SideData data = sideData.get(TransmissionType.FLUID); List outputSides = getOutputSides(TransmissionType.FLUID, data); - FluidTank tank = (FluidTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; - - if(tank.getFluidAmount() > 0) + if(((ITankManager)tileEntity).getTanks() != null) { - FluidStack toEmit = new FluidStack(tank.getFluid().getFluid(), Math.min(FLUID_OUTPUT, tank.getFluidAmount())); - int emit = PipeUtils.emit(outputSides, toEmit, tileEntity); - tank.drain(emit, true); + FluidTank tank = (FluidTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; + + if(tank.getFluidAmount() > 0) + { + FluidStack toEmit = new FluidStack(tank.getFluid().getFluid(), Math.min(FLUID_OUTPUT, tank.getFluidAmount())); + int emit = PipeUtils.emit(outputSides, toEmit, tileEntity); + tank.drain(emit, true); + } } } } @@ -158,7 +163,6 @@ public class TileComponentEjector implements ITileComponent, IEjector return outputSides; } - @Override public void outputItems() { if(!getEjecting(TransmissionType.ITEM) || tileEntity.getWorld().isRemote) @@ -173,12 +177,12 @@ public class TileComponentEjector implements ITileComponent, IEjector { int slotID = sideData.get(TransmissionType.ITEM).availableSlots[index]; - if(tileEntity.inventory[slotID] == null) + if(tileEntity.getStackInSlot(slotID) == null) { continue; } - ItemStack stack = tileEntity.inventory[slotID]; + ItemStack stack = tileEntity.getStackInSlot(slotID); List outputs = getTrackedOutputs(TransmissionType.ITEM, index, outputSides); for(EnumFacing side : outputs) @@ -211,47 +215,41 @@ public class TileComponentEjector implements ITileComponent, IEjector } } - tileEntity.inventory[slotID] = stack; + tileEntity.setInventorySlotContents(slotID, stack); tileEntity.markDirty(); } tickDelay = 20; } - @Override public boolean hasStrictInput() { return strictInput; } - @Override public void setStrictInput(boolean strict) { strictInput = strict; MekanismUtils.saveChunk(tileEntity); } - @Override public void setOutputColor(EnumColor color) { outputColor = color; MekanismUtils.saveChunk(tileEntity); } - @Override public EnumColor getOutputColor() { return outputColor; } - @Override public void setInputColor(EnumFacing side, EnumColor color) { inputColors[side.ordinal()] = color; MekanismUtils.saveChunk(tileEntity); } - @Override public EnumColor getInputColor(EnumFacing side) { return inputColors[side.ordinal()]; diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index f2512f348..a46057381 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -1,7 +1,11 @@ package mekanism.common.util; +import mekanism.api.util.StackUtils; +import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidContainerItem; @@ -10,15 +14,15 @@ public final class FluidContainerUtils { public static FluidStack extractFluid(FluidTank tileTank, ItemStack container) { - return extractFluid(tileTank, container, tileTank.getFluid() != null ? tileTank.getFluid().getFluid() : null); + return extractFluid(tileTank, container, FluidChecker.check(tileTank.getFluid())); } - public static FluidStack extractFluid(FluidTank tileTank, ItemStack container, Fluid fluid) + public static FluidStack extractFluid(FluidTank tileTank, ItemStack container, FluidChecker checker) { - return extractFluid(tileTank.getCapacity()-tileTank.getFluidAmount(), container, fluid); + return extractFluid(tileTank.getCapacity()-tileTank.getFluidAmount(), container, checker); } - public static FluidStack extractFluid(int needed, ItemStack container, Fluid fluid) + public static FluidStack extractFluid(int needed, ItemStack container, FluidChecker checker) { IFluidContainerItem item = (IFluidContainerItem)container.getItem(); @@ -27,7 +31,7 @@ public final class FluidContainerUtils return null; } - if(fluid != null && item.getFluid(container).getFluid() != fluid) + if(checker != null && !checker.isValid(item.getFluid(container).getFluid())) { return null; } @@ -52,6 +56,205 @@ public final class FluidContainerUtils return item.fill(container, fluid, true); } + public static void handleContainerItemFill(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot) + { + tank.setFluid(handleContainerItemFill(tileEntity, tileEntity.inventory, tank.getFluid(), inSlot, outSlot)); + } + + public static FluidStack handleContainerItemFill(TileEntity tileEntity, ItemStack[] inventory, FluidStack stack, int inSlot, int outSlot) + { + if(stack != null) + { + int prev = stack.amount; + + stack.amount -= insertFluid(stack, inventory[inSlot]); + + if(prev == stack.amount || stack.amount == 0) + { + if(inventory[outSlot] == null) + { + inventory[outSlot] = inventory[inSlot].copy(); + inventory[inSlot] = null; + } + } + + if(stack.amount == 0) + { + stack = null; + } + + tileEntity.markDirty(); + } + + return stack; + } + + public static void handleContainerItemEmpty(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot) + { + handleContainerItemEmpty(tileEntity, tank, inSlot, outSlot, null); + } + + public static void handleContainerItemEmpty(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot, FluidChecker checker) + { + tank.setFluid(handleContainerItemEmpty(tileEntity, tileEntity.inventory, tank.getFluid(), tank.getCapacity()-tank.getFluidAmount(), inSlot, outSlot, checker)); + } + + public static FluidStack handleContainerItemEmpty(TileEntity tileEntity, ItemStack[] inventory, FluidStack stored, int needed, int inSlot, int outSlot, final FluidChecker checker) + { + final Fluid storedFinal = stored != null ? stored.getFluid() : null; + + FluidStack ret = extractFluid(needed, inventory[inSlot], new FluidChecker() { + @Override + public boolean isValid(Fluid f) + { + return (checker == null || checker.isValid(f)) && (storedFinal == null || storedFinal == f); + } + }); + + if(ret != null) + { + if(stored == null) + { + stored = ret; + } + else { + stored.amount += ret.amount; + } + + needed -= ret.amount; + + tileEntity.markDirty(); + } + + if(((IFluidContainerItem)inventory[inSlot].getItem()).getFluid(inventory[inSlot]) == null || needed == 0) + { + if(inventory[outSlot] == null) + { + inventory[outSlot] = inventory[inSlot].copy(); + inventory[inSlot] = null; + + tileEntity.markDirty(); + } + } + + return stored; + } + + public static void handleRegistryItemFill(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot) + { + tank.setFluid(handleRegistryItemFill(tileEntity, tileEntity.inventory, tank.getFluid(), inSlot, outSlot)); + } + + public static FluidStack handleRegistryItemFill(TileEntity tileEntity, ItemStack[] inventory, FluidStack stack, int inSlot, int outSlot) + { + if(stack != null) + { + ItemStack filled = FluidContainerRegistry.fillFluidContainer(stack, inventory[inSlot]); + + if(filled != null) + { + if(inventory[outSlot] == null || (StackUtils.equalsWildcardWithNBT(inventory[outSlot], filled) && inventory[outSlot].stackSize+1 <= filled.getMaxStackSize())) + { + inventory[inSlot].stackSize--; + + if(inventory[inSlot].stackSize <= 0) + { + inventory[inSlot] = null; + } + + if(inventory[outSlot] == null) + { + inventory[outSlot] = filled; + } + else { + inventory[outSlot].stackSize++; + } + + stack.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; + + if(stack.amount == 0) + { + return null; + } + + tileEntity.markDirty(); + } + } + } + + return stack; + } + + public static void handleRegistryItemEmpty(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot) + { + handleRegistryItemEmpty(tileEntity, tank, inSlot, outSlot, null); + } + + public static void handleRegistryItemEmpty(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot, FluidChecker checker) + { + tank.setFluid(handleRegistryItemEmpty(tileEntity, tileEntity.inventory, tank.getFluid(), tank.getCapacity()-tank.getFluidAmount(), inSlot, outSlot, checker)); + } + + public static FluidStack handleRegistryItemEmpty(TileEntity tileEntity, ItemStack[] inventory, FluidStack stored, int needed, int inSlot, int outSlot, final FluidChecker checker) + { + FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[inSlot]); + + if(itemFluid != null && itemFluid.amount <= needed) + { + if((stored != null && !stored.isFluidEqual(itemFluid)) || (checker != null && !checker.isValid(itemFluid.getFluid()))) + { + return stored; + } + + ItemStack containerItem = inventory[inSlot].getItem().getContainerItem(inventory[inSlot]); + + boolean filled = false; + + if(containerItem != null) + { + if(inventory[outSlot] == null || (StackUtils.equalsWildcardWithNBT(inventory[outSlot], containerItem) && inventory[outSlot].stackSize+1 <= containerItem.getMaxStackSize())) + { + inventory[inSlot] = null; + + if(inventory[outSlot] == null) + { + inventory[outSlot] = containerItem; + } + else { + inventory[outSlot].stackSize++; + } + + filled = true; + } + } + else { + inventory[inSlot].stackSize--; + + if(inventory[inSlot].stackSize == 0) + { + inventory[inSlot] = null; + } + + filled = true; + } + + if(filled) + { + if(stored == null) + { + stored = itemFluid.copy(); + } + else { + stored.amount += itemFluid.amount; + } + + tileEntity.markDirty(); + } + } + + return stored; + } + public static enum ContainerEditMode { BOTH("fluidedit.both"), @@ -70,4 +273,36 @@ public final class FluidContainerUtils display = s; } } + + public static class FluidChecker + { + public boolean isValid(Fluid f) + { + return true; + } + + public static FluidChecker check(FluidStack fluid) + { + final Fluid type = fluid != null ? fluid.getFluid() : null; + + return new FluidChecker() { + @Override + public boolean isValid(Fluid f) + { + return type == null || type == f; + } + }; + } + + public static FluidChecker check(final Fluid type) + { + return new FluidChecker() { + @Override + public boolean isValid(Fluid f) + { + return type == null || type == f; + } + }; + } + } } diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index e7072a39e..f9801d02c 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -1,18 +1,14 @@ package mekanism.common.util; -import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; -import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterTile; - -import net.minecraft.world.World; import net.minecraft.util.EnumFacing; public class HeatUtils { public static double[] simulate(IHeatTransfer source) { - double heatTransferred[] = new double[] {0,0}; + double heatTransferred[] = new double[] {0, 0}; for(EnumFacing side : EnumFacing.VALUES) { diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index c45ea5770..b3d77294b 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -7,7 +7,6 @@ import mekanism.common.content.transporter.Finder; import mekanism.common.content.transporter.InvStack; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityLogisticalSorter; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryLargeChest; @@ -92,14 +91,33 @@ public final class InventoryUtils if(inSlot == null) { - inventory.setInventorySlotContents(i, toInsert); - inventory.markDirty(); - - return null; + if(toInsert.stackSize <= inventory.getInventoryStackLimit()) + { + inventory.setInventorySlotContents(i, toInsert); + inventory.markDirty(); + + return null; + } + else { + int rejects = toInsert.stackSize - inventory.getInventoryStackLimit(); + + ItemStack toSet = toInsert.copy(); + toSet.stackSize = inventory.getInventoryStackLimit(); + + ItemStack remains = toInsert.copy(); + remains.stackSize = rejects; + + inventory.setInventorySlotContents(i, toSet); + inventory.markDirty(); + + toInsert = remains; + } } - else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) + else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) { ItemStack toSet = toInsert.copy(); toSet.stackSize += inSlot.stackSize; @@ -110,10 +128,10 @@ public final class InventoryUtils return null; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; ItemStack toSet = toInsert.copy(); - toSet.stackSize = inSlot.getMaxStackSize(); + toSet.stackSize = max; ItemStack remains = toInsert.copy(); remains.stackSize = rejects; @@ -153,14 +171,33 @@ public final class InventoryUtils if(inSlot == null) { - inventory.setInventorySlotContents(slotID, toInsert); - inventory.markDirty(); - - return null; + if(toInsert.stackSize <= inventory.getInventoryStackLimit()) + { + inventory.setInventorySlotContents(slotID, toInsert); + inventory.markDirty(); + + return null; + } + else { + int rejects = toInsert.stackSize - inventory.getInventoryStackLimit(); + + ItemStack toSet = toInsert.copy(); + toSet.stackSize = inventory.getInventoryStackLimit(); + + ItemStack remains = toInsert.copy(); + remains.stackSize = rejects; + + inventory.setInventorySlotContents(slotID, toSet); + inventory.markDirty(); + + toInsert = remains; + } } - else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) + else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) { ItemStack toSet = toInsert.copy(); toSet.stackSize += inSlot.stackSize; @@ -171,10 +208,10 @@ public final class InventoryUtils return null; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; ItemStack toSet = toInsert.copy(); - toSet.stackSize = inSlot.getMaxStackSize(); + toSet.stackSize = max; ItemStack remains = toInsert.copy(); remains.stackSize = rejects; @@ -407,16 +444,29 @@ public final class InventoryUtils if(inSlot == null) { - return true; - } - else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) - { - if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize()) + if(itemStack.stackSize <= inventory.getInventoryStackLimit()) { return true; } else { - int rejects = (inSlot.stackSize + itemStack.stackSize) - inSlot.getMaxStackSize(); + int rejects = itemStack.stackSize - inventory.getInventoryStackLimit(); + + if(rejects < itemStack.stackSize) + { + return true; + } + } + } + else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) + { + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + itemStack.stackSize <= max) + { + return true; + } + else { + int rejects = (inSlot.stackSize + itemStack.stackSize) - max; if(rejects < itemStack.stackSize) { @@ -453,16 +503,29 @@ public final class InventoryUtils if(inSlot == null) { - return true; - } - else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) - { - if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize()) + if(itemStack.stackSize <= inventory.getInventoryStackLimit()) { return true; } else { - int rejects = (inSlot.stackSize + itemStack.stackSize) - inSlot.getMaxStackSize(); + int rejects = itemStack.stackSize - inventory.getInventoryStackLimit(); + + if(rejects < itemStack.stackSize) + { + return true; + } + } + } + else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) + { + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + itemStack.stackSize <= max) + { + return true; + } + else { + int rejects = (inSlot.stackSize + itemStack.stackSize) - max; if(rejects < itemStack.stackSize) { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index b14a23019..3e19f6949 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -32,8 +32,11 @@ import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.OreDictCache; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.BinTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; +import mekanism.common.Tier.FluidTankTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; import mekanism.common.Upgrade; @@ -49,6 +52,7 @@ import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.item.ItemBlockGasTank; +import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; @@ -61,6 +65,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -369,15 +374,36 @@ public final class MekanismUtils { return ((ItemBlockBasic)new ItemStack(MekanismBlocks.BasicBlock2, 1, 4).getItem()).getUnchargedProvider(tier); } + + /** + * Retrieves an Bin with a defined tier. + * @param tier - tier to add to the Bin + * @return Bin with defined tier + */ + public static ItemStack getBin(BinTier tier) + { + ItemStack ret = new ItemStack(MekanismBlocks.BasicBlock, 1, 6); + ((ItemBlockBasic)ret.getItem()).setBaseTier(ret, tier.getBaseTier()); + + return ret; + } /** * Retrieves an empty Gas Tank. * @return empty gas tank */ - public static ItemStack getEmptyGasTank() + public static ItemStack getEmptyGasTank(GasTankTier tier) { - ItemStack itemstack = ((ItemBlockGasTank)new ItemStack(MekanismBlocks.GasTank).getItem()).getEmptyItem(); - return itemstack; + return ((ItemBlockGasTank)new ItemStack(MekanismBlocks.GasTank).getItem()).getEmptyItem(tier); + } + + public static ItemStack getEmptyFluidTank(FluidTankTier tier) + { + ItemStack stack = new ItemStack(MekanismBlocks.MachineBlock2, 1, 11); + ItemBlockMachine itemMachine = (ItemBlockMachine)stack.getItem(); + itemMachine.setBaseTier(stack, tier.getBaseTier()); + + return stack; } /** @@ -1132,12 +1158,12 @@ public final class MekanismUtils */ public static String getEnergyDisplay(double energy) { - if(energy == Integer.MAX_VALUE) + if(energy == Double.MAX_VALUE) { return LangUtils.localize("gui.infinite"); } - switch(general.activeType) + switch(general.energyUnit) { case J: return UnitDisplayUtils.getDisplayShort(energy, ElectricUnit.JOULES); @@ -1159,7 +1185,7 @@ public final class MekanismUtils */ public static double convertToJoules(double energy) { - switch(general.activeType) + switch(general.energyUnit) { case RF: return energy * general.FROM_TE; @@ -1179,7 +1205,7 @@ public final class MekanismUtils */ public static double convertToDisplay(double energy) { - switch(general.activeType) + switch(general.energyUnit) { case RF: return energy * general.TO_TE; @@ -1235,7 +1261,7 @@ public final class MekanismUtils */ public static boolean useRF() { - return Mekanism.hooks.CoFHCoreLoaded && !general.blacklistRF; + return !general.blacklistRF; } /** @@ -1324,17 +1350,30 @@ public final class MekanismUtils * @param gas - gas to fill the tank with * @return filled gas tank */ - public static ItemStack getFullGasTank(Gas gas) + public static ItemStack getFullGasTank(GasTankTier tier, Gas gas) { - ItemStack tank = getEmptyGasTank(); + ItemStack tank = getEmptyGasTank(tier); ItemBlockGasTank item = (ItemBlockGasTank)tank.getItem(); item.setGas(tank, new GasStack(gas, item.MAX_GAS)); return tank; } + + public static InventoryCrafting getDummyCraftingInv() + { + Container tempContainer = new Container() { + @Override + public boolean canInteractWith(EntityPlayer player) + { + return false; + } + }; + + return new InventoryCrafting(tempContainer, 3, 3); + } /** - * Finds the output of a defined InventoryCrafting grid. Taken from CofhCore. + * Finds the output of a defined InventoryCrafting grid. * @param inv - InventoryCrafting to check * @param world - world reference * @return output ItemStack @@ -1370,6 +1409,7 @@ public final class MekanismUtils int dmgDiff1 = theItem.getMaxDamage() - dmgItems[1].getItemDamage/*TODO:ForDisplay*/(); int value = dmgDiff0 + dmgDiff1 + theItem.getMaxDamage() * 5 / 100; int solve = Math.max(0, theItem.getMaxDamage() - value); + return new ItemStack(dmgItems[0].getItem(), 1, solve); } diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index 2cec2af09..7c9bbd020 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -5,7 +5,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; - import net.minecraft.block.Block; import net.minecraft.block.BlockSand; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index ccbebdca3..05bf47cd9 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -7,7 +7,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.transmitters.ITransmitterTile; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidRegistry; @@ -58,7 +57,7 @@ public final class PipeUtils { TileEntity acceptor = Coord4D.get(tileEntity).offset(orientation).getTileEntity(tileEntity.getWorld()); - if(acceptor instanceof IFluidHandler && !(acceptor instanceof ITransmitterTile)) + if(acceptor instanceof IFluidHandler) { acceptors[orientation.ordinal()] = (IFluidHandler)acceptor; } diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 4f955aeaf..d901afe19 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -1,5 +1,6 @@ package mekanism.common.util; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -8,11 +9,14 @@ import java.util.Map; import mekanism.api.energy.IEnergizedItem; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; +import mekanism.api.util.StackUtils; import mekanism.common.Upgrade; import mekanism.common.base.IEnergyCube; import mekanism.common.base.IFactory; +import mekanism.common.base.ITierItem; +import mekanism.common.block.BlockBasic.BasicType; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.item.ItemBlockBasic; +import mekanism.common.inventory.InventoryBin; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.recipe.ShapelessMekanismRecipe; import net.minecraft.block.Block; @@ -42,61 +46,37 @@ public class RecipeUtils { return false; } - - if(!(target.getItem() instanceof IEnergizedItem) && !(input.getItem() instanceof IEnergizedItem) && !(target.getItem() instanceof IGasItem) && !(input.getItem() instanceof IGasItem)) + + if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) { - if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) + return false; + } + + if(target.getItem() instanceof IEnergyCube && input.getItem() instanceof IEnergyCube) + { + if(((IEnergyCube)target.getItem()).getEnergyCubeTier(target) != ((IEnergyCube)input.getItem()).getEnergyCubeTier(input)) { return false; } } - else { - if(target.getItem() instanceof IEnergizedItem && input.getItem() instanceof IEnergizedItem) + + if(target.getItem() instanceof ITierItem && input.getItem() instanceof ITierItem) + { + if(((ITierItem)target.getItem()).getBaseTier(target) != ((ITierItem)input.getItem()).getBaseTier(input)) { - if(((IEnergizedItem)target.getItem()).isMetadataSpecific(target) && ((IEnergizedItem)input.getItem()).isMetadataSpecific(input)) - { - if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) - { - return false; - } - } + return false; } - - if(target.getItem() instanceof IGasItem && input.getItem() instanceof IGasItem) + } + + if(target.getItem() instanceof IFactory && input.getItem() instanceof IFactory) + { + if(isFactory(target) && isFactory(input)) { - if(((IGasItem)target.getItem()).isMetadataSpecific(target) && ((IGasItem)input.getItem()).isMetadataSpecific(input)) - { - if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) - { - return false; - } - } - } - - if(target.getItem() instanceof IEnergyCube && input.getItem() instanceof IEnergyCube) - { - if(((IEnergyCube)target.getItem()).getEnergyCubeTier(target) != ((IEnergyCube)input.getItem()).getEnergyCubeTier(input)) + if(((IFactory)target.getItem()).getRecipeType(target) != ((IFactory)input.getItem()).getRecipeType(input)) { return false; } } - else if(target.getItem() instanceof ItemBlockBasic && input.getItem() instanceof ItemBlockBasic) - { - if(((ItemBlockBasic)target.getItem()).getTier(target) != ((ItemBlockBasic)input.getItem()).getTier(input)) - { - return false; - } - } - else if(target.getItem() instanceof IFactory && input.getItem() instanceof IFactory) - { - if(isFactory(target) && isFactory(input)) - { - if(((IFactory)target.getItem()).getRecipeType(target) != ((IFactory)input.getItem()).getRecipeType(input)) - { - return false; - } - } - } } return true; @@ -167,6 +147,74 @@ public class RecipeUtils ((IGasItem)toReturn.getItem()).setGas(toReturn, gasFound); } } + + if(toReturn.getItem() instanceof IFluidContainerItem) + { + FluidStack fluidFound = null; + + for(int i = 0; i < 9; i++) + { + ItemStack itemstack = inv.getStackInSlot(i); + + if(itemstack != null && itemstack.getItem() instanceof IFluidContainerItem) + { + FluidStack stored = ((IFluidContainerItem)itemstack.getItem()).getFluid(itemstack); + + if(stored != null) + { + if(((IFluidContainerItem)toReturn.getItem()).fill(toReturn, stored, false) == 0) + { + return null; + } + + if(fluidFound == null) + { + fluidFound = stored; + } + else { + if(fluidFound.getFluid() != stored.getFluid()) + { + return null; + } + + fluidFound.amount += stored.amount; + } + } + } + } + + if(fluidFound != null) + { + fluidFound.amount = Math.min(((IFluidContainerItem)toReturn.getItem()).getCapacity(toReturn), fluidFound.amount); + ((IFluidContainerItem)toReturn.getItem()).fill(toReturn, fluidFound, true); + } + } + + if(BasicType.get(toReturn) == BasicType.BIN) + { + int foundCount = 0; + ItemStack foundType = null; + + for(int i = 0; i < 9; i++) + { + ItemStack itemstack = inv.getStackInSlot(i); + + if(BasicType.get(itemstack) == BasicType.BIN) + { + InventoryBin binInv = new InventoryBin(itemstack); + + foundCount = binInv.getItemCount(); + foundType = binInv.getItemType(); + } + } + + if(foundCount > 0 && foundType != null) + { + InventoryBin binInv = new InventoryBin(toReturn); + binInv.setItemCount(foundCount); + binInv.setItemType(foundType); + } + } if(BlockStateMachine.MachineType.get(toReturn) != null && BlockStateMachine.MachineType.get(toReturn).supportsUpgrades) { @@ -254,7 +302,7 @@ public class RecipeUtils if(iterRecipe instanceof ShapedMekanismRecipe || iterRecipe instanceof ShapelessMekanismRecipe) { - if(ItemStack.areItemStacksEqual(stack, iterRecipe.getRecipeOutput())) + if(StackUtils.equalsWildcard(stack, iterRecipe.getRecipeOutput())) { iter.remove(); } @@ -263,4 +311,21 @@ public class RecipeUtils return false; } + + public static IRecipe getRecipeFromGrid(InventoryCrafting inv, World world) + { + List list = new ArrayList(CraftingManager.getInstance().getRecipeList()); + + for(Iterator iter = list.iterator(); iter.hasNext();) + { + IRecipe recipe = iter.next(); + + if(recipe.matches(inv, world)) + { + return recipe; + } + } + + return null; + } } diff --git a/src/main/java/mekanism/common/util/StatUtils.java b/src/main/java/mekanism/common/util/StatUtils.java index 6f71feecb..142d1def1 100644 --- a/src/main/java/mekanism/common/util/StatUtils.java +++ b/src/main/java/mekanism/common/util/StatUtils.java @@ -1,13 +1,13 @@ package mekanism.common.util; -import java.util.Random; - +import static java.lang.Math.E; +import static java.lang.Math.PI; import static java.lang.Math.ceil; -import static java.lang.Math.sqrt; import static java.lang.Math.exp; import static java.lang.Math.pow; -import static java.lang.Math.PI; -import static java.lang.Math.E; +import static java.lang.Math.sqrt; + +import java.util.Random; public class StatUtils { diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index 54195ef69..1501f4d31 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -11,7 +11,6 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.item.ItemWalkieTalkie; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/mekanism/common/world/GenHandler.java b/src/main/java/mekanism/common/world/GenHandler.java index 38a834a98..76cb68830 100644 --- a/src/main/java/mekanism/common/world/GenHandler.java +++ b/src/main/java/mekanism/common/world/GenHandler.java @@ -4,7 +4,6 @@ import java.util.Random; import mekanism.api.MekanismConfig.general; import mekanism.common.MekanismBlocks; - import net.minecraft.block.state.pattern.BlockHelper; import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; diff --git a/src/main/java/mekanism/common/world/WorldGenSalt.java b/src/main/java/mekanism/common/world/WorldGenSalt.java index 30d535c4e..b16258b2d 100644 --- a/src/main/java/mekanism/common/world/WorldGenSalt.java +++ b/src/main/java/mekanism/common/world/WorldGenSalt.java @@ -3,7 +3,6 @@ package mekanism.common.world; import java.util.Random; import mekanism.common.MekanismBlocks; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index 527e36c01..7ba0725ad 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -8,20 +8,20 @@ import mekanism.generators.client.model.ModelBioGenerator; import mekanism.generators.client.model.ModelGasGenerator; import mekanism.generators.client.model.ModelHeatGenerator; import mekanism.generators.client.model.ModelSolarGenerator; -import mekanism.generators.client.model.ModelWindTurbine; +import mekanism.generators.client.model.ModelWindGenerator; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.block.BlockGenerator.GeneratorType; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { @@ -30,7 +30,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler public ModelBioGenerator bioGenerator = new ModelBioGenerator(); public ModelHeatGenerator heatGenerator = new ModelHeatGenerator(); public ModelGasGenerator hydrogenGenerator = new ModelGasGenerator(); - public ModelWindTurbine windTurbine = new ModelWindTurbine(); + public ModelWindGenerator windTurbine = new ModelWindGenerator(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -84,9 +84,9 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, 0.35F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindTurbine.png")); - windTurbine.render(0.018F, 0); + GL11.glTranslatef(0.0F, 0.4F, 0.0F); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); + windTurbine.render(0.016F, 0); } else if(metadata != 2) { diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index f8d49a82a..7c5c53061 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -21,7 +21,7 @@ import mekanism.generators.client.render.RenderIndustrialTurbine; import mekanism.generators.client.render.RenderReactor; import mekanism.generators.client.render.RenderSolarGenerator; import mekanism.generators.client.render.RenderTurbineRotor; -import mekanism.generators.client.render.RenderWindTurbine; +import mekanism.generators.client.render.RenderWindGenerator; import mekanism.generators.client.render.item.GeneratorsItemRenderer; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.GeneratorsCommonProxy; @@ -63,7 +63,7 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy ClientRegistry.registerTileEntity(TileEntityBioGenerator.class, "BioGenerator", new RenderBioGenerator()); ClientRegistry.registerTileEntity(TileEntityHeatGenerator.class, "HeatGenerator", new RenderHeatGenerator()); ClientRegistry.registerTileEntity(TileEntityGasGenerator.class, "GasGenerator", new RenderGasGenerator()); - ClientRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine", new RenderWindTurbine()); + ClientRegistry.registerTileEntity(TileEntityWindGenerator.class, "WindTurbine", new RenderWindGenerator()); ClientRegistry.registerTileEntity(TileEntityReactorController.class, "ReactorController", new RenderReactor()); ClientRegistry.registerTileEntity(TileEntityTurbineRotor.class, "TurbineRod", new RenderTurbineRotor()); ClientRegistry.registerTileEntity(TileEntityTurbineCasing.class, "TurbineCasing", new RenderIndustrialTurbine()); diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index 4e6b58016..713621917 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -5,11 +5,11 @@ import java.util.List; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -18,11 +18,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiBioGenerator extends GuiMekanism { @@ -40,7 +41,6 @@ public class GuiBioGenerator extends GuiMekanism { return ListUtils.asList( LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.bioGeneration : 0) + "/t", - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index f12abaf54..1df15c3d4 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -5,14 +5,14 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -21,11 +21,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiGasGenerator extends GuiMekanism { @@ -42,7 +43,6 @@ public class GuiGasGenerator extends GuiMekanism { return ListUtils.asList( LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.generationRate) + "/t", - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java index 587fae7d6..d0fad2119 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java @@ -1,7 +1,6 @@ package mekanism.generators.client.gui; import mekanism.common.Mekanism; - import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.fml.client.config.GuiConfig; diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index 10783be7f..dfebfbab7 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -2,17 +2,19 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -22,11 +24,12 @@ import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiHeatGenerator extends GuiMekanism { @@ -44,7 +47,6 @@ public class GuiHeatGenerator extends GuiMekanism { return ListUtils.asList( LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.producingEnergy) + "/t", - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); @@ -58,6 +60,15 @@ public class GuiHeatGenerator extends GuiMekanism guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 16, 34)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 142, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, TemperatureUnit.KELVIN); + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index cf2cdca37..7fcef55fb 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -2,11 +2,12 @@ package mekanism.generators.client.gui; import java.util.List; +import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRateBar; import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; @@ -17,6 +18,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiTurbineTab; import mekanism.generators.client.gui.element.GuiTurbineTab.TurbineTab; +import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; @@ -42,7 +44,7 @@ public class GuiIndustrialTurbine extends GuiMekanism @Override public String getTooltip() { - return LangUtils.localize("gui.steamInput") + ": " + tileEntity.structure.lastSteamInput + "mB/t"; + return LangUtils.localize("gui.steamInput") + ": " + tileEntity.structure.lastSteamInput + " mB/t"; } @Override @@ -53,19 +55,19 @@ public class GuiIndustrialTurbine extends GuiMekanism return (double)tileEntity.structure.lastSteamInput/rate; } - }, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"), 40, 13)); + }, MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png"), 40, 13)); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override public List getInfo() { - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); return ListUtils.asList( LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t"); } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png"))); } @Override @@ -74,9 +76,10 @@ public class GuiIndustrialTurbine extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 5, 0x404040); - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow); rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow); diff --git a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java index 05ac959a1..431cf6a0c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java +++ b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java @@ -4,11 +4,11 @@ import java.util.List; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -17,11 +17,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerNeutronCapture; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiNeutronCapture extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index b2c19f9ec..82e2e2dd9 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -5,9 +5,9 @@ import java.util.List; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -18,11 +18,12 @@ import mekanism.generators.client.gui.element.GuiStatTab; import mekanism.generators.common.inventory.container.ContainerReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiReactorController extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index b5fe772cf..2bef4d537 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -7,8 +7,8 @@ import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index e28854255..17548bcd8 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -8,10 +8,10 @@ import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyGauge; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index 123c28a8c..55c3815ed 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -9,8 +9,8 @@ import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 8e6953245..442e112ac 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -4,11 +4,11 @@ import java.util.List; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -17,11 +17,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiSolarGenerator extends GuiMekanism { @@ -39,7 +40,6 @@ public class GuiSolarGenerator extends GuiMekanism { return ListUtils.asList( LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? tileEntity.getProduction() : 0) + "/t", - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java index 1d199b517..a389fde46 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java @@ -3,17 +3,19 @@ package mekanism.generators.client.gui; import java.util.List; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiTurbineTab; import mekanism.generators.client.gui.element.GuiTurbineTab.TurbineTab; +import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import net.minecraft.entity.player.InventoryPlayer; @@ -37,7 +39,7 @@ public class GuiTurbineStats extends GuiMekanism @Override public List getInfo() { - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); return ListUtils.asList( LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), @@ -75,7 +77,7 @@ public class GuiTurbineStats extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.blades") + ": " + tileEntity.structure.blades + (bladesLimiting ? limiting : ""), 14, 81, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (coilsLimiting ? limiting : ""), 14, 90, 0x404040); - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow); rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow); diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java index 3f118992b..163f18c18 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -7,11 +7,11 @@ import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -20,11 +20,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerWindGenerator; import mekanism.generators.common.tile.TileEntityWindGenerator; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiWindGenerator extends GuiMekanism { @@ -44,7 +45,6 @@ public class GuiWindGenerator extends GuiMekanism { return ListUtils.asList( LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.windGenerationMin*tileEntity.getMultiplier() : 0) + "/t", - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java index 392d5628e..22584b8aa 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java @@ -2,6 +2,7 @@ package mekanism.generators.client.gui.element; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; +import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; diff --git a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java index 23a211b18..f6c4d7496 100644 --- a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java @@ -1,302 +1,154 @@ package mekanism.generators.client.model; -import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; -public class ModelAdvancedSolarGenerator extends ModelBase +@SideOnly(Side.CLIENT) +public class ModelAdvancedSolarGenerator extends ModelBase { - ModelRenderer foot1; - ModelRenderer foot2; - ModelRenderer foot3; - ModelRenderer foot1side; - ModelRenderer foot2side; - ModelRenderer foot3side; - ModelRenderer smallfoot; - ModelRenderer base; - ModelRenderer outputbox; - ModelRenderer outputboxbottom; - ModelRenderer basebeam; - ModelRenderer connectorbox; - ModelRenderer panelpivotbar; - ModelRenderer bar1; - ModelRenderer bar2; - ModelRenderer bar3; - ModelRenderer bar4; - ModelRenderer Panel1; - ModelRenderer Panel2; - ModelRenderer Panel3; - ModelRenderer Panel4; - ModelRenderer Panel5; - ModelRenderer Panel6; - ModelRenderer Panel7; - ModelRenderer Panel8; - ModelRenderer Panel9; - ModelRenderer Panel10; - ModelRenderer Panel11; - ModelRenderer Panel12; - ModelRenderer Inputlight; - ModelRenderer light1; - ModelRenderer light2; - ModelRenderer light3; - ModelRenderer light4; + ModelRenderer Shape1; + ModelRenderer Shape2; + ModelRenderer Shape3; + ModelRenderer Shape4; + ModelRenderer Shape5; + ModelRenderer Shape6; + ModelRenderer Shape7; + ModelRenderer Shape8; + ModelRenderer Shape9; + ModelRenderer Shape10; + ModelRenderer Shape11; + ModelRenderer Shape12; + ModelRenderer Shape13; + ModelRenderer Shape14; + ModelRenderer Shape15; + ModelRenderer Shape16; - public ModelAdvancedSolarGenerator() + public ModelAdvancedSolarGenerator() { - textureWidth = 128; - textureHeight = 64; + textureWidth = 256; + textureHeight = 256; - foot1 = new ModelRenderer(this, 16, 30); - foot1.addBox(16F, 13F, -2F, 6, 1, 4); - foot1.setRotationPoint(0F, 0F, 0F); - foot1.setTextureSize(128, 64); - foot1.mirror = true; - setRotation(foot1, 0F, 0F, 0.7330383F); - foot1.mirror = false; - foot2 = new ModelRenderer(this, 16, 23); - foot2.addBox(-2F, 13F, -22F, 4, 1, 6); - foot2.setRotationPoint(0F, 0F, 0F); - foot2.setTextureSize(128, 64); - foot2.mirror = true; - setRotation(foot2, 0.7330383F, 0F, 0F); - foot3 = new ModelRenderer(this, 16, 30); - foot3.addBox(-22F, 13F, -2F, 6, 1, 4); - foot3.setRotationPoint(0F, 0F, 0F); - foot3.setTextureSize(128, 64); - foot3.mirror = true; - setRotation(foot3, 0F, 0F, -0.7330383F); - foot1side = new ModelRenderer(this, 16, 35); - foot1side.addBox(4F, 14F, -2F, 1, 8, 4); - foot1side.setRotationPoint(0F, 0F, 0F); - foot1side.setTextureSize(128, 64); - foot1side.mirror = true; - setRotation(foot1side, 0F, 0F, 0F); - foot1side.mirror = false; - foot2side = new ModelRenderer(this, 0, 47); - foot2side.addBox(-2F, 9F, -5F, 4, 13, 3); - foot2side.setRotationPoint(0F, 0F, 0F); - foot2side.setTextureSize(128, 64); - foot2side.mirror = true; - setRotation(foot2side, 0F, 0F, 0F); - foot3side = new ModelRenderer(this, 26, 35); - foot3side.addBox(-4.866667F, 12F, -2F, 1, 8, 4); - foot3side.setRotationPoint(0F, 2F, 0F); - foot3side.setTextureSize(128, 64); - foot3side.mirror = true; - setRotation(foot3side, 0F, 0F, 0F); - smallfoot = new ModelRenderer(this, 38, 32); - smallfoot.addBox(-0.5F, 21F, 5F, 1, 3, 1); - smallfoot.setRotationPoint(0F, 0F, 0F); - smallfoot.setTextureSize(128, 64); - smallfoot.mirror = true; - setRotation(smallfoot, 0F, 0F, 0F); - base = new ModelRenderer(this, 61, 42); - base.addBox(-4F, 10F, -4F, 8, 13, 8); - base.setRotationPoint(0F, 0F, 0F); - base.setTextureSize(128, 64); - base.mirror = true; - setRotation(base, 0F, 0F, 0F); - outputbox = new ModelRenderer(this, 36, 36); - outputbox.addBox(-4F, 16F, 4F, 8, 8, 4); - outputbox.setRotationPoint(0F, -4F, 0F); - outputbox.setTextureSize(128, 64); - outputbox.mirror = true; - setRotation(outputbox, 0F, 0F, 0F); - outputboxbottom = new ModelRenderer(this, 42, 31); - outputboxbottom.addBox(-2F, 20F, 4F, 4, 1, 4); - outputboxbottom.setRotationPoint(0F, 0F, 0F); - outputboxbottom.setTextureSize(128, 64); - outputboxbottom.mirror = true; - setRotation(outputboxbottom, 0F, 0F, 0F); - basebeam = new ModelRenderer(this, 0, 14); - basebeam.addBox(-2F, -19F, -2F, 4, 29, 4); - basebeam.setRotationPoint(0F, 0F, 0F); - basebeam.setTextureSize(128, 64); - basebeam.mirror = true; - setRotation(basebeam, 0F, 0F, 0F); - connectorbox = new ModelRenderer(this, 14, 47); - connectorbox.addBox(-2.5F, -21F, -2.5F, 5, 3, 5); - connectorbox.setRotationPoint(0F, 0F, 0F); - connectorbox.setTextureSize(128, 64); - connectorbox.mirror = true; - setRotation(connectorbox, 0F, 0F, 0F); - panelpivotbar = new ModelRenderer(this, 0, 0); - panelpivotbar.addBox(-15F, -20.5F, -0.5F, 30, 2, 1); - panelpivotbar.setRotationPoint(0F, 0F, 0F); - panelpivotbar.setTextureSize(128, 64); - panelpivotbar.mirror = true; - setRotation(panelpivotbar, 0F, 0F, 0F); - bar1 = new ModelRenderer(this, 60, 30); - bar1.addBox(12.7F, -20.5F, -16F, 1, 1, 33); - bar1.setRotationPoint(0F, 0F, 0F); - bar1.setTextureSize(128, 64); - bar1.mirror = true; - setRotation(bar1, 0F, 0F, 0F); - bar2 = new ModelRenderer(this, 60, 30); - bar2.addBox(2.6F, -20.5F, -16F, 1, 1, 33); - bar2.setRotationPoint(0F, 0F, 0F); - bar2.setTextureSize(128, 64); - bar2.mirror = true; - setRotation(bar2, 0F, 0F, 0F); - bar3 = new ModelRenderer(this, 60, 30); - bar3.addBox(-3.6F, -20.5F, -16F, 1, 1, 33); - bar3.setRotationPoint(0F, 0F, 0F); - bar3.setTextureSize(128, 64); - bar3.mirror = true; - setRotation(bar3, 0F, 0F, 0F); - bar4 = new ModelRenderer(this, 60, 30); - bar4.addBox(-13.7F, -20.5F, -16F, 1, 1, 33); - bar4.setRotationPoint(0F, 0F, 0F); - bar4.setTextureSize(128, 64); - bar4.mirror = true; - setRotation(bar4, 0F, 0F, 0F); - Panel1 = new ModelRenderer(this, 70, 10); - Panel1.addBox(13.5F, -21F, -23.8F, 10, 1, 16); - Panel1.setRotationPoint(0F, 0F, 0F); - Panel1.setTextureSize(128, 64); - Panel1.mirror = true; - setRotation(Panel1, 0F, 0F, 0F); - Panel2 = new ModelRenderer(this, 16, 8); - Panel2.addBox(13.5F, -21F, -6.5F, 10, 1, 13); - Panel2.setRotationPoint(0F, 0F, 0F); - Panel2.setTextureSize(128, 64); - Panel2.mirror = true; - setRotation(Panel2, 0F, 0F, 0F); - Panel3 = new ModelRenderer(this, 70, 10); - Panel3.addBox(13.5F, -21F, 7.8F, 10, 1, 16); - Panel3.setRotationPoint(0F, 0F, 0F); - Panel3.setTextureSize(128, 64); - Panel3.mirror = true; - setRotation(Panel3, 0F, 0F, 0F); - Panel4 = new ModelRenderer(this, 70, 10); - Panel4.addBox(3F, -21F, -23.8F, 10, 1, 16); - Panel4.setRotationPoint(0F, 0F, 0F); - Panel4.setTextureSize(128, 64); - Panel4.mirror = true; - setRotation(Panel4, 0F, 0F, 0F); - Panel5 = new ModelRenderer(this, 16, 8); - Panel5.addBox(3F, -21F, -6.5F, 10, 1, 13); - Panel5.setRotationPoint(0F, 0F, 0F); - Panel5.setTextureSize(128, 64); - Panel5.mirror = true; - setRotation(Panel5, 0F, 0F, 0F); - Panel6 = new ModelRenderer(this, 70, 10); - Panel6.addBox(3F, -21F, 7.8F, 10, 1, 16); - Panel6.setRotationPoint(0F, 0F, 0F); - Panel6.setTextureSize(128, 64); - Panel6.mirror = true; - setRotation(Panel6, 0F, 0F, 0F); - Panel7 = new ModelRenderer(this, 70, 10); - Panel7.addBox(-13F, -21F, -23.8F, 10, 1, 16); - Panel7.setRotationPoint(0F, 0F, 0F); - Panel7.setTextureSize(128, 64); - Panel7.mirror = true; - setRotation(Panel7, 0F, 0F, 0F); - Panel8 = new ModelRenderer(this, 16, 8); - Panel8.addBox(-13F, -21F, -6.5F, 10, 1, 13); - Panel8.setRotationPoint(0F, 0F, 0F); - Panel8.setTextureSize(128, 64); - Panel8.mirror = true; - setRotation(Panel8, 0F, 0F, 0F); - Panel9 = new ModelRenderer(this, 70, 10); - Panel9.addBox(-13F, -21F, 7.8F, 10, 1, 16); - Panel9.setRotationPoint(0F, 0F, 0F); - Panel9.setTextureSize(128, 64); - Panel9.mirror = true; - setRotation(Panel9, 0F, 0F, 0F); - Panel10 = new ModelRenderer(this, 70, 10); - Panel10.addBox(-23.5F, -21F, -23.8F, 10, 1, 16); - Panel10.setRotationPoint(0F, 0F, 0F); - Panel10.setTextureSize(128, 64); - Panel10.mirror = true; - setRotation(Panel10, 0F, 0F, 0F); - Panel11 = new ModelRenderer(this, 16, 8); - Panel11.addBox(-23.5F, -21F, -6.5F, 10, 1, 13); - Panel11.setRotationPoint(0F, 0F, 0F); - Panel11.setTextureSize(128, 64); - Panel11.mirror = true; - setRotation(Panel11, 0F, 0F, 0F); - Panel12 = new ModelRenderer(this, 70, 10); - Panel12.addBox(-23.5F, -21F, 7.8F, 10, 1, 16); - Panel12.setRotationPoint(0F, 0F, 0F); - Panel12.setTextureSize(128, 64); - Panel12.mirror = true; - setRotation(Panel12, 0F, 0F, 0F); - Inputlight = new ModelRenderer(this, 5, 6); - Inputlight.addBox(-1F, 15F, 7.2F, 2, 2, 1); - Inputlight.setRotationPoint(0F, 0F, 0F); - Inputlight.setTextureSize(128, 64); - Inputlight.mirror = true; - setRotation(Inputlight, 0F, 0F, 0F); - light1 = new ModelRenderer(this, 5, 4); - light1.addBox(3.2F, 15F, 6F, 1, 2, 1); - light1.setRotationPoint(0F, 0F, 0F); - light1.setTextureSize(128, 64); - light1.mirror = true; - setRotation(light1, 0F, 0F, 0F); - light2 = new ModelRenderer(this, 5, 4); - light2.addBox(-4.2F, 15F, 6F, 1, 2, 1); - light2.setRotationPoint(0F, 0F, 0F); - light2.setTextureSize(128, 64); - light2.mirror = true; - setRotation(light2, 0F, 0F, 0F); - light3 = new ModelRenderer(this, 5, 4); - light3.addBox(3.2F, 15F, 2F, 1, 2, 3); - light3.setRotationPoint(0F, 0F, 0F); - light3.setTextureSize(128, 64); - light3.mirror = true; - setRotation(light3, 0F, 0F, 0F); - light4 = new ModelRenderer(this, 5, 4); - light4.addBox(-4.2F, 15F, 2F, 1, 2, 3); - light4.setRotationPoint(0F, 0F, 0F); - light4.setTextureSize(128, 64); - light4.mirror = true; - setRotation(light4, 0F, 0F, 0F); + Shape1 = new ModelRenderer(this, 0, 95); + Shape1.addBox(0F, -1F, -1F, 40, 2, 2); + Shape1.setRotationPoint(-20F, -17F, 0F); + Shape1.setTextureSize(256, 256); + Shape1.mirror = true; + setRotation(Shape1, 0F, 0F, 0F); //rotates + Shape2 = new ModelRenderer(this, 0, 49); + Shape2.addBox(0F, -1F, -23F, 16, 1, 45); + Shape2.setRotationPoint(7F, -17F, 0F); + Shape2.setTextureSize(256, 256); + Shape2.mirror = true; + setRotation(Shape2, 0F, 0F, 0F); //rotates + Shape3 = new ModelRenderer(this, 0, 0); + Shape3.addBox(0F, -2F, -24F, 18, 1, 48); + Shape3.setRotationPoint(6F, -17F, 0F); + Shape3.setTextureSize(256, 256); + Shape3.mirror = true; + setRotation(Shape3, 0F, 0F, 0F); //rotates + Shape4 = new ModelRenderer(this, 86, 21); + Shape4.addBox(0F, 0F, 0F, 6, 6, 10); + Shape4.setRotationPoint(-3F, 13F, -7F); + Shape4.setTextureSize(256, 256); + Shape4.mirror = true; + setRotation(Shape4, 0F, 0F, 0F); + Shape5 = new ModelRenderer(this, 0, 0); + Shape5.addBox(0F, 0F, 0F, 4, 40, 4); + Shape5.setRotationPoint(-2F, -16F, -2F); + Shape5.setTextureSize(256, 256); + Shape5.mirror = true; + setRotation(Shape5, 0F, 0F, 0F); + Shape6 = new ModelRenderer(this, 16, 28); + Shape6.addBox(0F, 0F, 0F, 2, 2, 12); + Shape6.setRotationPoint(1F, -14F, -6F); + Shape6.setTextureSize(256, 256); + Shape6.mirror = true; + setRotation(Shape6, 0F, 0F, 0F); + Shape7 = new ModelRenderer(this, 0, 50); + Shape7.addBox(0F, 0F, 0F, 1, 7, 7); + Shape7.setRotationPoint(1.5F, -20.5F, -3.5F); + Shape7.setTextureSize(256, 256); + Shape7.mirror = true; + setRotation(Shape7, 0F, 0F, 0F); + Shape8 = new ModelRenderer(this, 16, 28); + Shape8.addBox(0F, 0F, 0F, 2, 2, 12); + Shape8.setRotationPoint(-3F, -14F, -6F); + Shape8.setTextureSize(256, 256); + Shape8.mirror = true; + setRotation(Shape8, 0F, 0F, 0F); + Shape9 = new ModelRenderer(this, 16, 0); + Shape9.addBox(0F, 0F, 0F, 8, 6, 6); + Shape9.setRotationPoint(-4F, -20F, -3F); + Shape9.setTextureSize(256, 256); + Shape9.mirror = true; + setRotation(Shape9, 0F, 0F, 0F); + Shape10 = new ModelRenderer(this, 0, 50); + Shape10.addBox(0F, 0F, 0F, 1, 7, 7); + Shape10.setRotationPoint(-2.5F, -20.5F, -3.5F); + Shape10.setTextureSize(256, 256); + Shape10.mirror = true; + setRotation(Shape10, 0F, 0F, 0F); + Shape11 = new ModelRenderer(this, 0, 0); + Shape11.addBox(0F, -2F, -24F, 18, 1, 48); + Shape11.setRotationPoint(-24F, -17F, 0F); + Shape11.setTextureSize(256, 256); + Shape11.mirror = true; + setRotation(Shape11, 0F, 0F, 0F); //rotates + Shape12 = new ModelRenderer(this, 0, 49); + Shape12.addBox(0F, -1F, -23F, 16, 1, 45); + Shape12.setRotationPoint(-23F, -17F, 0F); + Shape12.setTextureSize(256, 256); + Shape12.mirror = true; + setRotation(Shape12, 0F, 0F, 0F); //rotates + Shape13 = new ModelRenderer(this, 78, 50); + Shape13.addBox(0F, 0F, 0F, 16, 2, 16); + Shape13.setRotationPoint(-8F, 22F, -8F); + Shape13.setTextureSize(256, 256); + Shape13.mirror = true; + setRotation(Shape13, 0F, 0F, 0F); + Shape14 = new ModelRenderer(this, 86, 12); + Shape14.addBox(0F, 0F, 0F, 8, 8, 1); + Shape14.setRotationPoint(-4F, 12F, -8F); + Shape14.setTextureSize(256, 256); + Shape14.mirror = true; + setRotation(Shape14, 0F, 0F, 0F); + Shape15 = new ModelRenderer(this, 16, 12); + Shape15.addBox(0F, 0F, 0F, 8, 8, 8); + Shape15.setRotationPoint(-4F, 14F, -4F); + Shape15.setTextureSize(256, 256); + Shape15.mirror = true; + setRotation(Shape15, 0F, 0F, 0F); + Shape16 = new ModelRenderer(this, 86, 0); + Shape16.addBox(0F, 0F, 0F, 10, 2, 10); + Shape16.setRotationPoint(-5F, 21F, -5F); + Shape16.setTextureSize(256, 256); + Shape16.mirror = true; + setRotation(Shape16, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - foot1.render(size); - foot2.render(size); - foot3.render(size); - foot1side.render(size); - foot2side.render(size); - foot3side.render(size); - smallfoot.render(size); - base.render(size); - outputbox.render(size); - outputboxbottom.render(size); - basebeam.render(size); - connectorbox.render(size); - panelpivotbar.render(size); - bar1.render(size); - bar2.render(size); - bar3.render(size); - bar4.render(size); - Panel1.render(size); - Panel2.render(size); - Panel3.render(size); - Panel4.render(size); - Panel5.render(size); - Panel6.render(size); - Panel7.render(size); - Panel8.render(size); - Panel9.render(size); - Panel10.render(size); - Panel11.render(size); - Panel12.render(size); - - MekanismRenderer.glowOn(); - Inputlight.render(size); - light1.render(size); - light2.render(size); - light3.render(size); - light4.render(size); - MekanismRenderer.glowOff(); + Shape1.render(size); + Shape2.render(size); + Shape3.render(size); + Shape4.render(size); + Shape5.render(size); + Shape6.render(size); + Shape7.render(size); + Shape8.render(size); + Shape9.render(size); + Shape10.render(size); + Shape11.render(size); + Shape12.render(size); + Shape13.render(size); + Shape14.render(size); + Shape15.render(size); + Shape16.render(size); } - private void setRotation(ModelRenderer model, float x, float y, float z) + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; diff --git a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java index 3cbd40ff2..843f778e5 100644 --- a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java @@ -3,53 +3,85 @@ package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -public class ModelSolarGenerator extends ModelBase +public class ModelSolarGenerator extends ModelBase { - ModelRenderer Base; - ModelRenderer Base2; - ModelRenderer Stand; - ModelRenderer PhotovoltaicCells; + ModelRenderer solarPanelPipeBase; + ModelRenderer solarPanel; + ModelRenderer solarPanelBottom; + ModelRenderer solarPanelConnector; + ModelRenderer solarPanelPipeU; + ModelRenderer solarPanelPipeConnector; + ModelRenderer solarPanelPipeBase1; + ModelRenderer solarPanelPipeU1; - public ModelSolarGenerator() + public ModelSolarGenerator() { textureWidth = 64; - textureHeight = 32; + textureHeight = 64; - Base = new ModelRenderer(this, 0, 16); - Base.addBox(0F, 0F, 0F, 6, 1, 6); - Base.setRotationPoint(-3F, 23F, -3F); - Base.setTextureSize(64, 32); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Base2 = new ModelRenderer(this, 0, 24); - Base2.addBox(0F, 0F, 0F, 3, 1, 3); - Base2.setRotationPoint(-1.5F, 22F, -1.5F); - Base2.setTextureSize(64, 32); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); - Stand = new ModelRenderer(this, 25, 16); - Stand.addBox(0F, 0F, 0F, 1, 7, 1); - Stand.setRotationPoint(-0.5F, 15F, -0.5F); - Stand.setTextureSize(64, 32); - Stand.mirror = true; - setRotation(Stand, 0F, 0F, 0F); - PhotovoltaicCells = new ModelRenderer(this, 0, 0); - PhotovoltaicCells.addBox(-7F, -1F, -7F, 14, 1, 14); - PhotovoltaicCells.setRotationPoint(0F, 15F, 0F); - PhotovoltaicCells.setTextureSize(64, 32); - PhotovoltaicCells.mirror = true; - setRotation(PhotovoltaicCells, 0F, 0F, 0F); + solarPanelPipeBase = new ModelRenderer(this, 48, 33); + solarPanelPipeBase.addBox(0F, 0F, 0F, 1, 6, 6); + solarPanelPipeBase.setRotationPoint(3F, 23F, -3F); + solarPanelPipeBase.setTextureSize(64, 64); + solarPanelPipeBase.mirror = true; + setRotation(solarPanelPipeBase, 0F, 0F, 1.570796F); + solarPanel = new ModelRenderer(this, 0, 0); + solarPanel.addBox(0F, 0F, 0F, 16, 2, 16); + solarPanel.setRotationPoint(-8F, 13F, -8F); + solarPanel.setTextureSize(64, 64); + solarPanel.mirror = true; + setRotation(solarPanel, 0F, 0F, 0F); + solarPanelBottom = new ModelRenderer(this, 0, 18); + solarPanelBottom.addBox(0F, 0F, 0F, 14, 1, 14); + solarPanelBottom.setRotationPoint(-7F, 15F, -7F); + solarPanelBottom.setTextureSize(64, 64); + solarPanelBottom.mirror = true; + setRotation(solarPanelBottom, 0F, 0F, 0F); + solarPanelConnector = new ModelRenderer(this, 0, 33); + solarPanelConnector.addBox(0F, 0F, 0F, 4, 2, 4); + solarPanelConnector.setRotationPoint(-2F, 15F, -2F); + solarPanelConnector.setTextureSize(64, 64); + solarPanelConnector.mirror = true; + setRotation(solarPanelConnector, 0F, 0F, 0F); + solarPanelPipeU = new ModelRenderer(this, 16, 33); + solarPanelPipeU.addBox(0F, 0F, 0F, 2, 3, 2); + solarPanelPipeU.setRotationPoint(-1F, 19F, -1F); + solarPanelPipeU.setTextureSize(64, 64); + solarPanelPipeU.mirror = true; + setRotation(solarPanelPipeU, 0F, 0F, 0F); + solarPanelPipeConnector = new ModelRenderer(this, 24, 33); + solarPanelPipeConnector.addBox(0F, 0F, 0F, 3, 3, 3); + solarPanelPipeConnector.setRotationPoint(-1.5F, 18F, -1.5F); + solarPanelPipeConnector.setTextureSize(64, 64); + solarPanelPipeConnector.mirror = true; + setRotation(solarPanelPipeConnector, 0F, 0F, 0F); + solarPanelPipeBase1 = new ModelRenderer(this, 36, 33); + solarPanelPipeBase1.addBox(0F, 0F, 0F, 2, 4, 4); + solarPanelPipeBase1.setRotationPoint(2F, 22F, -2F); + solarPanelPipeBase1.setTextureSize(64, 64); + solarPanelPipeBase1.mirror = true; + setRotation(solarPanelPipeBase1, 0F, 0F, 1.570796F); + solarPanelPipeU1 = new ModelRenderer(this, 16, 33); + solarPanelPipeU1.addBox(0F, 0F, 0F, 2, 3, 2); + solarPanelPipeU1.setRotationPoint(-1F, 16F, -1F); + solarPanelPipeU1.setTextureSize(64, 64); + solarPanelPipeU1.mirror = true; + setRotation(solarPanelPipeU1, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Base.render(size); - Base2.render(size); - Stand.render(size); - PhotovoltaicCells.render(size); + solarPanelPipeBase.render(size); + solarPanel.render(size); + solarPanelBottom.render(size); + solarPanelConnector.render(size); + solarPanelPipeU.render(size); + solarPanelPipeConnector.render(size); + solarPanelPipeBase1.render(size); + solarPanelPipeU1.render(size); } - private void setRotation(ModelRenderer model, float x, float y, float z) + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; diff --git a/src/main/java/mekanism/generators/client/model/ModelTurbine.java b/src/main/java/mekanism/generators/client/model/ModelTurbine.java index 4258aa6c5..b5acb3ebb 100644 --- a/src/main/java/mekanism/generators/client/model/ModelTurbine.java +++ b/src/main/java/mekanism/generators/client/model/ModelTurbine.java @@ -1,10 +1,9 @@ package mekanism.generators.client.model; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; + +import org.lwjgl.opengl.GL11; public class ModelTurbine extends ModelBase { diff --git a/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java b/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java new file mode 100644 index 000000000..81cbeec65 --- /dev/null +++ b/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java @@ -0,0 +1,214 @@ +package mekanism.generators.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; + +public class ModelWindGenerator extends ModelBase +{ + ModelRenderer head; + ModelRenderer plateConnector2; + ModelRenderer plateConnector; + ModelRenderer plate; + ModelRenderer bladeCap; + ModelRenderer bladeCenter; + ModelRenderer baseRim; + ModelRenderer base; + ModelRenderer wire; + ModelRenderer rearPlate1; + ModelRenderer rearPlate2; + ModelRenderer blade1a; + ModelRenderer blade2a; + ModelRenderer blade3a; + ModelRenderer blade1b; + ModelRenderer blade2b; + ModelRenderer blade3b; + ModelRenderer post1a; + ModelRenderer post1b; + ModelRenderer post1c; + ModelRenderer post1d; + + public ModelWindGenerator() + { + textureWidth = 128; + textureHeight = 128; + + head = new ModelRenderer(this, 20, 0); + head.addBox(-3.5F, -3.5F, 0F, 7, 7, 9); + head.setRotationPoint(0F, -48F, -4F); + head.setTextureSize(128, 128); + head.mirror = true; + setRotation(head, 0F, 0F, 0F); + plateConnector2 = new ModelRenderer(this, 42, 34); + plateConnector2.addBox(0F, 0F, 0F, 6, 6, 10); + plateConnector2.setRotationPoint(-3F, 13F, -7F); + plateConnector2.setTextureSize(128, 128); + plateConnector2.mirror = true; + setRotation(plateConnector2, 0F, 0F, 0F); + plateConnector = new ModelRenderer(this, 0, 75); + plateConnector.addBox(0F, 0F, 0F, 4, 2, 2); + plateConnector.setRotationPoint(-2F, 19F, -5.5F); + plateConnector.setTextureSize(128, 128); + plateConnector.mirror = true; + setRotation(plateConnector, 0F, 0F, 0F); + plate = new ModelRenderer(this, 42, 25); + plate.addBox(0F, 0F, 0F, 8, 8, 1); + plate.setRotationPoint(-4F, 12F, -8F); + plate.setTextureSize(128, 128); + plate.mirror = true; + setRotation(plate, 0F, 0F, 0F); + bladeCap = new ModelRenderer(this, 22, 0); + bladeCap.addBox(-1F, -1F, -8F, 2, 2, 1); + bladeCap.setRotationPoint(0F, -48F, 0F); + bladeCap.setTextureSize(128, 128); + bladeCap.mirror = true; + setRotation(bladeCap, 0F, 0F, 0F); + bladeCenter = new ModelRenderer(this, 20, 25); + bladeCenter.addBox(-2F, -2F, -7F, 4, 4, 3); + bladeCenter.setRotationPoint(0F, -48F, 0F); + bladeCenter.setTextureSize(128, 128); + bladeCenter.mirror = true; + setRotation(bladeCenter, 0F, 0F, 0F); + baseRim = new ModelRenderer(this, 26, 50); + baseRim.addBox(0F, 0F, 0F, 12, 2, 12); + baseRim.setRotationPoint(-6F, 21F, -6F); + baseRim.setTextureSize(128, 128); + baseRim.mirror = true; + setRotation(baseRim, 0F, 0F, 0F); + base = new ModelRenderer(this, 10, 64); + base.addBox(0F, 0F, 0F, 16, 2, 16); + base.setRotationPoint(-8F, 22F, -8F); + base.setTextureSize(128, 128); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + wire = new ModelRenderer(this, 74, 0); + wire.addBox(-1F, 0F, -1.1F, 2, 65, 2); + wire.setRotationPoint(0F, -46F, -1.5F); + wire.setTextureSize(128, 128); + wire.mirror = true; + setRotation(wire, -0.0349066F, 0F, 0F); + rearPlate1 = new ModelRenderer(this, 20, 16); + rearPlate1.addBox(-2.5F, -6F, 0F, 5, 6, 3); + rearPlate1.setRotationPoint(0F, -44.5F, 4F); + rearPlate1.setTextureSize(128, 128); + rearPlate1.mirror = true; + setRotation(rearPlate1, 0.122173F, 0F, 0F); + rearPlate2 = new ModelRenderer(this, 36, 16); + rearPlate2.addBox(-1.5F, -5F, -1F, 3, 5, 2); + rearPlate2.setRotationPoint(0F, -45F, 7F); + rearPlate2.setTextureSize(128, 128); + rearPlate2.mirror = true; + setRotation(rearPlate2, 0.2094395F, 0F, 0F); + blade1a = new ModelRenderer(this, 20, 32); + blade1a.addBox(-1F, -32F, 0F, 2, 32, 1); + blade1a.setRotationPoint(0F, -48F, -5.99F); + blade1a.setTextureSize(128, 128); + blade1a.mirror = true; + setRotation(blade1a, 0F, 0F, 0F); + blade2a = new ModelRenderer(this, 20, 32); + blade2a.addBox(-1F, 0F, 0F, 2, 32, 1); + blade2a.setRotationPoint(0F, -48F, -6F); + blade2a.setTextureSize(128, 128); + blade2a.mirror = true; + setRotation(blade2a, 0F, 0F, 1.047198F); + blade3a = new ModelRenderer(this, 20, 32); + blade3a.addBox(-1F, 0F, 0F, 2, 32, 1); + blade3a.setRotationPoint(0F, -48F, -6F); + blade3a.setTextureSize(128, 128); + blade3a.mirror = true; + setRotation(blade3a, 0F, 0F, -1.047198F); + blade1b = new ModelRenderer(this, 26, 32); + blade1b.addBox(-2F, -28F, 0F, 2, 28, 1); + blade1b.setRotationPoint(0F, -48F, -6F); + blade1b.setTextureSize(128, 128); + blade1b.mirror = true; + setRotation(blade1b, 0F, 0F, 0.0349066F); + blade2b = new ModelRenderer(this, 26, 32); + blade2b.addBox(0F, 0F, 0F, 2, 28, 1); + blade2b.setRotationPoint(0F, -48F, -6.01F); + blade2b.setTextureSize(128, 128); + blade2b.mirror = true; + setRotation(blade2b, 0F, 0F, 1.082104F); + blade3b = new ModelRenderer(this, 26, 32); + blade3b.addBox(0F, 0F, 0F, 2, 28, 1); + blade3b.setRotationPoint(0F, -48F, -6.01F); + blade3b.setTextureSize(128, 128); + blade3b.mirror = true; + setRotation(blade3b, 0F, 0F, -1.012291F); + post1a = new ModelRenderer(this, 0, 0); + post1a.addBox(-2.5F, 0F, -2.5F, 5, 68, 5); + post1a.setRotationPoint(0F, -46F, 0F); + post1a.setTextureSize(128, 128); + post1a.mirror = true; + setRotation(post1a, -0.0349066F, 0F, 0.0349066F); + post1b = new ModelRenderer(this, 0, 0); + post1b.addBox(-2.5F, 0F, -2.5F, 5, 68, 5); + post1b.setRotationPoint(0F, -46F, 0F); + post1b.setTextureSize(128, 128); + post1b.mirror = true; + setRotation(post1b, 0.0349066F, 0F, -0.0349066F); + post1c = new ModelRenderer(this, 0, 0); + post1c.addBox(-2.5F, 0F, -2.5F, 5, 68, 5); + post1c.setRotationPoint(0F, -46F, 0F); + post1c.setTextureSize(128, 128); + post1c.mirror = true; + setRotation(post1c, 0.0347321F, 0F, 0.0347321F); + post1d = new ModelRenderer(this, 0, 0); + post1d.addBox(-2.5F, 0F, -2.5F, 5, 68, 5); + post1d.setRotationPoint(0F, -46F, 0F); + post1d.setTextureSize(128, 128); + post1d.mirror = true; + setRotation(post1d, -0.0347321F, 0F, -0.0347321F); + } + + public void render(float size, double angle) + { + head.render(size); + plateConnector2.render(size); + plateConnector.render(size); + plate.render(size); + bladeCap.render(size); + bladeCenter.render(size); + baseRim.render(size); + base.render(size); + wire.render(size); + rearPlate1.render(size); + rearPlate2.render(size); + post1a.render(size); + post1b.render(size); + post1c.render(size); + post1d.render(size); + + setRotation(blade1a, 0F, 0F, getRotation(getAbsoluteAngle(angle))); + setRotation(blade1b, 0F, 0F, 0.0349066F + getRotation(getAbsoluteAngle(angle))); + + setRotation(blade2a, 0F, 0F, getRotation(getAbsoluteAngle(angle - 60))); + setRotation(blade2b, 0F, 0F, 0.0349066F + getRotation(getAbsoluteAngle(angle - 60))); + + setRotation(blade3a, 0F, 0F, getRotation(getAbsoluteAngle(angle + 60))); + setRotation(blade3b, 0F, 0F, 0.0349066F + getRotation(getAbsoluteAngle(angle + 60))); + + blade1a.render(size); + blade2a.render(size); + blade3a.render(size); + blade1b.render(size); + blade2b.render(size); + blade3b.render(size); + } + + public float getRotation(double angle) + { + return ((float)angle / (float) 180) * (float)Math.PI; + } + + public double getAbsoluteAngle(double angle) + { + return angle % 360; + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } +} diff --git a/src/main/java/mekanism/generators/client/model/ModelWindTurbine.java b/src/main/java/mekanism/generators/client/model/ModelWindTurbine.java deleted file mode 100644 index 89d14718c..000000000 --- a/src/main/java/mekanism/generators/client/model/ModelWindTurbine.java +++ /dev/null @@ -1,151 +0,0 @@ -package mekanism.generators.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelWindTurbine extends ModelBase -{ - ModelRenderer Base; - ModelRenderer TowerFront; - ModelRenderer TowerLeft; - ModelRenderer TowerBack; - ModelRenderer TowerRight; - ModelRenderer TowerMoterFront; - ModelRenderer TowerBaseMotor; - ModelRenderer TowerBaseMotorBack; - ModelRenderer TowerMotor; - ModelRenderer Rotor; - ModelRenderer RotorCover; - ModelRenderer BladeBaseC; - ModelRenderer BladeBaseB; - ModelRenderer BladeBaseA; - - public ModelWindTurbine() - { - textureWidth = 128; - textureHeight = 64; - - Base = new ModelRenderer(this, 0, 0); - Base.addBox(-8F, 0F, -8F, 16, 6, 16); - Base.setRotationPoint(0F, 18F, 0F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - TowerFront = new ModelRenderer(this, 104, 0); - TowerFront.addBox(-5F, -62F, -7F, 10, 63, 2); - TowerFront.setRotationPoint(0F, 19F, 0F); - TowerFront.setTextureSize(128, 64); - TowerFront.mirror = true; - setRotation(TowerFront, -0.0872665F, 0F, 0F); - TowerLeft = new ModelRenderer(this, 104, 0); - TowerLeft.addBox(-5F, -62F, 5F, 10, 63, 2); - TowerLeft.setRotationPoint(0F, 19F, 0F); - TowerLeft.setTextureSize(128, 64); - TowerLeft.mirror = true; - setRotation(TowerLeft, 0.0872665F, 1.570796F, 0F); - TowerBack = new ModelRenderer(this, 104, 0); - TowerBack.addBox(-5F, -62F, 5F, 10, 63, 2); - TowerBack.setRotationPoint(0F, 19F, 0F); - TowerBack.setTextureSize(128, 64); - TowerBack.mirror = true; - setRotation(TowerBack, 0.0872665F, 0F, 0F); - TowerRight = new ModelRenderer(this, 104, 0); - TowerRight.addBox(-5F, -62F, 5F, 10, 63, 2); - TowerRight.setRotationPoint(0F, 19F, 0F); - TowerRight.setTextureSize(128, 64); - TowerRight.mirror = true; - setRotation(TowerRight, 0.0872665F, -1.570796F, 0F); - TowerMoterFront = new ModelRenderer(this, 40, 38); - TowerMoterFront.addBox(-6F, -7.3F, -5F, 12, 9, 6); - TowerMoterFront.setRotationPoint(0F, -45F, -1F); - TowerMoterFront.setTextureSize(128, 64); - TowerMoterFront.mirror = true; - setRotation(TowerMoterFront, 0F, 0F, 0F); - TowerBaseMotor = new ModelRenderer(this, 65, 0); - TowerBaseMotor.addBox(-6F, -0.3F, 0F, 12, 2, 7); - TowerBaseMotor.setRotationPoint(0F, -45F, 0F); - TowerBaseMotor.setTextureSize(128, 64); - TowerBaseMotor.mirror = true; - setRotation(TowerBaseMotor, 0F, 0F, 0F); - TowerBaseMotorBack = new ModelRenderer(this, 65, 30); - TowerBaseMotorBack.addBox(-4F, -3.3F, 7F, 8, 4, 3); - TowerBaseMotorBack.setRotationPoint(0F, -45F, 0F); - TowerBaseMotorBack.setTextureSize(128, 64); - TowerBaseMotorBack.mirror = true; - setRotation(TowerBaseMotorBack, 0F, 0F, 0F); - TowerMotor = new ModelRenderer(this, 65, 15); - TowerMotor.addBox(-4F, -6.3F, 0F, 8, 6, 7); - TowerMotor.setRotationPoint(0F, -45F, 0F); - TowerMotor.setTextureSize(128, 64); - TowerMotor.mirror = true; - setRotation(TowerMotor, 0F, 0F, 0F); - Rotor = new ModelRenderer(this, 88, 30); - Rotor.addBox(-0.5F, -0.5F, 0F, 1, 1, 3); - Rotor.setRotationPoint(0F, -48F, -8F); - Rotor.setTextureSize(128, 64); - Rotor.mirror = true; - setRotation(Rotor, 0F, 0F, 0F); - RotorCover = new ModelRenderer(this, 88, 35); - RotorCover.addBox(-2F, -2F, -1F, 4, 4, 1); - RotorCover.setRotationPoint(0F, -48F, -8F); - RotorCover.setTextureSize(128, 64); - RotorCover.mirror = true; - setRotation(RotorCover, 0F, 0F, 0F); - BladeBaseC = new ModelRenderer(this, 0, 54); - BladeBaseC.addBox(1F, -1F, 0F, 32, 2, 1); - BladeBaseC.setRotationPoint(0F, -48F, -8F); - BladeBaseC.setTextureSize(128, 64); - BladeBaseC.mirror = true; - setRotation(BladeBaseC, 0F, 0F, getRotation(120)); - BladeBaseB = new ModelRenderer(this, 0, 54); - BladeBaseB.addBox(1F, -1F, 0F, 32, 2, 1); - BladeBaseB.setRotationPoint(0F, -48F, -8F); - BladeBaseB.setTextureSize(128, 64); - BladeBaseB.mirror = true; - setRotation(BladeBaseB, 0F, 0F, 0F); - BladeBaseA = new ModelRenderer(this, 0, 54); - BladeBaseA.addBox(1F, -1F, 0F, 32, 2, 1); - BladeBaseA.setRotationPoint(0F, -48F, -8F); - BladeBaseA.setTextureSize(128, 64); - BladeBaseA.mirror = true; - setRotation(BladeBaseA, 0F, 0F, getRotation(240)); - } - - public void render(float size, double angle) - { - Base.render(size); - TowerFront.render(size); - TowerLeft.render(size); - TowerBack.render(size); - TowerRight.render(size); - TowerMoterFront.render(size); - TowerBaseMotor.render(size); - TowerBaseMotorBack.render(size); - TowerMotor.render(size); - Rotor.render(size); - RotorCover.render(size); - setRotation(BladeBaseC, 0.0F, 0.0F, getRotation(getAbsoluteAngle(120 + angle))); - BladeBaseC.render(size); - setRotation(BladeBaseB, 0.0F, 0.0F, getRotation(getAbsoluteAngle(angle))); - BladeBaseB.render(size); - setRotation(BladeBaseA, 0.0F, 0.0F, getRotation(getAbsoluteAngle(240 + angle))); - BladeBaseA.render(size); - } - - public float getRotation(double angle) - { - return ((float)angle/(float)180)*(float)Math.PI; - } - - public double getAbsoluteAngle(double angle) - { - return angle % 360; - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index eceae94bd..b1d3fb18b 100644 --- a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -4,13 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer { @@ -25,10 +26,10 @@ public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java index 6fde9bce3..b6237f662 100644 --- a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderGasGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java index 35250bdd3..5c18d0f93 100644 --- a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderHeatGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java index 63c7df4c5..9cb3d0f32 100644 --- a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java @@ -22,9 +22,13 @@ import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) public class RenderIndustrialTurbine extends TileEntitySpecialRenderer { - private static Map cachedFluids = new HashMap(); + private static Map cachedFluids = new HashMap(); private Fluid STEAM = FluidRegistry.getFluid("steam"); @@ -76,10 +80,10 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer MekanismRenderer.glowOn(tileEntity.structure.fluidStored.getFluid().getLuminosity()); MekanismRenderer.colorFluid(tileEntity.structure.fluidStored.getFluid()); - DisplayInteger[] displayList = getListAndRender(data, tileEntity.getWorldObj()); + DisplayInteger display = getListAndRender(data, tileEntity.getWorldObj()); - GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.fluidStored.amount / (float)tileEntity.structure.getFluidCapacity())+0.3F)); - displayList[getStages(data.height+1)-1].render(); + GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.fluidStored.amount / (float)tileEntity.structure.getFluidCapacity())+MekanismRenderer.GAS_RENDER_BASE)); + display.render(); MekanismRenderer.glowOff(); MekanismRenderer.resetColor(); @@ -126,7 +130,7 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer return z - TileEntityRendererDispatcher.staticPlayerZ; } - private DisplayInteger[] getListAndRender(RenderData data, World world) + private DisplayInteger getListAndRender(RenderData data, World world) { if(cachedFluids.containsKey(data)) { @@ -138,31 +142,26 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer toReturn.setTexture(STEAM.getIcon()); final int stages = getStages(data.height); - DisplayInteger[] displays = new DisplayInteger[stages]; + DisplayInteger display = DisplayInteger.createAndStart(); - cachedFluids.put(data, displays); - - for(int i = 0; i < stages; i++) + cachedFluids.put(data, display); + + if(STEAM.getIcon() != null) { - displays[i] = DisplayInteger.createAndStart(); + toReturn.minX = 0 + .01; + toReturn.minY = 0 + .01; + toReturn.minZ = 0 + .01; - if(STEAM.getIcon() != null) - { - toReturn.minX = 0 + .01; - toReturn.minY = 0 + .01; - toReturn.minZ = 0 + .01; + toReturn.maxX = data.length - .01; + toReturn.maxY = data.height - .01; + toReturn.maxZ = data.width - .01; - toReturn.maxX = data.length - .01; - toReturn.maxY = ((float)i/(float)stages)*(data.height+1) - .01; - toReturn.maxZ = data.width - .01; - - MekanismRenderer.renderObject(toReturn); - } - - GL11.glEndList(); + MekanismRenderer.renderObject(toReturn); } - return displays; + GL11.glEndList(); + + return display; } public static void resetDisplayInts() diff --git a/src/main/java/mekanism/generators/client/render/RenderReactor.java b/src/main/java/mekanism/generators/client/render/RenderReactor.java index d0730ea27..4eb64f7b5 100644 --- a/src/main/java/mekanism/generators/client/render/RenderReactor.java +++ b/src/main/java/mekanism/generators/client/render/RenderReactor.java @@ -7,14 +7,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.tile.reactor.TileEntityReactorController; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderReactor extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java index 9e6c0f301..73c84b9d2 100644 --- a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java @@ -4,7 +4,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java b/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java similarity index 85% rename from src/main/java/mekanism/generators/client/render/RenderWindTurbine.java rename to src/main/java/mekanism/generators/client/render/RenderWindGenerator.java index 704c3c429..1d960701a 100644 --- a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java @@ -3,24 +3,23 @@ package mekanism.generators.client.render; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.client.model.ModelWindTurbine; +import mekanism.generators.client.model.ModelWindGenerator; import mekanism.generators.common.tile.TileEntityWindGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -public class RenderWindTurbine extends TileEntitySpecialRenderer +public class RenderWindGenerator extends TileEntitySpecialRenderer { - private ModelWindTurbine model = new ModelWindTurbine(); + private ModelWindGenerator model = new ModelWindGenerator(); @Override public void renderTileEntityAt(TileEntityWindGenerator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindTurbine.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); switch(tileEntity.facing) { diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 009231792..717ff5cfb 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -354,7 +354,7 @@ public class FusionReactor implements IFusionReactor } @Override - public void formMultiblock() + public void formMultiblock(boolean keepBurning) { updatedThisTick = true; @@ -367,19 +367,19 @@ public class FusionReactor implements IFusionReactor if(!createFrame(centreOfReactor)) { - unformMultiblock(false); + unformMultiblock(keepBurning); return; } if(!addSides(centreOfReactor)) { - unformMultiblock(false); + unformMultiblock(keepBurning); return; } if(!centreIsClear(centreOfReactor)) { - unformMultiblock(false); + unformMultiblock(keepBurning); return; } @@ -447,6 +447,7 @@ public class FusionReactor implements IFusionReactor { neutronCaptors.add((INeutronCapture)tile); } + if(tile instanceof IHeatTransfer) { heatTransfers.add((IHeatTransfer)tile); diff --git a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java index 42ce9d3a3..47a6948b3 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java +++ b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java @@ -4,7 +4,6 @@ import mekanism.generators.common.block.BlockGenerator; import mekanism.generators.common.block.BlockReactor; import mekanism.generators.common.item.ItemBlockGenerator; import mekanism.generators.common.item.ItemBlockReactor; - import net.minecraft.block.Block; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index ee2ef3e21..46c3ede49 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -5,7 +5,6 @@ import mekanism.common.Mekanism; import mekanism.common.base.IGuiProvider; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityContainerBlock; -import mekanism.common.tile.TileEntityPressureDisperser; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.inventory.container.ContainerGasGenerator; import mekanism.generators.common.inventory.container.ContainerHeatGenerator; @@ -101,7 +100,6 @@ public class GeneratorsCommonProxy implements IGuiProvider loadWindConfiguration(); generators.turbineBladesPerCoil = Mekanism.configuration.get("generation", "TurbineBladesPerCoil", 4).getInt(); - generators.turbineBaseEnergyPerSteam = Mekanism.configuration.get("generation", "TurbineBaseEnergyPerSteam", 10D).getDouble(); generators.turbineVentGasFlow = Mekanism.configuration.get("generation", "TurbineVentGasFlow", 16000D).getDouble(); generators.turbineDisperserGasFlow = Mekanism.configuration.get("generation", "TurbineDisperserGasFlow", 640D).getDouble(); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 35d960398..80af48e5c 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -14,6 +14,7 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.multiblock.MultiblockManager; @@ -166,7 +167,7 @@ public class MekanismGenerators implements IModule " I ", "IGI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('G'), "blockGlass" })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Reactor, 1, 0), new Object[] { - "CGC", "ITI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('T'), MekanismUtils.getEmptyGasTank() + "CGC", "ITI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.ReactorGlass, 2, 1), new Object[] { " I ", "ILI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.ReactorGlass, 1, 0), Character.valueOf('L'), "blockRedstone" @@ -207,7 +208,6 @@ public class MekanismGenerators implements IModule dataStream.writeInt(generators.windGenerationMaxY); dataStream.writeInt(generators.turbineBladesPerCoil); - dataStream.writeDouble(generators.turbineBaseEnergyPerSteam); dataStream.writeDouble(generators.turbineVentGasFlow); dataStream.writeDouble(generators.turbineDisperserGasFlow); } @@ -229,7 +229,6 @@ public class MekanismGenerators implements IModule generators.windGenerationMaxY = dataStream.readInt(); generators.turbineBladesPerCoil = dataStream.readInt(); - generators.turbineBaseEnergyPerSteam = dataStream.readDouble(); generators.turbineVentGasFlow = dataStream.readDouble(); generators.turbineDisperserGasFlow = dataStream.readDouble(); } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 9daa00f65..12f78c17d 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -588,7 +588,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB if(metadata == GeneratorType.SOLAR_GENERATOR.meta) { - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.65F, 1.0F); + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.7F, 1.0F); } else if(metadata == GeneratorType.TURBINE_ROTOR.meta) { @@ -788,7 +788,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB { if(metadata == GeneratorType.SOLAR_GENERATOR.meta) { - block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.65F, 1.0F); + block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.7F, 1.0F); } else if(metadata == GeneratorType.TURBINE_ROTOR.meta) { diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index 9a65de0dd..21cdc3b05 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -25,6 +25,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class TurbineUpdateProtocol extends UpdateProtocol { public static final int FLUID_PER_TANK = TankUpdateProtocol.FLUID_PER_TANK; + public static final int MAX_BLADES = 28; public TurbineUpdateProtocol(TileEntityTurbineCasing tileEntity) { diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java index 029e264cb..c9b772b3e 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityBioGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java index c655e9118..94356d5eb 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java @@ -5,7 +5,6 @@ import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityGasGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java index e551ad3e0..019b4067d 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityHeatGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java index f8d4c28bd..198066124 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java index 9fbc487d6..17e3b6fff 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.reactor.TileEntityReactorController; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java index 33efa9396..b31ac95a9 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntitySolarGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java index f31578680..c8fe3b47a 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityWindGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index ddc46c654..ef36426dd 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -57,8 +57,7 @@ import ic2.api.item.ISpecialElectricItem; */ @InterfaceList({ - @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, ISustainedInventory, ISustainedTank, IEnergyContainerItem { @@ -451,12 +450,6 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp return (int)(getMaxEnergy(theItem)* general.TO_TE); } - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return true; - } - @Override @Method(modid = "IC2") public IElectricItemManager getManager(ItemStack itemStack) diff --git a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java index f2228f9d0..0ed553c04 100644 --- a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java +++ b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java @@ -24,8 +24,6 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem { super(); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); } @Override @@ -113,23 +111,19 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem return null; } - GasStack stored = GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); - - if(stored == null) - { - itemstack.setItemDamage(100); - } - else { - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100)))); - } - - return stored; + return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } @Override @@ -142,14 +136,12 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem if(stack == null || stack.amount == 0) { - itemstack.setItemDamage(100); itemstack.getTagCompound().removeTag("stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100)))); itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); } } @@ -158,7 +150,7 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem { ItemStack stack = new ItemStack(this); setGas(stack, null); - stack.setItemDamage(100); + return stack; } @@ -167,7 +159,6 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); list.add(empty); ItemStack filled = new ItemStack(this); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 2c1ca4a0f..c4178017c 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -7,7 +7,6 @@ import mekanism.api.ISalinationSolar; import mekanism.api.MekanismConfig.generators; import mekanism.common.base.IBoundingBlock; import mekanism.common.util.MekanismUtils; - import net.minecraft.util.EnumFacing; public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, ISalinationSolar diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 168b39e37..7e0247666 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -1,6 +1,10 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.EnumSet; + import mekanism.api.MekanismConfig.generators; import mekanism.common.FluidSlot; import mekanism.common.MekanismItems; @@ -10,10 +14,12 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.*; - -import java.util.ArrayList; -import java.util.EnumSet; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class TileEntityBioGenerator extends TileEntityGenerator implements IFluidHandler, ISustainedData { @@ -211,7 +217,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui return EnumSet.of(EnumFacing.getFront(facing).getOpposite()); } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getBioFuel", "getBioFuelNeeded"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getBioFuel", "getBioFuelNeeded"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 8801f0e81..d3322ab18 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -1,8 +1,18 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + import mekanism.api.MekanismConfig.general; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.IGasItem; +import mekanism.api.gas.ITubeConnection; import mekanism.common.FuelHandler; import mekanism.common.FuelHandler.FuelGas; import mekanism.common.base.ISustainedData; @@ -12,8 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import java.util.ArrayList; - public class TileEntityGasGenerator extends TileEntityGenerator implements IGasHandler, ITubeConnection, ISustainedData { /** The maximum amount of gas this block can store. */ @@ -156,7 +164,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH return fuelTank.getStored()*i / MAX_GAS; } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getGas", "getGasNeeded"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getGas", "getGasNeeded"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index c9f8eee4c..1f3deda65 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -1,8 +1,10 @@ package mekanism.generators.common.tile; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.EnumSet; + import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; @@ -19,9 +21,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; - -import java.util.ArrayList; -import java.util.EnumSet; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock implements IComputerIntegration, IActiveState, IHasSound, ISoundSource, IRedstoneControl { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 647c2fe88..0dabb9fcf 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -1,11 +1,19 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismConfig.generators; import mekanism.common.base.ISustainedData; -import mekanism.common.util.*; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.FluidContainerUtils.FluidChecker; +import mekanism.common.util.HeatUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.PipeUtils; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -13,9 +21,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.*; - -import java.util.ArrayList; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.IFluidHandler; public class TileEntityHeatGenerator extends TileEntityGenerator implements IFluidHandler, ISustainedData, IHeatTransfer { @@ -31,6 +44,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu public double heatToAbsorb = 0; public double producingEnergy; + + public double lastTransferLoss; + public double lastEnvironmentLoss; public TileEntityHeatGenerator() { @@ -53,7 +69,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu if(inventory[0].getItem() instanceof IFluidContainerItem) { - lavaTank.fill(FluidContainerUtils.extractFluid(lavaTank, inventory[0], FluidRegistry.LAVA), true); + lavaTank.fill(FluidContainerUtils.extractFluid(lavaTank, inventory[0], FluidChecker.check(FluidRegistry.LAVA)), true); } else if(fluid != null) { @@ -121,9 +137,12 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu setActive(false); } - simulateHeat(); + double[] loss = simulateHeat(); applyTemperatureChange(); + lastTransferLoss = loss[0]; + lastEnvironmentLoss = loss[1]; + producingEnergy = getEnergy()-prev; } } @@ -246,6 +265,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu super.handlePacketData(dataStream); producingEnergy = dataStream.readDouble(); + + lastTransferLoss = dataStream.readDouble(); + lastEnvironmentLoss = dataStream.readDouble(); int amount = dataStream.readInt(); @@ -264,6 +286,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu super.getNetworkedData(data); data.add(producingEnergy); + + data.add(lastTransferLoss); + data.add(lastEnvironmentLoss); if(lavaTank.getFluid() != null) { @@ -276,7 +301,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu return data; } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getFuel", "getFuelNeeded"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getFuel", "getFuelNeeded"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index fb6824565..73838b2d7 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -139,7 +139,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator return 0; } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getSeesSun"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getSeesSun"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index 89a58868f..1938b2d24 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.generators; import mekanism.common.base.IBoundingBlock; @@ -9,6 +7,8 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityWindGenerator extends TileEntityGenerator implements IBoundingBlock { @@ -71,7 +71,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou return 1.5F*super.getVolume(); } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getMultiplier"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getMultiplier"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index 417d1a61c..76cb83cca 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -8,7 +8,6 @@ import mekanism.api.Coord4D; import mekanism.api.reactor.IFusionReactor; import mekanism.api.reactor.IReactorBlock; import mekanism.common.tile.TileEntityElectricBlock; - import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -55,7 +54,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp if(getReactor() != null) { - getReactor().formMultiblock(); + getReactor().formMultiblock(false); } } @@ -96,7 +95,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp if(!(this instanceof TileEntityReactorController) && getReactor() != null) { - getReactor().formMultiblock(); + getReactor().formMultiblock(true); } } @@ -109,7 +108,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp { if(getReactor() != null) { - getReactor().formMultiblock(); + getReactor().formMultiblock(false); } else { updateController(); @@ -125,7 +124,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp if(found != null && (found.getReactor() == null || !found.getReactor().isFormed())) { - found.formMultiblock(); + found.formMultiblock(false); } } } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index 6d63423ec..e18e22277 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -71,14 +71,14 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen public void radiateNeutrons(int neutrons) {} //future impl - public void formMultiblock() + public void formMultiblock(boolean keepBurning) { if(getReactor() == null) { setReactor(new FusionReactor(this)); } - getReactor().formMultiblock(); + getReactor().formMultiblock(keepBurning); } public double getPlasmaTemp() @@ -139,7 +139,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { super.onChunkUnload(); - formMultiblock(); + formMultiblock(true); } @Override @@ -147,7 +147,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { super.onAdded(); - formMultiblock(); + formMultiblock(false); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java index 463309609..6789f7ac3 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java @@ -1,7 +1,6 @@ package mekanism.generators.common.tile.reactor; import mekanism.api.lasers.ILaserReceptor; - import net.minecraft.util.EnumFacing; public class TileEntityReactorLaserFocusMatrix extends TileEntityReactorBlock implements ILaserReceptor diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index 9052f335c..ec97de5fd 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -133,7 +133,8 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem return data; } - private static final String[] methods = new String[] {"isIgnited", "canIgnite", "getPlasmaHeat", "getMaxPlasmaHeat", "getCaseHeat", "getMaxCaseHeat", "getInjectionRate", "setInjectionRate", "hasFuel", "getProducing"}; + private static final String[] methods = new String[] {"isIgnited", "canIgnite", "getPlasmaHeat", "getMaxPlasmaHeat", "getCaseHeat", "getMaxCaseHeat", "getInjectionRate", "setInjectionRate", "hasFuel", "getProducing", "getIgnitionTemp", + "getEnergy", "getMaxEnergy", "getWater", "getSteam", "getFuel"}; @Override public String[] getMethods() @@ -179,6 +180,18 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem (getReactor().getTritiumTank().getStored() >= getReactor().getInjectionRate()/2)}; case 9: return new Object[] {getReactor().getPassiveGeneration(false, true)}; + case 10: + return new Object[] {getReactor().getIgnitionTemperature(activeCooled)}; + case 11: + return new Object[] {getReactor().getBufferedEnergy()}; + case 12: + return new Object[] {getReactor().getBufferSize()}; + case 13: + return new Object[] {getReactor().getWaterTank().getFluidAmount()}; + case 14: + return new Object[] {getReactor().getSteamTank().getFluidAmount()}; + case 15: + return new Object[] {getReactor().getFuelTank().getStored()}; default: return new Object[] {"Unknown command."}; } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index b224033df..1501d9abd 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -240,6 +240,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl { return getReactor().getTemp(); } + return 0; } @@ -256,6 +257,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl { return getReactor().getInsulationCoefficient(side); } + return 0; } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 78e1adc09..39879c3e8 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.generators; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; @@ -27,8 +28,6 @@ import net.minecraftforge.fluids.FluidStack; public class TileEntityTurbineCasing extends TileEntityMultiblock implements IStrictEnergyStorage { - public float prevScale; - public TileEntityTurbineCasing() { this("TurbineCasing"); @@ -44,19 +43,6 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock 0.01) - { - prevScale = (9*prevScale + targetScale)/10; - } - } - } - if(!worldObj.isRemote) { if(structure != null) @@ -78,7 +64,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock 0 && getEnergy() < structure.getEnergyCapacity()) { - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(structure.blades, structure.coils*generators.turbineBladesPerCoil); + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(structure.blades, structure.coils*generators.turbineBladesPerCoil); double rate = structure.lowerVolume*(structure.getDispersers()*generators.turbineDisperserGasFlow); rate = Math.min(rate, structure.vents*generators.turbineVentGasFlow); diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index d04c60943..19a624c8c 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -10,7 +10,6 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.common.base.IEnergyWrapper; import mekanism.common.util.CableUtils; import mekanism.common.util.LangUtils; @@ -32,8 +31,7 @@ import cpw.mods.fml.common.Optional.Method; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"), - @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"), - @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore"), + @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2") }) public class TileEntityTurbineValve extends TileEntityTurbineCasing implements IFluidHandler, IEnergyWrapper { @@ -177,14 +175,12 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - @Method(modid = "CoFHCore") public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { return 0; } @Override - @Method(modid = "CoFHCore") public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { if(getOutputtingSides().contains(from)) @@ -203,21 +199,18 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - @Method(modid = "CoFHCore") public boolean canConnectEnergy(ForgeDirection from) { return structure != null; } @Override - @Method(modid = "CoFHCore") public int getEnergyStored(ForgeDirection from) { return (int)Math.round(getEnergy()*general.TO_TE); } @Override - @Method(modid = "CoFHCore") public int getMaxEnergyStored(ForgeDirection from) { return (int)Math.round(getMaxEnergy()*general.TO_TE); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index b973112fb..db596ba91 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -1,15 +1,9 @@ package mekanism.tools.common; -import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.Mod.Instance; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import io.netty.buffer.ByteBuf; + +import java.io.IOException; + import mekanism.api.MekanismConfig.tools; import mekanism.common.Mekanism; import mekanism.common.Version; @@ -25,8 +19,15 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingSpawnEvent; - -import java.io.IOException; +import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.Mod.Instance; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule diff --git a/src/main/java/mekanism/tools/common/ToolsItems.java b/src/main/java/mekanism/tools/common/ToolsItems.java index 96ab62ad0..3c9e42ad9 100644 --- a/src/main/java/mekanism/tools/common/ToolsItems.java +++ b/src/main/java/mekanism/tools/common/ToolsItems.java @@ -8,7 +8,6 @@ import mekanism.tools.item.ItemMekanismPaxel; import mekanism.tools.item.ItemMekanismPickaxe; import mekanism.tools.item.ItemMekanismShovel; import mekanism.tools.item.ItemMekanismSword; - import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/resources/assets/mekanism/gui/GuiBoilerStats.png b/src/main/resources/assets/mekanism/gui/GuiBoilerStats.png new file mode 100644 index 000000000..71f0b307b Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/GuiBoilerStats.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiDictionary.png b/src/main/resources/assets/mekanism/gui/GuiDictionary.png index 05fdc0e53..5c8d64c25 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiDictionary.png and b/src/main/resources/assets/mekanism/gui/GuiDictionary.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png b/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png new file mode 100644 index 000000000..12b4246bb Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiMOreDictFilter.png b/src/main/resources/assets/mekanism/gui/GuiMOreDictFilter.png index bca31627a..7827f2681 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiMOreDictFilter.png and b/src/main/resources/assets/mekanism/gui/GuiMOreDictFilter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png b/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png new file mode 100644 index 000000000..67588cf77 Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiTeleporter.png b/src/main/resources/assets/mekanism/gui/GuiTeleporter.png index 3ddea9267..1c32f08b0 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiTeleporter.png and b/src/main/resources/assets/mekanism/gui/GuiTeleporter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiThermoelectricBoiler.png b/src/main/resources/assets/mekanism/gui/GuiThermoelectricBoiler.png new file mode 100644 index 000000000..16376d2ec Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/GuiThermoelectricBoiler.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png b/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png index 35aee32c4..3a899bdfa 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png and b/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiGraph.png b/src/main/resources/assets/mekanism/gui/elements/GuiGraph.png new file mode 100644 index 000000000..0a87e28b3 Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/elements/GuiGraph.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiHeatInfo.png b/src/main/resources/assets/mekanism/gui/elements/GuiHeatInfo.png new file mode 100644 index 000000000..97ddc2b70 Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/elements/GuiHeatInfo.png differ diff --git a/src/main/resources/assets/mekanism/lang/da_DK.lang b/src/main/resources/assets/mekanism/lang/da_DK.lang new file mode 100644 index 000000000..1ef32add0 --- /dev/null +++ b/src/main/resources/assets/mekanism/lang/da_DK.lang @@ -0,0 +1,964 @@ +//********// +//MEKANISM// +//********// + +//Items +tile.ObsidianTNT.name=Obsidian TNT +item.EnrichedAlloy.name=Beriget Legering +item.ReinforcedAlloy.name=Forstærket Legering +item.AtomicAlloy.name=Atomar Legering +item.EnergyTablet.name=Energi-tablet +item.SpeedUpgrade.name=Hastighedsopgradering +item.EnergyUpgrade.name=Energiopgradering +item.FilterUpgrade.name=Filtreringsopgradering +item.GasUpgrade.name=Gasopgradering +item.Robit.name=Robit +item.AtomicDisassembler.name=Atomadskiller +item.ElectricBow.name=Elektrisk Bue +item.EnrichedIron.name=Beriget Jern +item.CompressedCarbon.name=Komprimeret Kulstof +item.CompressedRedstone.name=Komprimeret Rødsten +item.CompressedDiamond.name=Komprimeret Diamant +item.CompressedObsidian.name=Komprimeret Obsidian +item.PortableTeleporter.name=Portabel Teleportør +item.TeleportationCore.name=Teleporteringskerne +item.Configurator.name=Konfiguratør +item.NetworkReader.name=Netværkslæser +item.WalkieTalkie.name=Walkie-Talkie +item.Jetpack.name=Jetpack +item.ScubaTank.name=Iltflaske +item.GasMask.name=Gasmaske +item.Dictionary.name=Ordbog +item.ElectrolyticCore.name=Elektrolysekerne +item.Sawdust.name=Savsmuld +item.Salt.name=Salt +item.BrineBucket.name=Saltlagespand +item.LithiumBucket.name=Lithiumsspand +item.HeavyWaterBucket.name=Tungtvandsspand +item.FreeRunners.name=Fritløbere +item.ArmoredJetpack.name=Panseret Jetpack +item.FilterCard.name=Filterkort +item.SeismicReader.name=Seismisk Aflæser +item.HDPEPellet.name=HDPE-pellet +item.HDPERod.name=HDPE-stav +item.HDPESheet.name=HDPE-plade +item.PlaStick.name=PlaStick +item.Substrate.name=Substrat +item.Flamethrower.name=Flammekaster +item.GaugeDropper.name=Gauge Dropper +item.BioFuel.name=Biobrændsel + +//Control Circuits +item.BasicControlCircuit.name=Basalt Kontrolkredsløb +item.AdvancedControlCircuit.name=Avanceret Kontrolkredsløb +item.EliteControlCircuit.name=Elite Kontrolkredsløb +item.UltimateControlCircuit.name=Ultimativt Kontrolkredsløb + +//Gas Tank +tile.GasTank.GasTank.name=Gasstank + +//Cardboard Box +tile.CardboardBox.name=Papkasse + +//Bounding Block +tile.BoundingBlock.name=Markeringsblok + +//Salt +tile.SaltBlock.name=Saltblok + +//Basic Block +tile.BasicBlock.OsmiumBlock.name=Osmiumblok +tile.BasicBlock.BronzeBlock.name=Bronzeblok +tile.BasicBlock.RefinedObsidian.name=Raffineret Obsidian +tile.BasicBlock.CharcoalBlock.name=Trækulsblok +tile.BasicBlock.RefinedGlowstone.name=Raffineret Glødesten +tile.BasicBlock.SteelBlock.name=Stålblok +tile.BasicBlock.Bin.name=Papirkurv +tile.BasicBlock.TeleporterFrame.name=Teleportørindramning +tile.BasicBlock.SteelCasing.name=Stål-casing +tile.BasicBlock.DynamicTank.name=Dynamisk Tank +tile.BasicBlock.DynamicGlass.name=Dynamisk Glas +tile.BasicBlock.DynamicValve.name=Dynamisk Ventil +tile.BasicBlock.CopperBlock.name=Kobberblok +tile.BasicBlock.TinBlock.name=Tinblok +tile.BasicBlock.SolarEvaporationController.name=Solfordampningscontroller +tile.BasicBlock.SolarEvaporationValve.name=Solfordampningsventil + +//Basic Block 2 (second ID iteration) +tile.BasicBlock2.SolarEvaporationBlock.name=Solfordampningsblok +tile.BasicBlock2.InductionCasing.name=Induktions-casing +tile.BasicBlock2.InductionPort.name=Induktionsport +tile.BasicBlock2.InductionCellBasic.name=Basal Induktionscelle +tile.BasicBlock2.InductionCellAdvanced.name=Avanceret Induktionscelle +tile.BasicBlock2.InductionCellElite.name=Elite Induktionscelle +tile.BasicBlock2.InductionCellUltimate.name=Ultimativ Induktionscelle +tile.BasicBlock2.InductionProviderBasic.name=Basal Induktionsprovider +tile.BasicBlock2.InductionProviderAdvanced.name=Avanceret Induktionsprovider +tile.BasicBlock2.InductionProviderElite.name=Elite Induktionsprovider +tile.BasicBlock2.InductionProviderUltimate.name=Ultimativ Induktionsprovider + +//Machine Block +tile.MachineBlock.EnrichmentChamber.name=Berigelseskammer +tile.MachineBlock.OsmiumCompressor.name=Osmiumkompressor +tile.MachineBlock.Combiner.name=Kombinerer +tile.MachineBlock.Crusher.name=Knuser +tile.MachineBlock.Factory.name=Fabrik +tile.MachineBlock.MetallurgicInfuser.name=Metallurgic Infuser +tile.MachineBlock.PurificationChamber.name=Rensningskammer +tile.MachineBlock.EnergizedSmelter.name=Energibaseret Smelteværk +tile.MachineBlock.Teleporter.name=Teleporter +tile.MachineBlock.ElectricPump.name=Elektrisk Pumpe +tile.MachineBlock.ElectricChest.name=Elektrisk Kiste +tile.MachineBlock.Chargepad.name=Chargepad +tile.MachineBlock.LogisticalSorter.name=Logistical Sorterer +tile.MachineBlock.DigitalMiner.name=Digital Miner + +//Machine Block 2 (second ID iteration) +tile.MachineBlock2.RotaryCondensentrator.name=Rotary Condensentrator +tile.MachineBlock2.ChemicalOxidizer.name=Kemisk Oxidationsenhed +tile.MachineBlock2.ChemicalInfuser.name=Kemisk Infuser +tile.MachineBlock2.ChemicalCombiner.name=Kemisk Kombinerer +tile.MachineBlock2.ChemicalInjectionChamber.name=Kemisk Injektionskammer +tile.MachineBlock2.ElectrolyticSeparator.name=Elektrolytisk Separator +tile.MachineBlock2.PrecisionSawmill.name=Precisionssavmølle +tile.MachineBlock2.ChemicalDissolutionChamber.name=Kemisk Opløsningskammer +tile.MachineBlock2.ChemicalWasher.name=Kemisk vasker +tile.MachineBlock2.ChemicalCrystallizer.name=Kemisk Krystalisator +tile.MachineBlock2.SeismicVibrator.name=Seismisk Vibrator +tile.MachineBlock2.PressurizedReactionChamber.name=Pressurized Reaction Chamber +tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC +tile.MachineBlock2.PortableTank.name=Mobil Tank +tile.MachineBlock2.FluidicPlenisher.name=Fluidisk Plenisher +tile.MachineBlock2.Laser.name=Laser +tile.MachineBlock2.LaserAmplifier.name=Laserfortstærker +tile.MachineBlock2.LaserTractorBeam.name=Laser Traktorstråle + +//Machine Block 3 (third ID iteration) +tile.MachineBlock3.SolarNeutronActivator.name=Solar Neutron Activator +tile.MachineBlock3.Oredictionificator.name=Oredictionificator + +//Plastic +tile.PlasticBlock.name=Plastblok +tile.SlickPlasticBlock.name=Slick Plastblok +tile.GlowPlasticBlock.name=Plast Glødeblok +tile.ReinforcedPlasticBlock.name=Forstærket Plastblok +tile.RoadPlasticBlock.name=Plastvej + +tile.PlasticFence.name=Plastbarriere + +//Infuse types +infuse.carbon=Kulstof +infuse.tin=Tin +infuse.diamond=Diamant +infuse.redstone=Rødsten +infuse.fungi=Fungi +infuse.obsidian=Obsidian +infuse.bio=Biomasse + +//Ore Block +tile.OreBlock.OsmiumOre.name=Osmiummalm +tile.OreBlock.CopperOre.name=Kobbermalm +tile.OreBlock.TinOre.name=Tinmalm + +//Transmitters +item.MultipartTransmitter.BasicPressurizedTube.name=Basal Tryk-tube +item.MultipartTransmitter.AdvancedPressurizedTube.name=Avanceret Tryk-tube +item.MultipartTransmitter.ElitePressurizedTube.name=Elite Tryk-tube +item.MultipartTransmitter.UltimatePressurizedTube.name=Ultimativ Tryk-tube +item.MultipartTransmitter.BasicUniversalCable.name=Basalt Universalkabel +item.MultipartTransmitter.AdvancedUniversalCable.name=Avanceret Universalkabel +item.MultipartTransmitter.EliteUniversalCable.name=Elite Universalkabel +item.MultipartTransmitter.UltimateUniversalCable.name=Ultimativt Universalkabel +item.MultipartTransmitter.BasicMechanicalPipe.name=Basalt Mekanisk Rør +item.MultipartTransmitter.AdvancedMechanicalPipe.name=Avanceret Mekanisk Rør +item.MultipartTransmitter.EliteMechanicalPipe.name=Elite Mekanisk Rør +item.MultipartTransmitter.UltimateMechanicalPipe.name=Ultimativt Mekanisk Rør +item.MultipartTransmitter.BasicLogisticalTransporter.name=Basal Logistisk Transportør +item.MultipartTransmitter.AdvancedLogisticalTransporter.name=Avanceret Logistisk Transportør +item.MultipartTransmitter.EliteLogisticalTransporter.name=Elite Logistisk Transportør +item.MultipartTransmitter.UltimateLogisticalTransporter.name=Ultimativ Logistisk Transportør +item.MultipartTransmitter.RestrictiveTransporter.name=Begrænsende Transporter +item.MultipartTransmitter.DiversionTransporter.name=Afledningstransporter + +//Glow Panel +item.GlowPanel.name=Glødepanel + +//Energy Cubes +tile.EnergyCubeBasic.name=Basal Energikube +tile.EnergyCubeAdvanced.name=Avanceret Energikube +tile.EnergyCubeElite.name=Elite Energikube +tile.EnergyCubeUltimate.name=Ultimativ Energikube +tile.EnergyCubeCreative.name=Kreativ Energikube + +//Factory Installers +item.basicFactoryInstaller.name=Basal Fabrikinstallerer +item.advancedFactoryInstaller.name=Avanceret Fabrikinstallerer +item.eliteFactoryInstaller.name=Elite Fabrikinstallerer + +//Dust +item.ironDust.name=Jernstøv +item.goldDust.name=Guldstøv +item.osmiumDust.name=Osmiumstøv +item.obsidianDust.name=Obsidianstøv +item.refinedobsidianDust.name=Raffineret Obsidianstøv +item.diamondDust.name=Diamantstøv +item.steelDust.name=Stålstøv +item.copperDust.name=Kobberstøv +item.tinDust.name=Tinstøv +item.silverDust.name=Sølvstøv +item.leadDust.name=Blystøv +item.sulfurDust.name=Svovlstøv +item.lithiumDust.name=Lithiumstøv + +//Clumps +item.ironClump.name=Jernklump +item.goldClump.name=Guldklump +item.osmiumClump.name=Osmiumklump +item.copperClump.name=Kobberklump +item.tinClump.name=Tinklump +item.silverClump.name=Sølvklump +item.leadClump.name=Blyklump + +//Shards +item.ironShard.name=Jernshard +item.goldShard.name=Guldshard +item.osmiumShard.name=Osmiumshard +item.copperShard.name=Kobbershard +item.tinShard.name=Tinshard +item.silverShard.name=Sølvshard +item.leadShard.name=Blyshard + +//Crystals +item.ironCrystal.name=Jernkrystal +item.goldCrystal.name=Guldkrystal +item.osmiumCrystal.name=Osmiumkrystal +item.copperCrystal.name=Kobberkrystal +item.tinCrystal.name=Tinkrystal +item.silverCrystal.name=Sølvkrystal +item.leadCrystal.name=Blykrystal + +//Dirty Dust +item.dirtyIronDust.name=Beskidt Jernstøv +item.dirtyGoldDust.name=Beskidt Guldstøv +item.dirtyOsmiumDust.name=Beskidt Osmiumstøv +item.dirtyCopperDust.name=Beskidt Kobberstøv +item.dirtyTinDust.name=Beskidt Tinstøv +item.dirtySilverDust.name=Beskidt Sølvstøv +item.dirtyLeadDust.name=Beskidt Blystøv + +//Ingots +item.obsidianIngot.name=Obsidianbarre +item.osmiumIngot.name=Osmiumbarre +item.bronzeIngot.name=Bronzebarre +item.glowstoneIngot.name=Glødestensbarre +item.steelIngot.name=Stålbarre +item.copperIngot.name=Kobberbarre +item.tinIngot.name=Tinbarre + +//Gasses +gas.hydrogen=Brint +gas.oxygen=Ilt +gas.water=Vanddamp +gas.chlorine=Klor +gas.sulfurDioxideGas=Svovldioxid +gas.sulfurTrioxideGas=Svovltrioxid +gas.sulfuricAcid=Svovlsyre +gas.hydrogenChloride=Hydrogenklorid +gas.liquidOsmium=Flydende Osmium +gas.liquidStone=Flydende Sten +gas.ethene=Ethen +gas.sodium=Natrium +gas.brine=Saltlage i Gasform +gas.deuterium=Deuterium +gas.tritium=Tritium +gas.lithium=Lithium +gas.fusionFuelDT=D-T Brændsel + +gas.iron=Jernslurry +gas.gold=Guldslurry +gas.osmium=Osmiumslurry +gas.copper=Kobberslurry +gas.tin=Tinslurry +gas.silver=Sølvslurry +gas.obsidian=Obsidianslurry +gas.lead=Blyslurry + +gas.cleanIron=Ren Jernslurry +gas.cleanGold=Ren Guldslurry +gas.cleanOsmium=Ren Osmiumslurry +gas.cleanCopper=Ren Kobberslurry +gas.cleanTin=Ren Tinslurry +gas.cleanSilver=Ren Sølvslurry +gas.cleanObsidian=Ren Obsidianslurry +gas.cleanLead=Ren Blyslurry + +//BC Fuel Gases +gas.fuel=Fordampet Brændsel +gas.oil=Fordampet Olie + +//Fluids +fluid.hydrogen=Flydende Brint +fluid.oxygen=Flydende Ilt +fluid.chlorine=Flydende Klor +fluid.sulfurDioxideGas=Flydende Svovldioxid +fluid.sulfurTrioxideGas=Flydende Svovltrioxid +fluid.sulfuricAcid=Flydende Svovlsyre +fluid.hydrogenChloride=Flydende Hydrogenklorid +fluid.brine=Saltlage +fluid.ethene=Flydende Ethen +fluid.sodium=Flydende Natrium +fluid.heavyWater=Tungtvand +fluid.lithium=Flydende Lithium +fluid.deuterium=Flydende Deuterium +fluid.tritium=Flydende Tritium +fluid.fusionFuelDT=Flydende D-T Brændsel + +//OreGas names +oregas.iron=Jernmalm +oregas.gold=Guldmalm +oregas.osmium=Osmiummalm +oregas.copper=Kobbermalm +oregas.tin=Tinmalm +oregas.silver=Sølvmalm +oregas.obsidian=Obsidianmalm +oregas.lead=Blymalm + +//Tier names +tier.Basic=Basal +tier.Advanced=Avanceret +tier.Elite=Elite +tier.Ultimate=Ultimativ +tier.Creative=Kreativ + +//Transmission types +transmission.Energy=Energi +transmission.Fluids=Væsker +transmission.Gases=Gasser +transmission.Items=Ting +transmission.Heat=Varme + +//Update handler text +update.consider=Tænk på at opdatere til version +update.newFeatures=Nye funktioner +update.visit=Besøg +update.toDownload=til at downloade +update.devBuild=Du bruger en udviklerversion +update.outdated=Du bruger en forældet version på et eller flere moduler + +//Upgrades +upgrade.energy=Energi +upgrade.energy.desc=Øger energieffektiviteten !nog kapaciteten på maskinen. +upgrade.speed=Hastighed +upgrade.speed.desc=Øger hastigheden på maskinen. +upgrade.filter=Filter +upgrade.filter.desc=Et filter som sepererer !ntungtvand fra almindelig vand. +upgrade.gas=Gas +upgrade.gas.desc=Øger effektiviteten !naf gasforbrugende maskineri. + +//Key description text +key.mode=Ændr Itemmodus +key.armorMode=Ændr Armormodus +key.voice=Stemme + +//Entities +entity.Robit.name=Robit +entity.BabySkeleton.name=Baby Skelet + +//Config Gui +mekanism.configgui.ctgy.general=Mekanism Generelle Indstillinger +mekanism.configgui.ctgy.machines=Maskinindstillinger +mekanism.configgui.ctgy.tier=Tierindstillinger +mekanism.configgui.ctgy.usage=Brugsindstillinger +mekanism.configgui.ctgy.client=Klientindstillinger + +//Config Tooltips +mekanism.configgui.ctgy.general.tooltip=Generelle indstillinger vedr. Mekanism og alle dets moduler +mekanism.configgui.ctgy.machines.tooltip=Indstillinger vedr. aktivering og deaktivering af specifikke maskiner +mekanism.configgui.ctgy.tier.tooltip=Indstillinger vedr. Mekanism tiers og deres tilsvarende værdier +mekanism.configgui.ctgy.usage.tooltip=Indstillinger vedr. machinery og deres energiforbrug +mekanism.configgui.ctgy.client.tooltip=Klientspecifikke indstillinger vedr. Mekanism og alle dets moduler + +//Gui text +gui.removeSpeedUpgrade=Fjern hastighedsopgradering +gui.removeEnergyUpgrade=Fjern energiopgradering +gui.condensentrating=Condensentrating +gui.decondensentrating=Decondensentrating +gui.power=Strøm +gui.confirm=Bekræft +gui.open=Åbn +gui.allOK=Alt OK +gui.none=Ingen +gui.new=Nyt +gui.edit=Ændr +gui.save=Lagr +gui.output=Udgang +gui.delete=Slet +gui.status=Status +gui.autoEject=Auto-udstød +gui.itemstack=ItemStack +gui.oredict=OreDict +gui.material=Materiale +gui.out=Ud +gui.noFluid=Ingen væske +gui.empty=Tom +gui.volume=Volume +gui.start=Start +gui.stop=Stop +gui.config=Konfig +gui.teleport=Teleportér +gui.eject=Udstød +gui.input=Input +gui.strictInput=Striks Input +gui.slots=Plads +gui.state=Tilstand +gui.on=Til +gui.off=Fra +gui.filters=Filtere +gui.filter=Filter +gui.idle=Inaktiv +gui.data=Data +gui.newFilter=Nyt Filter +gui.energy=Energi +gui.gas=Gas +gui.dumping=Udsmidning +gui.dumping_excess=Smid overflødigt ud +gui.modID=Mod ID +gui.key=Nøgle +gui.id=ID +gui.finished=Færdig +gui.well=Alt er vel! +gui.upgrade=Opgradér +gui.infinite=Uendelig +gui.min=Min +gui.max=Maks +gui.delay=Forsinkelse +gui.noDelay=Ingen forsinkelse +gui.fuel=Brændstof +gui.heat=Varme +gui.formed=Formet +gui.incomplete=Ufuldstændig +gui.inductionMatrix=Induktionsmatrice +gui.matrixStats=Matrice-statistik +gui.main=Hoved +gui.outputting=Outputting +gui.receiving=Modtager +gui.dimensions=Dimensioner +gui.constituents=Bestanddele +gui.cells=celler +gui.providers=providers +gui.structure=Struktur +gui.dynamicTank=Dynamisk Tank +gui.visuals=Visuelle +gui.noEject=Kan ikke udstøde +gui.undefined=Udefineret +gui.owner=Ejer +gui.public=Offentlig +gui.private=Privat +gui.add=Tilføj +gui.set=Sæt +gui.freq=Frek. +gui.security=Sikkerhed +gui.index=Indeks +gui.producing=Producing +gui.maxOutput=Max Output +gui.storing=Storing +gui.skyBlocked=Sky blocked +gui.using=Using +gui.needed=Needed +gui.noRecipe=No recipe +gui.conflict=Conflict +gui.height=Height +gui.mult=Mult +gui.chunk=Chunk +gui.vibrating=Vibrating +gui.abundancy=Abundancy +gui.nextItem=Next Item +gui.lastItem=Last Item +gui.oreDictCompat=Compatible OreDict Key +gui.toggleCooling=Toggle Cooling Measurements +gui.coolingMeasurements=Active cooling +gui.redstoneOutputMode=Redstone mode +gui.entityDetection=Entity Detection +gui.moveUp=Move Up +gui.moveDown=Move Down + +gui.reactor.injectionRate=Injektionssats + +gui.upgrades=Opgraderinger +gui.upgrades.supported=Støttet +gui.upgrades.noSelection=Intet valgt +gui.upgrades.amount=Mængde +gui.upgrades.max=Maks +gui.upgrades.effect=Effekt + +gui.chemicalInfuser.short=K. Infuser +gui.chemicalDissolutionChamber.short=K. Opløsningskammer +gui.solarEvaporationController.short=Sol E. Kontrollør + +gui.dictionary.noKey=Ingen nøgle. + +gui.configuration=Konfiguration +gui.config=Konfig +gui.configuration.side=Sidekonfig +gui.configuration.transporter=Transporter-konfig +gui.configuration.strictInput=Striks Input + +gui.rotaryCondensentrator.toggleOperation=Skift operation + +gui.factory.secondaryEnergy=Sekundær energi +gui.factory.autoSort=Auto-sortér + +//Recipe types +gui.factory.Smelting=Smeltnings +gui.factory.Enriching=Berigelses +gui.factory.Crushing=Knusnings +gui.factory.Compressing=Komprimerings +gui.factory.Combining=Kombinerings +gui.factory.Purifying=Rensnings +gui.factory.Injecting=Injicerings + +gui.seismicReader.short=S. Aflæser +gui.seismicReader.solids=Faste Stoffer +gui.seismicReader.fluids=Væsker +gui.seismicReader.reading=Aflæser + +gui.filterSelect.title=Lav Nyt Filter + +gui.oredictFilter=OreDict Filter +gui.oredictFilter.noKey=Ingen nøgle +gui.oredictFilter.sameKey=Samme nøgle + +gui.modIDFilter=Mod ID Filter +gui.modIDFilter.noID=Intet ID +gui.modIDFilter.sameID=Samme ID + +gui.oredictionificatorFilter=Oredictionificator Filter + +gui.itemFilter=Genstandsfilter +gui.itemFilter.noItem=Ingen genstand +gui.itemFilter.details=ItemStack Detaljer +gui.itemFilter.min=Min +gui.itemFilter.max=Maks + +gui.materialFilter=Materialefilter +gui.materialFilter.details=Bruger materiale af + +gui.portableTeleporter=Mobil Teleportør + +gui.robit=Robit +gui.robit.smelting=Robit Smeltning +gui.robit.inventory=Robit Inventar +gui.robit.crafting=Robit Crafting +gui.robit.greeting=Hej, jeg hedder +gui.robit.toggleFollow=Skift 'følge'-modus +gui.robit.rename=Giv nyt navn til denne Robit +gui.robit.teleport=Teleportér hjem +gui.robit.togglePickup=Skift 'saml ting op'-modus +gui.robit.following=Følger +gui.robit.dropPickup=Saml ting op +gui.robit.owner=Ejer + +gui.password.setPassword=Sæt adgangskode +gui.password.enterPassword=Skriv adgangskode +gui.password.fieldsEmpty=Felt(er) tomme +gui.password.notMatching=Matcher ikke +gui.password.identical=Idenstisk +gui.password.invalid=Ugyldig +gui.password=Adgangskode + +gui.logisticalSorter.default=Standard +gui.logisticalSorter.auto=Auto +gui.logisticalSorter.roundRobin=Round-robin + +gui.electricChest.editPassword=Ændr Kode + +gui.teleporter.notReady=Ikke klar +gui.teleporter.ready=Klar +gui.teleporter.noFrame=Ingen indramning +gui.teleporter.noLink=Ingen tilkoblinge +gui.teleporter.exceeds=Tilkoblinger > 2 +gui.teleporter.needsEnergy=Mangler energi +gui.teleporter.noAccess=Du har ikke adgang til denne teleportør. +gui.teleporter.noFreq=Ingen frekvens + +gui.digitalMinerConfig=Digital Miner Konfig + +gui.digitalMiner.autoPull=Auto-træk +gui.digitalMiner.replaceBlock=Erstat blok +gui.digitalMiner.reset=Nulstil +gui.digitalMiner.silkTouch=Silk touch +gui.digitalMiner.pull=Træk +gui.digitalMiner.silk=Silk +gui.digitalMiner.toMine=At grave +gui.digitalMiner.running=Kører +gui.digitalMiner.inverse=Inverse modus +gui.digitalMiner.requireReplace=Kræv erstatning +gui.digitalMiner.fuzzyMode=Fuzzy modus +gui.digitalMiner.missingBlock=Manglende blok + +//Recipe names +recipe.mekanismShaped=Formet + +//Item and block tooltip text +tooltip.configurator.configurate=Konfigurér +tooltip.configurator.empty=Tom +tooltip.configurator.rotate=Rotér +tooltip.configurator.wrench=Skruenøgle +tooltip.configurator.pumpReset=Nulstil Elektrisk Pumpe udregning +tooltip.configurator.toggleDiverter=Afledermodus ændret til +tooltip.configurator.toggleMode=%s opførsel ændret til +tooltip.configurator.viewMode=Nuværende %s opførsel +tooltip.configurator.unauth=Denne kiste er låst +tooltip.configurator.noLink=Ingen forbindelse +tooltip.configurator.linkMsg=Forbundet til +tooltip.configurator.dim=dimension +tooltip.configurator.setLink=Sæt tilkobling til blok +tooltip.configurator.plenisherReset=Nulstil Fluidisk Plenisher udregning +tooltip.configurator.inductionPortMode=Skiftet Indukstionsports overføringsmodus til +tooltip.configurator.toggleColor=Farve skiftet til +tooltip.configurator.viewColor=Nuværende farve + +tooltip.upgrade.speed=Hastighed +tooltip.upgrade.energy=Energi + +tooltip.inventory=Inventar +tooltip.storedEnergy=Opbevaret energi +tooltip.auth=Enutentificeret +tooltip.locked=Låst +tooltip.recipeType=Opskriftstype +tooltip.hold=Hold +tooltip.forDesc=for en beskrivelse +tooltip.forDetails=for detaljer +tooltip.fireMode=Enffyringsmodus +tooltip.capacity=Kapacitet +tooltip.pumpRate=Pumpningssats +tooltip.items=Genstande +tooltip.blocks=Blokke +tooltip.universal=universal +tooltip.fluids=Væsker +tooltip.gasses=Gasser +tooltip.capableTrans=I stand til at overføre +tooltip.restrictiveDesc=Kun brugt hvis ingen andre veje er tilgængelige +tooltip.diversionDesc=Kontrollerbar via rødsten +tooltip.noGas=Ingen gas opbevaret +tooltip.stored=Opbevaret +tooltip.channel=Kanal +tooltip.mode=Modus +tooltip.efficiency=Effektivitet +tooltip.modeToggle=Modus skiftet til +tooltip.flowing=Strømmer +tooltip.yes=ja +tooltip.no=nej +tooltip.name=Navn +tooltip.blockData=Blokdata +tooltip.block=Blok +tooltip.meta=Metadata +tooltip.tile=Tile +tooltip.keysFound=Tast(er) fundet +tooltip.noKey=Ingen tast +tooltip.hp=HP +tooltip.configureState=Konfigurér tilstand +tooltip.outputRate=Output Sats +tooltip.insufficientFuel=Utilstrækkelig Brændsel +tooltip.readyForReaction=Klar til Reaktion +tooltip.speed=Fart +tooltip.and=og + +tooltip.portableTank.bucketMode=Spand-modus + +tooltip.disassembler.normal=normal +tooltip.disassembler.slow=langsom +tooltip.disassembler.fast=hurtig +tooltip.disassembler.vein=åre +tooltip.disassembler.off=fra + +tooltip.filterCard.got=Hentet filterdata fra %s +tooltip.filterCard.set=Injicerede filterdata af typen %s +tooltip.filterCard.unequal=Ulige filterdata-formater +tooltip.filterCard.logisticalSorter=Logistisk Sorterer +tooltip.filterCard.digitalMiner=Digital Miner +tooltip.filterCard.oredictionificator=Oredictionificator + +tooltip.balloon=Ballon + +tooltip.jetpack.regular=Almindelig +tooltip.jetpack.hover=Svæv +tooltip.jetpack.disabled=Deaktiveret + +tooltip.flamethrower.combat=Kamp +tooltip.flamethrower.heat=Opvarm +tooltip.flamethrower.inferno=Inferno +tooltip.flamethrower.modeBump=Flammekastermodus skubbet til + +tooltip.seismicReader.needsEnergy=Ikke nok energi til at læse vibration +tooltip.seismicReader.noVibrations=Ikke i stand til at opdage nogen vibrationer + +tooltip.EnrichmentChamber=En simpel maskine brugt til at berige malm om til !nto af deres støvmodparter, såvel som at !nudføre mange andre operationer. +tooltip.OsmiumCompressor=En nogenlunde avanceret maskine brugt til at !nkomprimere osmium om til adskillige støve for !nså at kunne lave deres barremodparter. +tooltip.Combiner=En maskine brugt til at kombinere støv og brosten !nfor at forme deres malmmodparter. +tooltip.Crusher=En maskine brugt til at knuse barrer om til deres støvmodparter, !nså vel som at udføre mange andre operationer. +tooltip.DigitalMiner=En højtavanceret, filterbaseret, auto-miner !nder kan mine hvilken som helst blok du beder den om !ninden for en 32-bloks(maks)radius. +tooltip.BasicFactory=Det laveste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. +tooltip.AdvancedFactory=Det mellemste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. +tooltip.EliteFactory=The højeste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. +tooltip.MetallurgicInfuser=En maskine brugt til at infuse adskillige materialer !nom til (generelt) metaller til at lave legeringer !nog andre sammensætninger. +tooltip.PurificationChamber=En avanceret maskine i stand til at processere !nmalm om til the klumper: Bruges som det indledende !nfase i 300%-malmforarbejdning. +tooltip.EnergizedSmelter=En simpel maskine der bruges som en Mekanism-baseret !novn, der kører på energy. +tooltip.Teleporter=En maskine i stand til at teleportere spillere til forskellige !nsteder defineret af en anden teleporter. +tooltip.ElectricPump=En avanceret pumpe i stand til at pumpe !nen hele lavasø op. +tooltip.ElectricChest=En mobil kiste, med 54 pladser, der bruger energi til at låse !nsig selv fra andre vha. adgangskodebeskyttelse. +tooltip.Chargepad=En universal chargepad der kan lade !nenhver energibaseret ting fra enhver mod. +tooltip.LogisticalSorter=En filterbaseret, avanceret sorteringsmaskine, der !nautomatisk kan ustøde specifikke ting ud fra og ind i !ninventarer og Logistiske Transporters ved siden af. +tooltip.RotaryCondensentrator=En maskine i stand til at konvertere gasser om til !nderes flydende form og vice versa. +tooltip.ChemicalInjectionChamber=En elite maskine i stand til at forarbejde !nmalm om til fire shards: Bruges som det indledende !nfase i 400%-malmforarbejdning. +tooltip.ElectrolyticSeparator=En maskine, der bruger electrolyse til at !nsplitte en bestemt gas !nom til to forskellige gasser. +tooltip.PrecisionSawmill=En maskine brugt til at forarbejde logs og andre !ntræbaserede ting mere effektivt, så vel som !nat opnå savsmuld. +tooltip.ChemicalDissolutionChamber=En ultimativ maskine brugt til kemisk at !nopløse alle urenheder af malm, !nder efterlader en uforarbejdet slurry. +tooltip.ChemicalWasher=En ultimativ maskine der rengører uforarbejdet !nslurry og forbereder det krystalisering. +tooltip.ChemicalCrystallizer=En ultimativ maskine brugt til at krystalisere !nrenset malm slurry om til malmkrystaller. +tooltip.ChemicalOxidizer=En maskine i stand til at oxidere !nfast materiale ind til gasform. +tooltip.ChemicalInfuser=En maskine, der producerer en ny !ngas ved infuse til andre. +tooltip.SeismicVibrator=En maskine, der bruger seismiske vibrationer til at !ngive information om forskellige lag !ni verdenen. +tooltip.PressurizedReactionChamber=En avanceret maskine der forarbejder en !nfast, flydende og gasformig blanding og !nlaver både et gasformigt og fast produkt. +tooltip.PortableTank=En handy, mobil tank, der lader dig !nbære 14 spande væske hvorhen du !nønsker. Kan også bruges som spand! +tooltip.FluidicPlenisher=En maskine i stand til at lave hele !nsøer ved at fylde slugter op med væske. +tooltip.Laser=En avanceret form for linær!nenergitransfer der udnytter en!nekstremt kollimeret lysstråle. +tooltip.LaserAmplifier=En blok that can be brugt til at merge,!nomdirigere og forstærke laserstråler,!nmed finkontrollering over hvornår der skydes. +tooltip.LaserTractorBeam=En blok brugt til at forene og!nomdirigere laserstråler. Indsamler!ndrops fra blokke, den ødelægger. +tooltip.SolarNeutronActivator=En maskine der dirigerer neutronstrålingen !nfra solen om til sin interne reserve, hvilket tillader !nen langsom dannelse af forskelige isotoper. +tooltip.Oredictionificator=En maskine brugt til at forene og !noversætte mellem forskellige ting !nog blokke vha. Ore Dictionaryen. + +tooltip.HeatGenerator=En generator der bruger lavaens varme eller !nandre brændbare ressourcer til at producere energi. +tooltip.SolarGenerator=En generator der bruger solens !nkraft til producere energi. +tooltip.GasGenerator=En generator der udnytter de molekulært !nvariende gasser til producere energi. +tooltip.BioGenerator=En generator der brænder organisk materiale i !nverdenen til producere energi. +tooltip.AdvancedSolarGenerator=En avanceret generator der direkte !nabsorberer solens stråler med lille tab !ntil at producere energi. +tooltip.WindTurbine=En generator der bruger vindens styrke !ntil at producere energi med større effektivitet !nved højere niveauer. + +tooltip.ReactorGlass=Forstærket glas, der kan bruges i !nFusionsreaktor-multiblokken. +tooltip.ReactorLaserFocusMatrix=Et panel af Reaktorglas i !nstand til at absorbere optisk energi og !nderved opvarme Fusionsreaktoren. +tooltip.ReactorController=Den kotrollerende blok til hele !nFusionsreaktorens struktur. +tooltip.ReactorFrame=Forstærket indramning, der kan bruges i !nFusionsreaktor-multiblokken. +tooltip.ReactorNeutronCapturePlate=En blok, der kan bruges til !nbåde at blokere Fusionsreaktorstråling og assistere !ni produktionen af Tritium. +tooltip.ReactorPort=En blok forstærket indramning i stand til !nat håndtere både gas- og energioverførslen !naf Fusionsreaktoren. +tooltip.ReactorLogicAdapter=En blok der kan bruges til at !ntillade basal overvågning af en reaktor vha. rødsten. + +tooltip.OsmiumOre=Et stærkt mineral der kan findes på !nenhver højde i verdenen. Den er!nkendt for at have mange anvendelser i !nkonstruktionen af maskineri. +tooltip.CopperOre=Et almindeligt, ledende materiale der !nkan bruges i produktionen af !nledninger. Dets evne til at modstå !nhøj varme gør den også essential !ntil avanceret maskineri. +tooltip.TinOre=Et letvægts, dog stadig robust, ledende !nmateriale, der er en smule mindre !nsjælden end Kobber. + +//Side data +sideData.None=Ingen +sideData.Input=Indgang +sideData.Output=Udgang +sideData.Energy=Energi +sideData.Gas=Gas +sideData.Extra=Ekstra +sideData.Infuse=Infuse +sideData.Fluid=Væske + +//Redstone control +control.disabled=Deaktiveret +control.high=Høj +control.low=Lav +control.pulse=Puls +control.disabled.desc=Altid aktiv +control.high.desc=Aktiv med signal +control.low.desc=Aktiv uden signal +control.pulse.desc=Kun aktiv ved modtagelse af første signal + +//Container edit modes +fluidedit.both=Begge +fluidedit.fill=Fyld +fluidedit.empty=Tom + +//Colors +color.black=Sort +color.darkBlue=Mørkeblå +color.darkGreen=Mørkegrøn +color.darkAqua=Mørkeaqua +color.darkRed=Mørkerød +color.purple=Lilla +color.orange=Orange +color.grey=Grå +color.darkGrey=Mørkegrå +color.indigo=Indigo +color.brightGreen=Lysegrøn +color.aqua=Aqua +color.red=Rød +color.pink=Pink +color.yellow=Gul +color.white=Hvid +color.brown=Brun +color.brightPink=Lyserød + +//Dyes +dye.black=Sort +dye.darkBlu=Blå +dye.brown=Brun +dye.darkGreen=Grøn +dye.darkAqua=Cyan +dye.darkRed=Mørkerød +dye.purple=Lilla +dye.orange=Orange +dye.grey=Lysegrå +dye.darkGrey=Mørkegrå +dye.indigo=Lyseblå +dye.brightGreen=Lime +dye.aqua=Aqua +dye.red=Rød +dye.brightPink=Pink +dye.pink=Magenta +dye.yellow=Gul +dye.white=Hvid + +//Reactor Logic modes +reactor.disabled=Deaktiveret +reactor.disabled.desc=Vil ikke udgive et rødstenssignal +reactor.ready=Klar til at tænde +reactor.ready.desc=Reaktoren er nået det nødvendige varmeniveau til at tænde +reactor.capacity=Varmekapacitet mødt +reactor.capacity.desc=Reaktorens kernevarmekapacitet er blevet mødt +reactor.depleted=Utilstrækkelig Brændstof +reactor.depleted.desc=Reaktoren har utilstrækkelig brændstof til at vedligeholde en reaktion + +//Creative tab +itemGroup.tabMekanism=Mekanism + +//NEI stuff +nei.chemicalInjectionChamber=K. Injektionskammer +nei.rotaryCondensentrator=R. Condensentrator + +//**********// +//GENERATORS// +//**********// + +//Items +item.SolarPanel.name=Solpanel +item.Hohlraum.name=Hohlraum + +//Generators +tile.Generator.HeatGenerator.name=Varmegenerator +tile.Generator.SolarGenerator.name=Solgenerator +tile.Generator.GasGenerator.name=Gasbrændende Generator +tile.Generator.BioGenerator.name=Bio-generator +tile.Generator.AdvancedSolarGenerator.name=Avanceret Solgenerator +tile.Generator.WindTurbine.name=Vindturbine + +tile.Reactor.ReactorController.name=Reaktor-controller +tile.Reactor.ReactorFrame.name=Reaktorindramning +tile.Reactor.ReactorNeutronCapturePlate.name=Neutronfanger-plade +tile.Reactor.ReactorInOutPort.name=Reaktor-port +tile.Reactor.ReactorLogicAdapter.name=Reaktorlogiks-adapter + +tile.ReactorGlass.ReactorGlass.name=Reaktorglas +tile.ReactorGlass.ReactorLaserFocusMatrix.name=Laserfokus-matrice + +//Gui text +gui.heatGenerator.fuel=Brændstof +gui.solarGenerator.sun=Sol +gui.bioGenerator.bioFuel=Bio-brændsel +gui.electrolyticSeparator.dump=Udstød + +gui.passive=Luftkølet +gui.active=Vandkølet + +gui.minInject=Min. injektionssats +gui.ignition=Tændingstemp. +gui.maxPlasma=Maks. Plasma-temp. +gui.maxCasing=Maks. Casing-temp. +gui.passiveGeneration=Passiv Generering +gui.steamProduction=Dampproduktion + +//*****// +//TOOLS// +//*****// + +//Vanilla Paxels +item.WoodPaxel.name=Træ-paxel +item.StonePaxel.name=Sten-paxel +item.IronPaxel.name=Jern-paxel +item.DiamondPaxel.name=Diamant-paxel +item.GoldPaxel.name=Guld-paxel + +//Obsidian +item.ObsidianHelmet.name=Obsidianhjelm +item.ObsidianChestplate.name=Obsidianbrystplade +item.ObsidianLeggings.name=Obsidianbukser +item.ObsidianBoots.name=Obsidianstøvler +item.ObsidianPaxel.name=Obsidian-paxel +item.ObsidianPickaxe.name=Obsidianhakke +item.ObsidianAxe.name=Obsidianøkse +item.ObsidianShovel.name=Obsidianspade +item.ObsidianHoe.name=Obsidianlugejern +item.ObsidianSword.name=Obsidiansværd + +//Lapis Lazuli +item.LazuliHelmet.name=Lapis Lazuli-hjelm +item.LazuliChestplate.name=Lapis Lazuli-brystplate +item.LazuliLeggings.name=Lapis Lazuli-bukser +item.LazuliBoots.name=Lapis Lazuli-støvler +item.LazuliPaxel.name=Lapis Lazuli-paxel +item.LazuliPickaxe.name=Lapis Lazuli-hakke +item.LazuliAxe.name=Lapis Lazuli-økse +item.LazuliShovel.name=Lapis Lazuli-spade +item.LazuliHoe.name=Lapis Lazuli-lugejern +item.LazuliSword.name=Lapis Lazuli-sværd + +//Osmium +item.OsmiumHelmet.name=Osmiumhjelm +item.OsmiumChestplate.name=Osmiumbrystplade +item.OsmiumLeggings.name=Osmiumbukser +item.OsmiumBoots.name=Osmiumstøvler +item.OsmiumPaxel.name=Osmium-paxel +item.OsmiumPickaxe.name=Osmiumhakke +item.OsmiumAxe.name=Osmiumøkse +item.OsmiumShovel.name=Osmiumspade +item.OsmiumHoe.name=Osmiumlugejern +item.OsmiumSword.name=Osmiumsværd + +//Bronze +item.BronzeHelmet.name=Bronzehjelm +item.BronzeChestplate.name=Bronzebrystplade +item.BronzeLeggings.name=Bronzebukser +item.BronzeBoots.name=Bronzestøvler +item.BronzePaxel.name=Bronze-paxel +item.BronzePickaxe.name=Bronzehakke +item.BronzeAxe.name=Bronzeøkse +item.BronzeShovel.name=Bronzespade +item.BronzeHoe.name=Bronzelugejern +item.BronzeSword.name=Bronzesværd + +//Glow +item.GlowstoneHelmet.name=Glødestenshjelm +item.GlowstoneChestplate.name=Glødestensbrystplade +item.GlowstoneLeggings.name=Glødestensbukser +item.GlowstoneBoots.name=Glødestensstøvler +item.GlowstonePaxel.name=Glødestens-paxel +item.GlowstonePickaxe.name=Glødestenshakke +item.GlowstoneAxe.name=Glødestensøkse +item.GlowstoneShovel.name=Glødestensspade +item.GlowstoneHoe.name=Glødestenslugejern +item.GlowstoneSword.name=Glødestenssværd + +//Steel +item.SteelHelmet.name=Stålhjelm +item.SteelChestplate.name=Stålbrystplade +item.SteelLeggings.name=Stålbukser +item.SteelBoots.name=Stålstøvler +item.SteelPaxel.name=Stål-paxel +item.SteelPickaxe.name=Stålhakke +item.SteelAxe.name=Ståløkse +item.SteelShovel.name=Stålspade +item.SteelHoe.name=Stållugejern +item.SteelSword.name=Stålsværd + +//Config Gui +mekanism.configgui.ctgy.tools.general=Generelt +mekanism.configgui.ctgy.tools.armor=Rustningsbalance +mekanism.configgui.ctgy.tools.tools=Værktøjsbalance + +//Config Tooltips +mekanism.configgui.ctgy.tools.general.tooltip=Indstillinger vedr. MekanismTools' generelle konfiguration. +mekanism.configgui.ctgy.tools.armor.tooltip=Indstillinger vedr. beskyttelsesværdier og balance for MekanismTools rustninger. +mekanism.configgui.ctgy.tools.tools.tooltip=Indstillinger vedr. effektivitetsværdier og balance for MekanismTools værktøj. diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index ef79904d5..f9066ecfb 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -38,7 +38,7 @@ item.LithiumBucket.name=Lithium Bucket item.HeavyWaterBucket.name=Heavy Water Bucket item.FreeRunners.name=Free Runners item.ArmoredJetpack.name=Armored Jetpack -item.FilterCard.name=Filter Card +item.ConfigurationCard.name=Configuration Card item.SeismicReader.name=Seismic Reader item.HDPEPellet.name=HDPE Pellet item.HDPERod.name=HDPE Rod @@ -48,6 +48,7 @@ item.Substrate.name=Substrate item.Flamethrower.name=Flamethrower item.GaugeDropper.name=Gauge Dropper item.BioFuel.name=Bio Fuel +item.CraftingFormula.name=Crafting Formula //Control Circuits item.BasicControlCircuit.name=Basic Control Circuit @@ -56,7 +57,16 @@ item.EliteControlCircuit.name=Elite Control Circuit item.UltimateControlCircuit.name=Ultimate Control Circuit //Gas Tank -tile.GasTank.GasTank.name=Gas Tank +tile.GasTankBasic.name=Basic Gas Tank +tile.GasTankAdvanced.name=Advanced Gas Tank +tile.GasTankElite.name=Elite Gas Tank +tile.GasTankUltimate.name=Ultimate Gas Tank + +//Fluid Tank (part of MachineBlock2, naming handled differently) +tile.FluidTankBasic.name=Basic Fluid Tank +tile.FluidTankAdvanced.name=Advanced Fluid Tank +tile.FluidTankElite.name=Elite Fluid Tank +tile.FluidTankUltimate.name=Ultimate Fluid Tank //Cardboard Box tile.CardboardBox.name=Cardboard Box @@ -74,7 +84,10 @@ tile.BasicBlock.RefinedObsidian.name=Refined Obsidian tile.BasicBlock.CharcoalBlock.name=Charcoal Block tile.BasicBlock.RefinedGlowstone.name=Refined Glowstone tile.BasicBlock.SteelBlock.name=Steel Block -tile.BasicBlock.Bin.name=Bin +tile.BasicBlock.BinBasic.name=Basic Bin +tile.BasicBlock.BinAdvanced.name=Advanced Bin +tile.BasicBlock.BinElite.name=Elite Bin +tile.BasicBlock.BinUltimate.name=Ultimate Bin tile.BasicBlock.TeleporterFrame.name=Teleporter Frame tile.BasicBlock.SteelCasing.name=Steel Casing tile.BasicBlock.DynamicTank.name=Dynamic Tank @@ -132,15 +145,17 @@ tile.MachineBlock2.ChemicalCrystallizer.name=Chemical Crystallizer tile.MachineBlock2.SeismicVibrator.name=Seismic Vibrator tile.MachineBlock2.PressurizedReactionChamber.name=Pressurized Reaction Chamber tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC -tile.MachineBlock2.PortableTank.name=Portable Tank tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher tile.MachineBlock2.Laser.name=Laser tile.MachineBlock2.LaserAmplifier.name=Laser Amplifier tile.MachineBlock2.LaserTractorBeam.name=Laser Tractor Beam //Machine Block 3 (third ID iteration) +tile.MachineBlock3.QuantumEntangloporter.name=Quantum Entangloporter tile.MachineBlock3.SolarNeutronActivator.name=Solar Neutron Activator tile.MachineBlock3.Oredictionificator.name=Oredictionificator +tile.MachineBlock3.ResistiveHeater.name=Resistive Heater +tile.MachineBlock3.FormulaicAssemblicator.name=Formulaic Assemblicator //Plastic tile.PlasticBlock.name=Plastic Block @@ -450,6 +465,7 @@ gui.incomplete=Incomplete gui.inductionMatrix=Induction Matrix gui.matrixStats=Matrix Statistics gui.turbineStats=Turbine Statistics +gui.boilerStats=Boiler Statistics gui.main=Main gui.outputting=Outputting gui.receiving=Receiving @@ -460,6 +476,7 @@ gui.providers=providers gui.structure=Structure gui.dynamicTank=Dynamic Tank gui.industrialTurbine=Industrial Turbine +gui.thermoelectricBoiler=Thermoelectric Boiler gui.visuals=Visuals gui.noEject=Can't Eject gui.undefined=Undefined @@ -508,6 +525,21 @@ gui.steamInput=Steam Input gui.capacity=Capacity gui.unit=Unit gui.temp=Temp +gui.usage=Usage +gui.transferred=Transferred +gui.dissipated=Dissipated +gui.boilRate=Boil Rate +gui.maxBoil=Max Boil +gui.maxWater=Max Water +gui.maxSteam=Max Steam +gui.heatTransfer=Heat Transfer +gui.superheaters=Superheaters +gui.boilCapacity=Boil Capacity +gui.encodeFormula=Encode Formula +gui.autoModeToggle=Turn Auto-Mode +gui.craftSingle=Craft Single Item +gui.craftAvailable=Craft Available Items +gui.fillEmpty=Fill/Empty Grid gui.reactor.injectionRate=Injection Rate @@ -606,9 +638,11 @@ gui.teleporter.noFrame=No frame gui.teleporter.noLink=No link gui.teleporter.exceeds=Links > 2 gui.teleporter.needsEnergy=Needs energy -gui.teleporter.noAccess=You don't have access to this teleporter. +gui.teleporter.noAccess=You don't have access to this Teleporter. gui.teleporter.noFreq=No frequency +gui.entangloporter.noAccess=You don't have access to this Entangloporter. + gui.digitalMinerConfig=Digital Miner Config gui.digitalMiner.autoPull=Auto-pull @@ -694,6 +728,9 @@ tooltip.speed=Speed tooltip.and=and tooltip.heat=Heat tooltip.itemAmount=Item amount +tooltip.invalid=Invalid +tooltip.encoded=Encoded +tooltip.ingredients=Ingredients tooltip.portableTank.bucketMode=Bucket Mode @@ -703,12 +740,9 @@ tooltip.disassembler.fast=fast tooltip.disassembler.vein=vein tooltip.disassembler.off=off -tooltip.filterCard.got=Retrieved filter data from %s -tooltip.filterCard.set=Injected filter data of type %s -tooltip.filterCard.unequal=Unequal filter data formats -tooltip.filterCard.logisticalSorter=Logistical Sorter -tooltip.filterCard.digitalMiner=Digital Miner -tooltip.filterCard.oredictionificator=Oredictionificator +tooltip.configurationCard.got=Retrieved configuration data from %s +tooltip.configurationCard.set=Injected configuration data of type %s +tooltip.configurationCard.unequal=Unequal configuration data formats tooltip.balloon=Balloon @@ -766,7 +800,7 @@ tooltip.ChemicalOxidizer=A machine capable of oxidizing solid materials into gas tooltip.ChemicalInfuser=A machine that produces a new gas by infusing two others. tooltip.SeismicVibrator=A machine that uses seismic vibrations to provide information on differing layers of the world. tooltip.PressurizedReactionChamber=An advanced machine that processes a solid, liquid and gaseous mixture and creates both a gaseous and solid product. -tooltip.PortableTank=A handy, sturdy, portable tank that lets you carry 14 buckets of fluid wherever you please. Also doubles as a bucket! +tooltip.FluidTank=A handy, sturdy, portable tank that lets you carry multiple buckets of fluid wherever you please. Also doubles as a bucket! tooltip.FluidicPlenisher=A machine that is capable of creating entire lakes by filling ravines with fluids. tooltip.Laser=An advanced form of linear energy transfer that utilizes an extremely collimated beam of light. tooltip.LaserAmplifier=A block that can be used to merge, redirect and amplify laser beams, with fine controls over when to fire. @@ -774,6 +808,8 @@ tooltip.LaserTractorBeam=A block used to merge and redirect laser beams. Collect tooltip.SolarNeutronActivator=A machine that directs the neutron radiation of the sun into its internal reservoir, allowing for the slow creation of various isotopes. tooltip.Oredictionificator=A machine used to unify and translate between various items and blocks using the Ore Dictionary. tooltip.Factory=A machine that serves as an upgrade to regular machinery, allowing for multiple processing operations to occur at once. +tooltip.ResistiveHeater=A condensed, coiled resistor capable of converting electrical energy directly into heat energy. +tooltip.FormulaicAssemblicator=A machine that uses energy to rapidly craft items and blocks from Crafting Formulas. Doubles as an advanced crafting bench. tooltip.HeatGenerator=A generator that uses the heat of lava or other burnable resources to produce energy. tooltip.SolarGenerator=A generator that uses the power of the sun to produce energy. diff --git a/src/main/resources/assets/mekanism/lang/pt_BR.lang b/src/main/resources/assets/mekanism/lang/pt_BR.lang index 3cc4d63a3..e57a0e8e7 100644 --- a/src/main/resources/assets/mekanism/lang/pt_BR.lang +++ b/src/main/resources/assets/mekanism/lang/pt_BR.lang @@ -10,6 +10,8 @@ item.AtomicAlloy.name=Liga Atômica item.EnergyTablet.name=Tablete de Energia item.SpeedUpgrade.name=Upgrade de Velocidade item.EnergyUpgrade.name=Upgrade de Energia +item.FilterUpgrade.name=Filter Upgrade +item.GasUpgrade.name=Gas Upgrade item.Robit.name=Robit item.AtomicDisassembler.name=Desintegrador Atômico item.ElectricBow.name=Arco Elétrico @@ -31,22 +33,26 @@ item.ElectrolyticCore.name=Núcleo Eletrolítico item.Sawdust.name=Serragem item.Salt.name=Sal item.BrineBucket.name=Balde de Salmoura +item.LithiumBucket.name=Balde de Lítio +item.HeavyWaterBucket.name=Balde de Água Pesada item.FreeRunners.name=Corredores item.ArmoredJetpack.name=Jetpack Blindado item.FilterCard.name=Cartão de Filtro item.SeismicReader.name=Leitor Sísmico -item.HDPEPellet.name=Pelota de HDPE -item.HDPERod.name=Vara de HDPE -item.HDPESheet.name=Folha de HDPE +item.HDPEPellet.name=Pelota de PEAD +item.HDPERod.name=Vara de PEAD +item.HDPESheet.name=Folha de PEAD item.PlaStick.name=Plástico item.Substrate.name=Substrato item.Flamethrower.name=Lança-Chamas +item.GaugeDropper.name=Medidor Conta-Gotas +item.BioFuel.name=Biocombustível //Control Circuits item.BasicControlCircuit.name=Circuito de Controle Básico item.AdvancedControlCircuit.name=Circuito de Controle Avançado item.EliteControlCircuit.name=Circuito de Controle Elite -item.UltimateControlCircuit.name=Circuito de Controle Ultimate +item.UltimateControlCircuit.name=Circuito de Controle Final //Gas Tank tile.GasTank.GasTank.name=Tanque de Gás @@ -65,7 +71,7 @@ tile.BasicBlock.OsmiumBlock.name=Bloco de Ósmio tile.BasicBlock.BronzeBlock.name=Bloco de Bronze tile.BasicBlock.RefinedObsidian.name=Obsidiana Refinada tile.BasicBlock.CharcoalBlock.name=Bloco de Carvão Vegetal -tile.BasicBlock.RefinedGlowstone.name=Glowstone Refinada +tile.BasicBlock.RefinedGlowstone.name=Pedra Luminosa Refinada tile.BasicBlock.SteelBlock.name=Bloco de Aço tile.BasicBlock.Bin.name=Silo tile.BasicBlock.TeleporterFrame.name=Moldura do Teletransportador @@ -75,32 +81,40 @@ tile.BasicBlock.DynamicGlass.name=Vidro Dinâmico tile.BasicBlock.DynamicValve.name=Válvula Dinâmica tile.BasicBlock.CopperBlock.name=Bloco de Cobre tile.BasicBlock.TinBlock.name=Bloco de Estanho -tile.BasicBlock.SalinationController.name=Controlador de Salinização -tile.BasicBlock.SalinationValve.name=Válvula de Salinização +tile.BasicBlock.SolarEvaporationController.name=Controlador de Salinização +tile.BasicBlock.SolarEvaporationValve.name=Válvula de Salinização //Basic Block 2 (second ID iteration) -tile.BasicBlock2.SalinationBlock.name=Bloco de Salinização +tile.BasicBlock2.SolarEvaporationBlock.name=Bloco de Salinização +tile.BasicBlock2.InductionCasing.name=Caixa de Indução +tile.BasicBlock2.InductionPort.name=Porta de Indução +tile.BasicBlock2.InductionCellBasic.name=Célula de Indução Básica +tile.BasicBlock2.InductionCellAdvanced.name=Célula de Indução Avançada +tile.BasicBlock2.InductionCellElite.name=Célula de Indução Elite +tile.BasicBlock2.InductionCellUltimate.name=Célula de Indução Final +tile.BasicBlock2.InductionProviderBasic.name=Provedor de Indução Básico +tile.BasicBlock2.InductionProviderAdvanced.name=Provedor de Indução Avançado +tile.BasicBlock2.InductionProviderElite.name=Provedor de Indução Elite +tile.BasicBlock2.InductionProviderUltimate.name=Provedor de Indução Final //Machine Block tile.MachineBlock.EnrichmentChamber.name=Câmara de Enriquecimento tile.MachineBlock.OsmiumCompressor.name=Compressor de Ósmio tile.MachineBlock.Combiner.name=Combinador tile.MachineBlock.Crusher.name=Triturador -tile.MachineBlock.BasicFactory.name=Fábrica Básica -tile.MachineBlock.AdvancedFactory.name=Fábrica Avançada -tile.MachineBlock.EliteFactory.name=Fábrica de Elite +tile.MachineBlock.Factory.name=Fábrica tile.MachineBlock.MetallurgicInfuser.name=Infusor Metalúrgico tile.MachineBlock.PurificationChamber.name=Câmara de Purificação tile.MachineBlock.EnergizedSmelter.name=Fundição Energizada tile.MachineBlock.Teleporter.name=Teletransportador tile.MachineBlock.ElectricPump.name=Bomba Elétrica tile.MachineBlock.ElectricChest.name=Baú Elétrico -tile.MachineBlock.Chargepad.name=Plataforma Recarregadora +tile.MachineBlock.Chargepad.name=Base de Recarga tile.MachineBlock.LogisticalSorter.name=Classificador Logístico tile.MachineBlock.DigitalMiner.name=Minerador Digital //Machine Block 2 (second ID iteration) -tile.MachineBlock2.RotaryCondensentrator.name=Condensentrator Rotatório +tile.MachineBlock2.RotaryCondensentrator.name=Condensentrador Rotativo tile.MachineBlock2.ChemicalOxidizer.name=Oxidador Químico tile.MachineBlock2.ChemicalInfuser.name=Infusor Químico tile.MachineBlock2.ChemicalCombiner.name=Combinador Químico @@ -112,12 +126,16 @@ tile.MachineBlock2.ChemicalWasher.name=Lavador Químico tile.MachineBlock2.ChemicalCrystallizer.name=Cristalizador Químico tile.MachineBlock2.SeismicVibrator.name=Vibrador Sísmico tile.MachineBlock2.PressurizedReactionChamber.name=Câmara de Reação Pressurizada -tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC +tile.MachineBlock2.PressurizedReactionChamber.short.name=CRP tile.MachineBlock2.PortableTank.name=Tanque Portátil -tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher +tile.MachineBlock2.FluidicPlenisher.name=Abastecedor Fluídico tile.MachineBlock2.Laser.name=Laser tile.MachineBlock2.LaserAmplifier.name=Amplificador de Laser -tile.MachineBlock2.LaserTractorBeam.name=Feixe do trator do Laser +tile.MachineBlock2.LaserTractorBeam.name=Feixe Trator do Laser + +//Machine Block 3 (third ID iteration) +tile.MachineBlock3.SolarNeutronActivator.name=Ativador Neutrônico Solar +tile.MachineBlock3.Oredictionificator.name=Oredictionificador //Plastic tile.PlasticBlock.name=Bloco de Plástico @@ -135,6 +153,7 @@ infuse.diamond=Diamante infuse.redstone=Redstone infuse.fungi=Fungos infuse.obsidian=Obsidiana +infuse.bio=Biomassa //Ore Block tile.OreBlock.OsmiumOre.name=Minério de Ósmio @@ -146,23 +165,23 @@ item.MultipartTransmitter.PressurizedTube.name=Tubo Pressurizado item.MultipartTransmitter.BasicUniversalCable.name=Cabo Universal Básico item.MultipartTransmitter.AdvancedUniversalCable.name=Cabo Universal Avançado item.MultipartTransmitter.EliteUniversalCable.name=Cabo Universal Elite -item.MultipartTransmitter.UltimateUniversalCable.name=Cabo Universal Ultimate +item.MultipartTransmitter.UltimateUniversalCable.name=Cabo Universal Final item.MultipartTransmitter.BasicMechanicalPipe.name=Tubo Mecânico Básico item.MultipartTransmitter.AdvancedMechanicalPipe.name=Tubo Mecânico Avançado item.MultipartTransmitter.EliteMechanicalPipe.name=Tubo Mecânico Elite -item.MultipartTransmitter.UltimateMechanicalPipe.name=Tubo Mecânico Ultimate +item.MultipartTransmitter.UltimateMechanicalPipe.name=Tubo Mecânico Final item.MultipartTransmitter.LogisticalTransporter.name=Transportador Logístico item.MultipartTransmitter.RestrictiveTransporter.name=Transportador Restritivo item.MultipartTransmitter.DiversionTransporter.name=Transportador Redirecionador //Glow Panel -item.GlowPanel.name=Painel de Glowstone +item.GlowPanel.name=Painel de Pedra Luminosa //Energy Cubes tile.EnergyCube.Basic.name=Cubo de Energia Básico tile.EnergyCube.Advanced.name=Cubo de Energia Avançado tile.EnergyCube.Elite.name=Cubo de Energia de Elite -tile.EnergyCube.Ultimate.name=Cubo de Energia Ultimate +tile.EnergyCube.Ultimate.name=Cubo de Energia Final tile.EnergyCube.Creative.name=Cubo de Energia Criativo //Dust @@ -177,6 +196,7 @@ item.tinDust.name=Pó de Estanho item.silverDust.name=Pó de Prata item.leadDust.name=Pó de Chumbo item.sulfurDust.name=Pó de Enxofre +item.lithiumDust.name=Pó de Lítio //Clumps item.ironClump.name=Aglomerado de Ferro @@ -189,14 +209,14 @@ item.obsidianClump.name=Aglomerado de Obsidiana item.leadClump.name=Aglomerado de Chumbo //Shards -item.ironShard.name=Fragmento de Ferro -item.goldShard.name=Fragmento de Ouro -item.osmiumShard.name=Fragmento de Ósmio -item.copperShard.name=Fragmento de Cobre -item.tinShard.name=Fragmento de Estanho -item.silverShard.name=Fragmento de Prata -item.obsidianShard.name=Fragmento de Obsidiana -item.leadShard.name=Fragmento de Chumbo +item.ironShard.name=Estilhaço de Ferro +item.goldShard.name=Estilhaço de Ouro +item.osmiumShard.name=Estilhaço de Ósmio +item.copperShard.name=Estilhaço de Cobre +item.tinShard.name=Estilhaço de Estanho +item.silverShard.name=Estilhaço de Prata +item.obsidianShard.name=Estilhaço de Obsidiana +item.leadShard.name=Estilhaço de Chumbo //Crystals item.ironCrystal.name=Cristal de Ferro @@ -241,6 +261,10 @@ gas.liquidStone=Pedra Líquida gas.ethene=Etileno gas.sodium=Sódio gas.brine=Salmoura Gasosa +gas.deuterium=Deutério +gas.tritium=Trítio +gas.lithium=Lítio +gas.fusionFuelDT=Combustível D-T gas.iron=Lodo de Ferro gas.gold=Lodo de Ouro @@ -286,6 +310,13 @@ oregas.silver=Minério de Prata oregas.obsidian=Minério de Obsidiana oregas.lead=Minério de Chumbo +//Tier names +tier.Basic=Básico +tier.Advanced=Avançado +tier.Elite=Elite +tier.Ultimate=Final +tier.Creative=Criativo + //Update handler text update.consider=Considere atualizar para a versão update.newFeatures=Novas funcionalidades diff --git a/src/main/resources/assets/mekanism/lang/ru_RU.lang b/src/main/resources/assets/mekanism/lang/ru_RU.lang index a6267135c..70a277d33 100644 --- a/src/main/resources/assets/mekanism/lang/ru_RU.lang +++ b/src/main/resources/assets/mekanism/lang/ru_RU.lang @@ -1,4 +1,4 @@ -//********// +//********// //MEKANISM// //********// @@ -51,7 +51,7 @@ item.BioFuel.name=Биотопливо item.BasicControlCircuit.name=Основная схема управления item.AdvancedControlCircuit.name=Продвинутая схема управления item.EliteControlCircuit.name=Элитная схема управления -item.UltimateControlCircuit.name=Максимальная схема управления +item.UltimateControlCircuit.name=Совершенная схема управления //Gas Tank tile.GasTank.GasTank.name=Газовый баллон @@ -137,13 +137,13 @@ tile.MachineBlock3.SolarNeutronActivator.name=Активатор солнечн tile.MachineBlock3.Oredictionificator.name=Унификатор словаря руд //Plastic -tile.PlasticBlock.name=пластиковый блок -tile.SlickPlasticBlock.name=гладкий пластиковый блок -tile.GlowPlasticBlock.name=пластиковый светящийся блок -tile.ReinforcedPlasticBlock.name=укреплённый пластиковый блок -tile.RoadPlasticBlock.name=пластиковый путь +tile.PlasticBlock.name=Пластиковый блок +tile.SlickPlasticBlock.name=Пладкий пластиковый блок +tile.GlowPlasticBlock.name=Пластиковый светящийся блок +tile.ReinforcedPlasticBlock.name=Укреплённый пластиковый блок +tile.RoadPlasticBlock.name=Пластиковый путь -tile.PlasticFence.name=пластиковый забор +tile.PlasticFence.name=Пластиковый забор //Infuse types infuse.carbon=Углерод @@ -163,30 +163,30 @@ tile.OreBlock.TinOre.name=Оловянная руда item.MultipartTransmitter.BasicPressurizedTube.name=Основная герметичная труба item.MultipartTransmitter.AdvancedPressurizedTube.name=Продвинутая герметичная труба item.MultipartTransmitter.ElitePressurizedTube.name=Элитная герметичная труба -item.MultipartTransmitter.UltimatePressurizedTube.name=Максимальная герметичная труба +item.MultipartTransmitter.UltimatePressurizedTube.name=Совершенная герметичная труба item.MultipartTransmitter.BasicUniversalCable.name=Основной универсальный провод item.MultipartTransmitter.AdvancedUniversalCable.name=Продвинутый универсальный провод item.MultipartTransmitter.EliteUniversalCable.name=Элитный универсальный провод -item.MultipartTransmitter.UltimateUniversalCable.name=Максимальный универсальный провод +item.MultipartTransmitter.UltimateUniversalCable.name=Совершенный универсальный провод item.MultipartTransmitter.BasicMechanicalPipe.name=Основная механическая труба item.MultipartTransmitter.AdvancedMechanicalPipe.name=Продвинутая механическая труба item.MultipartTransmitter.EliteMechanicalPipe.name=Элитная механическая труба -item.MultipartTransmitter.UltimateMechanicalPipe.name=Максимальная механическая труба +item.MultipartTransmitter.UltimateMechanicalPipe.name=Совершенная механическая труба item.MultipartTransmitter.BasicLogisticalTransporter.name=Основной логистический транспортер item.MultipartTransmitter.AdvancedLogisticalTransporter.name=Продвинутый логистический транспортер item.MultipartTransmitter.EliteLogisticalTransporter.name=Элитный логистический транспортер -item.MultipartTransmitter.UltimateLogisticalTransporter.name=Максимальный логистический транспортер +item.MultipartTransmitter.UltimateLogisticalTransporter.name=Совершенный логистический транспортер item.MultipartTransmitter.RestrictiveTransporter.name=Ограничительный транспортер item.MultipartTransmitter.DiversionTransporter.name=Отклоняющий транспортер //Glow Panel -item.GlowPanel.name=светящийся полублок +item.GlowPanel.name=Cветящийся полублок //Energy Cubes tile.EnergyCubeBasic.name=Основной энергетический куб tile.EnergyCubeAdvanced.name=Продвинутый энергетический куб tile.EnergyCubeElite.name=Элитный энергетический куб -tile.EnergyCubeUltimate.name=Максимальный энергетический куб +tile.EnergyCubeUltimate.name=Совершенный энергетический куб tile.EnergyCubeCreative.name=Творческий энергетический куб //Factory Installers @@ -237,13 +237,13 @@ item.silverCrystal.name=Серебряный кристалл item.leadCrystal.name=Свинцовый кристалл //Dirty Dust -item.dirtyIronDust.name=Грязная железная пыль -item.dirtyGoldDust.name=Грязная золотая пыль -item.dirtyOsmiumDust.name=Грязная осмиевая пыль -item.dirtyCopperDust.name=Грязная медная пыль -item.dirtyTinDust.name=Грязная оловянная пыль -item.dirtySilverDust.name=Грязная серебряная пыль -item.dirtyLeadDust.name=Грязная свинцовая пыль +item.dirtyIronDust.name=Загрязненная железная пыль +item.dirtyGoldDust.name=Загрязненная золотая пыль +item.dirtyOsmiumDust.name=Загрязненная осмиевая пыль +item.dirtyCopperDust.name=Загрязненная медная пыль +item.dirtyTinDust.name=Загрязненная оловянная пыль +item.dirtySilverDust.name=Загрязненная серебряная пыль +item.dirtyLeadDust.name=Загрязненная свинцовая пыль //Ingots item.obsidianIngot.name=Обсидиановый слиток @@ -271,7 +271,7 @@ gas.brine=Газообразная рапа gas.deuterium=Дейтерий gas.tritium=Тритий gas.lithium=Литий -gas.fusionFuelDT=Д/т топливо +gas.fusionFuelDT=Дейтерий-тритиевое топливо gas.iron=Расплавленное железо gas.gold=Расплавленное золото @@ -310,7 +310,7 @@ fluid.heavyWater=Тяжёлая вода fluid.lithium=Жидкий литий fluid.deuterium=Жидкий дейтерий fluid.tritium=Жидкий тритий -fluid.fusionFuelDT=Жидкое д/т топливо +fluid.fusionFuelDT=Жидкое дейтерий-тритиевое топливо //OreGas names oregas.iron=Железная руда @@ -340,7 +340,7 @@ transmission.Heat=Нагрев update.consider=Подумайте о обновлении до версии update.newFeatures=Нововведения update.visit=Посетите -update.toDownload=чтобы загрузить +update.toDownload=Чтобы загрузить update.devBuild=Используется сборка разработчиков update.outdated=Используется устаревшая версия одного или нескольких модулей @@ -435,20 +435,20 @@ gui.noDelay=Без задержки gui.fuel=Топливо gui.heat=Нагрев gui.formed=Сформировано -gui.incomplete=Незавершено +gui.incomplete=Незавершенно gui.inductionMatrix=Индукционная матрица gui.matrixStats=Статистика матрицы gui.main=Главное gui.outputting=Выход -gui.dimensions=Dimensions +gui.dimensions=Измерения gui.constituents=Составляющие -gui.cells=ячейки -gui.providers=поставщики +gui.cells=Ячейки +gui.providers=Поставщики gui.structure=Структура gui.dynamicTank=Динам. резервуар -gui.visuals=Visuals +gui.visuals=Визуальные gui.noEject=Невозможно извлечь -gui.undefined=Неопределено +gui.undefined=Неопределенно gui.owner=Владелец gui.public=Общественный gui.private=Частный @@ -456,7 +456,7 @@ gui.add=Добавить gui.set=Установить gui.freq=Частота gui.security=Безопасность -gui.index=Index +gui.index=Индекс gui.producing=Производится gui.maxOutput=Макс. выход gui.storing=Накапливается @@ -466,13 +466,13 @@ gui.needed=Нужно gui.noRecipe=Нет рецепта gui.conflict=Конфликт gui.height=Высота -gui.mult=Mult +gui.mult=Мульти gui.chunk=Чанк gui.vibrating=Вибрации gui.abundancy=Избыток gui.nextItem=След. предмет gui.lastItem=Послед. предмет -gui.oreDictCompat=Compatible OreDict Key +gui.oreDictCompat=Совместимый OreDict ключ gui.toggleCooling=Переключить измерение охлаждения gui.coolingMeasurements=Активное охлаждение gui.redstoneOutputMode=Режим красного камня @@ -491,9 +491,9 @@ gui.upgrades.effect=Эффект gui.chemicalInfuser.short=Хим. зарядник gui.chemicalDissolutionChamber.short=Хим. камера растворения -gui.solarEvaporationController.short=Контроллер солнечного опресн. +gui.solarEvaporationController.short=Контроллер солнечного опреснения -gui.dictionary.noKey=Нет ключа. +gui.dictionary.noKey=Нет ключа gui.configuration=Конфигурация gui.config=Настройка @@ -509,13 +509,13 @@ gui.factory.autoSort=Авто-сортировка //Recipe types gui.factory.Smelting=Плавящая gui.factory.Enriching=Обогащающая -gui.factory.Crushing=Дроблящая +gui.factory.Crushing=Дробящая gui.factory.Compressing=Сжимающая gui.factory.Combining=Объединяющая gui.factory.Purifying=Очищающая gui.factory.Injecting=Впрыскивающая -gui.seismicReader.short=С. считыватель +gui.seismicReader.short=Сейсм. считыватель gui.seismicReader.solids=Твёрдые gui.seismicReader.fluids=Жидкости gui.seismicReader.reading=Считывание @@ -527,7 +527,7 @@ gui.oredictFilter.noKey=Нет введённых ключей gui.oredictFilter.sameKey=Одинаковый ключ gui.modIDFilter=Фильтр по ID мода -gui.modIDFilter.noID=Нет введённых ID +gui.modIDFilter.noID=Не введен ID gui.modIDFilter.sameID=Одинаковый ID gui.oredictionificatorFilter=Фильтр унификатора словаря руд @@ -564,7 +564,7 @@ gui.password.identical=Идентичный gui.password.invalid=Неправильный gui.password=Пароль -gui.logisticalSorter.default=По-умолч. +gui.logisticalSorter.default=По умолчанию gui.logisticalSorter.auto=Авто gui.logisticalSorter.roundRobin=Цикл @@ -576,7 +576,7 @@ gui.teleporter.noFrame=Нет каркаса gui.teleporter.noLink=Нет соединения gui.teleporter.exceeds=Соединений > 2 gui.teleporter.needsEnergy=Требуется энергия -gui.teleporter.noAccess=У Вас нет доступа к этому телепорту. +gui.teleporter.noAccess=У Вас нет доступа к этому телепорту gui.teleporter.noFreq=Нет частоты gui.digitalMinerConfig=Настройки цифрового шахтёра @@ -587,7 +587,7 @@ gui.digitalMiner.reset=Сброс gui.digitalMiner.silkTouch=Шёлковое касание gui.digitalMiner.pull=Собирать gui.digitalMiner.silk=Шёлк -gui.digitalMiner.toMine=To mine +gui.digitalMiner.toMine=Копать gui.digitalMiner.running=Работает gui.digitalMiner.inverse="Обратный" режим gui.digitalMiner.requireReplace=Требуется замена @@ -609,7 +609,7 @@ tooltip.configurator.viewMode=Текущий режим: %s tooltip.configurator.unauth=Этот сундук закрыт tooltip.configurator.noLink=Нет соединения tooltip.configurator.linkMsg=Связан с -tooltip.configurator.dim=измерение +tooltip.configurator.dim=Измерение tooltip.configurator.setLink=Установить соединение на блок tooltip.configurator.plenisherReset=Сбросить расчёт жидкостного снабжателя tooltip.configurator.inductionPortMode=Режим передачи индукционного порта переключен на @@ -625,14 +625,14 @@ tooltip.auth=Проверенный tooltip.locked=Закрытый tooltip.recipeType=Тип рецепта tooltip.hold=Зажмите -tooltip.forDesc=для описания -tooltip.forDetails=для деталей +tooltip.forDesc=Для описания +tooltip.forDetails=Для деталей tooltip.fireMode=Режим огня tooltip.capacity=Ёмкость tooltip.pumpRate=Скорость откачки tooltip.items=Предметы tooltip.blocks=Блоки -tooltip.universal=любые +tooltip.universal=Любые tooltip.fluids=Жидкости tooltip.gasses=Газы tooltip.capableTrans=Подходит для передачи @@ -645,13 +645,13 @@ tooltip.mode=Режим tooltip.efficiency=Эффективность tooltip.modeToggle=Режим изменён на tooltip.flowing=Текущий -tooltip.yes=да -tooltip.no=нет +tooltip.yes=Да +tooltip.no=Нет tooltip.name=Имя tooltip.blockData=Данные блока tooltip.block=Блок tooltip.meta=Метаданные -tooltip.tile=Tile +tooltip.tile=Плитка tooltip.keysFound=Ключ(и) найдены tooltip.noKey=Нет ключа tooltip.hp=Прочность @@ -663,11 +663,11 @@ tooltip.speed=Скорость tooltip.portableTank.bucketMode=Режим ведра -tooltip.disassembler.normal=обычный -tooltip.disassembler.slow=медленный -tooltip.disassembler.fast=быстрый -tooltip.disassembler.vein=жила -tooltip.disassembler.off=откл. +tooltip.disassembler.normal=Обычный +tooltip.disassembler.slow=Медленный +tooltip.disassembler.fast=Быстрый +tooltip.disassembler.vein=Жила +tooltip.disassembler.off=Откл. tooltip.filterCard.got=Получены данные фильтра из %s tooltip.filterCard.set=Введены данные фильтра типа %s @@ -676,7 +676,7 @@ tooltip.filterCard.logisticalSorter=Логистический сортиров tooltip.filterCard.digitalMiner=Цифровой шахтёр tooltip.filterCard.oredictionificator=Унификатор словаря руд -tooltip.balloon=воздушный шар +tooltip.balloon=Воздушный шар tooltip.jetpack.regular=Обычный tooltip.jetpack.hover=Зависание @@ -704,10 +704,10 @@ tooltip.LogisticalSorter=Основанный на фильтре, продви tooltip.RotaryCondensentrator=Механизм, способный конвертировать газы в !nжидкость и наоборот. tooltip.ChemicalInjectionChamber=Элитный механизм, способный перерабатывать руды в !nчетыре осколка, выступающие в качестве начальной !nстадии 400% переработки руды. tooltip.ElectrolyticSeparator=Механизм, который использует процесс !nэлектролиза для разделения газа !nна два других газа. -tooltip.PrecisionSawmill=Этот механизм используется для обработки древесины и других !nдеревянных предметов, а также !nдля получения опилков. -tooltip.ChemicalDissolutionChamber=Максимальный механизм используемый для !nхимического растворения всех примесей !nруды, оставляя необработанный расплав. -tooltip.ChemicalWasher=Максимальный механизм, который очищает необработанные !nрасплавленные руды и подготавливает их для кристаллизации. -tooltip.ChemicalCrystalizer=Максимальный механизм, который используется для кристаллизации !nочищенной расплавленной руды в кристаллы. +tooltip.PrecisionSawmill=Этот механизм используется для обработки древесины и других !nдеревянных предметов, а также !nдля получения опилок. +tooltip.ChemicalDissolutionChamber=Совершенный механизм используемый для !nхимического растворения всех примесей !nруды, оставляя необработанный расплав. +tooltip.ChemicalWasher=Совершенный механизм, который очищает необработанные !nрасплавленные руды и подготавливает их для кристаллизации. +tooltip.ChemicalCrystalizer=Совершенный механизм, который используется для кристаллизации !nочищенной расплавленной руды в кристаллы. tooltip.ChemicalOxidizer=Механизм, который окисляет !nтвёрдые материалы до газа. tooltip.ChemicalInfuser=Механизм, который производит !nновый газ, путём объединения двух других газов. tooltip.SeismicVibrator=Механизм, который использует сейсмические колебания для !nпредоставления информации о различных слоях мира. @@ -727,17 +727,17 @@ tooltip.BioGenerator=Генератор, который сжигает орга tooltip.AdvancedSolarGenerator=Продвинутый генератор, который напрямую !nпоглощает солнечные лучи с небольшой потерей, !nдля производства энергии. tooltip.WindTurbine=Генератор, который использует силу ветра !nдля производства энергии, с большей эффективностью !nна большой высоте. -tooltip.ReactorGlass=Укреплённое стекло, которое используется !nстроительстве термоядерного реактора. +tooltip.ReactorGlass=Укреплённое стекло, которое используется при !nстроительстве термоядерного реактора. tooltip.ReactorLaserFocusMatrix=Панель из реакторного стекла, которая !nспособна поглощать оптическую энергию, !nнагревая термоядерный реактор. tooltip.ReactorController=Блок управления для всего !nтермоядерного реактора. -tooltip.ReactorFrame=Укреплённый каркас, который используется в !nстроительстве термоядерного реактора. +tooltip.ReactorFrame=Укреплённый каркас, который используется при !nстроительстве термоядерного реактора. tooltip.ReactorNeutronCapturePlate=Блок, который используется как !nдля блокирования излучения термоядерного реактора, так и для !nполучения трития. -tooltip.ReactorPort=Блок укреплённого каркаса, который способен !nуправлять и передачей газа и передачей энергии !nтермоядерного реактора. +tooltip.ReactorPort=Блок укреплённого каркаса, который способен !nуправлять передачей газа и энергии !nтермоядерного реактора. tooltip.ReactorLogicAdapter=Блок, который может быть использован для !nмониторинга основных функций реактора, используя красный камень. tooltip.OsmiumOre=Крепкий минерал, который можно найти !nпочти на любой высоте в мире. Он как известно !nимеет множество применений в !nпроизводстве механизмов. -tooltip.CopperOre=Общий проводящий материал, который может быть использован !nв производстве проводов. Имеет способность выдерживать!nвысокие температуры, это делает его необходимым для !nсовременного оборудования. -tooltip.TinOre=Лёгкий, но крепкий проводящий материал, !nкоторый находится немного реже, чем медь. +tooltip.CopperOre=Общий проводящий материал, который может быть использован !nпри производстве проводов. Способность выдерживать!nвысокие температуры, делает его незаменимым в !nсовременном оборудовании. +tooltip.TinOre=Лёгкий, но крепкий проводящий материал, !nкоторый встречается немного реже, чем медь. //Side data sideData.None=Нет @@ -765,54 +765,54 @@ fluidedit.fill=Заполнять fluidedit.empty=Опустошать //Colors -color.black=Чёрный -color.darkBlue=Тёмно-синий -color.darkGreen=Тёмно-зелёный -color.darkAqua=Тёмно-голбуй -color.darkRed=Тёмно-красный +color.black=Черный +color.darkBlue=Темно-Синий +color.darkGreen=Темно-Зеленый +color.darkAqua=Темно-Голубой +color.darkRed=Темно-Красный color.purple=Фиолетовый color.orange=Оранжевый color.grey=Серый -color.darkGrey=Тёмно-серый +color.darkGrey=Темно-Серый color.indigo=Индиго -color.brightGreen=Светло-зелёный +color.brightGreen=Светло-Серый color.aqua=Голубой color.red=Красный color.pink=Розовый -color.yellow=Жёлтый +color.yellow=Желтый color.white=Белый color.brown=Коричневый -color.brightPink=Светло-розовый +color.brightPink=Светло-Розовый //Dyes -dye.black=Чёрный +dye.black=Черный dye.darkBlue=Синий dye.brown=Коричневый -dye.darkGreen=Зелёный -dye.darkAqua=Бирюзовый -dye.darkRed=Тёмно-красный +dye.darkGreen=Зеленый +dye.darkAqua=Темно-Голубой +dye.darkRed=Темно-Красный dye.purple=Фиолетовый dye.orange=Оранжевый -dye.grey=Светло-серый +dye.grey=Светло-Серый dye.darkGrey=Серый -dye.indigo=Светло-синий -dye.brightGreen=Лаймовый +dye.indigo=Светло-Голубой +dye.brightGreen=Светло-Зеленый dye.aqua=Голубой dye.red=Красный dye.brightPink=Розовый -dye.pink=Сиреневый -dye.yellow=Жёлтый +dye.pink=Пурпурный +dye.yellow=Желтый dye.white=Белый //Reactor Logic modes -reactor.disabled=Disabled -reactor.disabled.desc=Will not emit a redstone signal -reactor.ready=Ready for Ignition -reactor.ready.desc=Reactor has reached the required heat level to ignite -reactor.capacity=Heat Capacity Met -reactor.capacity.desc=The reactor's core heat capacity has been met -reactor.depleted=Insufficient Fuel -reactor.depleted.desc=The reactor has insufficient fuel to sustain a reaction +reactor.disabled=Отключен +reactor.disabled.desc=Не излучает редстоун сигнал +reactor.ready=Реактор вот-вот взорвется +reactor.ready.desc=Реактор сильно перегрелся и скоро взорвется +reactor.capacity=Перегрев +reactor.capacity.desc=Ядро реактора перегрелось +reactor.depleted=Недостаточно топлива +reactor.depleted.desc=Реактору не хватает топлива для поддержания реакции //Creative tab itemGroup.tabMekanism=Mekanism @@ -837,13 +837,13 @@ tile.Generator.BioGenerator.name=Биогенератор tile.Generator.AdvancedSolarGenerator.name=Продвинутый солнечный генератор tile.Generator.WindTurbine.name=Ветровая турбина -tile.Reactor.ReactorController.name=Реакторный контроллер -tile.Reactor.ReactorFrame.name=Реакторный каркас +tile.Reactor.ReactorController.name=Панель управления реактором +tile.Reactor.ReactorFrame.name=Каракас реактора tile.Reactor.ReactorNeutronCapturePlate.name=Пластина нейтронного захвата -tile.Reactor.ReactorPort.name=Реакторный порт -tile.Reactor.ReactorLogicAdapter.name=Реакторный логический адаптер +tile.Reactor.ReactorPort.name=Порт реактора +tile.Reactor.ReactorLogicAdapter.name=Логический адаптер реактора -tile.ReactorGlass.ReactorGlass.name=Реакторное стекло +tile.ReactorGlass.ReactorGlass.name=Стекло реактора tile.ReactorGlass.ReactorLaserFocusMatrix.name=Матрица лазерного фокуса //Gui text @@ -867,18 +867,18 @@ gui.steamProduction=Производство пара //*****// //Vanilla Paxels -item.WoodPaxel.name=Деревянный мульти-инмтрумент -item.StonePaxel.name=Каменный мульти-инмтрумент -item.IronPaxel.name=Железный мульти-инмтрумент -item.DiamondPaxel.name=Алмазный мульти-инмтрумент -item.GoldPaxel.name=Золотой мульти-инмтрумент +item.WoodPaxel.name=Деревянный мульти-инcтрумент +item.StonePaxel.name=Каменный мульти-инcтрумент +item.IronPaxel.name=Железный мульти-инcтрумент +item.DiamondPaxel.name=Алмазный мульти-инcтрумент +item.GoldPaxel.name=Золотой мульти-инcтрумент //Obsidian item.ObsidianHelmet.name=Обсидиановый шлем item.ObsidianChestplate.name=Обсидиановая кираса item.ObsidianLeggings.name=Обсидиановые поножи item.ObsidianBoots.name=Обсидиановые ботинки -item.ObsidianPaxel.name=Обсидиановый мульти-инмтрумент +item.ObsidianPaxel.name=Обсидиановый мульти-инcтрумент item.ObsidianPickaxe.name=Обсидиановая кирка item.ObsidianAxe.name=Обсидиановый топор item.ObsidianShovel.name=Обсидиановая лопата @@ -890,7 +890,7 @@ item.LazuliHelmet.name=Лазуритовый шлем item.LazuliChestplate.name=Лазуритовая кираса item.LazuliLeggings.name=Лазуритовые поножи item.LazuliBoots.name=Лазуритовые ботинки -item.LazuliPaxel.name=Лазуритовый мульти-инмтрумент +item.LazuliPaxel.name=Лазуритовый мульти-инcтрумент item.LazuliPickaxe.name=Лазуритовая кирка item.LazuliAxe.name=Лазуритовый топор item.LazuliShovel.name=Лазуритовая лопата @@ -902,7 +902,7 @@ item.OsmiumHelmet.name=Осмиевый шлем item.OsmiumChestplate.name=Осмиевая кираса item.OsmiumLeggings.name=Осмиевые поножи item.OsmiumBoots.name=Осмиевые ботинки -item.OsmiumPaxel.name=Осмиевый мульти-инмтрумент +item.OsmiumPaxel.name=Осмиевый мульти-инcтрумент item.OsmiumPickaxe.name=Осмиевая кирка item.OsmiumAxe.name=Осмиевый топор item.OsmiumShovel.name=Осмиевая лопата @@ -914,7 +914,7 @@ item.BronzeHelmet.name=Бронзовый шлем item.BronzeChestplate.name=Бронзовая кираса item.BronzeLeggings.name=Бронзовые поножи item.BronzeBoots.name=Бронзовые ботинки -item.BronzePaxel.name=Бронзовый мульти-инмтрумент +item.BronzePaxel.name=Бронзовый мульти-инcтрумент item.BronzePickaxe.name=Бронзовая кирка item.BronzeAxe.name=Бронзовый топор item.BronzeShovel.name=Бронзовая лопата @@ -926,7 +926,7 @@ item.GlowstoneHelmet.name=Шлем из светящегося камня item.GlowstoneChestplate.name=Кираса из светящегося камня item.GlowstoneLeggings.name=Поножи из светящегося камня item.GlowstoneBoots.name=Ботинки из светящегося камня -item.GlowstonePaxel.name=Мульти-инмтрумент из светящегося камня +item.GlowstonePaxel.name=Мульти-инcтрумент из светящегося камня item.GlowstonePickaxe.name=Кирка из светящегося камня item.GlowstoneAxe.name=Топор из светящегося камня item.GlowstoneShovel.name=Лопата из светящегося камня @@ -938,7 +938,7 @@ item.SteelHelmet.name=Стальной шлем item.SteelChestplate.name=Стальная кираса item.SteelLeggings.name=Стальные поножи item.SteelBoots.name=Стальные ботинки -item.SteelPaxel.name=Стальной мульти-инмтрумент +item.SteelPaxel.name=Стальной мульти-инcтрумент item.SteelPickaxe.name=Стальная кирка item.SteelAxe.name=Стальной топор item.SteelShovel.name=Стальная лопата diff --git a/src/main/resources/assets/mekanism/render/AdvancedSolarGenerator.png b/src/main/resources/assets/mekanism/render/AdvancedSolarGenerator.png index 8e50de4f7..28f3734f7 100644 Binary files a/src/main/resources/assets/mekanism/render/AdvancedSolarGenerator.png and b/src/main/resources/assets/mekanism/render/AdvancedSolarGenerator.png differ diff --git a/src/main/resources/assets/mekanism/render/DigitalMiner.png b/src/main/resources/assets/mekanism/render/DigitalMiner.png index a5f4bd998..b9eefd990 100644 Binary files a/src/main/resources/assets/mekanism/render/DigitalMiner.png and b/src/main/resources/assets/mekanism/render/DigitalMiner.png differ diff --git a/src/main/resources/assets/mekanism/render/DigitalMinerOn.png b/src/main/resources/assets/mekanism/render/DigitalMinerOn.png index 078b3bd4d..5c5187413 100644 Binary files a/src/main/resources/assets/mekanism/render/DigitalMinerOn.png and b/src/main/resources/assets/mekanism/render/DigitalMinerOn.png differ diff --git a/src/main/resources/assets/mekanism/render/FluidTank.png b/src/main/resources/assets/mekanism/render/FluidTank.png new file mode 100755 index 000000000..b1dc430e9 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/FluidTank.png differ diff --git a/src/main/resources/assets/mekanism/render/FluidTankOn.png b/src/main/resources/assets/mekanism/render/FluidTankOn.png new file mode 100644 index 000000000..e3d6c514c Binary files /dev/null and b/src/main/resources/assets/mekanism/render/FluidTankOn.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTank.png b/src/main/resources/assets/mekanism/render/GasTank.png deleted file mode 100644 index 355a92aa3..000000000 Binary files a/src/main/resources/assets/mekanism/render/GasTank.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/render/GasTankAdvanced.png b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png new file mode 100644 index 000000000..98c797b73 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankBasic.png b/src/main/resources/assets/mekanism/render/GasTankBasic.png new file mode 100644 index 000000000..7d7dd42dd Binary files /dev/null and b/src/main/resources/assets/mekanism/render/GasTankBasic.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankElite.png b/src/main/resources/assets/mekanism/render/GasTankElite.png new file mode 100644 index 000000000..ecb928ddf Binary files /dev/null and b/src/main/resources/assets/mekanism/render/GasTankElite.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankUltimate.png b/src/main/resources/assets/mekanism/render/GasTankUltimate.png new file mode 100644 index 000000000..3b7ad2ab2 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/GasTankUltimate.png differ diff --git a/src/main/resources/assets/mekanism/render/PortableTank.png b/src/main/resources/assets/mekanism/render/PortableTank.png deleted file mode 100755 index fb33bd7bd..000000000 Binary files a/src/main/resources/assets/mekanism/render/PortableTank.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/render/PortableTankOn.png b/src/main/resources/assets/mekanism/render/PortableTankOn.png deleted file mode 100644 index 673c45df0..000000000 Binary files a/src/main/resources/assets/mekanism/render/PortableTankOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/render/SolarGenerator.png b/src/main/resources/assets/mekanism/render/SolarGenerator.png index 40a589f4e..1dcf1a0cf 100644 Binary files a/src/main/resources/assets/mekanism/render/SolarGenerator.png and b/src/main/resources/assets/mekanism/render/SolarGenerator.png differ diff --git a/src/main/resources/assets/mekanism/render/WindGenerator.png b/src/main/resources/assets/mekanism/render/WindGenerator.png new file mode 100644 index 000000000..a964ae0d5 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/WindGenerator.png differ diff --git a/src/main/resources/assets/mekanism/render/WindTurbine.png b/src/main/resources/assets/mekanism/render/WindTurbine.png deleted file mode 100644 index fd876cec7..000000000 Binary files a/src/main/resources/assets/mekanism/render/WindTurbine.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/sounds.json b/src/main/resources/assets/mekanism/sounds.json index fedba3bd1..88b8ee63a 100644 --- a/src/main/resources/assets/mekanism/sounds.json +++ b/src/main/resources/assets/mekanism/sounds.json @@ -37,6 +37,7 @@ "tile.machine.smelter": {"category": "block", "sounds": [{"name": "Smelter", "stream": false}]}, "tile.machine.laser": {"category": "block", "sounds": [{"name": "Laser", "stream": false}]}, "tile.machine.fusionreactor": {"category": "block", "sounds": [{"name": "FusionReactor", "stream": false}]}, + "tile.machine.resistiveheater": {"category": "block", "sounds": [{"name": "ResistiveHeater", "stream": false}]}, "tile.christmas.1": {"category": "block", "sounds": [{"name": "holiday/Nutcracker1", "stream": false}]}, "tile.christmas.2": {"category": "block", "sounds": [{"name": "holiday/Nutcracker2", "stream": false}]}, diff --git a/src/main/resources/assets/mekanism/sounds/ResistiveHeater.ogg b/src/main/resources/assets/mekanism/sounds/ResistiveHeater.ogg new file mode 100644 index 000000000..d92d15423 Binary files /dev/null and b/src/main/resources/assets/mekanism/sounds/ResistiveHeater.ogg differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png new file mode 100644 index 000000000..1d37f514c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png new file mode 100644 index 000000000..a776eab8b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png new file mode 100644 index 000000000..55fd07f98 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png new file mode 100644 index 000000000..aa394fd75 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png new file mode 100644 index 000000000..3cd450e72 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png new file mode 100644 index 000000000..19b8520b7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png new file mode 100644 index 000000000..32642dd8e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png new file mode 100644 index 000000000..4ee5cf6b6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png new file mode 100644 index 000000000..dc5a1fffd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png new file mode 100644 index 000000000..f10595555 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png new file mode 100644 index 000000000..318ddd90d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png new file mode 100644 index 000000000..9425e35f7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png new file mode 100644 index 000000000..5faafe1a9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png new file mode 100644 index 000000000..b0ae8d075 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png new file mode 100644 index 000000000..9ae7fe5bb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinFront.png b/src/main/resources/assets/mekanism/textures/blocks/BinFront.png deleted file mode 100644 index 984fcb484..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinFrontOn.png deleted file mode 100644 index 4278df44e..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinSide.png deleted file mode 100644 index 286ea845d..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinTop.png b/src/main/resources/assets/mekanism/textures/blocks/BinTop.png deleted file mode 100644 index 84dffc490..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinTop.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinTopOn.png deleted file mode 100644 index 8d8ea5a3c..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinTopOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png new file mode 100644 index 000000000..76e4f5f23 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png new file mode 100644 index 000000000..1a2584411 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png new file mode 100644 index 000000000..19b58516f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png new file mode 100644 index 000000000..8c1b3c8eb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png new file mode 100644 index 000000000..c24e0bc35 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png old mode 100644 new mode 100755 index a225b5111..94aac7ed1 Binary files a/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png old mode 100644 new mode 100755 index 149e8c7a1..4697f350f Binary files a/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png b/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png old mode 100644 new mode 100755 index 98eb5cba8..b339997f5 Binary files a/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png and b/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png old mode 100644 new mode 100755 index b737d529f..1cf648c8c Binary files a/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png old mode 100644 new mode 100755 index a39951d85..3e2207a71 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png old mode 100644 new mode 100755 index 9cddf5ae4..5ae84ba41 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/FilterCard.png b/src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/items/FilterCard.png rename to src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png new file mode 100644 index 000000000..779e0d2e0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png new file mode 100644 index 000000000..ca802ce64 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png new file mode 100644 index 000000000..ae37f53d8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png differ