From 787395494cc73495312dc37d31fc4f5e7a2a36ec Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 29 Jul 2017 15:42:34 -0700 Subject: [PATCH 1/3] Fix tree generation with Mystcraft --- .../arboriculture/worldgen/TreeDecorator.java | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java b/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java index c618c9241..afd21c5fe 100644 --- a/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java +++ b/src/main/java/forestry/arboriculture/worldgen/TreeDecorator.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.worldgen; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -18,6 +19,18 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + +import net.minecraftforge.common.IPlantable; +import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; + +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IGrowthProvider; @@ -28,22 +41,10 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.arboriculture.commands.TreeGenHelper; import forestry.core.utils.BlockUtil; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; public class TreeDecorator { - - private static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "FORESTRY_TREES", new Class[0]); private static final List SPECIES = new ArrayList<>(); - private static final Map> biomeCache = new HashMap<>(); + private static final Map> biomeCache = new HashMap<>(); @SubscribeEvent public void decorateTrees(Decorate event) { @@ -53,7 +54,7 @@ public class TreeDecorator { } public static void decorateTrees(World world, Random rand, int worldX, int worldZ) { - if(biomeCache.isEmpty()){ + if (biomeCache.isEmpty()) { generateBiomeCache(world, rand); } for (int tries = 0; tries < 4 + rand.nextInt(2); tries++) { @@ -62,9 +63,9 @@ public class TreeDecorator { BlockPos pos = new BlockPos(x, 0, z); Biome biome = world.getBiome(pos); - - Set trees = biomeCache.get(biome); - for(ITree tree : trees){ + + Set trees = biomeCache.computeIfAbsent(biome.getRegistryName(), k -> new HashSet<>()); + for (ITree tree : trees) { IAlleleTreeSpecies species = tree.getGenome().getPrimary(); if (species.getRarity() >= rand.nextFloat()) { pos = getValidPos(world, x, z, tree); @@ -83,15 +84,16 @@ public class TreeDecorator { } } + @Nullable private static BlockPos getValidPos(World world, int x, int z, ITree tree){ // get to the ground final BlockPos topPos = world.getHeight(new BlockPos(x, 0, z)); if (topPos.getY() == 0) { return null; } - + final BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos(topPos); - + IBlockState blockState = world.getBlockState(pos); IBlockState downState = world.getBlockState(pos.down()); while (BlockUtil.canReplace(blockState, world, pos)) { @@ -124,14 +126,14 @@ public class TreeDecorator { } private static void generateBiomeCache(World world, Random rand){ - for(IAlleleTreeSpecies species : getSpecies()){ + for (IAlleleTreeSpecies species : getSpecies()) { IAllele[] template = TreeManager.treeRoot.getTemplate(species); ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(template); ITree tree = TreeManager.treeRoot.getTree(world, genome); IGrowthProvider growthProvider = species.getGrowthProvider(); - for(Biome biome : Biome.REGISTRY){ - Set trees = biomeCache.computeIfAbsent(biome, k -> new HashSet<>()); - if(growthProvider.isBiomeValid(tree, biome)){ + for (Biome biome : Biome.REGISTRY) { + Set trees = biomeCache.computeIfAbsent(biome.getRegistryName(), k -> new HashSet<>()); + if (growthProvider.isBiomeValid(tree, biome)) { trees.add(tree); } } From 1e6716f8ec93bc6baa6f7b4437b19e40b4644fd1 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 28 Jul 2017 23:28:43 -0700 Subject: [PATCH 2/3] #1687 Fix crash when genetics items are missing nbt --- .../java/forestry/core/genetics/Genome.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index cf9c26827..c5a711984 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -14,13 +14,13 @@ import javax.annotation.Nullable; import java.util.Arrays; import com.google.common.base.Objects; -import com.google.common.base.Preconditions; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.ISpeciesRoot; +import forestry.core.utils.Log; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -136,12 +136,23 @@ public abstract class Genome implements IGenome { private static IChromosome getChromosome(ItemStack itemStack, IChromosomeType chromosomeType, ISpeciesRoot speciesRoot) { NBTTagCompound nbtTagCompound = itemStack.getTagCompound(); - Preconditions.checkArgument(nbtTagCompound != null, "itemStack must have nbt"); + if (nbtTagCompound == null) { + nbtTagCompound = new NBTTagCompound(); + itemStack.setTagCompound(nbtTagCompound); + } - NBTTagCompound genome = nbtTagCompound.getCompoundTag("Genome"); - Preconditions.checkArgument(!genome.hasNoTags(), "itemStack nbt must have a genome tag"); + NBTTagCompound genomeNbt = nbtTagCompound.getCompoundTag("Genome"); + if (genomeNbt.hasNoTags()) { + Log.error("Got a genetic item with no genome, setting it to a default value."); + genomeNbt = new NBTTagCompound(); - IChromosome[] chromosomes = getChromosomes(genome, speciesRoot); + IAllele[] defaultTemplate = speciesRoot.getDefaultTemplate(); + IGenome genome = speciesRoot.templateAsGenome(defaultTemplate); + genome.writeToNBT(genomeNbt); + nbtTagCompound.setTag("Genome", genomeNbt); + } + + IChromosome[] chromosomes = getChromosomes(genomeNbt, speciesRoot); return chromosomes[chromosomeType.ordinal()]; } From 8f29faa28a03b435d6e16303f9dd0421030f439d Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 12 Aug 2017 12:36:47 -0700 Subject: [PATCH 3/3] Fix #1787 Wood logs drop the wrong item when harvested with silk touch --- .../forestry/arboriculture/blocks/BlockForestryLog.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLog.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLog.java index 6366289fe..3d7192b17 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLog.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLog.java @@ -140,6 +140,14 @@ public abstract class BlockForestryLog & IWoodType> extends Bl return woodType.getHardness(); } + @Override + protected ItemStack getSilkTouchDrop(IBlockState state) { + ItemStack silkTouchDrop = super.getSilkTouchDrop(state); + int damage = this.damageDropped(state); + silkTouchDrop.setItemDamage(damage); + return silkTouchDrop; + } + /* PROPERTIES */ @Override public final int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) {