A lot of stuff looks better now

This commit is contained in:
Modmuss50 2015-11-24 22:58:18 +00:00
parent 0bb1375823
commit d56e6752c0
14 changed files with 249 additions and 54 deletions

View file

@ -2,6 +2,8 @@ package techreborn.blocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -9,11 +11,14 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IBlockTextureProvider;
import reborncore.common.BaseBlock;
import reborncore.common.util.OreDrop; import reborncore.common.util.OreDrop;
import reborncore.common.util.OreDropSet; import reborncore.common.util.OreDropSet;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
@ -26,7 +31,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockOre extends Block { public class BlockOre extends BaseBlock implements IBlockTextureProvider {
public static ItemStack getOreByName(String name, int count) { public static ItemStack getOreByName(String name, int count) {
int index = -1; int index = -1;
@ -48,12 +53,14 @@ public class BlockOre extends Block {
"Sphalerite", "Tungston", "Sheldonite", "Peridot", "Sodalite", "Sphalerite", "Tungston", "Sheldonite", "Peridot", "Sodalite",
"Tetrahedrite", "Cassiterite", "Lead", "Silver"}; "Tetrahedrite", "Cassiterite", "Lead", "Silver"};
public PropertyInteger METADATA;
public BlockOre(Material material) { public BlockOre(Material material) {
super(material); super(material);
setUnlocalizedName("techreborn.ore"); setUnlocalizedName("techreborn.ore");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2.0f); setHardness(2.0f);
this.setDefaultState(this.blockState.getBaseState().withProperty(METADATA, 0));
} }
@ -127,22 +134,46 @@ public class BlockOre extends Block {
} }
} }
// @Override
// public int damageDropped(int metaData) {
// if (metaData == 2) {
// return 0;
// } else if (metaData == 3) {
// return 1;
// } else if (metaData == 5) {
// return 60;
// }
// return metaData;
// }
@Override @Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) {
return super.getPickBlock(target, world, pos, player); return super.getPickBlock(target, world, pos, player);
} }
@Override
public int damageDropped(IBlockState state) {
int meta = getMetaFromState(state);
if (meta == 2) {
return 0;
} else if (meta == 3) {
return 1;
} else if (meta == 5) {
return 60;
}
return meta;
}
@Override
public String getTextureName(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/ore/ore" + types[getMetaFromState(blockState)];
}
@Override
public int amoutOfVariants() {
return types.length;
}
@Override
public IBlockState getStateFromMeta(int meta) {
return this.getDefaultState().withProperty(METADATA, meta);
}
@Override
public int getMetaFromState(IBlockState state) {
return (Integer) state.getValue(METADATA);
}
protected BlockState createBlockState() {
METADATA = PropertyInteger.create("Type", 0, types.length);
return new BlockState(this, METADATA);
}
} }

View file

@ -2,19 +2,24 @@ package techreborn.blocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IBlockTextureProvider;
import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockStorage extends Block { public class BlockStorage extends BaseBlock implements IBlockTextureProvider {
public static ItemStack getStorageBlockByName(String name, int count) { public static ItemStack getStorageBlockByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
@ -34,12 +39,15 @@ public class BlockStorage extends Block {
"electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "osmium", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "osmium",
"iridium"}; "iridium"};
public PropertyInteger METADATA;
public BlockStorage(Material material) { public BlockStorage(Material material) {
super(material); super(material);
setUnlocalizedName("techreborn.storage"); setUnlocalizedName("techreborn.storage");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2f); setHardness(2f);
this.setDefaultState(this.blockState.getBaseState().withProperty(METADATA, 0));
} }
@Override @Override
@ -57,6 +65,31 @@ public class BlockStorage extends Block {
@Override @Override
public int damageDropped(IBlockState state) { public int damageDropped(IBlockState state) {
return super.damageDropped(state); return getMetaFromState(state);
}
@Override
public String getTextureName(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/storage/" + types[getMetaFromState(blockState)] + "_block";
}
@Override
public int amoutOfVariants() {
return types.length;
}
@Override
public IBlockState getStateFromMeta(int meta) {
return this.getDefaultState().withProperty(METADATA, meta);
}
@Override
public int getMetaFromState(IBlockState state) {
return (Integer) state.getValue(METADATA);
}
protected BlockState createBlockState() {
METADATA = PropertyInteger.create("Type", 0, types.length);
return new BlockState(this, METADATA);
} }
} }

View file

@ -2,12 +2,17 @@ package techreborn.blocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.IBlockTextureProvider;
import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
@ -15,7 +20,7 @@ import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockStorage2 extends Block { public class BlockStorage2 extends BaseBlock implements IBlockTextureProvider {
public static ItemStack getStorageBlockByName(String name, int count) { public static ItemStack getStorageBlockByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
@ -35,8 +40,12 @@ public class BlockStorage2 extends Block {
setUnlocalizedName("techreborn.storage2"); setUnlocalizedName("techreborn.storage2");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2f); setHardness(2f);
this.setDefaultState(this.blockState.getBaseState().withProperty(METADATA, 0));
} }
public PropertyInteger METADATA;
@Override @Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) { public Item getItemDropped(IBlockState state, Random rand, int fortune) {
@ -53,6 +62,32 @@ public class BlockStorage2 extends Block {
@Override @Override
public int damageDropped(IBlockState state) { public int damageDropped(IBlockState state) {
return super.damageDropped(state); //TODO fix for 1.8 return getMetaFromState(state);
}
@Override
public String getTextureName(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/storage/" + types[getMetaFromState(blockState)] + "_block";
}
@Override
public int amoutOfVariants() {
return types.length;
}
@Override
public IBlockState getStateFromMeta(int meta) {
return this.getDefaultState().withProperty(METADATA, meta);
}
@Override
public int getMetaFromState(IBlockState state) {
return (Integer) state.getValue(METADATA);
}
protected BlockState createBlockState() {
METADATA = PropertyInteger.create("Type", 0, types.length);
return new BlockState(this, METADATA);
} }
} }

View file

@ -5,11 +5,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class ItemCrushedOre extends Item { public class ItemCrushedOre extends ItemMetaBase {
public static ItemStack getCrushedOreByName(String name, int count) { public static ItemStack getCrushedOreByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) { if (types[i].equalsIgnoreCase(name)) {
@ -54,4 +55,14 @@ public class ItemCrushedOre extends Item {
} }
} }
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/crushedOre/crushed" + types[damage] + "Ore";
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -6,11 +6,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class ItemDusts extends ItemTR { public class ItemDusts extends ItemMetaBase {
public static ItemStack getDustByName(String name, int count) { public static ItemStack getDustByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) { if (types[i].equalsIgnoreCase(name)) {
@ -78,4 +79,14 @@ public class ItemDusts extends ItemTR {
} }
} }
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/dust/" + types[damage] + "Dust";
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -5,11 +5,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class ItemDustsSmall extends ItemTR { public class ItemDustsSmall extends ItemMetaBase {
public static ItemStack getSmallDustByName(String name, int count) { public static ItemStack getSmallDustByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
@ -68,4 +69,14 @@ public class ItemDustsSmall extends ItemTR {
} }
} }
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/smallDust/small" + types[damage] + "Dust";
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -5,11 +5,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class ItemGems extends Item { public class ItemGems extends ItemMetaBase {
public static ItemStack getGemByName(String name, int count) { public static ItemStack getGemByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
@ -55,4 +56,14 @@ public class ItemGems extends Item {
} }
} }
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/gem/" + types[damage];
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -5,11 +5,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class ItemIngots extends Item { public class ItemIngots extends ItemMetaBase {
public static ItemStack getIngotByName(String name, int count) { public static ItemStack getIngotByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) { if (types[i].equalsIgnoreCase(name)) {
@ -56,4 +57,14 @@ public class ItemIngots extends Item {
} }
} }
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/ingot/" + types[damage] + "Ingot";
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -5,11 +5,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class ItemNuggets extends Item { public class ItemNuggets extends ItemMetaBase {
public static ItemStack getNuggetByName(String name, int count) { public static ItemStack getNuggetByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
@ -56,4 +57,14 @@ public class ItemNuggets extends Item {
} }
} }
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/nuggets/" + types[damage] + "Nugget";
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -9,11 +9,12 @@ import techreborn.Core;
import techreborn.client.GuiHandler; import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class ItemParts extends Item { public class ItemParts extends ItemMetaBase {
public static ItemStack getPartByName(String name, int count) { public static ItemStack getPartByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) { if (types[i].equalsIgnoreCase(name)) {
@ -75,5 +76,13 @@ public class ItemParts extends Item {
} }
return itemStack; return itemStack;
} }
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/part/" + types[damage];
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -5,11 +5,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class ItemPlates extends ItemTR { public class ItemPlates extends ItemMetaBase {
public static ItemStack getPlateByName(String name, int count) { public static ItemStack getPlateByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
@ -61,4 +62,14 @@ public class ItemPlates extends ItemTR {
} }
} }
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/plate/" + types[damage] + "Plate";
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -5,11 +5,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import java.util.List; import java.util.List;
public class ItemPurifiedCrushedOre extends Item { public class ItemPurifiedCrushedOre extends ItemMetaBase {
public static ItemStack getPurifiedCrushedOreByName(String name, int count) { public static ItemStack getPurifiedCrushedOreByName(String name, int count) {
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
@ -55,4 +56,14 @@ public class ItemPurifiedCrushedOre extends Item {
} }
} }
@Override
public String getTextureName(int damage) {
return ModInfo.MOD_ID + ":items/purifiedCrushedOre/purifiedCrushed" + types[damage] + "Ore";
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -1,10 +1,10 @@
package techreborn.items; package techreborn.items;
import net.minecraft.item.Item;
import reborncore.api.TextureRegistry; import reborncore.api.TextureRegistry;
import reborncore.jsonDestroyers.item.BaseItem;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
public class ItemTR extends BaseItem { public class ItemTR extends Item {
public ItemTR() { public ItemTR() {
setNoRepair(); setNoRepair();

View file

@ -7,6 +7,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable;
import net.minecraftforge.fml.common.IWorldGenerator; import net.minecraftforge.fml.common.IWorldGenerator;
import techreborn.Core; import techreborn.Core;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;
import java.util.Random; import java.util.Random;
@ -32,27 +33,27 @@ public class TROreGen implements IWorldGenerator {
public TROreGen() { public TROreGen() {
//TODO meta fix //TODO meta fix
// // World // World
// oreGalena = new WorldGenMinable(ModBlocks.ore, 0, ConfigTechReborn.GalenaOreRare, Blocks.stone); oreGalena = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(0), ConfigTechReborn.GalenaOreRare);
// oreIridium = new WorldGenMinable(ModBlocks.ore, 1, ConfigTechReborn.IridiumOreRare, Blocks.stone); oreIridium = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(1), ConfigTechReborn.IridiumOreRare);
// oreRuby = new WorldGenMinable(ModBlocks.ore, 2, ConfigTechReborn.RubyOreRare, Blocks.stone); oreRuby = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(2), ConfigTechReborn.RubyOreRare);
// oreSapphire = new WorldGenMinable(ModBlocks.ore, 3, ConfigTechReborn.SapphireOreRare, Blocks.stone); oreSapphire = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(3), ConfigTechReborn.SapphireOreRare);
// oreBauxite = new WorldGenMinable(ModBlocks.ore, 4, ConfigTechReborn.BauxiteOreRare, Blocks.stone); oreBauxite = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(4), ConfigTechReborn.BauxiteOreRare);
// oreTetrahedrite = new WorldGenMinable(ModBlocks.ore, 12, ConfigTechReborn.TetrahedriteOreRare, Blocks.stone); oreTetrahedrite = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(12), ConfigTechReborn.TetrahedriteOreRare);
// oreCassiterite = new WorldGenMinable(ModBlocks.ore, 13, ConfigTechReborn.CassiteriteOreRare, Blocks.stone); oreCassiterite = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(13), ConfigTechReborn.CassiteriteOreRare);
// oreLead = new WorldGenMinable(ModBlocks.ore, 14, ConfigTechReborn.LeadOreRare, Blocks.stone); oreLead = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(14), ConfigTechReborn.LeadOreRare);
// oreSilver = new WorldGenMinable(ModBlocks.ore, 15, ConfigTechReborn.SilverOreRare, Blocks.stone); oreSilver = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(15), ConfigTechReborn.SilverOreRare);
//
// // Nether // Nether
// orePyrite = new WorldGenMinable(ModBlocks.ore, 5, ConfigTechReborn.PyriteOreRare, Blocks.netherrack); orePyrite = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(5), ConfigTechReborn.PyriteOreRare);
// oreCinnabar = new WorldGenMinable(ModBlocks.ore, 6, ConfigTechReborn.CinnabarOreRare, Blocks.netherrack); oreCinnabar = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(6), ConfigTechReborn.CinnabarOreRare);
// oreSphalerite = new WorldGenMinable(ModBlocks.ore, 7, ConfigTechReborn.SphaleriteOreRare, Blocks.netherrack); oreSphalerite = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(7), ConfigTechReborn.SphaleriteOreRare);
//
// // End // End
// oreTungston = new WorldGenMinable(ModBlocks.ore, 8, ConfigTechReborn.TungstenOreRare, Blocks.end_stone); oreTungston = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(8), ConfigTechReborn.TungstenOreRare);
// oreSheldonite = new WorldGenMinable(ModBlocks.ore, 9, ConfigTechReborn.SheldoniteOreRare, Blocks.end_stone); oreSheldonite = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(9), ConfigTechReborn.SheldoniteOreRare);
// orePeridot = new WorldGenMinable(ModBlocks.ore, 10, ConfigTechReborn.PeridotOreRare, Blocks.end_stone); orePeridot = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(10), ConfigTechReborn.PeridotOreRare);
// oreSodalite = new WorldGenMinable(ModBlocks.ore, 11, ConfigTechReborn.SodaliteOreRare, Blocks.end_stone); oreSodalite = new WorldGenMinable(ModBlocks.ore.getStateFromMeta(11), ConfigTechReborn.SodaliteOreRare);
Core.logHelper.info("WorldGen Loaded"); Core.logHelper.info("WorldGen Loaded");
} }
@ -68,9 +69,7 @@ public class TROreGen implements IWorldGenerator {
@Override @Override
public void generate(Random random, int xChunk, int zChunk, World world, public void generate(Random random, int xChunk, int zChunk, World world,
IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { IChunkProvider chunkGenerator, IChunkProvider chunkProvider) {
if(true == true){
return; //TODO meta fix
}
if (world.provider.isSurfaceWorld()) { if (world.provider.isSurfaceWorld()) {
generateUndergroundOres(random, xChunk * 16, zChunk * 16, world); generateUndergroundOres(random, xChunk * 16, zChunk * 16, world);
} else if (world.provider.getDimensionId() == 0) { } else if (world.provider.getDimensionId() == 0) {