mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 19:59:49 +00:00
Minor cleanups (#50)
* Finalize, minor alloc reduction Also enable Jabel and generic injection * Update dependencies.gradle * Clean up Machine a bit * spotless more enhanced instanceof * Update ModuleMachine.java * More clen * WARN: Removed exception catching * Many, many tiny patches + birthday fix * Spotless * Spotless again * Fix getLow and clamp tolerance value * Revert event -> ignored on unused event parameters * Rename instanceof variables * Update Machine.java * Use StringBuilder * Cache getStack() * Oops, Jabel can't handle that * Spotless * Spotless again My IDE was fighting with it * Remove unused elements + scream test success
This commit is contained in:
1 parent
6b4f3eb1c7
commit
f0f14bb278
325 files changed
+1205
-1868
No files matched your search
@@ -89,7 +89,6 @@ import forestry.api.arboriculture.EnumTreeChromosome;
|
||||
import forestry.api.arboriculture.IAlleleFruit;
|
||||
import forestry.api.arboriculture.IAlleleTreeSpecies;
|
||||
import forestry.api.arboriculture.IGermlingIconProvider;
|
||||
import forestry.api.arboriculture.ITree;
|
||||
import forestry.api.arboriculture.ITreeGenerator;
|
||||
import forestry.api.arboriculture.ITreeRoot;
|
||||
import forestry.api.arboriculture.TreeManager;
|
||||
@@ -233,19 +232,19 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
|
||||
DwarfHazel("Corylus", "americana", 0x9bb552, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut,
|
||||
WorldGenShrub.class);
|
||||
|
||||
public ILogType wood;
|
||||
public final ILogType wood;
|
||||
|
||||
protected ArrayList<IFruitFamily> families;
|
||||
protected int girth;
|
||||
protected Class<? extends WorldGenerator> gen;
|
||||
protected IAlleleFruit fruit;
|
||||
protected IAllele[] template;
|
||||
protected int color;
|
||||
protected String binomial;
|
||||
protected String uid;
|
||||
protected String branchName;
|
||||
protected IClassification branch;
|
||||
protected int colorPollineted;
|
||||
private final ArrayList<IFruitFamily> families;
|
||||
private final int girth;
|
||||
private Class<? extends WorldGenerator> gen;
|
||||
private final IAlleleFruit fruit;
|
||||
private IAllele[] template;
|
||||
private final int color;
|
||||
private final String binomial;
|
||||
private final String uid;
|
||||
final String branchName;
|
||||
IClassification branch;
|
||||
private final int colorPollineted;
|
||||
|
||||
private LeafType leafType;
|
||||
private SaplingType saplingType;
|
||||
@@ -816,7 +815,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
|
||||
return new WorldGenDefault(tree);
|
||||
}
|
||||
|
||||
protected ExtraTreeSpecies setLeafType(LeafType type) {
|
||||
private ExtraTreeSpecies setLeafType(LeafType type) {
|
||||
leafType = type;
|
||||
if (leafType == LeafType.CONIFER) {
|
||||
saplingType = SaplingType.CONIFER;
|
||||
@@ -828,7 +827,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
|
||||
return this;
|
||||
}
|
||||
|
||||
protected ExtraTreeSpecies setSaplingType(SaplingType saplingType) {
|
||||
private ExtraTreeSpecies setSaplingType(SaplingType saplingType) {
|
||||
this.saplingType = saplingType;
|
||||
return this;
|
||||
}
|
||||
@@ -886,7 +885,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
|
||||
return this;
|
||||
}
|
||||
|
||||
public int getLeafColor(ITree tree) {
|
||||
public int getLeafColor() {
|
||||
return color;
|
||||
}
|
||||
|
||||
@@ -935,9 +934,8 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
if (template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene) {
|
||||
ExtraTreeFruitGene fruit = (ExtraTreeFruitGene) template[EnumTreeChromosome.FRUITS.ordinal()];
|
||||
for (ItemStack stack : fruit.products.keySet()) {
|
||||
if (template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene fruitGene) {
|
||||
for (ItemStack stack : fruitGene.products.keySet()) {
|
||||
if (stack.isItemEqual(itemstack)) {
|
||||
return 1.0f;
|
||||
}
|
||||
@@ -971,7 +969,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
|
||||
ItemStack research = null;
|
||||
if (world.rand.nextFloat() < 10.0f / bountyLevel) {
|
||||
Collection<? extends IMutation> combinations = getRoot().getCombinations(this);
|
||||
if (combinations.size() > 0) {
|
||||
if (!combinations.isEmpty()) {
|
||||
IMutation[] candidates = combinations.toArray(new IMutation[0]);
|
||||
research = AlleleManager.alleleRegistry
|
||||
.getMutationNoteStack(researcher, candidates[world.rand.nextInt(candidates.length)]);
|
||||
@@ -982,9 +980,8 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
|
||||
bounty.add(research);
|
||||
}
|
||||
|
||||
if (template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene) {
|
||||
ExtraTreeFruitGene fruit = (ExtraTreeFruitGene) template[EnumTreeChromosome.FRUITS.ordinal()];
|
||||
for (ItemStack stack : fruit.products.keySet()) {
|
||||
if (template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene fruitGene) {
|
||||
for (ItemStack stack : fruitGene.products.keySet()) {
|
||||
ItemStack stack2 = stack.copy();
|
||||
stack2.stackSize = world.rand.nextInt((int) (bountyLevel / 2.0f)) + 1;
|
||||
bounty.add(stack2);
|
||||
@@ -998,14 +995,14 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
|
||||
public int getGermlingColour(EnumGermlingType type, int renderPass) {
|
||||
if (type == EnumGermlingType.SAPLING) {
|
||||
if (renderPass == 0) {
|
||||
return getLeafColor(null);
|
||||
return getLeafColor();
|
||||
}
|
||||
if (getLog() == null) {
|
||||
return 0xffffff;
|
||||
}
|
||||
return getLog().getColour();
|
||||
}
|
||||
return getLeafColor(null);
|
||||
return getLeafColor();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -1033,7 +1030,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
|
||||
highest = otherAdvance;
|
||||
}
|
||||
}
|
||||
return own + ((highest < 0) ? 0 : highest);
|
||||
return own + highest;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user