Update Forestry and add village hope field

This commit is contained in:
Nedelosk committed 2017-06-26 14:52:52 +02:00
1 parent b1de19e1f1
commit e0409c17ba
4 files changed
+214 -1

No files matched your search

@@ -20,6 +20,7 @@ import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.VillagerRegistry;
import forestry.api.arboriculture.EnumVanillaWoodType;
import forestry.api.arboriculture.IWoodAccess;
@@ -62,6 +63,7 @@ import binnie.extratrees.block.wood.ItemBlockETWoodDoor;
import binnie.extratrees.block.wood.ItemETSlab;
import binnie.extratrees.genetics.ETTreeDefinition;
import binnie.extratrees.item.ExtraTreeLiquid;
import binnie.extratrees.worldgen.VillageCreationExtraTrees;
public class ModuleBlocks implements IInitializable {
public List<BlockETLog> logs;
@@ -285,6 +287,8 @@ public class ModuleBlocks implements IInitializable {
hops = new BlockHops();
ExtraTrees.proxy.registerBlock(hops);
VillageCreationExtraTrees.registerVillageComponents();
}
public void registerDoors(WoodAccess woodAccess, List<BlockETDoor> blocks) {
@@ -306,6 +310,10 @@ public class ModuleBlocks implements IInitializable {
@Override
public void init() {
VillageCreationExtraTrees villageHandler = new VillageCreationExtraTrees();
VillagerRegistry villagerRegistry = VillagerRegistry.instance();
villagerRegistry.registerVillageCreationHandler(villageHandler);
RecipeSorter.register("extratrees:multifence", MultiFenceRecipeSize.class, RecipeSorter.Category.SHAPED, "");
RecipeSorter.register("extratrees:multifence2", MultiFenceRecipeEmbedded.class, RecipeSorter.Category.SHAPED, "");
RecipeSorter.register("extratrees:multifence3", MultiFenceRecipeSolid.class, RecipeSorter.Category.SHAPED, "");
@@ -0,0 +1,38 @@
package binnie.extratrees.worldgen;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Random;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.gen.structure.MapGenStructureIO;
import net.minecraft.world.gen.structure.StructureComponent;
import net.minecraft.world.gen.structure.StructureVillagePieces;
import net.minecraftforge.fml.common.registry.VillagerRegistry;
import binnie.Constants;
public class VillageCreationExtraTrees implements VillagerRegistry.IVillageCreationHandler {
public static void registerVillageComponents() {
MapGenStructureIO.registerStructureComponent(VillageHopeField.class, Constants.EXTRA_TREES_MOD_ID + ":Field");
}
@Override
public StructureVillagePieces.PieceWeight getVillagePieceWeight(Random random, int size) {
return new StructureVillagePieces.PieceWeight(VillageHopeField.class, 3, MathHelper.getInt(random, 1 + size, 4 + size));
}
@Override
public Class<?> getComponentClass() {
return VillageHopeField.class;
}
@Override
@Nullable
public StructureVillagePieces.Village buildComponent(StructureVillagePieces.PieceWeight villagePiece, StructureVillagePieces.Start startPiece, List<StructureComponent> pieces, Random random, int p1, int p2, int p3, EnumFacing facing, int p5) {
return VillageHopeField.buildComponent(startPiece, pieces, random, p1, p2, p3, facing, p5);
}
}
@@ -0,0 +1,167 @@
package binnie.extratrees.worldgen;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockCrops;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.gen.structure.StructureBoundingBox;
import net.minecraft.world.gen.structure.StructureComponent;
import net.minecraft.world.gen.structure.StructureVillagePieces;
import net.minecraft.world.gen.structure.template.TemplateManager;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.BlockHops;
public class VillageHopeField extends StructureVillagePieces.Village {
private Block cropTypeA;
private Block cropTypeB;
private Block cropTypeC;
private Block cropTypeD;
public VillageHopeField() {
}
public VillageHopeField(StructureVillagePieces.Start start, int type, Random rand, StructureBoundingBox boundingBox, EnumFacing facing) {
super(start, type);
this.setCoordBaseMode(facing);
this.boundingBox = boundingBox;
this.cropTypeA = this.getRandomCropType(rand);
this.cropTypeB = this.getRandomCropType(rand);
this.cropTypeC = this.getRandomCropType(rand);
this.cropTypeD = this.getRandomCropType(rand);
}
@Nullable
public static VillageHopeField buildComponent(StructureVillagePieces.Start startPiece, List<StructureComponent> pieces, Random random, int structureMinX, int structureMinY, int structureMinZ, EnumFacing facing, int componentType) {
StructureBoundingBox bbox = StructureBoundingBox.getComponentToAddBoundingBox(structureMinX, structureMinY, structureMinZ, 0, 0, 0, 13, 4, 9, facing);
if (!canVillageGoDeeper(bbox) || StructureComponent.findIntersecting(pieces, bbox) != null) {
return null;
}
return new VillageHopeField(startPiece, componentType, random, bbox, facing);
}
protected void writeStructureToNBT(NBTTagCompound tagCompound) {
super.writeStructureToNBT(tagCompound);
tagCompound.setInteger("CA", Block.REGISTRY.getIDForObject(this.cropTypeA));
tagCompound.setInteger("CB", Block.REGISTRY.getIDForObject(this.cropTypeB));
tagCompound.setInteger("CC", Block.REGISTRY.getIDForObject(this.cropTypeC));
tagCompound.setInteger("CD", Block.REGISTRY.getIDForObject(this.cropTypeD));
}
protected void readStructureFromNBT(NBTTagCompound tagCompound, TemplateManager manager) {
super.readStructureFromNBT(tagCompound, manager);
this.cropTypeA = Block.getBlockById(tagCompound.getInteger("CA"));
this.cropTypeB = Block.getBlockById(tagCompound.getInteger("CB"));
this.cropTypeC = Block.getBlockById(tagCompound.getInteger("CC"));
this.cropTypeD = Block.getBlockById(tagCompound.getInteger("CD"));
if (!(this.cropTypeA instanceof BlockCrops)) {
this.cropTypeA = Blocks.WHEAT;
}
if (!(this.cropTypeB instanceof BlockCrops)) {
this.cropTypeB = Blocks.CARROTS;
}
if (!(this.cropTypeC instanceof BlockCrops)) {
this.cropTypeC = Blocks.POTATOES;
}
if (!(this.cropTypeD instanceof BlockCrops)) {
this.cropTypeD = Blocks.BEETROOTS;
}
}
private Block getRandomCropType(Random rand) {
switch (rand.nextInt(10)) {
case 0:
case 1:
return Blocks.CARROTS;
case 2:
case 3:
return Blocks.POTATOES;
case 4:
return Blocks.BEETROOTS;
case 5:
case 6:
return ExtraTrees.blocks().hops;
default:
return Blocks.WHEAT;
}
}
public boolean addComponentParts(World worldIn, Random randomIn, StructureBoundingBox structureBoundingBoxIn)
{
if (this.averageGroundLvl < 0) {
this.averageGroundLvl = this.getAverageGroundLevel(worldIn, structureBoundingBoxIn);
if (this.averageGroundLvl < 0) {
return true;
}
this.boundingBox.offset(0, this.averageGroundLvl - this.boundingBox.maxY + 4 - 1, 0);
}
IBlockState iblockstate = this.getBiomeSpecificBlockState(Blocks.LOG.getDefaultState());
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 1, 0, 12, 4, 8, Blocks.AIR.getDefaultState(), Blocks.AIR.getDefaultState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 0, 1, 2, 0, 7, Blocks.FARMLAND.getDefaultState(), Blocks.FARMLAND.getDefaultState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 4, 0, 1, 5, 0, 7, Blocks.FARMLAND.getDefaultState(), Blocks.FARMLAND.getDefaultState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 7, 0, 1, 8, 0, 7, Blocks.FARMLAND.getDefaultState(), Blocks.FARMLAND.getDefaultState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 10, 0, 1, 11, 0, 7, Blocks.FARMLAND.getDefaultState(), Blocks.FARMLAND.getDefaultState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 0, 0, 0, 0, 8, iblockstate, iblockstate, false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 6, 0, 0, 6, 0, 8, iblockstate, iblockstate, false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 12, 0, 0, 12, 0, 8, iblockstate, iblockstate, false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 0, 0, 11, 0, 0, iblockstate, iblockstate, false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 0, 8, 11, 0, 8, iblockstate, iblockstate, false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 3, 0, 1, 3, 0, 7, Blocks.WATER.getDefaultState(), Blocks.WATER.getDefaultState(), false);
this.fillWithBlocks(worldIn, structureBoundingBoxIn, 9, 0, 1, 9, 0, 7, Blocks.WATER.getDefaultState(), Blocks.WATER.getDefaultState(), false);
for (int i = 1; i <= 7; ++i) {
int j = ((BlockCrops)this.cropTypeA).getMaxAge();
int k = j / 3;
this.setBlockState(worldIn, this.cropTypeA.getStateFromMeta(MathHelper.getInt(randomIn, k, j)), 1, 1, i, structureBoundingBoxIn);
this.setBlockState(worldIn, this.cropTypeA.getStateFromMeta(MathHelper.getInt(randomIn, k, j)), 2, 1, i, structureBoundingBoxIn);
int l = ((BlockCrops)this.cropTypeB).getMaxAge();
int i1 = l / 3;
this.setBlockState(worldIn, this.cropTypeB.getStateFromMeta(MathHelper.getInt(randomIn, i1, l)), 4, 1, i, structureBoundingBoxIn);
this.setBlockState(worldIn, this.cropTypeB.getStateFromMeta(MathHelper.getInt(randomIn, i1, l)), 5, 1, i, structureBoundingBoxIn);
int j1 = ((BlockCrops)this.cropTypeC).getMaxAge();
int k1 = j1 / 3;
this.setBlockState(worldIn, this.cropTypeC.getStateFromMeta(MathHelper.getInt(randomIn, k1, j1)), 7, 1, i, structureBoundingBoxIn);
this.setBlockState(worldIn, this.cropTypeC.getStateFromMeta(MathHelper.getInt(randomIn, k1, j1)), 8, 1, i, structureBoundingBoxIn);
int l1 = ((BlockCrops)this.cropTypeD).getMaxAge();
int i2 = l1 / 3;
this.setBlockState(worldIn, this.cropTypeD.getStateFromMeta(MathHelper.getInt(randomIn, i2, l1)), 10, 1, i, structureBoundingBoxIn);
this.setBlockState(worldIn, this.cropTypeD.getStateFromMeta(MathHelper.getInt(randomIn, i2, l1)), 11, 1, i, structureBoundingBoxIn);
}
for (int j2 = 0; j2 < 9; ++j2) {
for (int k2 = 0; k2 < 13; ++k2) {
this.clearCurrentPositionBlocksUpwards(worldIn, k2, 4, j2, structureBoundingBoxIn);
this.replaceAirAndLiquidDownwards(worldIn, Blocks.DIRT.getDefaultState(), k2, -1, j2, structureBoundingBoxIn);
}
}
return true;
}
@Override
protected void setBlockState(World worldIn, IBlockState blockstateIn, int x, int y, int z, StructureBoundingBox boundingboxIn) {
super.setBlockState(worldIn, blockstateIn, x, y, z, boundingboxIn);
Block block = blockstateIn.getBlock();
if(block instanceof BlockHops){
if(y < 2){
setBlockState(worldIn, block.getStateFromMeta(8), x, y + 1, z, boundingboxIn);
}
}
}
}