diff --git a/src/main/java/StevenDimDoors/experimental/LiquidCorium.java b/src/main/java/StevenDimDoors/experimental/LiquidCorium.java deleted file mode 100644 index 955765b..0000000 --- a/src/main/java/StevenDimDoors/experimental/LiquidCorium.java +++ /dev/null @@ -1,13 +0,0 @@ -package StevenDimDoors.experimental; - -import net.minecraftforge.fluids.Fluid; - -public class LiquidCorium extends Fluid -{ - - public LiquidCorium(String fluidName) - { - super(fluidName); - } - -} diff --git a/src/main/java/StevenDimDoors/experimental/LiquidCoriumBlock.java b/src/main/java/StevenDimDoors/experimental/LiquidCoriumBlock.java deleted file mode 100644 index 4ea1c12..0000000 --- a/src/main/java/StevenDimDoors/experimental/LiquidCoriumBlock.java +++ /dev/null @@ -1,106 +0,0 @@ -package StevenDimDoors.experimental; - -import java.util.Random; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import StevenDimDoors.mod_pocketDim.Point3D; -import StevenDimDoors.mod_pocketDim.mod_pocketDim; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fluids.BlockFluidBase; -import net.minecraftforge.fluids.BlockFluidFinite; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - -public class LiquidCoriumBlock extends BlockFluidFinite -{ - private Icon iconFlowing; - private Icon iconStill; - - public static Point3D[] spreadPoints= new Point3D[4]; - public LiquidCoriumBlock(int id, Fluid fluid, Material material) - { - super(id, fluid, material); - this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab); - } - - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) - { - par1World.setBlock(par2, par3, par4, this.blockID,15,2); - } - - @Override - public void updateTick(World world, int x, int y, int z, Random rand) - { - boolean didChange=false; - int fluid = this.getQuantaValue(world, x, y, z); - int blockBeneath = world.getBlockId(x, y-1,z); - - if(!(blockBeneath==0||blockBeneath==this.blockID)) - { - for(int xCount=-1;xCount<2;xCount++) - { - for(int yCount=-1;yCount<1;yCount++) - { - for(int zCount=-1;zCount<2;zCount++) - { - int id= world.getBlockId(x+xCount, y+yCount, z+zCount); - if(!(id ==0||id==this.blockID||id==Block.bedrock.blockID)&&!(Math.abs(zCount)+Math.abs(yCount)+Math.abs(xCount)>1)) - { - Block block =Block.blocksList[id]; - if(block.getUnlocalizedName().contains("ore")) - { - world.setBlock(x+xCount, y+yCount, z+zCount,this.blockID,6,2); - } - if(fluid>block.blockHardness*2&&yCount==0&&rand.nextInt(3)==0) - { - didChange=true;; - world.setBlock(x+xCount, y+yCount, z+zCount,0); - } - else if(fluid>block.blockHardness*2+1&&yCount==-1&&!didChange&&rand.nextBoolean()) - { - world.setBlock(x+xCount, y+yCount, z+zCount, 0); - } - - - } - } - } - } - } - - if((fluid==1)&&blockBeneath!=this.blockID&&blockBeneath!=Block.bedrock.blockID) - { - world.setBlockToAir(x, y, z); - world.setBlock(x, y-1, z,Block.bedrock.blockID); - } - super.updateTick(world, x, y, z, rand); - - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IconRegister ir) - { - - iconStill = ir.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_still"); - iconFlowing = ir.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_flowing"); - } - @Override - public Icon getIcon(int side, int meta) - { - return side <= 1 ? iconStill : iconFlowing; - } - - -} diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/DDProperties.java b/src/main/java/StevenDimDoors/mod_pocketDim/DDProperties.java index 5c9e841..2dce852 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/DDProperties.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/DDProperties.java @@ -21,7 +21,6 @@ public class DDProperties public final int TransientDoorID; public final int FabricBlockID; public final int RiftBlockID; - public final int CoriumBlockID; /** * World Generation Block IDs @@ -182,8 +181,6 @@ public class DDProperties GoldenDoorID = config.getBlock("Gold Door Block ID", 1980).getInt(); GoldenDimensionalDoorID = config.getBlock("Gold Dim Door Block ID", 1981).getInt(); - CoriumBlockID = config.getBlock("Corium Block ID", 900).getInt(); - WarpDoorItemID = config.getItem("Warp Door Item ID", 5670).getInt(); RiftRemoverItemID = config.getItem("Rift Remover Item ID", 5671).getInt(); StableFabricItemID = config.getItem("Stable Fabric Item ID", 5672).getInt(); diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 3c61aa1..de2bd61 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -1,7 +1,21 @@ package StevenDimDoors.mod_pocketDim; -import StevenDimDoors.experimental.LiquidCorium; -import StevenDimDoors.experimental.LiquidCoriumBlock; +import java.io.File; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityEggInfo; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatMessageComponent; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.ForgeChunkManager; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.Fluid; import StevenDimDoors.mod_pocketDim.blocks.BlockDimWall; import StevenDimDoors.mod_pocketDim.blocks.BlockDimWallPerm; import StevenDimDoors.mod_pocketDim.blocks.BlockDoorGold; @@ -36,10 +50,10 @@ import StevenDimDoors.mod_pocketDim.items.ItemWarpDoor; import StevenDimDoors.mod_pocketDim.items.ItemWorldThread; import StevenDimDoors.mod_pocketDim.items.itemRiftRemover; import StevenDimDoors.mod_pocketDim.ticking.CommonTickHandler; +import StevenDimDoors.mod_pocketDim.ticking.CustomLimboPopulator; import StevenDimDoors.mod_pocketDim.ticking.FastRiftRegenerator; import StevenDimDoors.mod_pocketDim.ticking.LimboDecay; import StevenDimDoors.mod_pocketDim.ticking.MobMonolith; -import StevenDimDoors.mod_pocketDim.ticking.CustomLimboPopulator; import StevenDimDoors.mod_pocketDim.ticking.RiftRegenerator; import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoor; import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoorGold; @@ -52,8 +66,6 @@ import StevenDimDoors.mod_pocketDim.world.LimboProvider; import StevenDimDoors.mod_pocketDim.world.PocketProvider; import StevenDimDoors.mod_pocketDimClient.ClientPacketHandler; import StevenDimDoors.mod_pocketDimClient.ClientTickHandler; - -import cpw.mods.fml.common.IPlayerTracker; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -71,26 +83,6 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; -import java.io.File; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityEggInfo; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.EnumToolMaterial; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatMessageComponent; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; - @Mod(modid = mod_pocketDim.modid, name = "Dimensional Doors", version = mod_pocketDim.version) @NetworkMod(clientSideRequired = true, serverSideRequired = false, connectionHandler=ConnectionHandler.class, @@ -146,9 +138,6 @@ public class mod_pocketDim public static GatewayGenerator gatewayGenerator; public static PlayerTracker tracker; - public static Block coriumBlock; - public static Fluid coriumFluid; - public static CreativeTabs dimDoorsCreativeTab = new CreativeTabs("dimDoorsCreativeTab") { @Override @@ -293,14 +282,6 @@ public class mod_pocketDim DungeonHelper.initialize(); this.gatewayGenerator.initGateways(); - /** - coriumFluid = new LiquidCorium("Corium").setDensity(1000).setTemperature(3473).setDensity(9400).setLuminosity(6).setRarity(EnumRarity.rare); - coriumBlock = new LiquidCoriumBlock(properties.CoriumBlockID, coriumFluid, Material.lava).setQuantaPerBlock(16).setTickRate(20).setTickRandomly(true).setUnlocalizedName("Corium"); - FluidRegistry.registerFluid(coriumFluid); - GameRegistry.registerBlock(coriumBlock,"Corium"); - LanguageRegistry.addName(coriumBlock, "Corium"); - **/ - // Register loot chests DDLoot.registerInfo(properties); proxy.loadTextures();