From 8ed8c659da9496bf49fec94c049b0abae21746a8 Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Wed, 24 May 2017 20:13:22 +0300 Subject: fixing bugs with Iron workbench and fractionator --- ihl/worldgen/IHLWorldGenerator.java | 10 +++---- ihl/worldgen/ores/BlockOre.java | 4 +-- ihl/worldgen/ores/DebugScannerGui.java | 4 +-- ihl/worldgen/ores/DebugScannerTileEntity.java | 10 +++---- ihl/worldgen/ores/IHLFluid.java | 41 +++++++-------------------- 5 files changed, 24 insertions(+), 45 deletions(-) (limited to 'ihl/worldgen') diff --git a/ihl/worldgen/IHLWorldGenerator.java b/ihl/worldgen/IHLWorldGenerator.java index 1c65b78..a6f3b6b 100644 --- a/ihl/worldgen/IHLWorldGenerator.java +++ b/ihl/worldgen/IHLWorldGenerator.java @@ -1,17 +1,17 @@ package ihl.worldgen; -import ihl.IHLMod; -import ihl.utils.IHLUtils; -import ihl.worldgen.ores.IHLFluid; - import java.util.HashSet; import java.util.Random; import java.util.Set; + +import cpw.mods.fml.common.IWorldGenerator; +import ihl.IHLMod; +import ihl.utils.IHLUtils; +import ihl.worldgen.ores.IHLFluid; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import cpw.mods.fml.common.IWorldGenerator; public class IHLWorldGenerator implements IWorldGenerator { diff --git a/ihl/worldgen/ores/BlockOre.java b/ihl/worldgen/ores/BlockOre.java index 4b0c7a7..00a8bcc 100644 --- a/ihl/worldgen/ores/BlockOre.java +++ b/ihl/worldgen/ores/BlockOre.java @@ -7,11 +7,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import ihl.IHLCreativeTab; -import ihl.IHLModInfo; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import ihl.IHLCreativeTab; +import ihl.IHLModInfo; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/ihl/worldgen/ores/DebugScannerGui.java b/ihl/worldgen/ores/DebugScannerGui.java index 2d79300..56be263 100644 --- a/ihl/worldgen/ores/DebugScannerGui.java +++ b/ihl/worldgen/ores/DebugScannerGui.java @@ -2,12 +2,12 @@ package ihl.worldgen.ores; import java.util.List; -import cpw.mods.fml.relauncher.Side; +import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class DebugScannerGui extends GuiContainer { diff --git a/ihl/worldgen/ores/DebugScannerTileEntity.java b/ihl/worldgen/ores/DebugScannerTileEntity.java index df027d5..b32f3e8 100644 --- a/ihl/worldgen/ores/DebugScannerTileEntity.java +++ b/ihl/worldgen/ores/DebugScannerTileEntity.java @@ -6,6 +6,11 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import ic2.core.ContainerBase; +import ic2.core.IC2; +import ic2.core.IHasGui; +import ic2.core.block.TileEntityInventory; +import ic2.core.block.invslot.InvSlot; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,11 +20,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.oredict.OreDictionary; -import ic2.core.ContainerBase; -import ic2.core.IC2; -import ic2.core.IHasGui; -import ic2.core.block.TileEntityInventory; -import ic2.core.block.invslot.InvSlot; public class DebugScannerTileEntity extends TileEntityInventory implements IHasGui { public final InvSlot itemsSlot; diff --git a/ihl/worldgen/ores/IHLFluid.java b/ihl/worldgen/ores/IHLFluid.java index 51e0999..d35dc73 100644 --- a/ihl/worldgen/ores/IHLFluid.java +++ b/ihl/worldgen/ores/IHLFluid.java @@ -7,11 +7,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import cpw.mods.fml.common.registry.GameRegistry; import ic2.core.Ic2Items; import ihl.IHLCreativeTab; import ihl.IHLModInfo; import ihl.items_blocks.IHLFluidBlock; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -47,7 +47,7 @@ public class IHLFluid extends Fluid { if (!FluidRegistry.registerFluid(instance)) { instance = FluidRegistry.getFluid(type.fluidRegistryName); } - if (instance.getBlock() == null && !type.noBlock) { + if (instance.getBlock() == null) { instance.setBlock(new IHLFluidBlock(instance, type.blockMaterial, type.textureName, "fluid" + type.fluidName.replaceFirst("fluid", "")).setFlammable(type.flammable) .setBlockName("block" + type.fluidName).setCreativeTab(IHLCreativeTab.tab)); @@ -136,7 +136,7 @@ public class IHLFluid extends Fluid { // "methane", Material.water, false, false, false, false), NitroGlyceryl("NitroGlycerin", 10052, 293, 291, 583, 1595, "nitroglycerin", Material.water, true, false, true), Ammonia("Ammonia", 10051, 273, 273 - 78, 273 - - 33, 0.772F, "ammonia", new MaterialLiquid(MapColor.airColor), false, false, true), + - 33, 0.772F, "ammonia", new MaterialLiquid(MapColor.airColor), true, false, true), Acetaldehyde("Acetaldehyde", 10050, 273, 273 - 123, 294, 784, "acetaldehyde", Material.water, false, false, false), Formaldehyde("Formaldehyde", 10049, 254, 273 @@ -160,13 +160,13 @@ public class IHLFluid extends Fluid { Fuel("Fuel", 10035, 293, 268, 633, 840, "fuel", Material.water, true, false, true), MineralOil("MineralOil", 10034, 293, 238, 704, 845, "mineraloil", Material.water, true, false, true), FuelOil("FuelOil", 10033, 293, 293, 693, 991, "fueloil", Material.water, true, false, true), - Oil("Oil", "fluidOil", 10032, 293, 284, 773, 850f, "oil", Material.water, true, false, true, false), + Oil("Oil", "fluidOil", 10032, 293, 284, 773, 850f, "oil", Material.water, true, false, true), Mercury("Mercury", 10031, 293, 234, 630, 13546), VapourMercury("VapourMercury", 10030, 630, 234, 630, 9.229F, "vapour.mercury", new MaterialLiquid( MapColor.cyanColor), false, false, false), Hydrogen("Hydrogen", 10029, 293, 14, 20, 0.046F, "hydrogen", new MaterialLiquid( MapColor.blueColor), true, false, true), - SaltWater("SaltWater", "fluidSaltWater", 10028, 293, 253, 373, 1360f, "saltwater", Material.water, true, false, false, false), + SaltWater("SaltWater", "fluidSaltWater", 10028, 293, 253, 373, 1360f, "saltwater", Material.water, true, false, false), HydrogenChloride("HydrogenChloride", 10027, 293, 159, 188, 1.477F, "hydrogenchloride", new MaterialLiquid( MapColor.yellowColor), true, false, true), NatriumTungstate("NatriumTungstateDissolvedInWater", 10026, 293, 249, 373, 1730, "solution.natriumtungstate", Material.water, true, false, false), @@ -178,8 +178,8 @@ public class IHLFluid extends Fluid { Oxygen("Oxygen", 10022, 93, 55, 93, 1.429F, "oxygen", new MaterialLiquid(MapColor.airColor), true, false, true), NatriumHydroxide("NatriumHydroxideDissolvedInWater", 10021, 293, 249, 373, 1525, "solution.natriumhydroxide", Material.water, true, false, false), LiquidGlass("LiquidGlass", 10020, 293, 253, 373, 2400), - fluidRubberTreeSap("fluidRubberTreeSap", "fluidRubberTreeSap", 10019, 293, 273, 393, 1200f, "fluidrubbertreesap", Material.water, true, true, false, false), - SpruceResin("SpruceResin","fluidSpruceResin", 10018, 293, 273, 533, 1080, "spruceresin", Material.water, true, true, true, false), + fluidRubberTreeSap("fluidRubberTreeSap", "fluidRubberTreeSap", 10019, 293, 273, 393, 1200f, "fluidrubbertreesap", Material.water, true, true, false), + SpruceResin("SpruceResin","fluidSpruceResin", 10018, 293, 273, 533, 1080, "spruceresin", Material.water, true, true, true), CablingColophony("CablingColophony", 10017, 363, 363, 533, 1070, "cablingcolophony", Material.water, true, false, true), Glycerol("Glycerol", 10016, 293, 291, 583, 1261, "glycerol", Material.water, true, false, true), SeedOil("SeedOil", 10015, 293, 256, 583, 920, "seedoil", Material.water, true, false, true), @@ -191,12 +191,12 @@ public class IHLFluid extends Fluid { NickelSulfateDissolvedInWater("NickelSulfateDissolvedInWater", 10009, 293, 253, 373, 1220, "solution.nickelsulfate", Material.water, true, false, false), BlueVitriolDissolvedInWater("BlueVitriolDissolvedInWater", 10008, 293, 253, 373, 1180, "solution.bluevitriol", Material.water, true, false, false), MoltenRubberWithSulfur("MoltenRubberWithSulfur", 10007, 600, 600, 1000, 1200, "molten.rubber", Material.lava, false, false, true), - MoltenPotassium("MoltenPotassium", "fluidMolten", 10042, 336, 336, 1047, 856, "molten.potassium", Material.lava, false, false, false, true), + MoltenPotassium("MoltenPotassium", "fluidMolten", 10042, 336, 336, 1047, 856, "molten.potassium", Material.lava, false, false, false), MoltenLithium("MoltenLithium", "fluidMolten", 10042, 454, 454, 1613, 512, "molten.lithium", Material.lava, false, false, false), MoltenPotassiumChloride("MoltenPotassiumChloride", "fluidMolten", 10006, 776 + 273, 776 + 273, 1407 - + 273, 1556, "molten.potassiumchloride", Material.lava, false, false, false, true), + + 273, 1556, "molten.potassiumchloride", Material.lava, false, false, false), MoltenSodiumChloride("MoltenSodiumChloride", "fluidMolten", 10006, 1273, 1273, 1740, 1556, "molten.sodiumchloride", Material.lava, false, false, false), - MoltenGlass("MoltenGlass", "fluidMolten", 10048, 600, 600, 1950, 2270, "molten.glass", Material.lava, false, false, false, true), + MoltenGlass("MoltenGlass", "fluidMolten", 10048, 600, 600, 1950, 2270, "molten.glass", Material.lava, false, false, false), MoltenMagnesium("MoltenMagnesium", "fluidMolten", 10006, 923, 923, 1623, 1584, "molten.magnesium", Material.lava, false, false, false), MoltenSteel("MoltenSteel", "fluidMolten", 10006, 1800, 1800, 3134, 6980, "molten.steel", Material.lava, false, false, false), MoltenCopper("MoltenCopper", "fluidMolten", 10048, 1356, 1356, 2840, 8920, "molten.copper", Material.lava, false, false, false), @@ -275,26 +275,6 @@ public class IHLFluid extends Fluid { damage = celldamage; } - IHLFluidType(String fluidName1, String textureName1, int celldamage, int temperature1, int meltingPoint1, - int boilingPoint1, float density1, String fluidRegistryName1, Material blockMaterial1, boolean hasCell1, - boolean haveBucket1, boolean flammable1, boolean noBlock1) { - noBlock = noBlock1; - fluidName = fluidName1; - fluidRegistryName = fluidRegistryName1; - textureName = textureName1; - temperature = temperature1; - density = density1; - cellName = "itemCell" + fluidName; - haveBucket = haveBucket1; - flammable = flammable1; - isGaseous = density1 < maxGaseousStateVapoursDensity; - blockMaterial = blockMaterial1; - boilingPoint = boilingPoint1; - meltingPoint = meltingPoint1; - hasCell = hasCell1; - damage = celldamage; - } - public String fluidName; public String fluidRegistryName; public String cellName; @@ -303,7 +283,6 @@ public class IHLFluid extends Fluid { float density; boolean isGaseous; boolean flammable = false; - boolean noBlock = true; boolean haveBucket; Material blockMaterial = Material.water; int meltingPoint; -- cgit v1.2.3