Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #125

Browse source 
Check plant constrains before planting it
Added mycelium to soils
This commit is contained in:
LemADEC 2016-01-28 22:54:02 +01:00
parent 8de46d5ee3
commit 3f7bf08fe6
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/cr0s/warpdrive/block/collection/TileEntityLaserTreeFarm.java
View file

@ -12,6 +12,7 @@ import li.cil.oc.api.machine.Context;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.Optional;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -359,6 +360,11 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner {
continue; continue;
} }
if (!plant.canPlaceBlockAt(worldObj, soil.x, soil.y + 1, soil.z)) {
slotIndex++;
continue;
}
found = true; found = true;
} }

2
src/main/java/cr0s/warpdrive/config/Dictionary.java
View file

@ -1,6 +1,5 @@
package cr0s.warpdrive.config; package cr0s.warpdrive.config;
import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -85,6 +84,7 @@ public class Dictionary {
config.get("block_tags", "minecraft:dirt" , "Soil").getString(); config.get("block_tags", "minecraft:dirt" , "Soil").getString();
config.get("block_tags", "minecraft:farmland" , "Soil").getString(); config.get("block_tags", "minecraft:farmland" , "Soil").getString();
config.get("block_tags", "minecraft:grass" , "Soil").getString(); config.get("block_tags", "minecraft:grass" , "Soil").getString();
config.get("block_tags", "minecraft:mycelium" , "Soil").getString();
config.get("block_tags", "minecraft:sand" , "Soil").getString(); config.get("block_tags", "minecraft:sand" , "Soil").getString();
config.get("block_tags", "minecraft:soul_sand" , "Soil").getString(); config.get("block_tags", "minecraft:soul_sand" , "Soil").getString();
config.get("block_tags", "IC2:blockRubWood" , "Log").getString(); config.get("block_tags", "IC2:blockRubWood" , "Log").getString();