Start to clean up tree generation

This commit is contained in:
Nedelosk committed 2017-03-21 15:50:03 +01:00
1 parent c93a79887f
commit 8f77efae6e
11 files changed
+132 -155

No files matched your search

@@ -11,6 +11,7 @@ import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.core.blocks.IColoredBlock;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@@ -39,6 +40,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored
super(Material.GLASS);
this.setCreativeTab(CreativeTabBotany.instance);
this.setRegistryName("stained");
setSoundType(SoundType.GLASS);
}
@Override
@@ -137,6 +139,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored
@Override
public String getDisplayName(final ItemStack par1ItemStack) {
final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
//TODO:localise
return EnumFlowerColor.get(meta).getColourName() + " Pigmented Glass";
}
@@ -21,48 +21,52 @@ public enum PacketID implements IPacketID {
public void onMessage(MessageBinnie message, MessageContext context) {
if (this == PacketID.FIELDKIT && context.side == Side.CLIENT) {
MessageNBT packet = new MessageNBT(message);
NBTTagCompound data = packet.getTagCompound();
EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer();
String info = "";
if (data == null || data.hasNoTags()) {
info += Binnie.LANGUAGE.localise("botany.flowers.species.not.discover");
} else {
IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species"));
IAlleleFlowerSpecies secondary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2"));
float age = data.getFloat("Age");
EnumFlowerColor color1 = EnumFlowerColor.get(data.getShort("Colour"));
EnumFlowerColor color2 = EnumFlowerColor.get(data.getShort("Colour2"));
if (primary == null || secondary == null) {
return;
}
info += "A";
if (age == 0.0f) {
info += "";
} else if (age < 0.25f) {
info += " Young";
} else if (age < 0.75f) {
info += " Mature";
} else {
info += " Old";
}
if (color1 == color2) {
info = info + " " + color1.getName();
} else {
info = info + " " + color1.getName() + " & " + color2.getName();
}
if (primary == secondary) {
info = info + " " + primary.getName();
} else {
info = info + " " + primary.getName() + "-" + secondary.getName() + " " + Binnie.LANGUAGE.localise("botany.flowers.species.hybrid");
}
if (age == 0.0f) {
info += " " + Binnie.LANGUAGE.localise("botany.flowers.species.germling");
}
if (data.getBoolean("Wilting")) {
info += ". " + Binnie.LANGUAGE.localise("botany.flowers.species.wilting");
}
}
player.sendStatusMessage(new TextComponentString(info), false);
onUseFieldKit(packet.getTagCompound());
}
}
//TODO: localise
public void onUseFieldKit(NBTTagCompound data){
EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer();
String info = "";
if (data == null || data.hasNoTags()) {
info += Binnie.LANGUAGE.localise("botany.flowers.species.not.discover");
} else {
IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species"));
IAlleleFlowerSpecies secondary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2"));
float age = data.getFloat("Age");
EnumFlowerColor color1 = EnumFlowerColor.get(data.getShort("Colour"));
EnumFlowerColor color2 = EnumFlowerColor.get(data.getShort("Colour2"));
if (primary == null || secondary == null) {
return;
}
info += "A";
if (age == 0.0f) {
info += "";
} else if (age < 0.25f) {
info += " Young";
} else if (age < 0.75f) {
info += " Mature";
} else {
info += " Old";
}
if (color1 == color2) {
info = info + " " + color1.getName();
} else {
info = info + " " + color1.getName() + " & " + color2.getName();
}
if (primary == secondary) {
info = info + " " + primary.getName();
} else {
info = info + " " + primary.getName() + "-" + secondary.getName() + " " + Binnie.LANGUAGE.localise("botany.flowers.species.hybrid");
}
if (age == 0.0f) {
info += " " + Binnie.LANGUAGE.localise("botany.flowers.species.germling");
}
if (data.getBoolean("Wilting")) {
info += ". " + Binnie.LANGUAGE.localise("botany.flowers.species.wilting");
}
}
player.sendStatusMessage(new TextComponentString(info), false);
}
}
@@ -131,7 +131,6 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB
return FakeErrorLogic.instance;
}
// TODO ??
@Override
public boolean canBlockSeeTheSky() {
return true;
@@ -157,7 +156,6 @@ public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IB
return beeInventory;
}
// TODO ??
@Override
public Iterable<IBeeListener> getBeeListeners() {
return Collections.emptyList();
@@ -179,6 +179,9 @@ public class DesignBlock {
adjustedFacing = getRotation(adjustedFacing, EnumFacing.SOUTH);
break;
}
default: {
break;
}
}
for (int i = 0; i < this.rotation; ++i) {
adjustedFacing = getRotation(adjustedFacing, EnumFacing.DOWN);
@@ -264,6 +267,9 @@ public class DesignBlock {
layout = layout.flipHorizontal();
break;
}
default: {
break;
}
}
if (facing == EnumFacing.EAST) {
for (int j = 0; j < this.rotation; ++j) {
@@ -8,7 +8,7 @@ import java.util.List;
public class DesignerManager {
public static DesignerManager instance = new DesignerManager();
;
List<IDesignSystem> systems;
public DesignerManager() {
@@ -1,104 +1,83 @@
package binnie.extratrees.gen;
import java.util.List;
import java.util.Random;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.worldgen.TreeBlockTypeLeaf;
import forestry.core.worldgen.WorldGenHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public class WorldGenApple {
public static class OrchardApple extends WorldGenTree {
public static class OrchardApple extends forestry.arboriculture.worldgen.WorldGenTree {
public OrchardApple(ITreeGenData tree) {
super(tree);
super(tree, 3, 6);
}
@Override
public void generate() {
this.generateTreeTrunk(this.height, this.girth);
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = this.height;
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
while (leafSpawn > 2) {
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.5f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, this.leaf, false);
}
@Override
public void preGenerate() {
this.height = this.determineHeight(3, 6);
this.girth = this.determineGirth(this.treeGen.getGirth());
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
}
public static class SweetCrabapple extends WorldGenTree {
public static class SweetCrabapple extends forestry.arboriculture.worldgen.WorldGenTree {
public SweetCrabapple(ITreeGenData tree) {
super(tree);
super(tree, 4, 4);
}
@Override
public void generate() {
this.generateTreeTrunk(this.height, this.girth);
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = this.height;
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false);
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.5f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
while (leafSpawn > 3) {
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 2F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.5f, 1, this.leaf, false);
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false);
}
@Override
public void preGenerate() {
this.height = this.determineHeight(4, 4);
this.girth = this.determineGirth(this.treeGen.getGirth());
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 2.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
}
public static class FloweringCrabapple extends WorldGenTree {
public static class FloweringCrabapple extends forestry.arboriculture.worldgen.WorldGenTree {
public FloweringCrabapple(ITreeGenData tree) {
super(tree);
super(tree, 3, 6);
}
@Override
public void generate() {
this.generateTreeTrunk(this.height, this.girth);
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = this.height;
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false);
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 2F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
while (leafSpawn > 3) {
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 4.0f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 3F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, this.leaf, false);
}
@Override
public void preGenerate() {
this.height = this.determineHeight(3, 6);
this.girth = this.determineGirth(this.treeGen.getGirth());
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
}
public static class PrairieCrabapple extends WorldGenTree {
public static class PrairieCrabapple extends forestry.arboriculture.worldgen.WorldGenTree {
public PrairieCrabapple(ITreeGenData tree) {
super(tree);
super(tree, 4, 4);
}
@Override
public void generate() {
this.generateTreeTrunk(this.height, this.girth);
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = this.height;
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false);
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.5f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.5F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
while (leafSpawn > 3) {
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 2F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, this.leaf, false);
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, this.leaf, false);
}
@Override
public void preGenerate() {
this.height = this.determineHeight(4, 4);
this.girth = this.determineGirth(this.treeGen.getGirth());
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 2F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1F + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
}
}
@@ -72,8 +72,8 @@ public class WorldGenEucalyptus {
for (int x = 0; x < this.girth; ++x) {
for (int y = 0; y < this.girth; ++y) {
for (int i = 0; i < 2; ++i) {
//TODO Eucalyptus2 log
//this.addBlock(x - offset, i, y - offset, new BlockTypeLog(EnumExtraTreeLog.Eucalyptus2), true);
//TODO:
//this.addBlock(x - offset, i, y - offset, new BlockTypeLog(EnumETLog.Eucalyptus2), true);
}
}
}
@@ -1,58 +1,52 @@
package binnie.extratrees.gen;
import java.util.List;
import java.util.Random;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.worldgen.TreeBlockTypeLeaf;
import forestry.core.worldgen.WorldGenHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.arboriculture.worldgen.WorldGenTree;
public class WorldGenWalnut {
public static class BlackWalnut extends WorldGenTree {
public BlackWalnut(ITreeGenData tree) {
super(tree);
super(tree, 9, 6);
}
@Override
public void generate() {
this.generateTreeTrunk(this.height, this.girth);
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = this.height + 1;
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, this.leaf, false);
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.6f, 1, this.leaf, false);
while (leafSpawn > this.randBetween(3, 4)) {
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.8f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.6f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
while (leafSpawn > 3) {
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.8f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.7f, 1, this.leaf, false);
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.8f, 1, this.leaf, false);
}
@Override
public void preGenerate() {
this.height = this.determineHeight(9, 6);
this.girth = this.determineGirth(this.treeGen.getGirth());
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.7f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.2f - girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
}
public static class Butternut extends WorldGenTree {
public Butternut(ITreeGenData tree) {
super(tree);
super(tree, 6, 3);
}
@Override
public void generate() {
this.generateTreeTrunk(this.height, this.girth);
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = this.height + 1;
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, this.leaf, false);
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.5f, 1, this.leaf, false);
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 4.5f, 1, this.leaf, false);
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 5.0f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 0.9f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.9f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 2.9f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
while (leafSpawn > 3) {
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 5.0f, 1, this.leaf, false);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 2.9f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
if (this.rand.nextBoolean()) {
this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 4.0f, 1, this.leaf, false);
if (rand.nextBoolean()) {
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, 1.9f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
}
@Override
public void preGenerate() {
this.height = this.determineHeight(6, 3);
this.girth = this.determineGirth(this.treeGen.getGirth());
}
}
}
@@ -10,11 +10,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class CreativeTabGenetics extends CreativeTabs {
public static CreativeTabs instance = new CreativeTabGenetics();
@Override
public ItemStack getIconItemStack() {
return GeneticsItems.EmptySerum.get(1);
}
public CreativeTabGenetics() {
super("Genetics");
}
@@ -34,8 +29,7 @@ public class CreativeTabGenetics extends CreativeTabs {
@Override
@SideOnly(Side.CLIENT)
public ItemStack getTabIconItem() {
//TODO add icon item for genetics
return ItemStack.EMPTY;
return GeneticsItems.EmptySerum.get(1);
}
}
@@ -23,7 +23,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandlerItem;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -143,10 +143,9 @@ public class AnalystPageProducts extends AnalystPageProduce {
};
for (ItemStack container : containers) {
// TODO 1.11 update for IFluidHandlerItem
IFluidHandler fluidHandler = FluidUtil.getFluidHandler(container);
IFluidHandlerItem fluidHandler = FluidUtil.getFluidHandler(container);
if (fluidHandler != null && fluidHandler.fill(fluidStack, true) > 0) {
return container;
return fluidHandler.getContainer();
}
}