From 2db8e30b1d2151fdde5d08a6c06aef55f0c397d2 Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Fri, 27 Jan 2017 11:32:28 +0300 Subject: License, readme and stuff --- ihl/worldgen/IHLWorldGenerator.java | 12 ++++-------- ihl/worldgen/WorldGenMinableMeta.java | 6 ++---- ihl/worldgen/ores/BlockOre.java | 4 ++-- ihl/worldgen/ores/DebugScannerContainer.java | 2 +- ihl/worldgen/ores/DebugScannerGui.java | 2 -- ihl/worldgen/ores/DebugScannerTileEntity.java | 8 ++++---- ihl/worldgen/ores/IHLFluid.java | 28 +++++++++++++++++---------- 7 files changed, 31 insertions(+), 31 deletions(-) (limited to 'ihl/worldgen') diff --git a/ihl/worldgen/IHLWorldGenerator.java b/ihl/worldgen/IHLWorldGenerator.java index 71478b3..7a5c83d 100644 --- a/ihl/worldgen/IHLWorldGenerator.java +++ b/ihl/worldgen/IHLWorldGenerator.java @@ -36,9 +36,9 @@ public class IHLWorldGenerator implements IWorldGenerator { saltwaterGenerator, bischofiteGenerator; private WorldGenMinableMeta currentGenerator; - protected final Map> oreCoordinatesToChunkCoordinates = new HashMap(); - protected final Map blockToOreCoordinates = new HashMap(); - public final Set precalculatedChunkChache = new HashSet(); + protected final Map> oreCoordinatesToChunkCoordinates = new HashMap>(); + protected final Map blockToOreCoordinates = new HashMap(); + public final Set precalculatedChunkChache = new HashSet(); public static IHLWorldGenerator instance; @@ -67,7 +67,6 @@ public class IHLWorldGenerator implements IWorldGenerator { @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - int x1 = 0,y1 = 0,z1 = 0; for(int ix=-16+chunkX;ix<=16+chunkX;ix++) { for(int iz=-16+chunkZ;iz<=16+chunkZ;iz++) @@ -104,10 +103,7 @@ public class IHLWorldGenerator implements IWorldGenerator { int y0 = oreCoordinate[1]; int z0 = oreCoordinate[2]; long oreCoordinatesKey = (x0<<30)+(y0<<15)+z0; - if(this.blockToOreCoordinates.get(oreCoordinatesKey).generate(world, random, x0, y0, z0)) - { - x1=x0;y1=y0;z1=z0; - } + this.blockToOreCoordinates.get(oreCoordinatesKey).generate(world, random, x0, y0, z0); } } } diff --git a/ihl/worldgen/WorldGenMinableMeta.java b/ihl/worldgen/WorldGenMinableMeta.java index 3c5f094..f80edba 100644 --- a/ihl/worldgen/WorldGenMinableMeta.java +++ b/ihl/worldgen/WorldGenMinableMeta.java @@ -16,7 +16,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class WorldGenMinableMeta extends WorldGenerator { protected final Block mineableBlock; - protected final Set replaceableBlocks=new HashSet(); + protected final Set replaceableBlocks=new HashSet(); protected final Block liquidBedBlock; protected final int mineableBlockMeta; protected final int numberOfBlocks; @@ -54,7 +54,6 @@ public class WorldGenMinableMeta extends WorldGenerator { @Override public boolean generate(World world, Random random, int x, int y, int z) { - boolean success=false; int chunkX = x>>4; int chunkZ = z>>4; int xyz[] = {0,0,1,0,0,-1,0,0}; @@ -68,7 +67,6 @@ public class WorldGenMinableMeta extends WorldGenerator { if(replaceableBlocks.contains(world.getBlock(x0, y0, z0))) { world.setBlock(x0, y0, z0, mineableBlock, mineableBlockMeta, 2); - success=true; } } } @@ -119,7 +117,7 @@ public class WorldGenMinableMeta extends WorldGenerator { } else { - Set oreCoordinatesS = new HashSet(); + Set oreCoordinatesS = new HashSet(); oreCoordinatesS.add(oreCoordinates); this.oreCoordinatesToChunkCoordinates.put(chunkKey, oreCoordinatesS); } diff --git a/ihl/worldgen/ores/BlockOre.java b/ihl/worldgen/ores/BlockOre.java index a88f3b7..4b0c7a7 100644 --- a/ihl/worldgen/ores/BlockOre.java +++ b/ihl/worldgen/ores/BlockOre.java @@ -24,8 +24,8 @@ import net.minecraftforge.oredict.OreDictionary; public class BlockOre extends Block { private Type type; - private static List instances = new ArrayList(); - private static Map iconMap = new HashMap(); + private static List instances = new ArrayList(); + private static Map iconMap = new HashMap(); public BlockOre(Type type1) { diff --git a/ihl/worldgen/ores/DebugScannerContainer.java b/ihl/worldgen/ores/DebugScannerContainer.java index 52d4990..1413ddb 100644 --- a/ihl/worldgen/ores/DebugScannerContainer.java +++ b/ihl/worldgen/ores/DebugScannerContainer.java @@ -5,7 +5,7 @@ import ic2.core.slot.SlotInvSlot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; -public class DebugScannerContainer extends ContainerBase { +public class DebugScannerContainer extends ContainerBase { protected DebugScannerTileEntity tileEntity; public int lastFluidAmount = -1; diff --git a/ihl/worldgen/ores/DebugScannerGui.java b/ihl/worldgen/ores/DebugScannerGui.java index 9d379fe..2d79300 100644 --- a/ihl/worldgen/ores/DebugScannerGui.java +++ b/ihl/worldgen/ores/DebugScannerGui.java @@ -24,8 +24,6 @@ public class DebugScannerGui extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - int xOffset = (this.width - xSize) / 2; - int yOffset = (this.height - ySize) / 2; List ode = container.tileEntity.oreDictionaryEntries; int verticalOffset = 31; for(int i=0;i oreDictionaryEntries = new ArrayList(); + public List oreDictionaryEntries = new ArrayList(); public DebugScannerTileEntity() { @@ -54,7 +54,7 @@ public class DebugScannerTileEntity extends TileEntityInventory implements IHasG if(this.itemsSlot.get().stackTagCompound!=null) { this.oreDictionaryEntries.add("NBT keys:"); - Iterator iterator = this.itemsSlot.get().stackTagCompound.func_150296_c().iterator(); + Iterator iterator = this.itemsSlot.get().stackTagCompound.func_150296_c().iterator(); while(iterator.hasNext()) { String entry = (String) iterator.next(); @@ -65,7 +65,7 @@ public class DebugScannerTileEntity extends TileEntityInventory implements IHasG if(ct!=null && ct.func_150296_c()!=null && !ct.func_150296_c().isEmpty()) { this.oreDictionaryEntries.add(" -NBT compound tag subkeys:"); - Iterator stIterator = ct.func_150296_c().iterator(); + Iterator stIterator = ct.func_150296_c().iterator(); while(stIterator.hasNext()) { String entry2 = (String) stIterator.next(); @@ -138,7 +138,7 @@ public class DebugScannerTileEntity extends TileEntityInventory implements IHasG } @Override - public ContainerBase getGuiContainer(EntityPlayer entityPlayer) + public ContainerBase getGuiContainer(EntityPlayer entityPlayer) { return new DebugScannerContainer(entityPlayer, this); } diff --git a/ihl/worldgen/ores/IHLFluid.java b/ihl/worldgen/ores/IHLFluid.java index 804a52c..beab11b 100644 --- a/ihl/worldgen/ores/IHLFluid.java +++ b/ihl/worldgen/ores/IHLFluid.java @@ -16,7 +16,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; import net.minecraft.item.ItemBucket; @@ -29,11 +28,11 @@ import net.minecraftforge.fluids.FluidStack; public class IHLFluid extends Fluid { private IHLFluidType type; - private static List fluidInstances = new ArrayList(); - private static Map localFluidRegistry = new HashMap(); - private static Map realDensityMap = new HashMap(); - private static Map condensationMap = new HashMap(); - private static Map> solutionMap = new HashMap(); + private static List fluidInstances = new ArrayList(); + private static Map localFluidRegistry = new HashMap(); + private static Map realDensityMap = new HashMap(); + private static Map condensationMap = new HashMap(); + private static Map> solutionMap = new HashMap>(); public static final int maxGaseousStateVapoursDensity = 40; public IHLFluid(IHLFluidType type1) { @@ -42,8 +41,8 @@ public class IHLFluid extends Fluid this.setTemperature(type.temperature); this.setDensity(Math.round(type.density)); realDensityMap.put(type1.fluidRegistryName, type.density); - this.setGaseous(type.isGaseous); this.setUnlocalizedName(type.fluidRegistryName.replaceFirst("fluid", "")); + this.setGaseous(type.isGaseous); Fluid instance = this; if (!FluidRegistry.registerFluid(instance)) { @@ -53,6 +52,7 @@ public class IHLFluid extends Fluid { instance.setBlock(new IHLFluidBlock(instance, type.blockMaterial, type.textureName, "fluid"+type.fluidName.replaceFirst("fluid", "")).setFlammable(type.flammable).setBlockName("block"+type.fluidName).setCreativeTab(IHLCreativeTab.tab)); } + instance.setGaseous(type.isGaseous); if(type.haveBucket) { Item bucket = new ItemBucket(block).setTextureName(IHLModInfo.MODID+":bucket_"+type.fluidName).setUnlocalizedName("bucket_"+type.fluidName).setCreativeTab(IHLCreativeTab.tab); @@ -151,6 +151,11 @@ public class IHLFluid extends Fluid public enum IHLFluidType { //Methane("Methane","fluidAcetylene",10047, 293, 249, 373, 1150, "methane", Material.water, false, false, false, false), + Ammonia("Ammonia", 10051, 273, 273-78, 273-33, 0.772F, "ammonia", new MaterialLiquid(MapColor.airColor), false, false, true), + Acetaldehyde("Acetaldehyde",10050, 273, 273-123, 294, 784, "acetaldehyde", Material.water, false, false, false), + Formaldehyde("Formaldehyde",10049, 254, 273-118, 254, 815, "formaldehyde", Material.water, false, false, false), + TarWater("TarWater",10048, 293, 176, 338, 1032, "tarwater", Material.water, false, false, false), + Methanol("Methanol",10047, 293, 176, 338, 792, "methanol", Material.water, true, false, false), LithiumChloride("LithiumChlorideDissolvedInWater",10046, 293, 249, 373, 1530, "solution.lithiumchloride", Material.water, false, false, false), CalciumChloride("CalciumChlorideDissolvedInWater",10045, 293, 249, 373, 1630, "solution.calciumchloride", Material.water, false, false, false), ZeolitePulp("ZeolitePulp","fluidPulpZeolite",10044, 293, 249, 373, 1150, "pulp.sodiumzeolite", Material.water, false, false, false), @@ -165,11 +170,11 @@ 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", 10032, 293, 284, 773, 850, "oil", Material.water, true, false, true), + Oil("Oil","fluidOil", 10032, 293, 284, 773, 850f, "oil", Material.water, true, false, true, false), 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", 10028, 293, 253, 373, 1360), + SaltWater("SaltWater","fluidSaltWater", 10028, 293, 253, 373, 1360f,"saltwater", Material.water, true, false, 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), Turpentine("Turpentine",10025, 293, 217, 453, 1470, "turpentine", Material.water, true, false, true), @@ -192,7 +197,9 @@ 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), 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), 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), MoltenMagnesium("MoltenMagnesium","fluidMolten",10006, 923, 923, 1623, 1584, "molten.magnesium", Material.lava, false, false, false), @@ -295,7 +302,7 @@ public class IHLFluid extends Fluid float density; boolean isGaseous; boolean flammable=false; - boolean noBlock=false; + boolean noBlock=true; boolean haveBucket; Material blockMaterial = Material.water; int meltingPoint; @@ -306,6 +313,7 @@ public class IHLFluid extends Fluid public final int damage; } + @SuppressWarnings("deprecation") public static FluidStack getCondensationResult(FluidStack condensatedGas) { String fluidname = condensationMap.get(condensatedGas.getFluid().getName()); -- cgit v1.2.3