From 58ab49d66e326c0880f1f8a0e4418d6cce2c2a33 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 11 Nov 2017 20:51:27 -0800 Subject: [PATCH 1/2] Stop viscous fluids from making water flowing sounds --- src/main/java/forestry/core/fluids/BlockForestryFluid.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/core/fluids/BlockForestryFluid.java b/src/main/java/forestry/core/fluids/BlockForestryFluid.java index b9c950048..aaf23877e 100644 --- a/src/main/java/forestry/core/fluids/BlockForestryFluid.java +++ b/src/main/java/forestry/core/fluids/BlockForestryFluid.java @@ -84,7 +84,7 @@ public class BlockForestryFluid extends BlockFluidClassic implements IItemModelR int i = stateIn.getValue(LEVEL); if (i > 0 && i < 8) { - if (rand.nextInt(64) == 0) { + if (getFluid().getViscosity(worldIn, pos) < 5000 && rand.nextInt(64) == 0) { worldIn.playSound(d0 + 0.5D, d1 + 0.5D, d2 + 0.5D, SoundEvents.BLOCK_WATER_AMBIENT, SoundCategory.BLOCKS, rand.nextFloat() * 0.25F + 0.75F, rand.nextFloat() + 0.5F, false); } } else if (rand.nextInt(10) == 0) { From 3df3d9121e51fca16e8a02b19ddb8e1a2b1d5bc6 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 11 Nov 2017 22:04:39 -0800 Subject: [PATCH 2/2] Slightly improve render performance of genetic items (bee, trees, etc) --- .../forestry/apiculture/compat/ApicultureJeiPlugin.java | 3 +-- .../java/forestry/apiculture/genetics/BeeGenome.java | 2 +- .../java/forestry/arboriculture/genetics/TreeGenome.java | 2 +- src/main/java/forestry/core/genetics/Chromosome.java | 4 ++-- src/main/java/forestry/core/genetics/Genome.java | 9 ++++----- .../lepidopterology/genetics/ButterflyGenome.java | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java index 8d5071554..ab9aedd08 100644 --- a/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java +++ b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java @@ -1,7 +1,6 @@ package forestry.apiculture.compat; import com.google.common.base.Preconditions; -import forestry.api.apiculture.BeeManager; import forestry.api.genetics.IAlleleSpecies; import forestry.apiculture.ModuleApiculture; import forestry.apiculture.items.ItemRegistryApiculture; @@ -20,7 +19,7 @@ public class ApicultureJeiPlugin implements IModPlugin { Preconditions.checkNotNull(items); ISubtypeRegistry.ISubtypeInterpreter beeSubtypeInterpreter = itemStack -> { - IAlleleSpecies species = Genome.getSpeciesDirectly(BeeManager.beeRoot, itemStack); + IAlleleSpecies species = Genome.getSpeciesDirectly(itemStack); return species == null ? ISubtypeRegistry.ISubtypeInterpreter.NONE : species.getUID(); }; diff --git a/src/main/java/forestry/apiculture/genetics/BeeGenome.java b/src/main/java/forestry/apiculture/genetics/BeeGenome.java index 39d719196..01361e290 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeGenome.java +++ b/src/main/java/forestry/apiculture/genetics/BeeGenome.java @@ -84,7 +84,7 @@ public class BeeGenome extends Genome implements IBeeGenome { public static IAlleleBeeSpecies getSpecies(ItemStack itemStack) { Preconditions.checkArgument(BeeManager.beeRoot.isMember(itemStack), "itemStack must be a bee"); - IAlleleSpecies species = getSpeciesDirectly(BeeManager.beeRoot, itemStack); + IAlleleSpecies species = getSpeciesDirectly(itemStack); if (species instanceof IAlleleBeeSpecies) { return (IAlleleBeeSpecies) species; } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java index 306b3a0d3..617311ce2 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java @@ -48,7 +48,7 @@ public class TreeGenome extends Genome implements ITreeGenome { public static IAlleleTreeSpecies getSpecies(ItemStack itemStack) { Preconditions.checkArgument(TreeManager.treeRoot.isMember(itemStack), "ItemStack must be a tree"); - IAlleleSpecies species = getSpeciesDirectly(TreeManager.treeRoot, itemStack); + IAlleleSpecies species = getSpeciesDirectly(itemStack); if (species instanceof IAlleleTreeSpecies) { return (IAlleleTreeSpecies) species; } diff --git a/src/main/java/forestry/core/genetics/Chromosome.java b/src/main/java/forestry/core/genetics/Chromosome.java index fa6f0fb84..a4a36394a 100755 --- a/src/main/java/forestry/core/genetics/Chromosome.java +++ b/src/main/java/forestry/core/genetics/Chromosome.java @@ -22,8 +22,8 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; public class Chromosome implements IChromosome { - private static final String UID0_TAG = "UID0"; - private static final String UID1_TAG = "UID1"; + public static final String UID0_TAG = "UID0"; + public static final String UID1_TAG = "UID1"; private final IAllele primary; private final IAllele secondary; diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index 9f5dd7f9a..91034378d 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -15,6 +15,7 @@ import com.google.common.base.MoreObjects; import javax.annotation.Nullable; import java.util.Arrays; +import forestry.api.genetics.AlleleManager; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -109,7 +110,7 @@ public abstract class Genome implements IGenome { * We need this because the client uses the species for rendering. */ @Nullable - public static IAlleleSpecies getSpeciesDirectly(ISpeciesRoot speciesRoot, ItemStack itemStack) { + public static IAlleleSpecies getSpeciesDirectly(ItemStack itemStack) { NBTTagCompound nbtTagCompound = itemStack.getTagCompound(); if (nbtTagCompound == null) { return null; @@ -126,13 +127,11 @@ public abstract class Genome implements IGenome { } NBTTagCompound chromosomeNBT = chromosomesNBT.getCompoundTagAt(0); - Chromosome chromosome = Chromosome.create(null, null, speciesRoot.getSpeciesChromosomeType(), chromosomeNBT); - - IAllele activeAllele = chromosome.getActiveAllele(); + String speciesUid = chromosomeNBT.getString(Chromosome.UID0_TAG); + IAllele activeAllele = AlleleManager.alleleRegistry.getAllele(speciesUid); if (!(activeAllele instanceof IAlleleSpecies)) { return null; } - return (IAlleleSpecies) activeAllele; } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java index 39ca1806b..367503728 100755 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java @@ -49,7 +49,7 @@ public class ButterflyGenome extends Genome implements IButterflyGenome { public static IAlleleButterflySpecies getSpecies(ItemStack itemStack) { Preconditions.checkArgument(ButterflyManager.butterflyRoot.isMember(itemStack), "Must be a butterfly"); - IAlleleSpecies species = getSpeciesDirectly(ButterflyManager.butterflyRoot, itemStack); + IAlleleSpecies species = getSpeciesDirectly(itemStack); if (species instanceof IAlleleButterflySpecies) { return (IAlleleButterflySpecies) species; }