etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commented out some random Chunk Provider code referencing a file that doesn't exist (Unfinished?), Ripped Block and Item declarations out of mod_BiomesOPlenty.class and put them in their own seperate files (Jesus Christ did that require more effort that it's worth), made Holy Grass turn into Smoldering Grass in the nether instead of soul sand, changed Holy grass to be more effective with a pick than a shovel.

This commit is contained in:
Adubbz 2013-04-05 14:41:51 +11:00
parent 92318aa9d6
commit 54169b4e4b
218 changed files with 10489 additions and 10325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/minecraft/tdwp_ftw/biomesop/armor/ArmorAmethyst.java
View File

@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.IArmorTextureProvider;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.CommonProxy;
import tdwp_ftw.biomesop.declarations.BOPItems;
public class ArmorAmethyst extends ItemArmor implements IArmorTextureProvider
{
@ -18,10 +19,10 @@ public class ArmorAmethyst extends ItemArmor implements IArmorTextureProvider
}
public String getArmorTextureFile(ItemStack par1) {
if(par1.itemID == mod_BiomesOPlenty.helmetAmethyst.itemID||par1.itemID == mod_BiomesOPlenty.chestplateAmethyst.itemID||par1.itemID == mod_BiomesOPlenty.bootsAmethyst.itemID){
if(par1.itemID == BOPItems.helmetAmethyst.itemID||par1.itemID == BOPItems.chestplateAmethyst.itemID||par1.itemID == BOPItems.bootsAmethyst.itemID){
return CommonProxy.ARMOR_AMETHYST1_PNG;
}
if(par1.itemID == mod_BiomesOPlenty.leggingsAmethyst.itemID){
if(par1.itemID == BOPItems.leggingsAmethyst.itemID){
return CommonProxy.ARMOR_AMETHYST2_PNG;
}
return null;

5
src/minecraft/tdwp_ftw/biomesop/armor/ArmorMuddy.java
View File

@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.IArmorTextureProvider;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.CommonProxy;
import tdwp_ftw.biomesop.declarations.BOPItems;
public class ArmorMuddy extends ItemArmor implements IArmorTextureProvider
{
@ -18,10 +19,10 @@ public class ArmorMuddy extends ItemArmor implements IArmorTextureProvider
}
public String getArmorTextureFile(ItemStack par1) {
if(par1.itemID == mod_BiomesOPlenty.helmetMud.itemID||par1.itemID == mod_BiomesOPlenty.chestplateMud.itemID||par1.itemID == mod_BiomesOPlenty.bootsMud.itemID){
if(par1.itemID == BOPItems.helmetMud.itemID||par1.itemID == BOPItems.chestplateMud.itemID||par1.itemID == BOPItems.bootsMud.itemID){
return CommonProxy.ARMOR_MUD1_PNG;
}
if(par1.itemID == mod_BiomesOPlenty.leggingsMud.itemID){
if(par1.itemID == BOPItems.leggingsMud.itemID){
return CommonProxy.ARMOR_MUD2_PNG;
}
return null;

58
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeDecoratorBOP.java
View File

@ -44,7 +44,7 @@ import net.minecraftforge.event.terraingen.DecorateBiomeEvent;
import net.minecraftforge.event.terraingen.OreGenEvent;
import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType;
import net.minecraftforge.event.terraingen.TerrainGen;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenAlgae;
import tdwp_ftw.biomesop.worldgen.WorldGenAsh;
import tdwp_ftw.biomesop.worldgen.WorldGenBoulder;
@ -313,12 +313,12 @@ public class BiomeDecoratorBOP extends BiomeDecorator
super(par1BiomeGenBase);
this.sandGen = new WorldGenSand(7, Block.sand.blockID);
this.oasesGen = new WorldGenOasis(7, Block.grass.blockID);
this.mudGen = new WorldGenMud(7, mod_BiomesOPlenty.mud.blockID);
this.mudGen = new WorldGenMud(7, BOPBlocks.mud.blockID);
this.gravelShoreGen = new WorldGenGravel(7, Block.gravel.blockID);
this.gravelAsSandGen = new WorldGenSand(6, Block.gravel.blockID);
this.dirtGen = new WorldGenMinable(Block.dirt.blockID, 32);
this.gravelGen = new WorldGenMinable(Block.gravel.blockID, 32);
this.ashGen = new WorldGenAsh(mod_BiomesOPlenty.ash.blockID, 32);
this.ashGen = new WorldGenAsh(BOPBlocks.ash.blockID, 32);
this.grassMesaGen = new WorldGenMesa(Block.grass.blockID, 48);
this.sandMesaGen = new WorldGenMesa(Block.sand.blockID, 32);
this.myceliumGen = new WorldGenMycelium(Block.mycelium.blockID, 32);
@ -328,9 +328,9 @@ public class BiomeDecoratorBOP extends BiomeDecorator
this.sandInStoneGen = new WorldGenMinable(Block.sand.blockID, 32);
this.clayInStoneGen = new WorldGenMinable(Block.blockClay.blockID, 32);
this.quagmireGen = new WorldGenQuagmire(Block.grass.blockID, 48);
this.canyonGen = new WorldGenCanyon(mod_BiomesOPlenty.redRock.blockID, 48);
this.smolderingGrassGen = new WorldGenSmolderingGrass(mod_BiomesOPlenty.smolderingGrass.blockID, 32);
this.driedDirtInSandGen = new WorldGenDriedDirt(mod_BiomesOPlenty.driedDirt.blockID, 32);
this.canyonGen = new WorldGenCanyon(BOPBlocks.redRock.blockID, 48);
this.smolderingGrassGen = new WorldGenSmolderingGrass(BOPBlocks.smolderingGrass.blockID, 32);
this.driedDirtInSandGen = new WorldGenDriedDirt(BOPBlocks.driedDirt.blockID, 32);
this.coalGen = new WorldGenMinable(Block.oreCoal.blockID, 16);
this.ironGen = new WorldGenMinable(Block.oreIron.blockID, 8);
this.goldGen = new WorldGenMinable(Block.oreGold.blockID, 8);
@ -339,34 +339,34 @@ public class BiomeDecoratorBOP extends BiomeDecorator
this.lapisGen = new WorldGenMinable(Block.oreLapis.blockID, 6);
this.plantYellowGen = new WorldGenFlowers(Block.plantYellow.blockID);
this.plantRedGen = new WorldGenFlowers(Block.plantRed.blockID);
this.plantWhiteGen = new WorldGenFlowers(mod_BiomesOPlenty.whiteFlower.blockID);
this.plantBlueGen = new WorldGenFlowers(mod_BiomesOPlenty.blueFlower.blockID);
this.plantPurpleGen = new WorldGenFlowers(mod_BiomesOPlenty.purpleFlower.blockID);
this.plantPinkGen = new WorldGenFlowers(mod_BiomesOPlenty.pinkFlower.blockID);
this.plantOrangeGen = new WorldGenFlowers(mod_BiomesOPlenty.orangeFlower.blockID);
this.plantTinyGen = new WorldGenFlowers(mod_BiomesOPlenty.tinyFlower.blockID);
this.plantGlowGen = new WorldGenFlowers(mod_BiomesOPlenty.glowFlower.blockID);
this.plantDeadGen = new WorldGenFlowers(mod_BiomesOPlenty.deadGrass.blockID);
this.plantDesertGen = new WorldGenFlowers(mod_BiomesOPlenty.desertGrass.blockID);
this.thornGen = new WorldGenFlowers(mod_BiomesOPlenty.thorn.blockID);
this.bushGen = new WorldGenBush(mod_BiomesOPlenty.bush.blockID);
this.tinyCactusGen = new WorldGenFlowers(mod_BiomesOPlenty.tinyCactus.blockID);
this.deathbloomGen = new WorldGenFlowers(mod_BiomesOPlenty.deathbloom.blockID);
this.hydrangeaGen = new WorldGenFlowers(mod_BiomesOPlenty.hydrangea.blockID);
this.violetGen = new WorldGenFlowers(mod_BiomesOPlenty.violet.blockID);
this.duneGrassGen = new WorldGenFlowers(mod_BiomesOPlenty.duneGrass.blockID);
this.holyTallGrassGen = new WorldGenFlowers(mod_BiomesOPlenty.holyTallGrass.blockID);
this.desertSproutsGen = new WorldGenFlowers(mod_BiomesOPlenty.desertSprouts.blockID);
this.plantWhiteGen = new WorldGenFlowers(BOPBlocks.whiteFlower.blockID);
this.plantBlueGen = new WorldGenFlowers(BOPBlocks.blueFlower.blockID);
this.plantPurpleGen = new WorldGenFlowers(BOPBlocks.purpleFlower.blockID);
this.plantPinkGen = new WorldGenFlowers(BOPBlocks.pinkFlower.blockID);
this.plantOrangeGen = new WorldGenFlowers(BOPBlocks.orangeFlower.blockID);
this.plantTinyGen = new WorldGenFlowers(BOPBlocks.tinyFlower.blockID);
this.plantGlowGen = new WorldGenFlowers(BOPBlocks.glowFlower.blockID);
this.plantDeadGen = new WorldGenFlowers(BOPBlocks.deadGrass.blockID);
this.plantDesertGen = new WorldGenFlowers(BOPBlocks.desertGrass.blockID);
this.thornGen = new WorldGenFlowers(BOPBlocks.thorn.blockID);
this.bushGen = new WorldGenBush(BOPBlocks.bush.blockID);
this.tinyCactusGen = new WorldGenFlowers(BOPBlocks.tinyCactus.blockID);
this.deathbloomGen = new WorldGenFlowers(BOPBlocks.deathbloom.blockID);
this.hydrangeaGen = new WorldGenFlowers(BOPBlocks.hydrangea.blockID);
this.violetGen = new WorldGenFlowers(BOPBlocks.violet.blockID);
this.duneGrassGen = new WorldGenFlowers(BOPBlocks.duneGrass.blockID);
this.holyTallGrassGen = new WorldGenFlowers(BOPBlocks.holyTallGrass.blockID);
this.desertSproutsGen = new WorldGenFlowers(BOPBlocks.desertSprouts.blockID);
this.promisedWillowGen = new WorldGenPromisedWillow();
this.quicksandGen = new WorldGenQuicksand();
this.quicksand2Gen = new WorldGenQuicksand2();
this.cattailGen = new WorldGenCattail();
this.mushroomBrownGen = new WorldGenFlowers(Block.mushroomBrown.blockID);
this.mushroomRedGen = new WorldGenFlowers(Block.mushroomRed.blockID);
this.toadstoolGen = new WorldGenFlowers(mod_BiomesOPlenty.toadstool.blockID);
this.sproutGen = new WorldGenSprout(mod_BiomesOPlenty.sprout.blockID, 1);
this.highGrassGen = new WorldGenHighGrass(mod_BiomesOPlenty.highGrassBottom.blockID, 0);
this.outbackGen = new WorldGenOutback(mod_BiomesOPlenty.mediumGrass.blockID, 1);
this.toadstoolGen = new WorldGenFlowers(BOPBlocks.toadstool.blockID);
this.sproutGen = new WorldGenSprout(BOPBlocks.sprout.blockID, 1);
this.highGrassGen = new WorldGenHighGrass(BOPBlocks.highGrassBottom.blockID, 0);
this.outbackGen = new WorldGenOutback(BOPBlocks.mediumGrass.blockID, 1);
this.steppeGen = new WorldGenSteppe(Block.sand.blockID, 0);
this.carrotGen = new WorldGenCarrots(Block.tallGrass.blockID, 0);
this.potatoGen = new WorldGenPotatoes(Block.tallGrass.blockID, 0);
@ -376,7 +376,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
this.desertCactusGen = new WorldGenDesertCactus();
this.waterlilyGen = new WorldGenWaterlily();
this.algaeGen = new WorldGenAlgae();
this.pitGen = new WorldGenPit(mod_BiomesOPlenty.ash.blockID);
this.pitGen = new WorldGenPit(BOPBlocks.ash.blockID);
this.waterlilyPerChunk = 0;
this.treesPerChunk = 0;
this.flowersPerChunk = 2;

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenArctic.java
View File

@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenTaiga3;
import tdwp_ftw.biomesop.worldgen.WorldGenTaiga4;
import tdwp_ftw.biomesop.worldgen.WorldGenTaiga9;
@ -43,6 +44,6 @@ public class BiomeGenArctic extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
}

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBadlands.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.biomes;
import java.awt.Color;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.world.biome.BiomeGenBase;
@ -16,7 +17,7 @@ public class BiomeGenBadlands extends BiomeGenBase
super(par1);
this.spawnableCreatureList.clear();
this.topBlock = (byte)Block.sandStone.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.hardSand.blockID;
this.fillerBlock = (byte)BOPBlocks.hardSand.blockID;
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = -999;

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBambooForest.java
View File

@ -9,6 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenBambooTree;
public class BiomeGenBambooForest extends BiomeGenBase
@ -41,7 +42,7 @@ public class BiomeGenBambooForest extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
public void decorate(World par1World, Random par2Random, int par3, int par4)

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBirchForest.java
View File

@ -9,6 +9,7 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenSilverBirch1;
import tdwp_ftw.biomesop.worldgen.WorldGenSilverBirch2;
@ -40,7 +41,7 @@ public class BiomeGenBirchForest extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
public void decorate(World par1World, Random par2Random, int par3, int par4)

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenBog.java
View File

@ -11,6 +11,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenBog1;
import tdwp_ftw.biomesop.worldgen.WorldGenBog2;
@ -51,7 +52,7 @@ public class BiomeGenBog extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1);
return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1);
}
/**

5
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenCanyon.java
View File

@ -5,6 +5,7 @@ import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import net.minecraft.world.biome.BiomeGenBase;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenCanyonShrub;
import tdwp_ftw.biomesop.worldgen.WorldGenCanyonTree;
import net.minecraft.world.gen.feature.WorldGenerator;
@ -19,8 +20,8 @@ public class BiomeGenCanyon extends BiomeGenBase
this.spawnableCreatureList.clear();
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.topBlock = (byte)mod_BiomesOPlenty.hardDirt.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.hardDirt.blockID;
this.topBlock = (byte)BOPBlocks.hardDirt.blockID;
this.fillerBlock = (byte)BOPBlocks.hardDirt.blockID;
this.customBiomeDecorator.treesPerChunk = 10;
this.customBiomeDecorator.flowersPerChunk = -999;
this.customBiomeDecorator.tinyCactiPerChunk = 2;

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenChaparral.java
View File

@ -9,6 +9,7 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenChaparral1;
import tdwp_ftw.biomesop.worldgen.WorldGenChaparral2;
import tdwp_ftw.biomesop.worldgen.WorldGenChaparral3;
@ -43,7 +44,7 @@ public class BiomeGenChaparral extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
}
public void decorate(World par1World, Random par2Random, int par3, int par4)

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenConiferousForest.java
View File

@ -10,6 +10,7 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenFir1;
import tdwp_ftw.biomesop.worldgen.WorldGenFir2;
import tdwp_ftw.biomesop.worldgen.WorldGenFir3;
@ -46,7 +47,7 @@ public class BiomeGenConiferousForest extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1);
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1);
}
public void decorate(World par1World, Random par2Random, int par3, int par4)

5
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenCrag.java
View File

@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import net.minecraft.block.Block;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenCrag;
public class BiomeGenCrag extends BiomeGenBase
@ -22,8 +23,8 @@ public class BiomeGenCrag extends BiomeGenBase
this.customBiomeDecorator.treesPerChunk = -999;
this.spawnableCreatureList.clear();
this.spawnableWaterCreatureList.clear();
this.topBlock = (byte)mod_BiomesOPlenty.cragRock.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.cragRock.blockID;
this.topBlock = (byte)BOPBlocks.cragRock.blockID;
this.fillerBlock = (byte)BOPBlocks.cragRock.blockID;
this.waterColorMultiplier = 944693;
}

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadForest.java
View File

@ -8,6 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree;
import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree2;
import tdwp_ftw.biomesop.worldgen.WorldGenTaiga5;
@ -33,7 +34,7 @@ public class BiomeGenDeadForest extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 0) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
/**

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadSwamp.java
View File

@ -8,6 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree;
public class BiomeGenDeadSwamp extends BiomeGenBase
@ -38,7 +39,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1);
return par1Random.nextInt(9) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1);
}
/**

5
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeadlands.java
View File

@ -12,6 +12,7 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenMinable;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree3;
import tdwp_ftw.biomesop.worldgen.WorldGenDeadlands;
@ -23,8 +24,8 @@ public class BiomeGenDeadlands extends BiomeGenBase
public BiomeGenDeadlands(int par1)
{
super(par1);
this.topBlock = (byte)mod_BiomesOPlenty.ash.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.ash.blockID;
this.topBlock = (byte)BOPBlocks.ash.blockID;
this.fillerBlock = (byte)BOPBlocks.ash.blockID;
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = 1;

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenDeciduousForest.java
View File

@ -8,6 +8,7 @@ import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraft.world.gen.feature.WorldGenShrub;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenDeciduous;
public class BiomeGenDeciduousForest extends BiomeGenBase
@ -39,7 +40,7 @@ public class BiomeGenDeciduousForest extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(5) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return par1Random.nextInt(5) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
/**

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenFen.java
View File

@ -9,6 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenFen1;
import tdwp_ftw.biomesop.worldgen.WorldGenFen2;
import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree;
@ -65,7 +66,7 @@ public class BiomeGenFen extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1)));
return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1)));
}
/**

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGarden.java
View File

@ -11,6 +11,7 @@ import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.worldgen.WorldGenGiantFlowerRed;
import tdwp_ftw.biomesop.worldgen.WorldGenGiantFlowerYellow;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.mobs.EntityRosester;
public class BiomeGenGarden extends BiomeGenBase
@ -42,7 +43,7 @@ public class BiomeGenGarden extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
}
/**

5
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGlacier.java
View File

@ -1,6 +1,7 @@
package tdwp_ftw.biomesop.biomes;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.world.biome.BiomeGenBase;
public class BiomeGenGlacier extends BiomeGenBase
@ -11,8 +12,8 @@ public class BiomeGenGlacier extends BiomeGenBase
{
super(par1);
this.spawnableCreatureList.clear();
this.topBlock = (byte)mod_BiomesOPlenty.hardIce.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.hardIce.blockID;
this.topBlock = (byte)BOPBlocks.hardIce.blockID;
this.fillerBlock = (byte)BOPBlocks.hardIce.blockID;
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = -999;

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenGrassland.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.biomes;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.entity.passive.EntityChicken;
@ -44,7 +45,7 @@ public class BiomeGenGrassland extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
public void decorate(World par1World, Random par2Random, int par3, int par4)

5
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenLushDesert.java
View File

@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenShrub;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenAcacia;
import net.minecraft.world.gen.feature.WorldGenerator;
@ -16,8 +17,8 @@ public class BiomeGenLushDesert extends BiomeGenBase
public BiomeGenLushDesert(int par1)
{
super(par1);
this.topBlock = (byte)mod_BiomesOPlenty.redRock.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.redRock.blockID;
this.topBlock = (byte)BOPBlocks.redRock.blockID;
this.fillerBlock = (byte)BOPBlocks.redRock.blockID;
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = 8;

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMarsh.java
View File

@ -8,6 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenMarsh;
public class BiomeGenMarsh extends BiomeGenBase
@ -47,6 +48,6 @@ public class BiomeGenMarsh extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
}

5
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMesa.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.biomes;
import java.awt.Color;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.entity.monster.EntitySpider;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
@ -15,8 +16,8 @@ public class BiomeGenMesa extends BiomeGenBase
{
super(par1);
this.spawnableCreatureList.clear();
this.topBlock = (byte)mod_BiomesOPlenty.redRock.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.redRock.blockID;
this.topBlock = (byte)BOPBlocks.redRock.blockID;
this.fillerBlock = (byte)BOPBlocks.redRock.blockID;
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = -999;

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenMoor.java
View File

@ -9,6 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenMoor;
public class BiomeGenMoor extends BiomeGenBase
@ -52,7 +53,7 @@ public class BiomeGenMoor extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1)));
return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1)));
}
/**

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOriginValley.java
View File

@ -6,6 +6,7 @@ import java.awt.Color;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenOriginTree;
public class BiomeGenOriginValley extends BiomeGenBase
@ -17,7 +18,7 @@ public class BiomeGenOriginValley extends BiomeGenBase
super(par1);
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.topBlock = (byte)mod_BiomesOPlenty.originGrass.blockID;
this.topBlock = (byte)BOPBlocks.originGrass.blockID;
this.customBiomeDecorator.treesPerChunk = 4;
this.customBiomeDecorator.grassPerChunk = -999;
this.customBiomeDecorator.generatePumpkins = false;

5
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenOutback.java
View File

@ -5,6 +5,7 @@ import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import net.minecraft.world.biome.BiomeGenBase;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenOutback;
import tdwp_ftw.biomesop.worldgen.WorldGenOutbackTree;
import tdwp_ftw.biomesop.worldgen.WorldGenOutbackShrub;
@ -20,8 +21,8 @@ public class BiomeGenOutback extends BiomeGenBase
this.spawnableCreatureList.clear();
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.topBlock = (byte)mod_BiomesOPlenty.hardSand.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.hardSand.blockID;
this.topBlock = (byte)BOPBlocks.hardSand.blockID;
this.fillerBlock = (byte)BOPBlocks.hardSand.blockID;
this.customBiomeDecorator.treesPerChunk = 3;
this.customBiomeDecorator.flowersPerChunk = -999;
this.customBiomeDecorator.outbackPerChunk = 10;

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPasture.java
View File

@ -2,6 +2,7 @@ package tdwp_ftw.biomesop.biomes;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
@ -26,7 +27,7 @@ public class BiomeGenPasture extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return new WorldGenTallGrass(mod_BiomesOPlenty.barley.blockID, 0);
return new WorldGenTallGrass(BOPBlocks.barley.blockID, 0);
}
/**

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPlainsNew.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.biomes;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.world.biome.BiomeGenBase;
@ -29,6 +30,6 @@ public class BiomeGenPlainsNew extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(Block.tallGrass.blockID, 1);
}
}

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPrairie.java
View File

@ -7,6 +7,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenPrairie;
public class BiomeGenPrairie extends BiomeGenBase
@ -36,6 +37,6 @@ public class BiomeGenPrairie extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1)));
return (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(3) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1)));
}
}

7
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenPromisedLand.java
View File

@ -8,6 +8,7 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenPromisedTree;
import tdwp_ftw.biomesop.worldgen.WorldGenPromisedTree2;
import tdwp_ftw.biomesop.worldgen.WorldGenPromisedTree3;
@ -24,8 +25,8 @@ public class BiomeGenPromisedLand extends BiomeGenBase
super(par1);
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.topBlock = (byte)mod_BiomesOPlenty.holyGrass.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.holyStone.blockID;
this.topBlock = (byte)BOPBlocks.holyGrass.blockID;
this.fillerBlock = (byte)BOPBlocks.holyStone.blockID;
this.customBiomeDecorator.treesPerChunk = 8;
this.customBiomeDecorator.grassPerChunk = -999;
this.customBiomeDecorator.holyTallGrassPerChunk = 50;
@ -73,7 +74,7 @@ public class BiomeGenPromisedLand extends BiomeGenBase
if (var10 == Block.stone.blockID)
{
par1World.setBlock(var7, var8, var9, mod_BiomesOPlenty.amethystOre.blockID, 0, 2);
par1World.setBlock(var7, var8, var9, BOPBlocks.amethystOre.blockID, 0, 2);
}
}

5
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenQuagmire.java
View File

@ -6,6 +6,7 @@ import java.awt.Color;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree;
public class BiomeGenQuagmire extends BiomeGenBase
@ -17,8 +18,8 @@ public class BiomeGenQuagmire extends BiomeGenBase
super(par1);
this.spawnableCreatureList.clear();
this.spawnableWaterCreatureList.clear();
this.topBlock = (byte)mod_BiomesOPlenty.mud.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.mud.blockID;
this.topBlock = (byte)BOPBlocks.mud.blockID;
this.fillerBlock = (byte)BOPBlocks.mud.blockID;
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = 0;

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSavanna.java
View File

@ -8,6 +8,7 @@ import net.minecraft.world.gen.feature.WorldGenShrub;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenAcacia;
public class BiomeGenSavanna extends BiomeGenBase
@ -40,6 +41,6 @@ public class BiomeGenSavanna extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
}

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSeasonalForest.java
View File

@ -9,6 +9,7 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenAutumn;
import tdwp_ftw.biomesop.worldgen.WorldGenAutumn2;
import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree2;
@ -36,7 +37,7 @@ public class BiomeGenSeasonalForest extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
/**

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenShrubland.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.biomes;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenShrub;
@ -38,6 +39,6 @@ public class BiomeGenShrubland extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
}

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSnowyWoods.java
View File

@ -8,6 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree;
import tdwp_ftw.biomesop.worldgen.WorldGenDeadTree2;
import tdwp_ftw.biomesop.worldgen.WorldGenTaiga5;
@ -31,7 +32,7 @@ public class BiomeGenSnowyWoods extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
/**

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSteppe.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.biomes;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
@ -33,7 +34,7 @@ public class BiomeGenSteppe extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return (par1Random.nextInt(8) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1)));
return (par1Random.nextInt(8) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1)));
}
/**

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenSwampwoods.java
View File

@ -8,6 +8,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenMarsh;
import tdwp_ftw.biomesop.worldgen.WorldGenCypress;
import net.minecraft.world.gen.feature.WorldGenShrub;
@ -63,7 +64,7 @@ public class BiomeGenSwampwoods extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1);
return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1);
}
/**

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTaigaNew.java
View File

@ -10,6 +10,7 @@ import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenTaiga1;
import net.minecraft.world.gen.feature.WorldGenTaiga2;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenNorwaySpruce1;
import tdwp_ftw.biomesop.worldgen.WorldGenNorwaySpruce2;
import net.minecraft.world.gen.feature.WorldGenerator;
@ -43,6 +44,6 @@ public class BiomeGenTaigaNew extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1);
return new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1);
}
}

3
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenTemperateRainforest.java
View File

@ -9,6 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenTallGrass;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraft.world.gen.feature.WorldGenShrub;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenMoss;
import tdwp_ftw.biomesop.worldgen.WorldGenTemperate;
import tdwp_ftw.biomesop.worldgen.WorldGenThickTree;
@ -46,7 +47,7 @@ public class BiomeGenTemperateRainforest extends BiomeGenBase
*/
public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
{
return (par1Random.nextInt(6) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(mod_BiomesOPlenty.mediumGrass.blockID, 1) : new WorldGenTallGrass(mod_BiomesOPlenty.shortGrass.blockID, 1))));
return (par1Random.nextInt(6) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : (par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : (par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(BOPBlocks.mediumGrass.blockID, 1) : new WorldGenTallGrass(BOPBlocks.shortGrass.blockID, 1))));
}
public void decorate(World par1World, Random par2Random, int par3, int par4)

5
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenVolcano.java
View File

@ -6,6 +6,7 @@ import java.awt.Color;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenVolcano;
public class BiomeGenVolcano extends BiomeGenBase
@ -16,8 +17,8 @@ public class BiomeGenVolcano extends BiomeGenBase
{
super(par1);
this.spawnableCreatureList.clear();
this.topBlock = (byte)mod_BiomesOPlenty.ashStone.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.ashStone.blockID;
this.topBlock = (byte)BOPBlocks.ashStone.blockID;
this.fillerBlock = (byte)BOPBlocks.ashStone.blockID;
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = 1;

5
src/minecraft/tdwp_ftw/biomesop/biomes/BiomeGenWasteland.java
View File

@ -7,6 +7,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenSpire;
public class BiomeGenWasteland extends BiomeGenBase
@ -16,8 +17,8 @@ public class BiomeGenWasteland extends BiomeGenBase
public BiomeGenWasteland(int par1)
{
super(par1);
this.topBlock = (byte)mod_BiomesOPlenty.driedDirt.blockID;
this.fillerBlock = (byte)mod_BiomesOPlenty.driedDirt.blockID;
this.topBlock = (byte)BOPBlocks.driedDirt.blockID;
this.fillerBlock = (byte)BOPBlocks.driedDirt.blockID;
this.theBiomeDecorator = new BiomeDecoratorBOP(this);
this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
this.customBiomeDecorator.treesPerChunk = -999;

11
src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.block.Block;
@ -109,7 +110,7 @@ public class BlockAcaciaLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.acaciaLeaves.blockID)
if (var12 == BOPBlocks.acaciaLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -158,11 +159,11 @@ public class BlockAcaciaLeaves extends BlockLeavesBase
{
var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14);
if (var15 == mod_BiomesOPlenty.acaciaWood.blockID)
if (var15 == BOPBlocks.acaciaWood.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.acaciaLeaves.blockID)
else if (var15 == BOPBlocks.acaciaLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -267,7 +268,7 @@ public class BlockAcaciaLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.acaciaSapling.blockID;
return BOPBlocks.acaciaSapling.blockID;
}
/**
@ -301,7 +302,7 @@ public class BlockAcaciaLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.acaciaLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.acaciaLeaves.blockID, 1, par6 & 3));
}
else
{

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -66,7 +67,7 @@ public class BlockAcaciaLog extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.acaciaWood.blockID;
return BOPBlocks.acaciaWood.blockID;
}
/**
@ -87,7 +88,7 @@ public class BlockAcaciaLog extends Block
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.acaciaLeaves.blockID)
if (var12 == BOPBlocks.acaciaLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);

13
src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSlab.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.helpers.CreativeTabsBOP;
import net.minecraft.block.BlockHalfSlab;
@ -69,7 +70,7 @@ public class BlockAcaciaSlab extends BlockHalfSlab
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.acaciaSingleSlab.blockID;
return BOPBlocks.acaciaSingleSlab.blockID;
}
/**
@ -78,7 +79,7 @@ public class BlockAcaciaSlab extends BlockHalfSlab
*/
protected ItemStack createStackedBlock(int par1)
{
return new ItemStack(mod_BiomesOPlenty.acaciaSingleSlab.blockID, 2, par1 & 7);
return new ItemStack(BOPBlocks.acaciaSingleSlab.blockID, 2, par1 & 7);
}
/**
@ -99,7 +100,7 @@ public class BlockAcaciaSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.acaciaDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.acaciaDoubleSlab.blockID);
return true;
}
@ -115,7 +116,7 @@ public class BlockAcaciaSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.acaciaDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.acaciaDoubleSlab.blockID);
return true;
}
@ -142,7 +143,7 @@ public class BlockAcaciaSlab extends BlockHalfSlab
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (par1 != mod_BiomesOPlenty.acaciaDoubleSlab.blockID)
if (par1 != BOPBlocks.acaciaDoubleSlab.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
}
@ -153,6 +154,6 @@ public class BlockAcaciaSlab extends BlockHalfSlab
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.acaciaSingleSlab.blockID;
return BOPBlocks.acaciaSingleSlab.blockID;
}
}

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystBlock.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -23,7 +24,7 @@ public class BlockAmethystBlock extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.amethystBlock.blockID;
return BOPBlocks.amethystBlock.blockID;
}
/**

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockAmethystOre.java
View File

@ -1,6 +1,7 @@
package tdwp_ftw.biomesop.blocks;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPItems;
import net.minecraft.block.Block;
import java.util.Random;
@ -30,7 +31,7 @@ public class BlockAmethystOre extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.amethyst.itemID;
return BOPItems.amethyst.itemID;
}
/**

9
src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeaves.java
View File

@ -7,6 +7,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.block.Block;
@ -71,7 +72,7 @@ public class BlockAppleLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.appleLeaves.blockID)
if (var12 == BOPBlocks.appleLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -124,7 +125,7 @@ public class BlockAppleLeaves extends BlockLeavesBase
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.appleLeaves.blockID || var15 == mod_BiomesOPlenty.appleLeaves.blockID)
else if (var15 == BOPBlocks.appleLeaves.blockID || var15 == BOPBlocks.appleLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -229,7 +230,7 @@ public class BlockAppleLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.appleSapling.blockID;
return BOPBlocks.appleSapling.blockID;
}
/**
@ -268,7 +269,7 @@ public class BlockAppleLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.appleLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.appleLeaves.blockID, 1, par6 & 3));
}
else
{

9
src/minecraft/tdwp_ftw/biomesop/blocks/BlockAppleLeavesFruitless.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -69,7 +70,7 @@ public class BlockAppleLeavesFruitless extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.appleLeavesFruitless.blockID)
if (var12 == BOPBlocks.appleLeavesFruitless.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -122,7 +123,7 @@ public class BlockAppleLeavesFruitless extends BlockLeavesBase
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.appleLeavesFruitless.blockID || var15 == mod_BiomesOPlenty.appleLeaves.blockID)
else if (var15 == BOPBlocks.appleLeavesFruitless.blockID || var15 == BOPBlocks.appleLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -227,7 +228,7 @@ public class BlockAppleLeavesFruitless extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.appleSapling.blockID;
return BOPBlocks.appleSapling.blockID;
}
/**
@ -266,7 +267,7 @@ public class BlockAppleLeavesFruitless extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.appleLeavesFruitless.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.appleLeavesFruitless.blockID, 1, par6 & 3));
}
else
{

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockAsh.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPItems;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -64,7 +65,7 @@ public class BlockAsh extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.ashes.itemID;
return BOPItems.ashes.itemID;
}
/**

9
src/minecraft/tdwp_ftw/biomesop/blocks/BlockAutumnLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.block.Block;
@ -71,7 +72,7 @@ public class BlockAutumnLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.autumnLeaves.blockID)
if (var12 == BOPBlocks.autumnLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -124,7 +125,7 @@ public class BlockAutumnLeaves extends BlockLeavesBase
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.autumnLeaves.blockID)
else if (var15 == BOPBlocks.autumnLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -229,7 +230,7 @@ public class BlockAutumnLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.yellowSapling.blockID;
return BOPBlocks.yellowSapling.blockID;
}
/**
@ -263,7 +264,7 @@ public class BlockAutumnLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.autumnLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.autumnLeaves.blockID, 1, par6 & 3));
}
else
{

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockBamboo.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPItems;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -108,7 +109,7 @@ public class BlockBamboo extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.bambooItem.itemID;
return BOPItems.bambooItem.itemID;
}
/**
@ -141,6 +142,6 @@ public class BlockBamboo extends Block
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.bambooItem.itemID;
return BOPItems.bambooItem.itemID;
}
}

9
src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -71,7 +72,7 @@ public class BlockBambooLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.bambooLeaves.blockID)
if (var12 == BOPBlocks.bambooLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -120,11 +121,11 @@ public class BlockBambooLeaves extends BlockLeavesBase
{
var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14);
if (var15 == mod_BiomesOPlenty.bamboo.blockID)
if (var15 == BOPBlocks.bamboo.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.bambooLeaves.blockID)
else if (var15 == BOPBlocks.bambooLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -263,7 +264,7 @@ public class BlockBambooLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.bambooLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.bambooLeaves.blockID, 1, par6 & 3));
}
else
{

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooThatching.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -29,7 +30,7 @@ public class BlockBambooThatching extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.bambooThatching.blockID;
return BOPBlocks.bambooThatching.blockID;
}
/**

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockBarley.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPItems;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -123,7 +124,7 @@ public class BlockBarley extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.barleyItem.itemID;
return BOPItems.barleyItem.itemID;
}
/**
@ -139,6 +140,6 @@ public class BlockBarley extends Block
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.barleyItem.itemID;
return BOPItems.barleyItem.itemID;
}
}

11
src/minecraft/tdwp_ftw/biomesop/blocks/BlockBlueLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.block.Block;
@ -70,7 +71,7 @@ public class BlockBlueLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.blueLeaves.blockID)
if (var12 == BOPBlocks.blueLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -119,11 +120,11 @@ public class BlockBlueLeaves extends BlockLeavesBase
{
var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14);
if (var15 == mod_BiomesOPlenty.magicWood.blockID)
if (var15 == BOPBlocks.magicWood.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.blueLeaves.blockID)
else if (var15 == BOPBlocks.blueLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -228,7 +229,7 @@ public class BlockBlueLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.magicSapling.blockID;
return BOPBlocks.magicSapling.blockID;
}
/**
@ -262,7 +263,7 @@ public class BlockBlueLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.blueLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.blueLeaves.blockID, 1, par6 & 3));
}
else
{

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockBush.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPItems;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFlower;
@ -110,7 +111,7 @@ public class BlockBush extends BlockFlower
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.bushItem, 1, par6));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPItems.bushItem, 1, par6));
}
else
{
@ -123,6 +124,6 @@ public class BlockBush extends BlockFlower
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.bushItem.itemID;
return BOPItems.bushItem.itemID;
}
}

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockCattail.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPItems;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -111,7 +112,7 @@ public class BlockCattail extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.cattailItem.itemID;
return BOPItems.cattailItem.itemID;
}
/**
@ -119,6 +120,6 @@ public class BlockCattail extends Block
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.cattailItem.itemID;
return BOPItems.cattailItem.itemID;
}
}

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -66,7 +67,7 @@ public class BlockCherryLog extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.cherryWood.blockID;
return BOPBlocks.cherryWood.blockID;
}
/**
@ -87,7 +88,7 @@ public class BlockCherryLog extends Block
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.pinkLeaves.blockID || var12 == mod_BiomesOPlenty.whiteLeaves.blockID)
if (var12 == BOPBlocks.pinkLeaves.blockID || var12 == BOPBlocks.whiteLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);

13
src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherrySlab.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.BlockHalfSlab;
import net.minecraft.block.material.Material;
@ -67,7 +68,7 @@ public class BlockCherrySlab extends BlockHalfSlab
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.cherrySingleSlab.blockID;
return BOPBlocks.cherrySingleSlab.blockID;
}
/**
@ -76,7 +77,7 @@ public class BlockCherrySlab extends BlockHalfSlab
*/
protected ItemStack createStackedBlock(int par1)
{
return new ItemStack(mod_BiomesOPlenty.cherrySingleSlab.blockID, 2, par1 & 7);
return new ItemStack(BOPBlocks.cherrySingleSlab.blockID, 2, par1 & 7);
}
/**
@ -97,7 +98,7 @@ public class BlockCherrySlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.cherryDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.cherryDoubleSlab.blockID);
return true;
}
@ -113,7 +114,7 @@ public class BlockCherrySlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.cherryDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.cherryDoubleSlab.blockID);
return true;
}
@ -140,7 +141,7 @@ public class BlockCherrySlab extends BlockHalfSlab
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (par1 != mod_BiomesOPlenty.cherryDoubleSlab.blockID)
if (par1 != BOPBlocks.cherryDoubleSlab.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
}
@ -151,6 +152,6 @@ public class BlockCherrySlab extends BlockHalfSlab
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.cherrySingleSlab.blockID;
return BOPBlocks.cherrySingleSlab.blockID;
}
}

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockCragRock.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -29,7 +30,7 @@ public class BlockCragRock extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.cragRock.blockID;
return BOPBlocks.cragRock.blockID;
}
/**

11
src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.block.Block;
@ -70,7 +71,7 @@ public class BlockDarkLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.darkLeaves.blockID)
if (var12 == BOPBlocks.darkLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -119,11 +120,11 @@ public class BlockDarkLeaves extends BlockLeavesBase
{
var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14);
if (var15 == mod_BiomesOPlenty.darkWood.blockID)
if (var15 == BOPBlocks.darkWood.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.darkLeaves.blockID)
else if (var15 == BOPBlocks.darkLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -228,7 +229,7 @@ public class BlockDarkLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.darkSapling.blockID;
return BOPBlocks.darkSapling.blockID;
}
/**
@ -262,7 +263,7 @@ public class BlockDarkLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.darkLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.darkLeaves.blockID, 1, par6 & 3));
}
else
{

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -66,7 +67,7 @@ public class BlockDarkLog extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.darkWood.blockID;
return BOPBlocks.darkWood.blockID;
}
/**
@ -87,7 +88,7 @@ public class BlockDarkLog extends Block
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.darkLeaves.blockID)
if (var12 == BOPBlocks.darkLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);

13
src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkSlab.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.BlockHalfSlab;
import net.minecraft.block.material.Material;
@ -67,7 +68,7 @@ public class BlockDarkSlab extends BlockHalfSlab
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.darkSingleSlab.blockID;
return BOPBlocks.darkSingleSlab.blockID;
}
/**
@ -76,7 +77,7 @@ public class BlockDarkSlab extends BlockHalfSlab
*/
protected ItemStack createStackedBlock(int par1)
{
return new ItemStack(mod_BiomesOPlenty.darkSingleSlab.blockID, 2, par1 & 7);
return new ItemStack(BOPBlocks.darkSingleSlab.blockID, 2, par1 & 7);
}
/**
@ -97,7 +98,7 @@ public class BlockDarkSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.darkDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.darkDoubleSlab.blockID);
return true;
}
@ -113,7 +114,7 @@ public class BlockDarkSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.darkDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.darkDoubleSlab.blockID);
return true;
}
@ -140,7 +141,7 @@ public class BlockDarkSlab extends BlockHalfSlab
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (par1 != mod_BiomesOPlenty.darkDoubleSlab.blockID)
if (par1 != BOPBlocks.darkDoubleSlab.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
}
@ -151,6 +152,6 @@ public class BlockDarkSlab extends BlockHalfSlab
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.darkSingleSlab.blockID;
return BOPBlocks.darkSingleSlab.blockID;
}
}

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadGrass.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -52,7 +53,7 @@ public class BlockDeadGrass extends Block
*/
protected boolean canThisPlantGrowOnThisBlockID(int par1)
{
return par1 == mod_BiomesOPlenty.driedDirt.blockID || par1 == Block.sand.blockID;
return par1 == BOPBlocks.driedDirt.blockID || par1 == Block.sand.blockID;
}
/**
@ -141,7 +142,7 @@ public class BlockDeadGrass extends Block
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.deadGrass, 1, par6));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.deadGrass, 1, par6));
}
else
{

9
src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.block.Block;
@ -70,7 +71,7 @@ public class BlockDeadLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.deadLeaves.blockID)
if (var12 == BOPBlocks.deadLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -123,7 +124,7 @@ public class BlockDeadLeaves extends BlockLeavesBase
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.deadLeaves.blockID)
else if (var15 == BOPBlocks.deadLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -228,7 +229,7 @@ public class BlockDeadLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.brownSapling.blockID;
return BOPBlocks.brownSapling.blockID;
}
/**
@ -262,7 +263,7 @@ public class BlockDeadLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.deadLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.deadLeaves.blockID, 1, par6 & 3));
}
else
{

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -66,7 +67,7 @@ public class BlockDeadLog extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.deadWood.blockID;
return BOPBlocks.deadWood.blockID;
}
/**

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertGrass.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -52,7 +53,7 @@ public class BlockDesertGrass extends Block
*/
protected boolean canThisPlantGrowOnThisBlockID(int par1)
{
return par1 == mod_BiomesOPlenty.redRock.blockID;
return par1 == BOPBlocks.redRock.blockID;
}
/**
@ -141,7 +142,7 @@ public class BlockDesertGrass extends Block
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.desertGrass, 1, par6));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.desertGrass, 1, par6));
}
else
{

11
src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -69,7 +70,7 @@ public class BlockFirLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.firLeaves.blockID)
if (var12 == BOPBlocks.firLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -118,11 +119,11 @@ public class BlockFirLeaves extends BlockLeavesBase
{
var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14);
if (var15 == mod_BiomesOPlenty.firWood.blockID)
if (var15 == BOPBlocks.firWood.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.firLeaves.blockID)
else if (var15 == BOPBlocks.firLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -227,7 +228,7 @@ public class BlockFirLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.firSapling.blockID;
return BOPBlocks.firSapling.blockID;
}
/**
@ -261,7 +262,7 @@ public class BlockFirLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.firLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.firLeaves.blockID, 1, par6 & 3));
}
else
{

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -66,7 +67,7 @@ public class BlockFirLog extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.firWood.blockID;
return BOPBlocks.firWood.blockID;
}
/**
@ -87,7 +88,7 @@ public class BlockFirLog extends Block
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.firLeaves.blockID)
if (var12 == BOPBlocks.firLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);

13
src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSlab.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.BlockHalfSlab;
import net.minecraft.block.material.Material;
@ -69,7 +70,7 @@ public class BlockFirSlab extends BlockHalfSlab
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.firSingleSlab.blockID;
return BOPBlocks.firSingleSlab.blockID;
}
/**
@ -78,7 +79,7 @@ public class BlockFirSlab extends BlockHalfSlab
*/
protected ItemStack createStackedBlock(int par1)
{
return new ItemStack(mod_BiomesOPlenty.firSingleSlab.blockID, 2, par1 & 7);
return new ItemStack(BOPBlocks.firSingleSlab.blockID, 2, par1 & 7);
}
/**
@ -99,7 +100,7 @@ public class BlockFirSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.firDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.firDoubleSlab.blockID);
return true;
}
@ -115,7 +116,7 @@ public class BlockFirSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.firDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.firDoubleSlab.blockID);
return true;
}
@ -142,7 +143,7 @@ public class BlockFirSlab extends BlockHalfSlab
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (par1 != mod_BiomesOPlenty.firDoubleSlab.blockID)
if (par1 != BOPBlocks.firDoubleSlab.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
}
@ -153,6 +154,6 @@ public class BlockFirSlab extends BlockHalfSlab
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.firSingleSlab.blockID;
return BOPBlocks.firSingleSlab.blockID;
}
}

7
src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerRed.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -59,7 +60,7 @@ public class BlockGiantFlowerRed extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.giantFlowerRed.blockID)
if (var12 == BOPBlocks.giantFlowerRed.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -108,11 +109,11 @@ public class BlockGiantFlowerRed extends BlockLeavesBase
{
var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14);
if (var15 == mod_BiomesOPlenty.giantFlowerStem.blockID)
if (var15 == BOPBlocks.giantFlowerStem.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.giantFlowerRed.blockID)
else if (var15 == BOPBlocks.giantFlowerRed.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerStem.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -87,7 +88,7 @@ public class BlockGiantFlowerStem extends Block
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.giantFlowerRed.blockID || var12 == mod_BiomesOPlenty.giantFlowerYellow.blockID)
if (var12 == BOPBlocks.giantFlowerRed.blockID || var12 == BOPBlocks.giantFlowerYellow.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);

7
src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerYellow.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -59,7 +60,7 @@ public class BlockGiantFlowerYellow extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.giantFlowerYellow.blockID)
if (var12 == BOPBlocks.giantFlowerYellow.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -108,11 +109,11 @@ public class BlockGiantFlowerYellow extends BlockLeavesBase
{
var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14);
if (var15 == mod_BiomesOPlenty.giantFlowerStem.blockID)
if (var15 == BOPBlocks.giantFlowerStem.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.giantFlowerYellow.blockID)
else if (var15 == BOPBlocks.giantFlowerYellow.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockGlowFlower.java
View File

@ -2,6 +2,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -46,7 +47,7 @@ public class BlockGlowFlower extends Block
*/
protected boolean canThisPlantGrowOnThisBlockID(int par1)
{
return par1 == Block.grass.blockID || par1 == Block.dirt.blockID || par1 == Block.tilledField.blockID || par1 == mod_BiomesOPlenty.holyGrass.blockID;
return par1 == Block.grass.blockID || par1 == Block.dirt.blockID || par1 == Block.tilledField.blockID || par1 == BOPBlocks.holyGrass.blockID;
}
/**

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassTop.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.BlockFlower;
import net.minecraft.block.material.Material;
@ -33,7 +34,7 @@ public class BlockHighGrassTop extends BlockFlower
*/
protected boolean canThisPlantGrowOnThisBlockID(int par1)
{
return par1 == mod_BiomesOPlenty.highGrassBottom.blockID;
return par1 == BOPBlocks.highGrassBottom.blockID;
}
public int getBlockColor()

11
src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyGrass.java
View File

@ -5,6 +5,7 @@ import static net.minecraftforge.common.ForgeDirection.UP;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -125,14 +126,14 @@ public class BlockHolyGrass extends Block
if (par1World.provider.isHellWorld)
{
par1World.setBlock(par2, par3 + 1, par4, Block.fire.blockID);
par1World.setBlock(par2, par3, par4, Block.slowSand.blockID);
par1World.setBlock(par2, par3, par4, BOPBlocks.smolderingGrass.blockID);
}
if (!par1World.isRemote)
{
if (par1World.getBlockLightValue(par2, par3 + 1, par4) < 4 && Block.lightOpacity[par1World.getBlockId(par2, par3 + 1, par4)] > 2)
{
par1World.setBlock(par2, par3, par4, mod_BiomesOPlenty.holyStone.blockID);
par1World.setBlock(par2, par3, par4, BOPBlocks.holyStone.blockID);
}
else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9)
{
@ -143,9 +144,9 @@ public class BlockHolyGrass extends Block
int var9 = par4 + par5Random.nextInt(3) - 1;
int var10 = par1World.getBlockId(var7, var8 + 1, var9);
if (par1World.getBlockId(var7, var8, var9) == mod_BiomesOPlenty.holyStone.blockID && par1World.getBlockLightValue(var7, var8 + 1, var9) >= 4 && Block.lightOpacity[var10] <= 2)
if (par1World.getBlockId(var7, var8, var9) == BOPBlocks.holyStone.blockID && par1World.getBlockLightValue(var7, var8 + 1, var9) >= 4 && Block.lightOpacity[var10] <= 2)
{
par1World.setBlock(var7, var8, var9, mod_BiomesOPlenty.holyGrass.blockID);
par1World.setBlock(var7, var8, var9, BOPBlocks.holyGrass.blockID);
}
}
}
@ -157,6 +158,6 @@ public class BlockHolyGrass extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.holyStone.idDropped(0, par2Random, par3);
return BOPBlocks.holyStone.idDropped(0, par2Random, par3);
}
}

11
src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -69,7 +70,7 @@ public class BlockHolyLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.holyLeaves.blockID)
if (var12 == BOPBlocks.holyLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -118,11 +119,11 @@ public class BlockHolyLeaves extends BlockLeavesBase
{
var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14);
if (var15 == mod_BiomesOPlenty.holyWood.blockID)
if (var15 == BOPBlocks.holyWood.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.holyLeaves.blockID)
else if (var15 == BOPBlocks.holyLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -227,7 +228,7 @@ public class BlockHolyLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.holySapling.blockID;
return BOPBlocks.holySapling.blockID;
}
/**
@ -261,7 +262,7 @@ public class BlockHolyLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.holyLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.holyLeaves.blockID, 1, par6 & 3));
}
else
{

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -66,7 +67,7 @@ public class BlockHolyLog extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.holyWood.blockID;
return BOPBlocks.holyWood.blockID;
}
/**
@ -87,7 +88,7 @@ public class BlockHolyLog extends Block
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.holyLeaves.blockID)
if (var12 == BOPBlocks.holyLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySapling.java
View File

@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenPromisedTree;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
@ -52,7 +53,7 @@ public class BlockHolySapling extends BlockSapling
{
Block soil = blocksList[par1World.getBlockId(par2, par3 - 1, par4)];
return (par1World.getFullBlockLightValue(par2, par3, par4) >= 8 || par1World.canBlockSeeTheSky(par2, par3, par4)) &&
(soil != null && soil.blockID == mod_BiomesOPlenty.holyGrass.blockID);
(soil != null && soil.blockID == BOPBlocks.holyGrass.blockID);
}
/**
@ -95,7 +96,7 @@ public class BlockHolySapling extends BlockSapling
*/
protected boolean canThisPlantGrowOnThisBlockID(int par1)
{
return par1 == mod_BiomesOPlenty.holyGrass.blockID;
return par1 == BOPBlocks.holyGrass.blockID;
}
/**

13
src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySlab.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.BlockHalfSlab;
import net.minecraft.block.material.Material;
@ -67,7 +68,7 @@ public class BlockHolySlab extends BlockHalfSlab
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.holySingleSlab.blockID;
return BOPBlocks.holySingleSlab.blockID;
}
/**
@ -76,7 +77,7 @@ public class BlockHolySlab extends BlockHalfSlab
*/
protected ItemStack createStackedBlock(int par1)
{
return new ItemStack(mod_BiomesOPlenty.holySingleSlab.blockID, 2, par1 & 7);
return new ItemStack(BOPBlocks.holySingleSlab.blockID, 2, par1 & 7);
}
/**
@ -97,7 +98,7 @@ public class BlockHolySlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.holyDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.holyDoubleSlab.blockID);
return true;
}
@ -113,7 +114,7 @@ public class BlockHolySlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.holyDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.holyDoubleSlab.blockID);
return true;
}
@ -140,7 +141,7 @@ public class BlockHolySlab extends BlockHalfSlab
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (par1 != mod_BiomesOPlenty.holyDoubleSlab.blockID)
if (par1 != BOPBlocks.holyDoubleSlab.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
}
@ -151,6 +152,6 @@ public class BlockHolySlab extends BlockHalfSlab
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.holySingleSlab.blockID;
return BOPBlocks.holySingleSlab.blockID;
}
}

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStone.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -29,7 +30,7 @@ public class BlockHolyStone extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.holyStone.blockID;
return BOPBlocks.holyStone.blockID;
}
/**

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyTallGrass.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.ArrayList;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -58,7 +59,7 @@ public class BlockHolyTallGrass extends Block implements IShearable
*/
protected boolean canThisPlantGrowOnThisBlockID(int par1)
{
return par1 == mod_BiomesOPlenty.holyGrass.blockID;
return par1 == BOPBlocks.holyGrass.blockID;
}
/**

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -65,7 +66,7 @@ public class BlockMagicLog extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.magicWood.blockID;
return BOPBlocks.magicWood.blockID;
}
/**
@ -86,7 +87,7 @@ public class BlockMagicLog extends Block
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.blueLeaves.blockID)
if (var12 == BOPBlocks.blueLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSapling.java
View File

@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenMystic2;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
@ -53,7 +54,7 @@ public class BlockMagicSapling extends BlockSapling
{
Block soil = blocksList[par1World.getBlockId(par2, par3 - 1, par4)];
return (par1World.getFullBlockLightValue(par2, par3, par4) >= 8 || par1World.canBlockSeeTheSky(par2, par3, par4)) &&
(soil != null && soil.blockID == mod_BiomesOPlenty.holyGrass.blockID);
(soil != null && soil.blockID == BOPBlocks.holyGrass.blockID);
}
/**

13
src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSlab.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.BlockHalfSlab;
import net.minecraft.block.material.Material;
@ -66,7 +67,7 @@ public class BlockMagicSlab extends BlockHalfSlab
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.magicSingleSlab.blockID;
return BOPBlocks.magicSingleSlab.blockID;
}
/**
@ -75,7 +76,7 @@ public class BlockMagicSlab extends BlockHalfSlab
*/
protected ItemStack createStackedBlock(int par1)
{
return new ItemStack(mod_BiomesOPlenty.magicSingleSlab.blockID, 2, par1 & 7);
return new ItemStack(BOPBlocks.magicSingleSlab.blockID, 2, par1 & 7);
}
/**
@ -96,7 +97,7 @@ public class BlockMagicSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.magicDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.magicDoubleSlab.blockID);
return true;
}
@ -112,7 +113,7 @@ public class BlockMagicSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.magicDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.magicDoubleSlab.blockID);
return true;
}
@ -139,7 +140,7 @@ public class BlockMagicSlab extends BlockHalfSlab
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (par1 != mod_BiomesOPlenty.magicDoubleSlab.blockID)
if (par1 != BOPBlocks.magicDoubleSlab.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
}
@ -150,6 +151,6 @@ public class BlockMagicSlab extends BlockHalfSlab
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.magicSingleSlab.blockID;
return BOPBlocks.magicSingleSlab.blockID;
}
}

11
src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -109,7 +110,7 @@ public class BlockMangroveLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.mangroveLeaves.blockID)
if (var12 == BOPBlocks.mangroveLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -158,11 +159,11 @@ public class BlockMangroveLeaves extends BlockLeavesBase
{
var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14);
if (var15 == mod_BiomesOPlenty.mangroveWood.blockID)
if (var15 == BOPBlocks.mangroveWood.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.mangroveLeaves.blockID)
else if (var15 == BOPBlocks.mangroveLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -267,7 +268,7 @@ public class BlockMangroveLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.mangroveSapling.blockID;
return BOPBlocks.mangroveSapling.blockID;
}
/**
@ -301,7 +302,7 @@ public class BlockMangroveLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.mangroveLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.mangroveLeaves.blockID, 1, par6 & 3));
}
else
{

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -66,7 +67,7 @@ public class BlockMangroveLog extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.mangroveWood.blockID;
return BOPBlocks.mangroveWood.blockID;
}
/**
@ -87,7 +88,7 @@ public class BlockMangroveLog extends Block
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.mangroveLeaves.blockID)
if (var12 == BOPBlocks.mangroveLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);

13
src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSlab.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.BlockHalfSlab;
import net.minecraft.block.material.Material;
@ -67,7 +68,7 @@ public class BlockMangroveSlab extends BlockHalfSlab
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.mangroveSingleSlab.blockID;
return BOPBlocks.mangroveSingleSlab.blockID;
}
/**
@ -76,7 +77,7 @@ public class BlockMangroveSlab extends BlockHalfSlab
*/
protected ItemStack createStackedBlock(int par1)
{
return new ItemStack(mod_BiomesOPlenty.mangroveSingleSlab.blockID, 2, par1 & 7);
return new ItemStack(BOPBlocks.mangroveSingleSlab.blockID, 2, par1 & 7);
}
/**
@ -97,7 +98,7 @@ public class BlockMangroveSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.mangroveDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.mangroveDoubleSlab.blockID);
return true;
}
@ -113,7 +114,7 @@ public class BlockMangroveSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.mangroveDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.mangroveDoubleSlab.blockID);
return true;
}
@ -140,7 +141,7 @@ public class BlockMangroveSlab extends BlockHalfSlab
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (par1 != mod_BiomesOPlenty.mangroveDoubleSlab.blockID)
if (par1 != BOPBlocks.mangroveDoubleSlab.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
}
@ -151,6 +152,6 @@ public class BlockMangroveSlab extends BlockHalfSlab
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.mangroveSingleSlab.blockID;
return BOPBlocks.mangroveSingleSlab.blockID;
}
}

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockMediumGrass.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPItems;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFlower;
@ -110,7 +111,7 @@ public class BlockMediumGrass extends BlockFlower
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.mediumGrassItem, 1, par6));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPItems.mediumGrassItem, 1, par6));
}
else
{
@ -123,6 +124,6 @@ public class BlockMediumGrass extends BlockFlower
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.mediumGrassItem.itemID;
return BOPItems.mediumGrassItem.itemID;
}
}

8
src/minecraft/tdwp_ftw/biomesop/blocks/BlockMoss.java
View File

@ -3,6 +3,8 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.declarations.BOPItems;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -178,7 +180,7 @@ public class BlockMoss extends Block
*/
private boolean canBePlacedOn(int par1)
{
if (par1 != Block.wood.blockID && par1 != mod_BiomesOPlenty.willowWood.blockID && par1 != Block.stone.blockID)
if (par1 != Block.wood.blockID && par1 != BOPBlocks.willowWood.blockID && par1 != Block.stone.blockID)
{
return false;
}
@ -436,7 +438,7 @@ public class BlockMoss extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.mossItem.itemID;
return BOPItems.mossItem.itemID;
}
/**
@ -452,6 +454,6 @@ public class BlockMoss extends Block
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.mossItem.itemID;
return BOPItems.mossItem.itemID;
}
}

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockMud.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPItems;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -40,7 +41,7 @@ public class BlockMud extends Block
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.mudBall.itemID;
return BOPItems.mudBall.itemID;
}
public int quantityDropped(Random par1Random)

13
src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickSlab.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.BlockHalfSlab;
import net.minecraft.block.material.Material;
@ -66,7 +67,7 @@ public class BlockMudBrickSlab extends BlockHalfSlab
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.mudBrickSingleSlab.blockID;
return BOPBlocks.mudBrickSingleSlab.blockID;
}
/**
@ -75,7 +76,7 @@ public class BlockMudBrickSlab extends BlockHalfSlab
*/
protected ItemStack createStackedBlock(int par1)
{
return new ItemStack(mod_BiomesOPlenty.mudBrickSingleSlab.blockID, 2, par1 & 7);
return new ItemStack(BOPBlocks.mudBrickSingleSlab.blockID, 2, par1 & 7);
}
/**
@ -96,7 +97,7 @@ public class BlockMudBrickSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.mudBrickDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.mudBrickDoubleSlab.blockID);
return true;
}
@ -112,7 +113,7 @@ public class BlockMudBrickSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.mudBrickDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.mudBrickDoubleSlab.blockID);
return true;
}
@ -139,7 +140,7 @@ public class BlockMudBrickSlab extends BlockHalfSlab
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (par1 != mod_BiomesOPlenty.mudBrickDoubleSlab.blockID)
if (par1 != BOPBlocks.mudBrickDoubleSlab.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
}
@ -150,6 +151,6 @@ public class BlockMudBrickSlab extends BlockHalfSlab
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.mudBrickSingleSlab.blockID;
return BOPBlocks.mudBrickSingleSlab.blockID;
}
}

9
src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -69,7 +70,7 @@ public class BlockOrangeLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.orangeLeaves.blockID)
if (var12 == BOPBlocks.orangeLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -122,7 +123,7 @@ public class BlockOrangeLeaves extends BlockLeavesBase
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.orangeLeaves.blockID)
else if (var15 == BOPBlocks.orangeLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -227,7 +228,7 @@ public class BlockOrangeLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.orangeSapling.blockID;
return BOPBlocks.orangeSapling.blockID;
}
/**
@ -266,7 +267,7 @@ public class BlockOrangeLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.orangeLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.orangeLeaves.blockID, 1, par6 & 3));
}
else
{

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginGrass.java
View File

@ -5,6 +5,7 @@ import static net.minecraftforge.common.ForgeDirection.UP;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFlower;
@ -129,7 +130,7 @@ public class BlockOriginGrass extends Block
if (par1World.getBlockId(var7, var8, var9) == Block.dirt.blockID && par1World.getBlockLightValue(var7, var8 + 1, var9) >= 4 && Block.lightOpacity[var10] <= 2)
{
par1World.setBlock(var7, var8, var9, mod_BiomesOPlenty.originGrass.blockID);
par1World.setBlock(var7, var8, var9, BOPBlocks.originGrass.blockID);
}
}
}

9
src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginLeaves.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -66,7 +67,7 @@ public class BlockOriginLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.originLeaves.blockID)
if (var12 == BOPBlocks.originLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -119,7 +120,7 @@ public class BlockOriginLeaves extends BlockLeavesBase
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.originLeaves.blockID)
else if (var15 == BOPBlocks.originLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -224,7 +225,7 @@ public class BlockOriginLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.originSapling.blockID;
return BOPBlocks.originSapling.blockID;
}
/**
@ -258,7 +259,7 @@ public class BlockOriginLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.originLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.originLeaves.blockID, 1, par6 & 3));
}
else
{

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginSapling.java
View File

@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import tdwp_ftw.biomesop.worldgen.WorldGenOriginTree;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
@ -84,7 +85,7 @@ public class BlockOriginSapling extends BlockSapling
*/
protected boolean canThisPlantGrowOnThisBlockID(int par1)
{
return par1 == Block.grass.blockID || par1 == Block.dirt.blockID || par1 == Block.tilledField.blockID || par1 == mod_BiomesOPlenty.originGrass.blockID;
return par1 == Block.grass.blockID || par1 == Block.dirt.blockID || par1 == Block.tilledField.blockID || par1 == BOPBlocks.originGrass.blockID;
}
/**

11
src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLeaves.java
View File

@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
@ -109,7 +110,7 @@ public class BlockPalmLeaves extends BlockLeavesBase
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.palmLeaves.blockID)
if (var12 == BOPBlocks.palmLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);
par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2);
@ -158,11 +159,11 @@ public class BlockPalmLeaves extends BlockLeavesBase
{
var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14);
if (var15 == mod_BiomesOPlenty.palmWood.blockID)
if (var15 == BOPBlocks.palmWood.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = 0;
}
else if (var15 == mod_BiomesOPlenty.palmLeaves.blockID)
else if (var15 == BOPBlocks.palmLeaves.blockID)
{
this.adjacentTreeBlocks[(var12 + var11) * var10 + (var13 + var11) * var9 + var14 + var11] = -2;
}
@ -267,7 +268,7 @@ public class BlockPalmLeaves extends BlockLeavesBase
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.palmSapling.blockID;
return BOPBlocks.palmSapling.blockID;
}
/**
@ -301,7 +302,7 @@ public class BlockPalmLeaves extends BlockLeavesBase
if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.itemID)
{
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(mod_BiomesOPlenty.palmLeaves.blockID, 1, par6 & 3));
this.dropBlockAsItem_do(par1World, par3, par4, par5, new ItemStack(BOPBlocks.palmLeaves.blockID, 1, par6 & 3));
}
else
{

5
src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java
View File

@ -3,6 +3,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -66,7 +67,7 @@ public class BlockPalmLog extends Block
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.palmWood.blockID;
return BOPBlocks.palmWood.blockID;
}
/**
@ -87,7 +88,7 @@ public class BlockPalmLog extends Block
{
int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11);
if (var12 == mod_BiomesOPlenty.palmLeaves.blockID)
if (var12 == BOPBlocks.palmLeaves.blockID)
{
int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11);

13
src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSlab.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.BlockHalfSlab;
import net.minecraft.block.material.Material;
@ -67,7 +68,7 @@ public class BlockPalmSlab extends BlockHalfSlab
*/
public int idDropped(int par1, Random par2Random, int par3)
{
return mod_BiomesOPlenty.palmSingleSlab.blockID;
return BOPBlocks.palmSingleSlab.blockID;
}
/**
@ -76,7 +77,7 @@ public class BlockPalmSlab extends BlockHalfSlab
*/
protected ItemStack createStackedBlock(int par1)
{
return new ItemStack(mod_BiomesOPlenty.palmSingleSlab.blockID, 2, par1 & 7);
return new ItemStack(BOPBlocks.palmSingleSlab.blockID, 2, par1 & 7);
}
/**
@ -97,7 +98,7 @@ public class BlockPalmSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.palmDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.palmDoubleSlab.blockID);
return true;
}
@ -113,7 +114,7 @@ public class BlockPalmSlab extends BlockHalfSlab
}
world.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.stepSound.getPlaceSound(), (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
world.setBlock(par2, par3, par4, mod_BiomesOPlenty.palmDoubleSlab.blockID);
world.setBlock(par2, par3, par4, BOPBlocks.palmDoubleSlab.blockID);
return true;
}
@ -140,7 +141,7 @@ public class BlockPalmSlab extends BlockHalfSlab
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (par1 != mod_BiomesOPlenty.palmDoubleSlab.blockID)
if (par1 != BOPBlocks.palmDoubleSlab.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
}
@ -151,6 +152,6 @@ public class BlockPalmSlab extends BlockHalfSlab
*/
public int idPicked(World par1World, int par2, int par3, int par4)
{
return mod_BiomesOPlenty.palmSingleSlab.blockID;
return BOPBlocks.palmSingleSlab.blockID;
}
}

3
src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkFlower.java
View File

@ -2,6 +2,7 @@ package tdwp_ftw.biomesop.blocks;
import java.util.Random;
import tdwp_ftw.biomesop.mod_BiomesOPlenty;
import tdwp_ftw.biomesop.declarations.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@ -46,7 +47,7 @@ public class BlockPinkFlower extends Block
*/
protected boolean canThisPlantGrowOnThisBlockID(int par1)
{
return par1 == Block.grass.blockID || par1 == Block.dirt.blockID || par1 == Block.tilledField.blockID || par1 == mod_BiomesOPlenty.holyGrass.blockID;
return par1 == Block.grass.blockID || par1 == Block.dirt.blockID || par1 == Block.tilledField.blockID || par1 == BOPBlocks.holyGrass.blockID;
}
/**

Some files were not shown because too many files have changed in this diff Show More