Rebalance electron tubes and add ender farm

This commit is contained in:
Nedelosk committed 2018-01-20 18:05:31 +01:00
1 parent 10fec50457
commit 287cb8cb87
36 files changed
+617 -115

No files matched your search

@@ -14,6 +14,8 @@ public interface IFarmInstance {
registerSoil(resource, soilState, false);
}
void registerFarmables(String identifier);
void registerSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData);
boolean isAcceptedSoil(IBlockState blockState);
@@ -20,8 +20,19 @@ public interface IFarmable {
/**
* @return true if the block at the given location is a "sapling" for this type, i.e. a non-harvestable immature version of the crop.
* @deprecated Since Forestry 5.8. Use the version below. TODO Remove this method in 1.13
*/
boolean isSaplingAt(World world, BlockPos pos);
@Deprecated
default boolean isSaplingAt(World world, BlockPos pos){
return false;
}
/**
* @return true if the block at the given location is a "sapling" for this type, i.e. a non-harvestable immature version of the crop.
*/
default boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState){
return isSaplingAt(world, pos);
}
/**
* @return {@link ICrop} if the block at the given location is a harvestable and mature crop, null otherwise.
@@ -15,11 +15,12 @@ public class Circuits {
public static ICircuit farmCropsManaged;
public static ICircuit farmPeatManaged;
public static ICircuit farmSucculentManaged;
public static ICircuit farmPoaleManaged;
public static ICircuit farmPoalesManaged;
public static ICircuit farmInfernalManaged;
public static ICircuit farmEnderManaged;
public static ICircuit farmOrchidManaged;
public static ICircuit farmGourdManaged;
public static ICircuit farmCocoaManaged;
public static ICircuit farmArborealManual;
@@ -1,6 +1,7 @@
package forestry.core.render;
import java.util.List;
import java.util.Random;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.Particle;
@@ -157,6 +158,26 @@ public class ParticleRender {
effectRenderer.addEffect(particle);
}
}
public static void addPortalFx(World world, BlockPos pos, Random rand){
if (!shouldSpawnParticle(world)) {
return;
}
int j = rand.nextInt(2) * 2 - 1;
int k = rand.nextInt(2) * 2 - 1;
double xPos = (double)pos.getX() + 0.5D + 0.25D * (double)j;
double yPos = (double)((float)pos.getY() + rand.nextFloat());
double zPos = (double)pos.getZ() + 0.5D + 0.25D * (double)k;
double xSpeed = (double)(rand.nextFloat() * (float)j);
double ySpeed = ((double)rand.nextFloat() - 0.5D) * 0.125D;
double zSpeed = (double)(rand.nextFloat() * (float)k);
ParticleManager effectRenderer = Minecraft.getMinecraft().effectRenderer;
Particle particle = effectRenderer.spawnEffectParticle(EnumParticleTypes.PORTAL.getParticleID(), xPos, yPos, zPos, xSpeed, ySpeed, zSpeed);
if(particle != null){
effectRenderer.addEffect(particle);
}
}
public static void addEntityBiodustFX(World world, double x, double y, double z){
if (!shouldSpawnParticle(world)) {
@@ -6,8 +6,6 @@ import com.google.common.collect.ImmutableSet;
import javax.annotation.Nullable;
import java.util.Set;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.util.ResourceLocation;
import forestry.api.modules.ForestryModule;
@@ -53,6 +51,7 @@ public class ModuleCultivation extends BlankForestryModule {
blocks.farmMushroom.init();
blocks.farmNether.init();
blocks.farmGourd.init();
blocks.farmEnder.init();
//blocks.plantation.init();
blocks.peatBog.init();
}
@@ -85,39 +84,49 @@ public class ModuleCultivation extends BlankForestryModule {
"TCT",
"GBG",
'G', OreDictUtil.BLOCK_GLASS,
'T', coreItems.tubes.get(EnumElectronTube.COPPER, 1),
'T', coreItems.tubes.get(EnumElectronTube.OBSIDIAN, 1),
'C', coreItems.sturdyCasing,
'B', coreItems.circuitboards.get(EnumCircuitBoardType.BASIC));
RecipeUtil.addRecipe("farm_mushroom", blocks.farmMushroom,
"BGR",
"GAG",
"RGB",
"GTG",
"TCT",
"GBG",
'G', OreDictUtil.BLOCK_GLASS,
'B', Blocks.BROWN_MUSHROOM,
'R', Blocks.RED_MUSHROOM,
'A', blocks.arboretum);
'T', coreItems.tubes.get(EnumElectronTube.APATITE, 1),
'C', coreItems.sturdyCasing,
'B', coreItems.circuitboards.get(EnumCircuitBoardType.BASIC));
RecipeUtil.addRecipe("farm_gourd", blocks.farmGourd,
"MGP",
"GAG",
"PGM",
"GTG",
"TCT",
"GBG",
'G', OreDictUtil.BLOCK_GLASS,
'M', Blocks.MELON_BLOCK,
'P', Blocks.PUMPKIN,
'A', blocks.arboretum);
'T', coreItems.tubes.get(EnumElectronTube.LAPIS, 1),
'C', coreItems.sturdyCasing,
'B', coreItems.circuitboards.get(EnumCircuitBoardType.BASIC));
RecipeUtil.addRecipe("farm_nether", blocks.farmNether,
"WGW",
"GAG",
"WGW",
"GTG",
"TCT",
"GBG",
'G', OreDictUtil.BLOCK_GLASS,
'W', Items.NETHER_WART,
'A', blocks.arboretum);
'T', coreItems.tubes.get(EnumElectronTube.BLAZE, 1),
'C', coreItems.sturdyCasing,
'B', coreItems.circuitboards.get(EnumCircuitBoardType.BASIC));
RecipeUtil.addRecipe("farm_ender", blocks.farmEnder,
"GTG",
"TCT",
"GBG",
'G', OreDictUtil.BLOCK_GLASS,
'T', coreItems.tubes.get(EnumElectronTube.ENDER, 1),
'C', coreItems.sturdyCasing,
'B', coreItems.circuitboards.get(EnumCircuitBoardType.BASIC));
for(BlockPlanter planter : getBlocks().getPlanters()){
RecipeUtil.addRecipe(planter.blockType.getName() + "_manual_managed", planter.get(true), "# ", " ", " ", '#', planter.get(false));
RecipeUtil.addRecipe(planter.blockType.getName() + "_managed_manual", planter.get(false), "# ", " ", " ", '#', planter.get(true));
RecipeUtil.addShapelessRecipe(planter.blockType.getName() + "_manual_managed", planter.get(true), planter.get(false));
RecipeUtil.addShapelessRecipe(planter.blockType.getName() + "_managed_manual", planter.get(false), planter.get(true));
}
}
}
@@ -1,5 +1,7 @@
package forestry.cultivation.blocks;
import java.util.Random;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.state.BlockStateContainer;
@@ -7,8 +9,6 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagByte;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
@@ -23,6 +23,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.core.blocks.BlockBase;
import forestry.core.render.ParticleRender;
import forestry.cultivation.tiles.TilePlanter;
public class BlockPlanter extends BlockBase<BlockTypePlanter> {
@@ -38,6 +39,16 @@ public class BlockPlanter extends BlockBase<BlockTypePlanter> {
return new BlockStateContainer(this, FACING, MANUAL);
}
@SideOnly(Side.CLIENT)
@Override
public void randomDisplayTick(IBlockState stateIn, World worldIn, BlockPos pos, Random rand) {
if(blockType == BlockTypePlanter.FARM_ENDER){
for (int i = 0; i < 3; ++i) {
ParticleRender.addPortalFx(worldIn, pos, rand);
}
}
}
@Override
public IBlockState getStateFromMeta(int meta) {
int facing = meta & 7;
@@ -62,6 +73,11 @@ public class BlockPlanter extends BlockBase<BlockTypePlanter> {
return tile;
}
@Override
public int damageDropped(IBlockState state) {
return state.getValue(MANUAL) ? 1 : 0;
}
@Override
@SideOnly(Side.CLIENT)
public void registerStateMapper() {
@@ -87,16 +103,10 @@ public class BlockPlanter extends BlockBase<BlockTypePlanter> {
}
public static boolean isManual(ItemStack stack){
NBTTagCompound tagCompound = stack.getTagCompound();
if(tagCompound != null){
return tagCompound.getBoolean("Manual");
}
return false;
return stack.getMetadata() == 1;
}
public ItemStack get(boolean isManual){
ItemStack stack = new ItemStack(this);
stack.setTagInfo("Manual", new NBTTagByte((byte) (isManual ? 1 : 0)));
return stack;
return new ItemStack(this, 1, isManual ? 1 : 0);
}
}
@@ -14,6 +14,7 @@ public class BlockRegistryCultivation extends BlockRegistry {
public final BlockPlanter farmMushroom;
public final BlockPlanter farmGourd;
public final BlockPlanter farmNether;
public final BlockPlanter farmEnder;
public final BlockPlanter peatBog;
/*public final BlockPlanter plantation;*/
@@ -38,6 +39,10 @@ public class BlockRegistryCultivation extends BlockRegistry {
registerBlock(farmNether, new ItemBlockPlanter(farmNether), "farm_nether");
planters.add(farmNether);
farmEnder = new BlockPlanter(BlockTypePlanter.FARM_ENDER);
registerBlock(farmEnder, new ItemBlockPlanter(farmEnder), "farm_ender");
planters.add(farmEnder);
peatBog = new BlockPlanter(BlockTypePlanter.PEAT_POG);
registerBlock(peatBog, new ItemBlockPlanter(peatBog), "peat_bog");
planters.add(peatBog);
@@ -2,14 +2,14 @@ package forestry.cultivation.blocks;
import forestry.core.blocks.IBlockTypeCustom;
import forestry.core.blocks.IMachineProperties;
import forestry.core.blocks.MachineProperties;
import forestry.core.tiles.TileForestry;
import forestry.cultivation.tiles.TileArboretum;
import forestry.cultivation.tiles.TileBog;
import forestry.cultivation.tiles.TileFarmCrops;
import forestry.cultivation.tiles.TileFarmEnder;
import forestry.cultivation.tiles.TileFarmGourd;
import forestry.cultivation.tiles.TileFarmMushroom;
import forestry.cultivation.tiles.TileFarmNether;
import forestry.cultivation.tiles.TilePlanter;
public enum BlockTypePlanter implements IBlockTypeCustom {
ARBORETUM(TileArboretum.class, "arboretum"),
@@ -17,6 +17,7 @@ public enum BlockTypePlanter implements IBlockTypeCustom {
FARM_MUSHROOM(TileFarmMushroom.class, "farm_mushroom"),
FARM_GOURD(TileFarmGourd.class, "farm_gourd"),
FARM_NETHER(TileFarmNether.class, "farm_nether"),
FARM_ENDER(TileFarmEnder.class, "farm_ender"),
PEAT_POG(TileBog.class, "peat_bog"),
//TODO Add ic2 integration
@@ -24,8 +25,8 @@ public enum BlockTypePlanter implements IBlockTypeCustom {
private final IMachineProperties machineProperties;
<T extends TileForestry> BlockTypePlanter(Class<T> teClass, String name) {
this.machineProperties = new MachineProperties<>(teClass, name);
BlockTypePlanter(Class<? extends TilePlanter> teClass, String name) {
this.machineProperties = new PlanterProperties<>(teClass, name);
}
@Override
@@ -0,0 +1,27 @@
package forestry.cultivation.blocks;
import com.google.common.base.Preconditions;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import forestry.api.core.IModelManager;
import forestry.core.blocks.MachineProperties;
import forestry.core.utils.ItemStackUtil;
import forestry.cultivation.tiles.TilePlanter;
public class PlanterProperties<T extends TilePlanter> extends MachineProperties<T> {
PlanterProperties(Class<T> teClass, String name) {
super(teClass, name);
}
@Override
public void registerModel(Item item, IModelManager manager) {
ResourceLocation itemNameFromRegistry = ItemStackUtil.getItemNameFromRegistry(item);
Preconditions.checkNotNull(itemNameFromRegistry, "No registry name for item");
String identifier = itemNameFromRegistry.getResourcePath();
manager.registerItemModel(item, 0, identifier);
manager.registerItemModel(item, 1, identifier);
}
}
@@ -0,0 +1,41 @@
package forestry.cultivation.tiles;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
public class TileFarmEnder extends TilePlanter {
public TileFarmEnder() {
super("farmEnder");
}
@Override
public ItemStack[] createGermlingStacks() {
return new ItemStack[]{
new ItemStack(Blocks.CHORUS_FLOWER),
new ItemStack(Blocks.CHORUS_FLOWER),
new ItemStack(Blocks.CHORUS_FLOWER),
new ItemStack(Blocks.CHORUS_FLOWER)
};
}
@Override
public ItemStack[] createResourceStacks() {
return new ItemStack[]{
new ItemStack(Blocks.END_STONE),
new ItemStack(Blocks.END_STONE),
new ItemStack(Blocks.END_STONE),
new ItemStack(Blocks.END_STONE)
};
}
@Override
public ItemStack[] createProductionStacks() {
return new ItemStack[]{
new ItemStack(Blocks.CHORUS_FLOWER),
new ItemStack(Items.CHORUS_FRUIT),
new ItemStack(Items.CHORUS_FRUIT),
new ItemStack(Blocks.CHORUS_FLOWER)
};
}
}
@@ -16,7 +16,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
import net.minecraft.item.ItemStack;
@@ -41,7 +40,6 @@ public final class FarmRegistry implements IFarmRegistry {
private static final FarmRegistry INSTANCE = new FarmRegistry();
private final Multimap<String, IFarmable> farmables = HashMultimap.create();
private final Map<ItemStack, Integer> fertilizers = new LinkedHashMap<>();
private final Map<String, IFarmLogic> logics = new HashMap<>();
private final Map<String, IFarmInstance> farmInstances = new HashMap<>();
public static FarmRegistry getInstance() {
@@ -51,7 +49,6 @@ public final class FarmRegistry implements IFarmRegistry {
@Override
@Deprecated
public void registerLogic(String identifier, IFarmLogic logic) {
logics.put(identifier, logic);
}
@Override
@@ -103,8 +100,7 @@ public final class FarmRegistry implements IFarmRegistry {
public IFarmInstance registerLogic(String identifier, BiFunction<IFarmInstance, Boolean, IFarmLogic> logicFactory, String... farmablesIdentifiers) {
Set<String> fIdentifiers = new HashSet<>(Arrays.asList(farmablesIdentifiers));
fIdentifiers.add(identifier);
Collection<IFarmable> farmablesSet = fIdentifiers.stream().map(farmables::get).flatMap(Collection::stream).collect(Collectors.toSet());
IFarmInstance instance = new FarmInstance(identifier, logicFactory, farmablesSet);
IFarmInstance instance = new FarmInstance(identifier, logicFactory, fIdentifiers);
farmInstances.put(identifier, instance);
return instance;
}
@@ -65,6 +65,7 @@ import forestry.farming.circuits.CircuitFarmLogic;
import forestry.farming.logic.FarmLogicArboreal;
import forestry.farming.logic.FarmLogicCocoa;
import forestry.farming.logic.FarmLogicCrops;
import forestry.farming.logic.FarmLogicEnder;
import forestry.farming.logic.FarmLogicGourd;
import forestry.farming.logic.FarmLogicInfernal;
import forestry.farming.logic.FarmLogicMushroom;
@@ -73,6 +74,7 @@ import forestry.farming.logic.FarmLogicPeat;
import forestry.farming.logic.FarmLogicReeds;
import forestry.farming.logic.FarmLogicSucculent;
import forestry.farming.logic.farmables.FarmableAgingCrop;
import forestry.farming.logic.farmables.FarmableChorus;
import forestry.farming.logic.farmables.FarmableGE;
import forestry.farming.logic.farmables.FarmableGourd;
import forestry.farming.logic.farmables.FarmableStacked;
@@ -153,6 +155,8 @@ public class ModuleFarming extends BlankForestryModule {
registry.registerFarmables("farmSucculentes", new FarmableStacked(new ItemStack(Blocks.CACTUS), Blocks.CACTUS, 3));
registry.registerFarmables("farmEnder", FarmableChorus.INSTANCE);
//Forestry fertilizer
registry.registerFertilizer(new ItemStack(coreItems.fertilizerCompound, 1, OreDictionary.WILDCARD_VALUE), 500);
@@ -198,6 +202,7 @@ public class ModuleFarming extends BlankForestryModule {
IFarmInstance orchardFarm = registry.registerLogic("farmOrchard", FarmLogicOrchard::new);
IFarmInstance gourdFarm = registry.registerLogic("farmGourd", FarmLogicGourd::new);
IFarmInstance cocoaFarm = registry.registerLogic("farmCocoa", FarmLogicCocoa::new);
IFarmInstance enderFarm = registry.registerLogic("farmEnder", FarmLogicEnder::new);
Circuits.farmArborealManaged = new CircuitFarmLogic("managedArboreal", arborealFarm, false);
Circuits.farmArborealManual = new CircuitFarmLogic("manualArboreal", arborealFarm, true);
@@ -225,16 +230,24 @@ public class ModuleFarming extends BlankForestryModule {
Circuits.farmOrchardManaged = new CircuitFarmLogic("managedOrchard", orchardFarm, false);
Circuits.farmOrchardManual = new CircuitFarmLogic("manualOrchard", orchardFarm, true);
Circuits.farmSucculentManaged = new CircuitFarmLogic("managedSucculent", succulentFarm, false);
Circuits.farmSucculentManual = new CircuitFarmLogic("manualSucculent", succulentFarm, true);
succulentFarm.registerSoil(new ItemStack(Blocks.SAND), Blocks.SAND.getDefaultState(),true);
Circuits.farmPoalesManual = new CircuitFarmLogic("manualPoales", poalesFarm, true).setManual();
Circuits.farmPoalesManaged = new CircuitFarmLogic("managedPoales", poalesFarm, false);
Circuits.farmPoalesManual = new CircuitFarmLogic("manualPoales", poalesFarm, true);
poalesFarm.registerSoil(new ItemStack(Blocks.SAND), Blocks.SAND.getDefaultState(),true);
poalesFarm.registerSoil(new ItemStack(Blocks.DIRT), Blocks.DIRT.getDefaultState(),false);
Circuits.farmGourdManual = new CircuitFarmLogic("manualGourd", gourdFarm, true).setManual();
Circuits.farmGourdManaged = new CircuitFarmLogic("managedGourd", gourdFarm, false);
Circuits.farmGourdManual = new CircuitFarmLogic("manualGourd", gourdFarm, true);
Circuits.farmCocoaManual = new CircuitFarmLogic("manualCocoa", cocoaFarm, true).setManual();
Circuits.farmCocoaManaged = new CircuitFarmLogic("managedCocoa", cocoaFarm, false);
Circuits.farmCocoaManual = new CircuitFarmLogic("manualCocoa", cocoaFarm, true);
Circuits.farmEnderManaged = new CircuitFarmLogic("managedEnder", enderFarm, false);
Circuits.farmEnderManual = new CircuitFarmLogic("manualEnder", enderFarm, false);
enderFarm.registerSoil(new ItemStack(Blocks.END_STONE), Blocks.END_STONE.getDefaultState());
}
@Override
@@ -302,20 +315,28 @@ public class ModuleFarming extends BlankForestryModule {
return;
}
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.COPPER, 1), Circuits.farmArborealManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.TIN, 1), Circuits.farmPeatManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.GOLD, 1), Circuits.farmArborealManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.COPPER, 1), Circuits.farmSucculentManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.OBSIDIAN, 1), Circuits.farmPeatManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.BRONZE, 1), Circuits.farmCropsManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.BLAZE, 1), Circuits.farmInfernalManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.TIN, 1), Circuits.farmPoalesManual);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.LAPIS, 1), Circuits.farmGourdManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.APATITE, 1), Circuits.farmShroomManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.DIAMOND, 1), Circuits.farmCocoaManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.EMERALD, 1), Circuits.farmOrchardManaged);
ChipsetManager.solderManager.addRecipe(layoutManaged, coreItems.tubes.get(EnumElectronTube.ENDER, 1), Circuits.farmEnderManaged);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.COPPER, 1), Circuits.farmOrchardManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.TIN, 1), Circuits.farmPeatManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.GOLD, 1), Circuits.farmArborealManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.COPPER, 1), Circuits.farmSucculentManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.OBSIDIAN, 1), Circuits.farmPeatManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.BRONZE, 1), Circuits.farmCropsManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.GOLD, 1), Circuits.farmSucculentManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.DIAMOND, 1), Circuits.farmPoalesManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.OBSIDIAN, 1), Circuits.farmGourdManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.TIN, 1), Circuits.farmPoalesManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.LAPIS, 1), Circuits.farmGourdManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.APATITE, 1), Circuits.farmShroomManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.LAPIS, 1), Circuits.farmCocoaManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.DIAMOND, 1), Circuits.farmCocoaManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.EMERALD, 1), Circuits.farmOrchardManual);
ChipsetManager.solderManager.addRecipe(layoutManual, coreItems.tubes.get(EnumElectronTube.ENDER, 1), Circuits.farmEnderManual);
}
@Override
@@ -18,6 +18,10 @@ public class FakeFarmInstance implements IFarmInstance {
this.logic = logic;
}
@Override
public void registerFarmables(String identifier) {
}
@Override
public void registerSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData) {
}
@@ -1,9 +1,11 @@
package forestry.farming.logic;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
@@ -13,23 +15,35 @@ import forestry.api.farming.IFarmInstance;
import forestry.api.farming.IFarmLogic;
import forestry.api.farming.IFarmable;
import forestry.api.farming.ISoil;
import forestry.farming.FarmRegistry;
public final class FarmInstance implements IFarmInstance {
private final Set<ISoil> soils = new HashSet<>();
private final Collection<IFarmable> farmables;
private final Set<String> farmablesIdentifiers;
private final IFarmLogic manualLogic;
private final IFarmLogic managedLogic;
private final String identifier;
public FarmInstance(String identifier, BiFunction<IFarmInstance, Boolean, IFarmLogic> logicFactory, Collection<IFarmable> farmables) {
@Nullable
private Collection<IFarmable> farmables;
public FarmInstance(String identifier, BiFunction<IFarmInstance, Boolean, IFarmLogic> logicFactory, Set<String> farmablesIdentifiers) {
this.identifier = identifier;
this.farmables = farmables;
this.farmablesIdentifiers = farmablesIdentifiers;
this.manualLogic = logicFactory.apply(this, true);
this.managedLogic = logicFactory.apply(this, false);
}
@Override
public void registerFarmables(String identifier) {
farmablesIdentifiers.add(identifier);
}
@Override
public Collection<IFarmable> getFarmables() {
if(farmables == null){
farmables = farmablesIdentifiers.stream().map(FarmRegistry.getInstance()::getFarmables).flatMap(Collection::stream).collect(Collectors.toSet());
}
return farmables;
}
@@ -65,21 +65,29 @@ public abstract class FarmLogic implements IFarmLogic {
Stack<ICrop> crops = new Stack<>();
for (int i = 0; i < extent; i++) {
BlockPos position = translateWithOffset(pos.up(), direction, i);
if (world.isAirBlock(position)) {
continue;
}
IBlockState blockState = world.getBlockState(position);
for (IFarmable seed : getFarmables()) {
ICrop crop = seed.getCropAt(world, position, blockState);
if (crop != null) {
crops.push(crop);
break;
}
ICrop crop = getCrop(world, position);
if(crop != null){
crops.push(crop);
}
}
return crops;
}
@Nullable
protected ICrop getCrop(World world, BlockPos position){
if (world.isAirBlock(position)) {
return null;
}
IBlockState blockState = world.getBlockState(position);
for (IFarmable seed : getFarmables()) {
ICrop crop = seed.getCropAt(world, position, blockState);
if (crop != null) {
return crop;
}
}
return null;
}
public abstract boolean isAcceptedWindfall(ItemStack stack);
protected final boolean isWaterSourceBlock(World world, BlockPos position) {
@@ -36,15 +36,18 @@ import forestry.api.farming.IFarmable;
public class FarmLogicArboreal extends FarmLogicHomogeneous {
@Nullable
private List<IFarmable> farmables;
public FarmLogicArboreal(IFarmInstance instance, boolean isManual) {
super(instance, isManual);
this.farmables = new ArrayList<>(instance.getFarmables());
}
@Override
public List<IFarmable> getFarmables() {
if(farmables == null){
this.farmables = new ArrayList<>(instance.getFarmables());
}
return farmables;
}
@@ -0,0 +1,154 @@
package forestry.farming.logic;
import com.google.common.collect.ImmutableSet;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.farming.FarmDirection;
import forestry.api.farming.ICrop;
import forestry.api.farming.IFarmHousing;
import forestry.api.farming.IFarmInstance;
import forestry.api.farming.IFarmable;
import forestry.core.utils.BlockUtil;
import forestry.farming.logic.crops.CropDestroy;
import forestry.farming.logic.farmables.FarmableChorus;
public class FarmLogicEnder extends FarmLogicHomogeneous {
private static final Set<EnumFacing> VALID_DIRECTIONS = ImmutableSet.of(EnumFacing.UP, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.WEST, EnumFacing.EAST);
private final IFarmable chorusFarmable;
public FarmLogicEnder(IFarmInstance instance, boolean isManual) {
super(instance, isManual);
chorusFarmable = FarmableChorus.INSTANCE;
}
@Override
public String getName() {
return "Manual Ender Farm";
}
@Override
public ItemStack getIconItemStack() {
return new ItemStack(Items.ENDER_EYE);
}
@Override
public int getFertilizerConsumption() {
return 20;
}
@Override
public int getWaterConsumption(float hydrationModifier) {
return 0;
}
@Override
public NonNullList<ItemStack> collect(World world, IFarmHousing farmHousing) {
NonNullList<ItemStack> products = produce;
produce = collectEntityItems(world, farmHousing, true);
return products;
}
private final Map<BlockPos, Integer> lastExtentsHarvest = new HashMap<>();
@Override
public Collection<ICrop> harvest(World world, BlockPos pos, FarmDirection direction, int extent) {
if (!lastExtentsHarvest.containsKey(pos)) {
lastExtentsHarvest.put(pos, 0);
}
int lastExtent = lastExtentsHarvest.get(pos);
if (lastExtent > extent) {
lastExtent = 0;
}
BlockPos position = translateWithOffset(pos.up(), direction, lastExtent);
Collection<ICrop> crops = harvestBlocks(world, position);
lastExtent++;
lastExtentsHarvest.put(pos, lastExtent);
return crops;
}
private Collection<ICrop> harvestBlocks(World world, BlockPos position) {
if(world.isAirBlock(position)){
return Collections.emptySet();
}
ICrop crop = getCrop(world, position);
if(crop != null){
return Collections.singleton(crop);
}
Stack<ICrop> crops = new Stack<>();
Stack<ICrop> plants = new Stack<>();
harvestBlock(world, position, EnumFacing.DOWN, plants, crops);
//Remove all flowers before remove all plants
if(!crops.isEmpty()) {
return crops;
}
return plants;
}
private boolean harvestBlock(World world, BlockPos pos, EnumFacing from, Stack<ICrop> plants, Stack<ICrop> flowers){
IBlockState blockState = world.getBlockState(pos);
if(blockState.getBlock() == Blocks.CHORUS_FLOWER){
ICrop crop = chorusFarmable.getCropAt(world, pos, blockState);
if(crop != null){
flowers.push(crop);
return false;
}
return false;
}else if(blockState.getBlock() == Blocks.CHORUS_PLANT){
boolean canHarvest = true;
for(EnumFacing facing : VALID_DIRECTIONS) {
if(facing == from){
continue;
}
canHarvest &= harvestBlock(world, pos.offset(facing), facing.getOpposite(), plants, flowers);
}
if(canHarvest){
plants.push(new CropDestroy(world, Blocks.CHORUS_PLANT.getDefaultState(), pos, null));
}
return canHarvest;
}
return true;
}
@Override
protected boolean maintainGermlings(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) {
for (int i = 0; i < extent; i++) {
BlockPos position = translateWithOffset(pos, direction, i);
IBlockState state = world.getBlockState(position);
if (!world.isAirBlock(position) && !BlockUtil.isReplaceableBlock(state, world, position)) {
continue;
}
BlockPos soilPos = position.down();
IBlockState blockState = world.getBlockState(soilPos);
if (!isAcceptedSoil(blockState)) {
continue;
}
if(trySetCrop(world, farmHousing, position, direction)){
return true;
}
}
return false;
}
}
@@ -137,7 +137,7 @@ public class FarmLogicOrchard extends FarmLogic {
// Determine what type we want to harvest.
IBlockState blockState = world.getBlockState(position);
Block block = blockState.getBlock();
if (!block.isWood(world, position) && !isBlockTraversable(blockState, traversalBlocks) && !isFruitBearer(world, position)) {
if (!block.isWood(world, position) && !isBlockTraversable(blockState, traversalBlocks) && !isFruitBearer(world, position, blockState)) {
return crops;
}
@@ -184,11 +184,11 @@ public class FarmLogicOrchard extends FarmLogic {
candidates.add(candidate);
seen.add(candidate);
}
if (isFruitBearer(world, candidate)) {
if (isFruitBearer(world, candidate, blockState)) {
candidates.add(candidate);
seen.add(candidate);
ICrop crop = getCrop(world, candidate);
ICrop crop = getCropAt(world, candidate);
if (crop != null) {
crops.push(crop);
}
@@ -200,14 +200,14 @@ public class FarmLogicOrchard extends FarmLogic {
return candidates;
}
private boolean isFruitBearer(World world, BlockPos position) {
private boolean isFruitBearer(World world, BlockPos position, IBlockState blockState) {
IFruitBearer tile = TileUtil.getTile(world, position, IFruitBearer.class);
if (tile != null) {
return true;
}
for (IFarmable farmable : getFarmables()) {
if (farmable.isSaplingAt(world, position)) {
if (farmable.isSaplingAt(world, position, blockState)) {
return true;
}
}
@@ -226,7 +226,7 @@ public class FarmLogicOrchard extends FarmLogic {
}
@Nullable
private ICrop getCrop(World world, BlockPos position) {
private ICrop getCropAt(World world, BlockPos position) {
IFruitBearer fruitBearer = TileUtil.getTile(world, position, IFruitBearer.class);
if (fruitBearer != null) {
@@ -234,13 +234,7 @@ public class FarmLogicOrchard extends FarmLogic {
return new CropFruit(world, position);
}
} else {
IBlockState blockState = world.getBlockState(position);
for (IFarmable seed : getFarmables()) {
ICrop crop = seed.getCropAt(world, position, blockState);
if (crop != null) {
return crop;
}
}
return getCrop(world, position);
}
return null;
}
@@ -0,0 +1,42 @@
package forestry.farming.logic.crops;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.event.ForgeEventFactory;
import forestry.core.network.packets.PacketFXSignal;
import forestry.core.utils.NetworkUtil;
public class CropChorusFlower extends Crop {
private static final IBlockState BLOCK_STATE = Blocks.CHORUS_FLOWER.getDefaultState();
public CropChorusFlower(World world, BlockPos position) {
super(world, position);
}
@Override
protected boolean isCrop(World world, BlockPos pos) {
return world.getBlockState(pos).getBlock() == Blocks.CHORUS_FLOWER;
}
@Override
protected NonNullList<ItemStack> harvestBlock(World world, BlockPos pos) {
NonNullList<ItemStack> harvested = NonNullList.create();
harvested.add(new ItemStack(Blocks.CHORUS_FLOWER));
float chance = ForgeEventFactory.fireBlockHarvesting(harvested, world, pos, BLOCK_STATE, 0, 1.0F, false, null);
harvested.removeIf(next -> world.rand.nextFloat() > chance);
PacketFXSignal packet = new PacketFXSignal(PacketFXSignal.VisualFXType.BLOCK_BREAK, PacketFXSignal.SoundFXType.BLOCK_BREAK, pos, BLOCK_STATE);
NetworkUtil.sendNetworkPacket(packet, pos, world);
world.setBlockToAir(pos);
return harvested;
}
}
@@ -70,6 +70,8 @@ public class CropDestroy extends Crop {
}
removedSeed = true;
}
}else{
dropIterator.remove();
}
}
@@ -45,8 +45,7 @@ public class FarmableAgingCrop implements IFarmable {
}
@Override
public boolean isSaplingAt(World world, BlockPos pos) {
IBlockState blockState = world.getBlockState(pos);
public boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState) {
return blockState.getBlock() == cropBlock && blockState.getValue(ageProperty) <= minHarvestAge;
}
@@ -25,8 +25,7 @@ public abstract class FarmableBase implements IFarmable {
}
@Override
public boolean isSaplingAt(World world, BlockPos pos) {
IBlockState blockState = world.getBlockState(pos);
public boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState) {
return blockState.getBlock() == plantedState.getBlock() && blockState != matureState;
}
@@ -0,0 +1,80 @@
package forestry.farming.logic.farmables;
import javax.annotation.Nullable;
import net.minecraft.block.BlockChorusFlower;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.farming.ICrop;
import forestry.api.farming.IFarmable;
import forestry.core.utils.BlockUtil;
import forestry.farming.logic.crops.CropChorusFlower;
public class FarmableChorus implements IFarmable {
public static final IFarmable INSTANCE = new FarmableChorus();
private final ItemStack germling;
private final ItemStack fruit;
private FarmableChorus() {
this.germling = new ItemStack(Blocks.CHORUS_FLOWER);
this.fruit = new ItemStack(Items.CHORUS_FRUIT);
}
@Override
public boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState) {
return blockState.getBlock() == Blocks.CHORUS_FLOWER;
}
@Nullable
@Override
public ICrop getCropAt(World world, BlockPos pos, IBlockState blockState) {
if (blockState.getBlock() != Blocks.CHORUS_FLOWER) {
return null;
}
if (blockState.getValue(BlockChorusFlower.AGE) < 5) {
return null;
}
return new CropChorusFlower(world, pos);
}
@Override
public boolean isGermling(ItemStack itemstack) {
return ItemStack.areItemsEqual(germling, itemstack);
}
@Override
public boolean isWindfall(ItemStack itemstack) {
return ItemStack.areItemsEqual(fruit, itemstack);
}
@Override
public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) {
if(!canPlace(world, pos)){
return false;
}
return BlockUtil.setBlockWithPlaceSound(world, pos, Blocks.CHORUS_FLOWER.getDefaultState());
}
private boolean canPlace(World world, BlockPos position) {
for (int x = -1; x <= 1; x++) {
for (int z = -1; z <= 1; z++) {
BlockPos offsetPosition = position.add(x, 0, z);
IBlockState state = world.getBlockState(offsetPosition);
if (state.getBlock() == Blocks.CHORUS_FLOWER || state.getBlock() == Blocks.CHORUS_PLANT) {
return false;
}
}
}
return true;
}
}
@@ -17,8 +17,7 @@ public class FarmableDoubleCrop extends FarmableBase {
}
@Override
public boolean isSaplingAt(World world, BlockPos pos) {
IBlockState blockState = world.getBlockState(pos);
public boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState) {
return blockState.getBlock() == plantedState.getBlock() && blockState != topMatureState;
}
@@ -28,14 +28,8 @@ import forestry.farming.logic.crops.CropDestroy;
public class FarmableGE implements IFarmable {
@Override
public boolean isSaplingAt(World world, BlockPos pos) {
if (world.isAirBlock(pos)) {
return false;
}
Block block = world.getBlockState(pos).getBlock();
return ModuleArboriculture.getBlocks().saplingGE == block;
public boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState) {
return ModuleArboriculture.getBlocks().saplingGE == blockState.getBlock();
}
@Override
@@ -35,8 +35,7 @@ public class FarmableGourd implements IFarmable {
}
@Override
public boolean isSaplingAt(World world, BlockPos pos) {
IBlockState blockState = world.getBlockState(pos);
public boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState) {
return blockState.getBlock() == stem;
}
@@ -28,8 +28,7 @@ public class FarmableRusticGrape implements IFarmable {
}
@Override
public boolean isSaplingAt(World world, BlockPos pos) {
IBlockState blockState = world.getBlockState(pos);
public boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState) {
return blockState.getBlock() == cropBlock;
}
@@ -37,8 +37,8 @@ public class FarmableRusticSapling implements IFarmable {
}
@Override
public boolean isSaplingAt(World world, BlockPos pos) {
return world.getBlockState(pos).getBlock() == germlingBlock;
public boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState) {
return blockState.getBlock() == germlingBlock;
}
@Override
@@ -60,8 +60,8 @@ public class FarmableSapling implements IFarmable {
}
@Override
public boolean isSaplingAt(World world, BlockPos pos) {
return world.getBlockState(pos).getBlock() == this.saplingBlock;
public boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState) {
return blockState.getBlock() == this.saplingBlock;
}
@Override
@@ -34,8 +34,7 @@ public class FarmableStacked implements IFarmable {
}
@Override
public boolean isSaplingAt(World world, BlockPos pos) {
IBlockState blockState = world.getBlockState(pos);
public boolean isSaplingAt(World world, BlockPos pos, IBlockState blockState) {
return blockState.getBlock() == cropBlock;
}
@@ -68,7 +68,7 @@ public class PluginExtraUtilities extends BlankForestryModule {
}
if (Config.isExUtilEnderLilyEnabled()) {
registerExPlant("Ender", "enderlilly", "Ender Lily", circuit -> Circuits.farmEnderManaged = circuit, Blocks.END_STONE);
registerExPlant("Ender", "enderlilly", "Ender Lily", circuit -> Circuits.farmEnderManaged = circuit);
}
}
@@ -77,10 +77,6 @@ public class PluginExtraUtilities extends BlankForestryModule {
if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) {
return;
}
if(Circuits.farmEnderManaged != null) {
ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed");
ChipsetManager.solderManager.addRecipe(layoutManaged, ModuleCore.getItems().tubes.get(EnumElectronTube.ENDER, 1), Circuits.farmEnderManaged);
}
if(Circuits.farmOrchidManaged != null) {
ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed");
ChipsetManager.solderManager.addRecipe(layoutManaged, ModuleCore.items.tubes.get(EnumElectronTube.ORCHID, 1), Circuits.farmOrchidManaged);
@@ -99,16 +95,20 @@ public class PluginExtraUtilities extends BlankForestryModule {
if (growthProperty == null) {
Log.error("Could not find the growth property of {}.", itemName);
} else {
String identifier = "farm" + id;
IFarmRegistry registry = FarmRegistry.getInstance();
int harvestAge = Collections.max(growthProperty.getAllowedValues());
int replantAge = plantBlock.getDefaultState().getValue(growthProperty);
registry.registerFarmables(itemName, new FarmableAgingCrop(new ItemStack(plantItem), plantBlock, growthProperty, harvestAge, replantAge));
registry.registerFarmables(identifier, new FarmableAgingCrop(new ItemStack(plantItem), plantBlock, growthProperty, harvestAge, replantAge));
IFarmInstance instance = registry.registerLogic("farm" + id, (i, m) -> new FarmLogicExU(i, m, (m ? "Manual " : "Managed ") + itemName + " Farm", plantItem), itemName);
for(Block soil : soils) {
instance.registerSoil(new ItemStack(soil), soil.getDefaultState());
IFarmInstance instance = registry.getFarm(identifier);
if(instance == null) {
instance = registry.registerLogic(identifier, (i, m) -> new FarmLogicExU(i, m, (m ? "Manual " : "Managed ") + itemName + " Farm", plantItem), itemName);
for (Block soil : soils) {
instance.registerSoil(new ItemStack(soil), soil.getDefaultState());
}
assignTo.accept(new CircuitFarmLogic("managed" + id, instance, false));
}
assignTo.accept(new CircuitFarmLogic("managed" + id, instance, false));
}
}
}