Started on village material replacement, cleaned up imports

This commit is contained in:
Matt Caughey 2013-09-14 19:01:07 -04:00
parent 28cde2321e
commit e4aae07486
13 changed files with 122 additions and 11 deletions

View file

@ -1,7 +1,6 @@
package thaumcraft.api.aspects; package thaumcraft.api.aspects;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
/** /**
* *

View file

@ -6,7 +6,6 @@ import java.util.HashMap;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;

View file

@ -24,6 +24,7 @@ import biomesoplenty.handlers.MovementHandler;
import biomesoplenty.handlers.SoundHandler; import biomesoplenty.handlers.SoundHandler;
import biomesoplenty.handlers.TickHandlerClient; import biomesoplenty.handlers.TickHandlerClient;
import biomesoplenty.handlers.TickHandlerServer; import biomesoplenty.handlers.TickHandlerServer;
import biomesoplenty.handlers.VillageMaterialEventHandler;
import biomesoplenty.helpers.AchievementHelper; import biomesoplenty.helpers.AchievementHelper;
import biomesoplenty.helpers.CreativeTabsBOP; import biomesoplenty.helpers.CreativeTabsBOP;
import biomesoplenty.helpers.Localizations; import biomesoplenty.helpers.Localizations;
@ -108,6 +109,7 @@ public class BiomesOPlenty
MinecraftForge.EVENT_BUS.register(new BreakSpeedHandler()); MinecraftForge.EVENT_BUS.register(new BreakSpeedHandler());
MinecraftForge.EVENT_BUS.register(new MovementHandler()); MinecraftForge.EVENT_BUS.register(new MovementHandler());
MinecraftForge.EVENT_BUS.register(new FlipperMovementEventHandler()); MinecraftForge.EVENT_BUS.register(new FlipperMovementEventHandler());
MinecraftForge.EVENT_BUS.register(new VillageMaterialEventHandler());
//MinecraftForge.EVENT_BUS.register(new AxeChopHandler()); //MinecraftForge.EVENT_BUS.register(new AxeChopHandler());
proxy.registerRenderers(); proxy.registerRenderers();

View file

@ -1,12 +1,12 @@
package biomesoplenty.biomes.nether; package biomesoplenty.biomes.nether;
import biomesoplenty.biomes.BiomeDecoratorBOP;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.monster.EntityMagmaCube; import net.minecraft.entity.monster.EntityMagmaCube;
import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.monster.EntityPigZombie;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import biomesoplenty.biomes.BiomeDecoratorBOP;
public class BiomeGenNetherBase extends BiomeGenBase public class BiomeGenNetherBase extends BiomeGenBase
{ {

View file

@ -1,12 +1,12 @@
package biomesoplenty.biomes.nether; package biomesoplenty.biomes.nether;
import biomesoplenty.biomes.BiomeDecoratorBOP;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.monster.EntityMagmaCube; import net.minecraft.entity.monster.EntityMagmaCube;
import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.monster.EntityPigZombie;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import biomesoplenty.biomes.BiomeDecoratorBOP;
public class BiomeGenNetherBone extends BiomeGenBase public class BiomeGenNetherBone extends BiomeGenBase
{ {

View file

@ -1,12 +1,12 @@
package biomesoplenty.biomes.nether; package biomesoplenty.biomes.nether;
import biomesoplenty.biomes.BiomeDecoratorBOP;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.monster.EntityMagmaCube; import net.minecraft.entity.monster.EntityMagmaCube;
import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.monster.EntityPigZombie;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import biomesoplenty.biomes.BiomeDecoratorBOP;
public class BiomeGenNetherDesert extends BiomeGenBase public class BiomeGenNetherDesert extends BiomeGenBase
{ {

View file

@ -10,7 +10,96 @@ import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.BiomeDictionary.Type; import net.minecraftforge.common.BiomeDictionary.Type;
import net.minecraftforge.common.BiomeManager; import net.minecraftforge.common.BiomeManager;
import biomesoplenty.api.Biomes; import biomesoplenty.api.Biomes;
import biomesoplenty.biomes.*; import biomesoplenty.biomes.BiomeGenAlps;
import biomesoplenty.biomes.BiomeGenAlpsBase;
import biomesoplenty.biomes.BiomeGenAlpsForest;
import biomesoplenty.biomes.BiomeGenArctic;
import biomesoplenty.biomes.BiomeGenAutumnHills;
import biomesoplenty.biomes.BiomeGenBadlands;
import biomesoplenty.biomes.BiomeGenBambooForest;
import biomesoplenty.biomes.BiomeGenBayou;
import biomesoplenty.biomes.BiomeGenBirchForest;
import biomesoplenty.biomes.BiomeGenBog;
import biomesoplenty.biomes.BiomeGenBorealForest;
import biomesoplenty.biomes.BiomeGenBrushland;
import biomesoplenty.biomes.BiomeGenCanyon;
import biomesoplenty.biomes.BiomeGenCanyonRavine;
import biomesoplenty.biomes.BiomeGenChaparral;
import biomesoplenty.biomes.BiomeGenCherryBlossomGrove;
import biomesoplenty.biomes.BiomeGenConiferousForest;
import biomesoplenty.biomes.BiomeGenConiferousForestSnow;
import biomesoplenty.biomes.BiomeGenCrag;
import biomesoplenty.biomes.BiomeGenDeadForest;
import biomesoplenty.biomes.BiomeGenDeadForestSnow;
import biomesoplenty.biomes.BiomeGenDeadSwamp;
import biomesoplenty.biomes.BiomeGenDeadlands;
import biomesoplenty.biomes.BiomeGenDeciduousForest;
import biomesoplenty.biomes.BiomeGenDunes;
import biomesoplenty.biomes.BiomeGenFen;
import biomesoplenty.biomes.BiomeGenField;
import biomesoplenty.biomes.BiomeGenFieldForest;
import biomesoplenty.biomes.BiomeGenFrostForest;
import biomesoplenty.biomes.BiomeGenFungiForest;
import biomesoplenty.biomes.BiomeGenGarden;
import biomesoplenty.biomes.BiomeGenGlacier;
import biomesoplenty.biomes.BiomeGenGrassland;
import biomesoplenty.biomes.BiomeGenGrove;
import biomesoplenty.biomes.BiomeGenHeathland;
import biomesoplenty.biomes.BiomeGenHighland;
import biomesoplenty.biomes.BiomeGenHotSprings;
import biomesoplenty.biomes.BiomeGenIcyHills;
import biomesoplenty.biomes.BiomeGenJadeCliffs;
import biomesoplenty.biomes.BiomeGenLushDesert;
import biomesoplenty.biomes.BiomeGenLushSwamp;
import biomesoplenty.biomes.BiomeGenMangrove;
import biomesoplenty.biomes.BiomeGenMapleWoods;
import biomesoplenty.biomes.BiomeGenMarsh;
import biomesoplenty.biomes.BiomeGenMeadow;
import biomesoplenty.biomes.BiomeGenMeadowForest;
import biomesoplenty.biomes.BiomeGenMesa;
import biomesoplenty.biomes.BiomeGenMoor;
import biomesoplenty.biomes.BiomeGenMountain;
import biomesoplenty.biomes.BiomeGenMysticGrove;
import biomesoplenty.biomes.BiomeGenOasis;
import biomesoplenty.biomes.BiomeGenOminousWoods;
import biomesoplenty.biomes.BiomeGenOminousWoodsThick;
import biomesoplenty.biomes.BiomeGenOrchard;
import biomesoplenty.biomes.BiomeGenOriginValley;
import biomesoplenty.biomes.BiomeGenOutback;
import biomesoplenty.biomes.BiomeGenOvergrownGreens;
import biomesoplenty.biomes.BiomeGenPasture;
import biomesoplenty.biomes.BiomeGenPastureMeadow;
import biomesoplenty.biomes.BiomeGenPastureThin;
import biomesoplenty.biomes.BiomeGenPolar;
import biomesoplenty.biomes.BiomeGenPrairie;
import biomesoplenty.biomes.BiomeGenQuagmire;
import biomesoplenty.biomes.BiomeGenRainforest;
import biomesoplenty.biomes.BiomeGenRedwoodForest;
import biomesoplenty.biomes.BiomeGenSacredSprings;
import biomesoplenty.biomes.BiomeGenSavanna;
import biomesoplenty.biomes.BiomeGenSavannaPlateau;
import biomesoplenty.biomes.BiomeGenScrubland;
import biomesoplenty.biomes.BiomeGenSeasonalForest;
import biomesoplenty.biomes.BiomeGenSeasonalSpruceForest;
import biomesoplenty.biomes.BiomeGenShield;
import biomesoplenty.biomes.BiomeGenShore;
import biomesoplenty.biomes.BiomeGenShrubland;
import biomesoplenty.biomes.BiomeGenShrublandForest;
import biomesoplenty.biomes.BiomeGenSilkglades;
import biomesoplenty.biomes.BiomeGenSludgepit;
import biomesoplenty.biomes.BiomeGenSpruceWoods;
import biomesoplenty.biomes.BiomeGenSteppe;
import biomesoplenty.biomes.BiomeGenTemperateRainforest;
import biomesoplenty.biomes.BiomeGenThicket;
import biomesoplenty.biomes.BiomeGenTimber;
import biomesoplenty.biomes.BiomeGenTimberThin;
import biomesoplenty.biomes.BiomeGenTropicalRainforest;
import biomesoplenty.biomes.BiomeGenTropics;
import biomesoplenty.biomes.BiomeGenTundra;
import biomesoplenty.biomes.BiomeGenVolcano;
import biomesoplenty.biomes.BiomeGenWasteland;
import biomesoplenty.biomes.BiomeGenWetland;
import biomesoplenty.biomes.BiomeGenWoodland;
import biomesoplenty.biomes.beach.BiomeGenBeachGravel; import biomesoplenty.biomes.beach.BiomeGenBeachGravel;
import biomesoplenty.biomes.beach.BiomeGenBeachOvergrown; import biomesoplenty.biomes.beach.BiomeGenBeachOvergrown;
import biomesoplenty.biomes.nether.BiomeGenNetherBase; import biomesoplenty.biomes.nether.BiomeGenNetherBase;

View file

@ -0,0 +1,21 @@
package biomesoplenty.handlers;
import net.minecraft.block.Block;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.terraingen.BiomeEvent;
import biomesoplenty.api.Biomes;
public class VillageMaterialEventHandler
{
@ForgeSubscribe
public void getVillageBlockID(BiomeEvent.GetVillageBlockID event)
{
if (event.biome == Biomes.savanna.get())
{
if (event.original == Block.cobblestone.blockID)
{
event.replacement = Block.brick.blockID;
}
}
}
}

View file

@ -1,9 +1,9 @@
package biomesoplenty.integration; package biomesoplenty.integration;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import codechicken.microblock.MicroMaterialRegistry;
import codechicken.microblock.BlockMicroMaterial;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import codechicken.microblock.BlockMicroMaterial;
import codechicken.microblock.MicroMaterialRegistry;
public class MultipartIntegration public class MultipartIntegration
{ {

View file

@ -1,8 +1,8 @@
package biomesoplenty.world.layer; package biomesoplenty.world.layer;
import net.minecraft.world.gen.layer.IntCache; import net.minecraft.world.gen.layer.IntCache;
import biomesoplenty.configuration.configfile.BOPConfigurationBiomeGen;
import biomesoplenty.api.Biomes; import biomesoplenty.api.Biomes;
import biomesoplenty.configuration.configfile.BOPConfigurationBiomeGen;
public class BiomeLayerCreate extends BiomeLayer public class BiomeLayerCreate extends BiomeLayer
{ {

View file

@ -1,6 +1,7 @@
package biomesoplenty.worldgen; package biomesoplenty.worldgen;
import java.util.Random; import java.util.Random;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;

View file

@ -3,10 +3,10 @@ package biomesoplenty.worldgen;
import java.util.Random; import java.util.Random;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import net.minecraft.block.material.Material;
public class WorldGenKelp extends WorldGenerator public class WorldGenKelp extends WorldGenerator
{ {

View file

@ -3,10 +3,10 @@ package biomesoplenty.worldgen;
import java.util.Random; import java.util.Random;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks; import biomesoplenty.api.Blocks;
import net.minecraft.block.material.Material;
public class WorldGenShortKelp extends WorldGenerator public class WorldGenShortKelp extends WorldGenerator
{ {