Added marble bees #36

This commit is contained in:
marcin212 committed 2017-06-16 12:46:38 +02:00
1 parent bf40504ddf
commit 6968ebed3f
10 files changed
+142 -24

No files matched your search

@@ -93,7 +93,9 @@ public class ExtraBees {
public void init(final FMLInitializationEvent evt) {
configHandler.reload(true);
ItemHoneyComb.addSubtypes();
GameRegistry.registerWorldGenerator(new ExtraBeesWorldGenerator(), 0);
ExtraBeesWorldGenerator extraBeesWorldGenerator = new ExtraBeesWorldGenerator();
extraBeesWorldGenerator.doInit();
GameRegistry.registerWorldGenerator(extraBeesWorldGenerator, 0);
ExtraBeesEffect.doInit();
ExtraBeesFlowers.doInit();
ExtraBeesSpecies.doInit();
@@ -28,6 +28,7 @@ import static forestry.apiculture.genetics.BeeDefinition.FIENDISH;
import static forestry.apiculture.genetics.BeeDefinition.FOREST;
import static forestry.apiculture.genetics.BeeDefinition.FRUGAL;
import static forestry.apiculture.genetics.BeeDefinition.HERMITIC;
import static forestry.apiculture.genetics.BeeDefinition.HEROIC;
import static forestry.apiculture.genetics.BeeDefinition.IMPERIAL;
import static forestry.apiculture.genetics.BeeDefinition.INDUSTRIOUS;
import static forestry.apiculture.genetics.BeeDefinition.MAJESTIC;
@@ -201,12 +202,30 @@ public class ExtraBeeMutation {
registerMutation(ExtraBeesSpecies.UNUSUAL, HERMITIC, ExtraBeesSpecies.SPATIAL, 5);
registerMutation(ExtraBeesSpecies.SPATIAL, SPECTRAL, ExtraBeesSpecies.QUANTUM, 5);
registerMutation(NOBLE, MONASTIC, ExtraBeesSpecies.MYSTICAL, 5);
registerMutation(ExtraBeesSpecies.WATER, ExtraBeesSpecies.MARBLE, COMMON, 15);
registerMutation(ExtraBeesSpecies.ROCK, ExtraBeesSpecies.MARBLE, COMMON, 15);
registerMutation(ExtraBeesSpecies.MARBLE, FOREST, COMMON, 15);
registerMutation(ExtraBeesSpecies.MARBLE, MEADOWS, COMMON, 15);
registerMutation(ExtraBeesSpecies.MARBLE, MODEST, COMMON, 15);
registerMutation(ExtraBeesSpecies.MARBLE, TROPICAL, COMMON, 15);
registerMutation(ExtraBeesSpecies.MARBLE, MARSHY, COMMON, 15);
registerMutation(ExtraBeesSpecies.MARBLE, COMMON, CULTIVATED, 12);
registerMutation(ExtraBeesSpecies.MARBLE, HEROIC, ExtraBeesSpecies.ROMAN, 10);
registerMutation(ExtraBeesSpecies.ROMAN, ExtraBeesSpecies.MARBLE, ExtraBeesSpecies.GREEK, 8);
registerMutation(ExtraBeesSpecies.ROMAN, ExtraBeesSpecies.MARBLE, ExtraBeesSpecies.GREEK, 8);
registerMutation(ExtraBeesSpecies.GREEK, ExtraBeesSpecies.ROMAN, ExtraBeesSpecies.CLASSICAL, 8);
}
public static IBeeMutationBuilder registerMutation(BeeDefinition allele0, BeeDefinition allele1, ExtraBeesSpecies mutation, int chance) {
return registerMutation(allele0.getGenome().getPrimary(), allele1.getGenome().getPrimary(), mutation, chance);
}
public static IBeeMutationBuilder registerMutation(ExtraBeesSpecies allele0, ExtraBeesSpecies allele1, BeeDefinition mutation, int chance) {
return registerMutation(allele0, allele1, mutation.getTemplate(), chance);
}
public static IBeeMutationBuilder registerMutation(IAlleleBeeSpecies allele0, BeeDefinition allele1, BeeDefinition mutation, int chance) {
return registerMutation(allele0, allele1.getGenome().getPrimary(), mutation.getTemplate(), chance);
}
@@ -120,10 +120,10 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
SWAMP("paludis", 3500339),
BOGGY("lama", 7887913),
FUNGAL("boletus", 13722112),
MARBLE,
ROMAN,
GREEK,
CLASSICAL,
MARBLE("marbla", 14076367),
ROMAN("roman", 11373488),
GREEK("greco", 8735882),
CLASSICAL("classica", 8592780),
BASALT("aceri", 9202025),
TEMPERED("iratus", 9062472),
ANGRY,
@@ -733,6 +733,21 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
ExtraBeesSpecies.BLUTONIUM.addProduct(EnumHoneyComb.BARREN, 0.20f);
ExtraBeesSpecies.BLUTONIUM.addSpecialty(EnumHoneyComb.BLUTONIUM, 0.01f);
ExtraBeesSpecies.MARBLE.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f);
ExtraBeesSpecies.MARBLE.importTemplate(BeeDefinition.NOBLE);
ExtraBeesSpecies.ROMAN.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f);
ExtraBeesSpecies.ROMAN.importTemplate(MARBLE);
ExtraBeesSpecies.GREEK.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f);
ExtraBeesSpecies.GREEK.setRecessive();
ExtraBeesSpecies.GREEK.importTemplate(ROMAN);
ExtraBeesSpecies.CLASSICAL.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f);
ExtraBeesSpecies.CLASSICAL.addSpecialty(PluginApiculture.getItems().royalJelly.getItemStack(), 0.25f);
ExtraBeesSpecies.CLASSICAL.setHasEffect();
ExtraBeesSpecies.CLASSICAL.importTemplate(GREEK);
ExtraBeesSpecies.MYSTICAL.importTemplate(BeeDefinition.NOBLE);
for (final Map.Entry<ItemStack, Float> entry : Utils.getSpecies(BeeDefinition.NOBLE).getProductChances().entrySet()) {
ExtraBeesSpecies.MYSTICAL.addProduct(entry.getKey(), entry.getValue());
@@ -44,6 +44,9 @@ public final class BlockRegister {
EnumHiveType.Rock.drops.add(new HiveDrop(valiantSpecies, 3));
EnumHiveType.Nether.drops.add(new HiveDrop(ExtraBeesSpecies.BASALT, 80));
EnumHiveType.Nether.drops.add(new HiveDrop(valiantSpecies, 3));
EnumHiveType.Marble.drops.add(new HiveDrop(ExtraBeesSpecies.MARBLE, 80));
EnumHiveType.Marble.drops.add(new HiveDrop(valiantSpecies, 3));
ExtraBees.hive.setHarvestLevel("scoop", 0, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Water));
ExtraBees.hive.setHarvestLevel("scoop", 0, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Rock));
ExtraBees.hive.setHarvestLevel("scoop", 0, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Nether));
@@ -7,31 +7,36 @@ import net.minecraft.world.chunk.IChunkGenerator;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraftforge.fml.common.IWorldGenerator;
import java.util.LinkedList;
import java.util.Random;
public class ExtraBeesWorldGenerator implements IWorldGenerator {
private LinkedList<WorldGenHive> worldGenHives = new LinkedList<>();
public void registerHiveWorldGen(WorldGenHive hive) {
worldGenHives.add(hive);
}
public void doInit() {
registerHiveWorldGen(new WorldGenHiveWater(ConfigurationMain.waterHiveRate));
registerHiveWorldGen(new WorldGenHiveRock(ConfigurationMain.rockHiveRate));
registerHiveWorldGen(new WorldGenHiveNether(ConfigurationMain.netherHiveRate));
registerHiveWorldGen(new WorldGenHiveMarble(ConfigurationMain.marbleHiveRate));
}
@Override
public void generate(final Random rand, int chunkX, int chunkZ, final World world, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider) {
public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) {
worldGenHives.stream().forEach(hive -> generateHive(hive, rand, chunkX, chunkZ, world));
}
private void generateHive(WorldGenHive hive, Random rand, int chunkX, int chunkZ, World world) {
chunkX <<= 4;
chunkZ <<= 4;
for (int i = 0; i < ConfigurationMain.waterHiveRate; ++i) {
for (int i = 0; i < hive.getRate(); ++i) {
final int randPosX = chunkX + rand.nextInt(16);
final int randPosY = rand.nextInt(50) + 20;
final int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveWater().generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ));
}
for (int i = 0; i < ConfigurationMain.rockHiveRate; ++i) {
final int randPosX = chunkX + rand.nextInt(16);
final int randPosY = rand.nextInt(50) + 20;
final int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveRock().generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ));
}
for (int i = 0; i < ConfigurationMain.netherHiveRate; ++i) {
final int randPosX = chunkX + rand.nextInt(16);
final int randPosY = rand.nextInt(50) + 20;
final int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveNether().generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ));
hive.generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ));
}
}
}
@@ -0,0 +1,16 @@
package binnie.extrabees.worldgen;
import net.minecraft.world.gen.feature.WorldGenerator;
public abstract class WorldGenHive extends WorldGenerator {
private int rate;
public WorldGenHive(int rate) {
this.rate = rate;
}
public int getRate() {
return rate;
}
}
@@ -0,0 +1,47 @@
package binnie.extrabees.worldgen;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.blocks.BlockExtraBeeHive;
import binnie.extrabees.blocks.type.EnumHiveType;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import java.util.HashSet;
import java.util.Random;
public class WorldGenHiveMarble extends WorldGenHive {
HashSet<Block> validBlocks = new HashSet<>();
public WorldGenHiveMarble(int rate) {
super(rate);
//TODO config option / more ore names
OreDictionary.getOres("stoneMarble").stream().filter(s -> s.getItem() instanceof ItemBlock).map(s -> ((ItemBlock) s.getItem()).getBlock()).forEach(validBlocks::add);
}
@Override
public boolean generate(World world, Random rand, BlockPos position) {
Block blockAtPos = world.getBlockState(position).getBlock();
if (world.isAirBlock(position) || !validBlocks.contains(blockAtPos)) {
return false;
}
//generate when one face is different from marble
int otherFace = 0;
for (EnumFacing face : EnumFacing.values()) {
if (!world.getBlockState(position.offset(face)).getBlock().equals(blockAtPos)) {
otherFace++;
if (otherFace > 1) {
return true;
}
}
}
world.setBlockState(position, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Marble));
return true;
}
}
@@ -9,12 +9,15 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.BiomeDictionary;
import java.util.Random;
public class WorldGenHiveNether extends WorldGenerator {
public class WorldGenHiveNether extends WorldGenHive {
public WorldGenHiveNether(int rate) {
super(rate);
}
@Override
public boolean generate(final World world, final Random random, final BlockPos pos) {
@@ -12,7 +12,11 @@ import net.minecraft.world.gen.feature.WorldGenerator;
import java.util.Random;
public class WorldGenHiveRock extends WorldGenerator {
public class WorldGenHiveRock extends WorldGenHive {
public WorldGenHiveRock(int rate) {
super(rate);
}
@Override
public boolean generate(final World world, final Random random, final BlockPos pos) {
@@ -11,7 +11,11 @@ import net.minecraft.world.gen.feature.WorldGenerator;
import java.util.Random;
public class WorldGenHiveWater extends WorldGenerator {
public class WorldGenHiveWater extends WorldGenHive {
public WorldGenHiveWater(int rate) {
super(rate);
}
@Override
public boolean generate(final World world, final Random random, final BlockPos blockPos) {