mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 03:25:07 +00:00
Remove FakeWorld
This commit is contained in:
1 parent
3178aa890d
commit
fc47c969f1
4 files changed
+16
-136
No files matched your search
@@ -4,14 +4,12 @@ import binnie.Binnie;
|
||||
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;
|
||||
@@ -89,9 +87,8 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
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);
|
||||
}
|
||||
@@ -116,9 +113,8 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
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);
|
||||
}
|
||||
@@ -174,19 +170,17 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
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;
|
||||
@@ -201,14 +195,11 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@ import binnie.craftgui.minecraft.control.ControlItemDisplay;
|
||||
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;
|
||||
@@ -22,7 +21,6 @@ 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;
|
||||
|
||||
@@ -46,18 +44,9 @@ public class PageSpeciesTreeGenome extends PageSpecies {
|
||||
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);
|
||||
|
||||
@@ -1,98 +0,0 @@
|
||||
package binnie.extratrees;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.*;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
import net.minecraft.world.chunk.IChunkProvider;
|
||||
import net.minecraft.world.storage.WorldInfo;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class FakeWorld extends World {
|
||||
public static FakeWorld instance = new FakeWorld();
|
||||
Block block;
|
||||
int metadata;
|
||||
TileEntity te;
|
||||
|
||||
public ItemStack getWooLog() {
|
||||
// if (te instanceof TileWood) {
|
||||
// return TileWood.getPickBlock(block, this, 0, 0, 0);
|
||||
// } else if (te instanceof TileEntityMetadata) {
|
||||
// return new ItemStack(block, 1, ((TileEntityMetadata) te).getTileMetadata());
|
||||
// }
|
||||
return null;
|
||||
}
|
||||
|
||||
public FakeWorld() {
|
||||
super(null, new WorldInfo(new WorldSettings(Long.MAX_VALUE, GameType.NOT_SET, false, false, WorldType.FLAT), ""), new WorldProvider() {
|
||||
@Override
|
||||
public DimensionType getDimensionType() {
|
||||
return DimensionType.OVERWORLD;
|
||||
}
|
||||
}, null, true);
|
||||
c = new Chunk(this, 0, 0);
|
||||
//super((SaveHandler) null, "", (WorldProvider) null, new WorldSettings(Long.MAX_VALUE, GameType.NOT_SET, false, false, WorldType.FLAT), null);
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public boolean setBlock(int p_147449_1_, int p_147449_2_, int p_147449_3_, Block block) {
|
||||
// this.block = block;
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean setBlock(int p_147465_1_, int p_147465_2_, int p_147465_3_, Block block, int metadata, int update) {
|
||||
// this.block = block;
|
||||
// this.metadata = metadata;
|
||||
// if (block.hasTileEntity(metadata)) {
|
||||
// te = block.createTileEntity(this, metadata);
|
||||
// } else {
|
||||
// TileWood wood = new TileWood();
|
||||
// wood.setWoodType(EnumWoodType.VALUES[metadata]);
|
||||
// te = wood;
|
||||
// }
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
public static Chunk c;
|
||||
|
||||
@Override
|
||||
protected IChunkProvider createChunkProvider() {
|
||||
return new IChunkProvider() {
|
||||
@Nullable
|
||||
@Override
|
||||
public Chunk getLoadedChunk(int x, int z) {
|
||||
return c;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Chunk provideChunk(int x, int z) {
|
||||
return c;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean unloadQueuedChunks() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String makeString() {
|
||||
return "";
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isChunkLoaded(int x, int z, boolean allowEmpty) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Entity getEntityByID(int p_73045_1_) {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,14 +6,12 @@ import binnie.craftgui.core.IWidget;
|
||||
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;
|
||||
|
||||
@@ -33,8 +31,8 @@ public class AnalystPageWood extends AnalystPageProduce {
|
||||
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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user