diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/RenderPipe.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/RenderPipe.java index e045545a..a32cccfe 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/RenderPipe.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/RenderPipe.java @@ -1,5 +1,7 @@ package resonantinduction.mechanical.fluid.pipe; +import java.awt.Color; + import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; @@ -24,6 +26,12 @@ public class RenderPipe implements ISimpleItemRenderer public void render(PartPipe part, double x, double y, double z, float f) { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); + GL11.glScalef(1.0F, -1F, -1F); + render(0, part.getAllCurrentConnections()); + GL11.glPopMatrix(); + GL11.glPushMatrix(); FluidStack fluid = part.getInternalTank().getFluid(); @@ -35,6 +43,8 @@ public class RenderPipe implements ISimpleItemRenderer float percentage = (float) fluid.amount / (float) capacity; int[] displayList = RenderFluidHelper.getFluidDisplayLists(fluid, part.world(), false); RenderUtility.bind(RenderFluidHelper.getFluidSheet(fluid)); + Color color = new Color(fluid.getFluid().getColor()); + GL11.glColor4f(color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, fluid.getFluid().isGaseous() ? 0.5f : 1); GL11.glPushMatrix(); GL11.glPushAttrib(GL11.GL_ENABLE_BIT); @@ -94,11 +104,6 @@ public class RenderPipe implements ISimpleItemRenderer } GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - render(0, part.getAllCurrentConnections()); - GL11.glPopMatrix(); } public static void render(int meta, byte sides) diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/RenderTank.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/RenderTank.java index 77a8fbfb..23e3f37d 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/RenderTank.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/RenderTank.java @@ -1,5 +1,7 @@ package resonantinduction.mechanical.fluid.tank; +import java.awt.Color; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; @@ -45,6 +47,10 @@ public class RenderTank extends TileEntitySpecialRenderer GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + Color color = new Color(fluid.getFluid().getColor()); + GL11.glColor4f(color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, fluid.getFluid().isGaseous() ? 0.5f : 1); + RenderUtility.bind(RenderFluidHelper.getFluidSheet(fluid)); // Prevent Z-fighting GL11.glTranslatef((float) x, (float) y + 0.001f, (float) z); diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java b/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java index 4c919782..d4d9df9f 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java @@ -1,9 +1,13 @@ package resonantinduction.mechanical.process; +import java.util.List; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -45,6 +49,15 @@ public class BlockFilter extends BlockTile world.scheduleBlockUpdate(x, y, z, blockID, 20); } + @Override + public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity entity) + { + if (entity instanceof EntityItem) + return; + + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, entity); + } + @Override public void updateTick(World world, int x, int y, int z, Random random) { diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java index b73cf2fd..150e63c9 100644 --- a/src/main/java/resonantinduction/core/ResonantInduction.java +++ b/src/main/java/resonantinduction/core/ResonantInduction.java @@ -8,8 +8,8 @@ import java.util.logging.Logger; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import org.modstats.ModstatInfo; import org.modstats.Modstats; @@ -77,13 +77,10 @@ public class ResonantInduction public static ItemOreResource itemRubble, itemDust, itemRefinedDust; public static ItemOreResourceBucket itemBucketMixture, itemBucketMolten; public static Block blockDust; - public static final HashMap blockMixtureFluids = new HashMap(); - public static final HashMap blockMoltenFluid = new HashMap(); + public static final HashMap blockMixtureFluids = new HashMap(); + public static final HashMap blockMoltenFluid = new HashMap(); public static Block blockMachinePart; - - public static List fluidMixtures = new ArrayList(); - public static List fluidMaterials = new ArrayList(); - + public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, Settings.idManager, ID).setPrefix(Reference.PREFIX).setTab(TabRI.CORE); @EventHandler @@ -133,13 +130,13 @@ public class ResonantInduction ResonantInduction.LOGGER.fine("Languages Loaded:" + LanguageUtility.loadLanguages(Reference.LANGUAGE_DIRECTORY, Reference.LANGUAGES)); // Set Mod Metadata Settings.setModMetadata(metadata, ID, NAME); + // Generate Resources + ResourceGenerator.generateOreResources(); } @EventHandler public void postInit(FMLPostInitializationEvent evt) { - // Generate Resources - ResourceGenerator.generateOreResources(); Settings.save(); } } diff --git a/src/main/java/resonantinduction/core/handler/TextureHookHandler.java b/src/main/java/resonantinduction/core/handler/TextureHookHandler.java index c9c5508d..e316e147 100644 --- a/src/main/java/resonantinduction/core/handler/TextureHookHandler.java +++ b/src/main/java/resonantinduction/core/handler/TextureHookHandler.java @@ -2,9 +2,11 @@ package resonantinduction.core.handler; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.event.ForgeSubscribe; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.BlockFluidFinite; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; +import resonantinduction.core.prefab.fluid.FluidColored; +import resonantinduction.core.resource.ResourceGenerator; import calclavia.lib.render.RenderUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -29,11 +31,18 @@ public class TextureHookHandler @ForgeSubscribe @SideOnly(Side.CLIENT) - public void textureHook(TextureStitchEvent.Post event) + public void postTextureHook(TextureStitchEvent.Post event) { - for (Fluid f : ResonantInduction.fluidMixtures) - f.setIcons(RenderUtility.loadedIconMap.get(Reference.PREFIX + "mixture_flow")); - for (Fluid f : ResonantInduction.fluidMaterials) - f.setIcons(RenderUtility.loadedIconMap.get(Reference.PREFIX + "molten_flow")); + for (BlockFluidFinite block : ResonantInduction.blockMixtureFluids.values()) + { + block.getFluid().setIcons(RenderUtility.getIcon(Reference.PREFIX + "mixture_flow")); + ((FluidColored) block.getFluid()).setColor(ResourceGenerator.getColor(ResourceGenerator.mixtureToMaterial(block.getFluid().getName()))); + } + + for (BlockFluidFinite block : ResonantInduction.blockMoltenFluid.values()) + { + block.getFluid().setIcons(RenderUtility.getIcon(Reference.PREFIX + "molten_flow")); + ((FluidColored) block.getFluid()).setColor(ResourceGenerator.getColor(ResourceGenerator.moltenToMaterial(block.getFluid().getName()))); + } } } diff --git a/src/main/java/resonantinduction/core/prefab/fluid/FluidColored.java b/src/main/java/resonantinduction/core/prefab/fluid/FluidColored.java new file mode 100644 index 00000000..1d559958 --- /dev/null +++ b/src/main/java/resonantinduction/core/prefab/fluid/FluidColored.java @@ -0,0 +1,23 @@ +package resonantinduction.core.prefab.fluid; + +import net.minecraftforge.fluids.Fluid; + +public class FluidColored extends Fluid +{ + private int color = 0xFFFFFF; + + public FluidColored(String fluidName) + { + super(fluidName); + } + + public int getColor() + { + return color; + } + + public void setColor(int newColor) + { + color = newColor; + } +} diff --git a/src/main/java/resonantinduction/core/resource/ResourceGenerator.java b/src/main/java/resonantinduction/core/resource/ResourceGenerator.java index 075edee5..8d4fb5a5 100644 --- a/src/main/java/resonantinduction/core/resource/ResourceGenerator.java +++ b/src/main/java/resonantinduction/core/resource/ResourceGenerator.java @@ -22,7 +22,7 @@ import net.minecraft.util.Icon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.event.ForgeSubscribe; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -34,6 +34,7 @@ import resonantinduction.api.recipe.OreDetectionBlackList; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; +import resonantinduction.core.prefab.fluid.FluidColored; import resonantinduction.core.resource.fluid.BlockFluidMaterial; import resonantinduction.core.resource.fluid.BlockFluidMixture; import calclavia.lib.utility.LanguageUtility; @@ -120,20 +121,20 @@ public class ResourceGenerator implements IVirtualObject String nameCaps = LanguageUtility.capitalizeFirst(materialName); /** Generate molten fluids */ - Fluid fluidMolten = new Fluid(materialNameToMolten(materialName)); + FluidColored fluidMolten = new FluidColored(materialNameToMolten(materialName)); fluidMolten.setDensity(7); fluidMolten.setViscosity(5000); fluidMolten.setTemperature(273 + 1538); FluidRegistry.registerFluid(fluidMolten); - Block blockFluidMaterial = new BlockFluidMaterial(fluidMolten); + BlockFluidMaterial blockFluidMaterial = new BlockFluidMaterial(fluidMolten); GameRegistry.registerBlock(blockFluidMaterial, "molten" + nameCaps); ResonantInduction.blockMoltenFluid.put(getID(materialName), blockFluidMaterial); FluidContainerRegistry.registerFluidContainer(fluidMolten, ResonantInduction.itemBucketMolten.getStackFromMaterial(materialName)); /** Generate dust mixture fluids */ - Fluid fluidMixture = new Fluid(materialNameToMixture(materialName)); + FluidColored fluidMixture = new FluidColored(materialNameToMixture(materialName)); FluidRegistry.registerFluid(fluidMixture); - Block blockFluidMixture = new BlockFluidMixture(fluidMixture); + BlockFluidMixture blockFluidMixture = new BlockFluidMixture(fluidMixture); GameRegistry.registerBlock(blockFluidMixture, "mixture" + nameCaps); ResonantInduction.blockMixtureFluids.put(getID(materialName), blockFluidMixture); FluidContainerRegistry.registerFluidContainer(fluidMixture, ResonantInduction.itemBucketMixture.getStackFromMaterial(materialName)); @@ -178,10 +179,11 @@ public class ResourceGenerator implements IVirtualObject int colorCount = 0; - for (ItemStack ingotStack : OreDictionary.getOres("ingot" + material.substring(0, 1).toUpperCase() + material.substring(1))) + for (ItemStack ingotStack : OreDictionary.getOres("ingot" + LanguageUtility.capitalizeFirst(material))) { Item theIngot = ingotStack.getItem(); - materialColorCache.put(material, getAverageColor(ingotStack)); + int color = getAverageColor(ingotStack); + materialColorCache.put(material, color); } if (!materialColorCache.containsKey(material)) @@ -267,7 +269,7 @@ public class ResourceGenerator implements IVirtualObject return 0xFFFFFF; } - public static String moltenNameToMaterial(String fluidName) + public static String moltenToMaterial(String fluidName) { return fluidNameToMaterial(fluidName, "molten"); } @@ -297,12 +299,12 @@ public class ResourceGenerator implements IVirtualObject return type + "_" + LanguageUtility.camelToLowerUnderscore(materialName); } - public static Block getMixture(String name) + public static BlockFluidFinite getMixture(String name) { return ResonantInduction.blockMixtureFluids.get(getID(name)); } - public static Block getMolten(String name) + public static BlockFluidFinite getMolten(String name) { return ResonantInduction.blockMoltenFluid.get(getID(name)); }