diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/fluids')
5 files changed, 86 insertions, 85 deletions
diff --git a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java index d8672dec2b..9bcc6ecf07 100644 --- a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java +++ b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java @@ -1,9 +1,5 @@ package gtPlusPlus.core.fluids; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -15,6 +11,11 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; + public class BlockFluidBase extends BlockFluidClassic { @SideOnly(Side.CLIENT) @@ -42,9 +43,10 @@ public class BlockFluidBase extends BlockFluidClassic { if (!(ent instanceof EntityLivingBase)) { return; } - /*EntityLivingBase player = (EntityLivingBase) ent; - int pot = world.rand.nextInt(Potion.potionTypes.length); - Potion.potionTypes[pot].performEffect(player, 40);*/ + /* + * EntityLivingBase player = (EntityLivingBase) ent; int pot = world.rand.nextInt(Potion.potionTypes.length); + * Potion.potionTypes[pot].performEffect(player, 40); + */ } @Override diff --git a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java index 59d0fd8839..54ed1f3a9e 100644 --- a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java +++ b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.fluids; -import gregtech.api.GregTech_API; -import gtPlusPlus.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.item.EnumRarity; import net.minecraftforge.fluids.Fluid; +import gregtech.api.GregTech_API; +import gtPlusPlus.core.lib.CORE; + public class FactoryFluid extends Fluid implements Runnable { private final String mTextureName; @@ -37,16 +38,8 @@ public class FactoryFluid extends Fluid implements Runnable { aRGBa); } - public FactoryFluid( - String fluidName, - Block aBlock, - int luminosity, - int density, - int temp, - int viscosity, - boolean gas, - EnumRarity aRarity, - final short[] aRGBa) { + public FactoryFluid(String fluidName, Block aBlock, int luminosity, int density, int temp, int viscosity, + boolean gas, EnumRarity aRarity, final short[] aRGBa) { super(fluidName); this.mRGBa = aRGBa; this.setBlock(aBlock); @@ -62,8 +55,7 @@ public class FactoryFluid extends Fluid implements Runnable { @Override public int getColor() { - return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) - | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8) + return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8) | Math.max(0, Math.min(255, this.mRGBa[2])); } diff --git a/src/main/java/gtPlusPlus/core/fluids/FluidFactory.java b/src/main/java/gtPlusPlus/core/fluids/FluidFactory.java index af7a806d31..121c217130 100644 --- a/src/main/java/gtPlusPlus/core/fluids/FluidFactory.java +++ b/src/main/java/gtPlusPlus/core/fluids/FluidFactory.java @@ -1,19 +1,8 @@ package gtPlusPlus.core.fluids; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.GTplusplus.INIT_PHASE; -import gtPlusPlus.api.objects.GregtechException; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.item.base.itemblock.FluidItemBlock; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; import java.util.LinkedHashMap; import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -26,6 +15,19 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.GTplusplus.INIT_PHASE; +import gtPlusPlus.api.objects.GregtechException; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.item.base.itemblock.FluidItemBlock; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; + public class FluidFactory { public static final Map<String, Fluid> mNameToFluidMap = new LinkedHashMap<String, Fluid>(); @@ -79,9 +81,10 @@ public class FluidFactory { /** * Generates a 'Water' type fluid. - * @param aID - The Fluid ID (Must be unique) + * + * @param aID - The Fluid ID (Must be unique) * @param aUnlocalName - Unlocalized Fluid Name - * @param aRGB - a {@link Short[]} containing the RGB of the FluidPackage. + * @param aRGB - a {@link Short[]} containing the RGB of the FluidPackage. * @return - A fully constructed & registered {@linkplain FluidPackage} */ public static FluidPackage generate(int aID, String aUnlocalName, short[] aRGB) { @@ -89,24 +92,26 @@ public class FluidFactory { } /** - * Generate a {@link FluidPackage} from the data provided. This FluidPackage is automatically registered and handled internally. - * Pass in {@link Short}.MIN_VALUE for any of the Fluid Fields (Besides ID, Name or RGB) and it will default to water values. - * @param aID - The Fluid ID (Must be unique) + * Generate a {@link FluidPackage} from the data provided. This FluidPackage is automatically registered and handled + * internally. Pass in {@link Short}.MIN_VALUE for any of the Fluid Fields (Besides ID, Name or RGB) and it will + * default to water values. + * + * @param aID - The Fluid ID (Must be unique) * @param aUnlocalName - Unlocalized Fluid Name - * @param luminosity - How bright is the fluid. - * @param density - completely arbitrary; negative density indicates that the fluid is - * lighter than air. Default value is approximately the real-life density of water in kg/m^3. - * @param temp - completely arbitrary; higher temperature indicates that the fluid is - * hotter than air. Default value is approximately the real-life room temperature of water in degrees Kelvin - * @param viscosity - completely arbitrary; negative values are not - * permissible. Default value is approximately the real-life density of water in m/s^2 (x10^-3). * - * Higher viscosity means that a fluid flows more slowly, like molasses. - * Lower viscosity means that a fluid flows more quickly, like helium. - * @param aRGB - a {@link Short[]} containing the RGB of the FluidPackage. + * @param luminosity - How bright is the fluid. + * @param density - completely arbitrary; negative density indicates that the fluid is lighter than air. + * Default value is approximately the real-life density of water in kg/m^3. + * @param temp - completely arbitrary; higher temperature indicates that the fluid is hotter than air. + * Default value is approximately the real-life room temperature of water in degrees Kelvin + * @param viscosity - completely arbitrary; negative values are not permissible. Default value is approximately + * the real-life density of water in m/s^2 (x10^-3). * Higher viscosity means that a fluid flows + * more slowly, like molasses. Lower viscosity means that a fluid flows more quickly, like + * helium. + * @param aRGB - a {@link Short[]} containing the RGB of the FluidPackage. * @return - A fully constructed & registered {@linkplain FluidPackage} */ - public static FluidPackage generate( - int aID, String aUnlocalName, int luminosity, int density, int temp, int viscosity, short[] aRGB) { + public static FluidPackage generate(int aID, String aUnlocalName, int luminosity, int density, int temp, + int viscosity, short[] aRGB) { FluidPackage aFluidToGenerate = null; @@ -145,8 +150,8 @@ public class FluidFactory { return aFluidToGenerate; } - private static Fluid fluid( - String aUnlocalName, int luminosity, int density, int temp, int viscosity, short[] aRGB) { + private static Fluid fluid(String aUnlocalName, int luminosity, int density, int temp, int viscosity, + short[] aRGB) { return new FactoryFluid(aUnlocalName, luminosity, density, temp, viscosity, aRGB); } @@ -163,13 +168,11 @@ public class FluidFactory { } /** - * Copyright © SpaceToad, 2011 http://www.mod-buildcraft.com BuildCraft is - * distributed under the terms of the Minecraft Mod Public License 1.0, or MMPL. - * Please check the contents of the license located in + * Copyright © SpaceToad, 2011 http://www.mod-buildcraft.com BuildCraft is distributed under the terms of the + * Minecraft Mod Public License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt * - * Modified version of the BC BucketHandler, except using ItemStacks > Items - * (Why?) + * Modified version of the BC BucketHandler, except using ItemStacks > Items (Why?) * * @author Alkalus */ diff --git a/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java b/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java index 3a0f56c2a5..dd510957fc 100644 --- a/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java +++ b/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java @@ -2,27 +2,25 @@ package gtPlusPlus.core.fluids; import static gtPlusPlus.core.block.ModBlocks.*; +import net.minecraft.block.material.Material; +import net.minecraftforge.fluids.FluidRegistry; + import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.block.general.fluids.BlockFluidSludge; import gtPlusPlus.core.lib.CORE; -import net.minecraft.block.material.Material; -import net.minecraftforge.fluids.FluidRegistry; public class FluidRegistryHandler { // Fluids /** * - * Luminosity .setLuminosity(luminosity) - * How much light does the fluid emit. Default: 0, Lava uses 15 - * Density .setDensity(density) - * How dense is the fluid, the only effect is whether or not a fluid replaces another fluid when they flow into each other. Default: 1000, the density of water at 4 degrees Celsius in kg/m³ - * Temperature .setTemperature(temp) - * How hot, or cold is the fluid. Has currently no effect. Default: 295, the "normal" room temperature in degrees Kelvin, this is approximately 72°F or 22°C. - * Viscosity .setViscosity(viscosity) - * How thick the fluid is. Determines how fast it flows. Default: 1000 for water, lava uses 6000 - * Is Gaseous .setGaseous(boolean) - * Indicates if the fluid is gaseous. Used for rendering. Default: false + * Luminosity .setLuminosity(luminosity) How much light does the fluid emit. Default: 0, Lava uses 15 Density + * .setDensity(density) How dense is the fluid, the only effect is whether or not a fluid replaces another fluid + * when they flow into each other. Default: 1000, the density of water at 4 degrees Celsius in kg/m³ Temperature + * .setTemperature(temp) How hot, or cold is the fluid. Has currently no effect. Default: 295, the "normal" room + * temperature in degrees Kelvin, this is approximately 72°F or 22°C. Viscosity .setViscosity(viscosity) How thick + * the fluid is. Determines how fast it flows. Default: 1000 for water, lava uses 6000 Is Gaseous + * .setGaseous(boolean) Indicates if the fluid is gaseous. Used for rendering. Default: false * */ public static void registerFluids() { @@ -43,9 +41,8 @@ public class FluidRegistryHandler { fluidSludge.setUnlocalizedName("fluid.sludge"); FluidRegistry.registerFluid(fluidSludge); blockFluidSludge = new BlockFluidSludge(fluidSludge, Material.cactus).setBlockName("fluidBlockSludge"); - GameRegistry.registerBlock( - blockFluidSludge, - CORE.MODID + "_" + blockFluidSludge.getUnlocalizedName().substring(5)); + GameRegistry + .registerBlock(blockFluidSludge, CORE.MODID + "_" + blockFluidSludge.getUnlocalizedName().substring(5)); fluidSludge.setUnlocalizedName(blockFluidSludge.getUnlocalizedName()); } } diff --git a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java index ed1cc112c3..668076eb68 100644 --- a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java +++ b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java @@ -1,13 +1,9 @@ package gtPlusPlus.core.fluids; -import cpw.mods.fml.common.eventhandler.Event; -import gtPlusPlus.api.objects.GregtechException; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.minecraft.ItemUtils; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,6 +20,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.FillBucketEvent; +import cpw.mods.fml.common.eventhandler.Event; +import gtPlusPlus.api.objects.GregtechException; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.minecraft.ItemUtils; + public class ItemGenericFluidBucket extends ItemBucket { private static IIcon mBaseBucketTexture; @@ -41,12 +43,16 @@ public class ItemGenericFluidBucket extends ItemBucket { if (FluidFactory.mMetaToBucketMap.containsKey(aID)) { try { - throw new GregtechException("" + aID + " is already registered! Unable to register fluid: " - + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); + throw new GregtechException( + "" + aID + + " is already registered! Unable to register fluid: " + + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); } catch (GregtechException e) { e.printStackTrace(); - CORE.crash("" + aID + " is already registered! Unable to register fluid: " - + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); + CORE.crash( + "" + aID + + " is already registered! Unable to register fluid: " + + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); } } mInternalFluidCache.put(FluidFactory.mMetaToBlockMap.get(aID)); @@ -56,8 +62,7 @@ public class ItemGenericFluidBucket extends ItemBucket { Map<Integer, IIcon> mIconCache = new LinkedHashMap<Integer, IIcon>(); /** - * Called whenever this item is equipped and the right mouse button is pressed. - * Args: itemStack, world, entityPlayer + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) { @@ -255,8 +260,10 @@ public class ItemGenericFluidBucket extends ItemBucket { } else { return mBaseBucketTexture; } - /*IIcon aTemp = mIconCache.get(stack.getItemDamage()); - return aTemp != null ? aTemp : super.getIcon(stack, renderPass, player, usingItem, useRemaining);*/ + /* + * IIcon aTemp = mIconCache.get(stack.getItemDamage()); return aTemp != null ? aTemp : super.getIcon(stack, + * renderPass, player, usingItem, useRemaining); + */ } @Override |