Skip to content

Commit

Permalink
Remove FakeWorld
Browse files Browse the repository at this point in the history
  • Loading branch information
@mezz
mezz committed Oct 21, 2016
1 parent 3178aa8 commit fc47c96
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 136 deletions.
33 changes: 12 additions & 21 deletions src/main/java/binnie/core/genetics/TreeBreedingSystem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
import binnie.core.BinnieCore;
import binnie.core.util.UniqueItemStackSet;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.FakeWorld;
import binnie.extratrees.machines.Lumbermill;
import com.mojang.authlib.GameProfile;
import forestry.api.arboriculture.*;
import forestry.api.genetics.*;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.EnumPlantType;
Expand Down Expand Up @@ -89,9 +87,8 @@ public void onSyncBreedingTracker(final IBreedingTracker tracker) {
final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID()));

FakeWorld world = FakeWorld.instance;
genome.getPrimary().getGenerator().setLogBlock(genome, world, new BlockPos(0, 0, 0), EnumFacing.UP);
final ItemStack wood = world.getWooLog();
IAlleleTreeSpecies treeSpecies = genome.getPrimary();
final ItemStack wood = treeSpecies.getWoodProvider().getWoodStack();
if (wood != null) {
this.discoveredWoods.add(wood);
}
Expand All @@ -116,9 +113,8 @@ public final void calculateArrays() {
final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
final ITreeGenome genome = (ITreeGenome) this.getSpeciesRoot().templateAsGenome(this.getSpeciesRoot().getTemplate(tSpecies.getUID()));

FakeWorld world = FakeWorld.instance;
//genome.getPrimary().getGenerator().setLogBlock(genome, world, new BlockPos(0, 0, 0), EnumFacing.UP);
final ItemStack wood = world.getWooLog();
IAlleleTreeSpecies treeSpecies = genome.getPrimary();
final ItemStack wood = treeSpecies.getWoodProvider().getWoodStack();
if (wood != null) {
this.allWoods.add(wood);
}
Expand Down Expand Up @@ -174,19 +170,17 @@ public Collection<IAlleleSpecies> getTreesThatCanBearFruit(final ItemStack fruit
return found;
}

public Collection<IAlleleSpecies> getTreesThatHaveWood(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) {
public Collection<IAlleleSpecies> getTreesThatHaveWood(final ItemStack wood, final boolean nei, final World world, final GameProfile player) {
final Collection<IAlleleSpecies> set = nei ? this.getAllSpecies() : this.getDiscoveredSpecies(world, player);
final List<IAlleleSpecies> found = new ArrayList<>();
for (final IAlleleSpecies species : set) {
IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID()));
// for (final ItemStack fruit2 :
// tSpecies.getRoot().getMember(fruit).getProduceList()){
tSpecies.getGenerator().setLogBlock(genome, FakeWorld.instance, new BlockPos(0, 0, 0), EnumFacing.UP);
ItemStack fruit2 = FakeWorld.instance.getWooLog();
if (fruit2.isItemEqual(fruit)) {
IAlleleTreeSpecies treeSpecies = genome.getPrimary();
final ItemStack woodStack = treeSpecies.getWoodProvider().getWoodStack();

if (woodStack.isItemEqual(wood)) {
found.add(species);
// }
}
}
return found;
Expand All @@ -201,14 +195,11 @@ public Collection<IAlleleSpecies> getTreesThatMakePlanks(final ItemStack fruit,
for (final IAlleleSpecies species : set) {
final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
ITreeGenome genome = TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID()));
tSpecies.getGenerator().setLogBlock(genome, FakeWorld.instance, new BlockPos(0, 0, 0), EnumFacing.UP);
ItemStack fruit2 = FakeWorld.instance.getWooLog();
// for (final ItemStack fruit2 :
// tSpecies.getRoot().getMember(fruit).getProduceList()) {
if (Lumbermill.getPlankProduct(fruit2) != null && fruit.isItemEqual(Lumbermill.getPlankProduct(fruit2))) {
IAlleleTreeSpecies treeSpecies = genome.getPrimary();
final ItemStack woodStack = treeSpecies.getWoodProvider().getWoodStack();
if (Lumbermill.getPlankProduct(woodStack) != null && fruit.isItemEqual(Lumbermill.getPlankProduct(woodStack))) {
found.add(species);
}
// }
}
return found;
}
Expand Down
13 changes: 1 addition & 12 deletions src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@
import binnie.craftgui.mod.database.DatabaseTab;
import binnie.craftgui.mod.database.PageSpecies;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.FakeWorld;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ITree;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleSpecies;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;

Expand All @@ -46,18 +44,9 @@ public void onValueChanged(final IAlleleSpecies species) {
return;
}

ItemStack log = null;
try {
FakeWorld world = FakeWorld.instance;
tree.getGenome().getPrimary().getGenerator().setLogBlock(tree.getGenome(), world, new BlockPos(0, 0, 0), EnumFacing.UP);// getGenome().getPrimary().getGenerator().getWorldGenerator(tree);
log = world.getWooLog();

} catch (Exception e) {
e.printStackTrace();
}

final ITreeGenome genome = tree.getGenome();
final IAlleleTreeSpecies treeSpecies = genome.getPrimary();
final ItemStack log = treeSpecies.getWoodProvider().getWoodStack();
final int w = 144;
final int h = 176;
new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), this.getValue().toString(), TextJustification.MiddleCenter);
Expand Down
98 changes: 0 additions & 98 deletions src/main/java/binnie/extratrees/FakeWorld.java
View file

This file was deleted.

8 changes: 3 additions & 5 deletions src/main/java/binnie/genetics/gui/AnalystPageWood.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
import binnie.craftgui.core.geometry.IArea;
import binnie.craftgui.core.geometry.IPoint;
import binnie.craftgui.minecraft.control.ControlItemDisplay;
import binnie.extratrees.FakeWorld;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ITree;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.genetics.IAlleleBoolean;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;

import java.util.Collection;

Expand All @@ -33,8 +31,8 @@ public AnalystPageWood(final IWidget parent, final IArea area, final ITree ind)
y += 30;
final Collection<ItemStack> products = new UniqueItemStackSet();

genome.getPrimary().getGenerator().setLogBlock(genome, FakeWorld.instance, new BlockPos(0, 0, 0), EnumFacing.UP);
ItemStack stackWood = FakeWorld.instance.getWooLog();
final IAlleleTreeSpecies treeSpecies = genome.getPrimary();
final ItemStack stackWood = treeSpecies.getWoodProvider().getWoodStack();
if (stackWood != null) {
products.add(stackWood);
}
Expand Down

0 comments on commit fc47c96

Please sign in to comment.