Improve Farm Logic System and add ring farm layout

This commit is contained in:
Nedelosk committed 2018-01-20 02:35:33 +01:00
1 parent 521514f3d2
commit 10fec50457
53 files changed
+1019 -534

No files matched your search

@@ -3,6 +3,7 @@ package forestry.farming;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -14,12 +15,15 @@ import java.util.List;
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;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.oredict.OreDictionary;
import forestry.api.farming.IFarmInstance;
import forestry.api.farming.IFarmLogic;
import forestry.api.farming.IFarmRegistry;
import forestry.api.farming.IFarmable;
@@ -28,6 +32,8 @@ import forestry.core.config.LocalizedConfiguration;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.Log;
import forestry.core.utils.Translator;
import forestry.farming.logic.FakeFarmInstance;
import forestry.farming.logic.FarmInstance;
import forestry.farming.logic.FarmLogicSimple;
public final class FarmRegistry implements IFarmRegistry {
@@ -35,18 +41,17 @@ 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<String, IFarmLogic>();
private final Map<String, IFarmLogic> logics = new HashMap<>();
private final Map<String, IFarmInstance> farmInstances = new HashMap<>();
public static FarmRegistry getInstance() {
return INSTANCE;
}
public void registerFarmLogic(String identifier, IFarmLogic logic) {
logics.put(identifier, logic);
}
public IFarmLogic getFarmLogic(String identifier) {
return logics.get(identifier);
@Override
@Deprecated
public void registerLogic(String identifier, IFarmLogic logic) {
logics.put(identifier, logic);
}
@Override
@@ -60,13 +65,18 @@ public final class FarmRegistry implements IFarmRegistry {
}
@Override
public IFarmLogic createLogic(ISimpleFarmLogic simpleFarmLogic) {
return new FarmLogicSimple(simpleFarmLogic);
public IFarmLogic createCropLogic(IFarmInstance instance, boolean isManual, ISimpleFarmLogic simpleFarmLogic) {
return new FarmLogicSimple(instance, isManual, simpleFarmLogic);
}
@Override
public IFarmInstance createFakeInstance(IFarmLogic logic) {
return new FakeFarmInstance(logic);
}
@Override
public void registerFertilizer(ItemStack itemStack, int value) {
if(itemStack == null || itemStack.isEmpty()){
if(itemStack.isEmpty()){
return;
}
fertilizers.put(itemStack, value);
@@ -76,16 +86,36 @@ public final class FarmRegistry implements IFarmRegistry {
public int getFertilizeValue(ItemStack itemStack) {
for (Entry<ItemStack, Integer> fertilizer : fertilizers.entrySet()) {
ItemStack fertilizerStack = fertilizer.getKey();
if (itemStack.getItem() == fertilizerStack.getItem()
&& (fertilizerStack.getItemDamage() == itemStack.getItemDamage()
|| fertilizerStack.getItemDamage() == OreDictionary.WILDCARD_VALUE)) {
if (ItemStackUtil.isIdenticalItem(fertilizerStack, itemStack)) {
return fertilizer.getValue();
}
}
return 0;
}
public void loadConfig(LocalizedConfiguration config) {
@Override
public IFarmInstance registerLogic(IFarmInstance farmInstance) {
farmInstances.put(farmInstance.getIdentifier(), farmInstance);
return farmInstance;
}
@Override
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);
farmInstances.put(identifier, instance);
return instance;
}
@Override
@Nullable
public IFarmInstance getFarm(String identifier) {
return farmInstances.get(identifier);
}
void loadConfig(LocalizedConfiguration config) {
List<String> defaultFertilizers = new ArrayList<>(getItemStrings());
Collections.sort(defaultFertilizers);
String[] defaultSortedFertilizers = defaultFertilizers.toArray(new String[defaultFertilizers.size()]);
@@ -102,6 +132,9 @@ public final class FarmRegistry implements IFarmRegistry {
itemName = "forestry:fertilizer_compound";
}
ItemStack fertilizerItem = ItemStackUtil.parseItemStackString(itemName, OreDictionary.WILDCARD_VALUE);
if(fertilizerItem == null){
continue;
}
int fertilizerValue = Integer.parseInt(fertilizers[1]);
registerFertilizer(fertilizerItem, fertilizerValue);
} catch (Exception e) {