Improve fertilizer config and Clean Up

This commit is contained in:
Nedelosk committed 2018-01-20 21:00:21 +01:00
1 parent ce3dea42e3
commit c00fa15f0e
34 files changed
+263 -236

No files matched your search

@@ -1,6 +1,7 @@
package forestry.farming;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multimap;
import javax.annotation.Nullable;
@@ -22,8 +23,8 @@ 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.IFarmProperties;
import forestry.api.farming.IFarmRegistry;
import forestry.api.farming.IFarmable;
import forestry.api.farming.ISimpleFarmLogic;
@@ -31,16 +32,18 @@ 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.FakeFarmProperties;
import forestry.farming.logic.FarmLogicSimple;
import forestry.farming.logic.FarmProperties;
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, IFarmInstance> farmInstances = new HashMap<>();
private final Map<String, IFarmProperties> farmInstances = new HashMap<>();
private FertilizerConfig fertilizer = FertilizerConfig.DUMMY;
public static FarmRegistry getInstance() {
return INSTANCE;
@@ -62,13 +65,13 @@ public final class FarmRegistry implements IFarmRegistry {
}
@Override
public IFarmLogic createCropLogic(IFarmInstance instance, boolean isManual, ISimpleFarmLogic simpleFarmLogic) {
public IFarmLogic createCropLogic(IFarmProperties instance, boolean isManual, ISimpleFarmLogic simpleFarmLogic) {
return new FarmLogicSimple(instance, isManual, simpleFarmLogic);
}
@Override
public IFarmInstance createFakeInstance(IFarmLogic logic) {
return new FakeFarmInstance(logic);
public IFarmProperties createFakeInstance(IFarmLogic logic) {
return new FakeFarmProperties(logic);
}
@Override
@@ -81,72 +84,113 @@ public final class FarmRegistry implements IFarmRegistry {
@Override
public int getFertilizeValue(ItemStack itemStack) {
for (Entry<ItemStack, Integer> fertilizer : fertilizers.entrySet()) {
ItemStack fertilizerStack = fertilizer.getKey();
if (ItemStackUtil.isIdenticalItem(fertilizerStack, itemStack)) {
return fertilizer.getValue();
}
}
return 0;
return fertilizer.getFertilizeValue(itemStack);
}
@Override
public IFarmInstance registerLogic(IFarmInstance farmInstance) {
public IFarmProperties registerLogic(IFarmProperties farmInstance) {
farmInstances.put(farmInstance.getIdentifier(), farmInstance);
return farmInstance;
}
@Override
public IFarmInstance registerLogic(String identifier, BiFunction<IFarmInstance, Boolean, IFarmLogic> logicFactory, String... farmablesIdentifiers) {
public IFarmProperties registerLogic(String identifier, BiFunction<IFarmProperties, Boolean, IFarmLogic> logicFactory, String... farmablesIdentifiers) {
Set<String> fIdentifiers = new HashSet<>(Arrays.asList(farmablesIdentifiers));
fIdentifiers.add(identifier);
IFarmInstance instance = new FarmInstance(identifier, logicFactory, fIdentifiers);
IFarmProperties instance = new FarmProperties(identifier, logicFactory, fIdentifiers);
farmInstances.put(identifier, instance);
return instance;
}
@Override
@Nullable
public IFarmInstance getFarm(String identifier) {
public IFarmProperties getFarm(String identifier) {
return farmInstances.get(identifier);
}
void loadConfig(LocalizedConfiguration config) {
List<String> defaultFertilizers = new ArrayList<>(getItemStrings());
Map<String, String> defaultEntries = getItemStrings();
List<String> defaultFertilizers = new ArrayList<>(defaultEntries.values());
Collections.sort(defaultFertilizers);
String[] defaultSortedFertilizers = defaultFertilizers.toArray(new String[defaultFertilizers.size()]);
Property fertilizerConf = config.get("fertilizers", "items", defaultSortedFertilizers, Translator.translateToLocal("for.config.farm.fertilizers.items"));
Property property = config.get("fertilizers", "items", defaultSortedFertilizers, Translator.translateToLocal("for.config.farm.fertilizers.items"));
fertilizers.clear();
String[] fertilizerList = fertilizerConf.getStringList();
for (int i = 0; i < fertilizerList.length; i++) {
try {
String fertilizer = fertilizerList[i];
String[] fertilizers = fertilizer.split(";");
String itemName = fertilizers[0];
if(itemName.equals("forestry:fertilizerCompound")){
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) {
Log.error("Forestry failed to parse a fertilizer entry at the farm config, at the position " + i + ".", e);
ImmutableMap<ItemStack, Integer> fertilizerMap = checkConfig(property, defaultEntries);
fertilizer = new FertilizerConfig(fertilizerMap);
}
private ImmutableMap<ItemStack, Integer> checkConfig(Property property, Map<String, String> defaultEntries){
String[] fertilizerList = property.getStringList();
ImmutableMap.Builder<ItemStack, Integer> fertilizerMap = new ImmutableMap.Builder<>();
Map<String, String> configEntries = parseConfig(fertilizerList, fertilizerMap);
List<String> newEntries = new ArrayList<>(Arrays.asList(fertilizerList));
for(Entry<String, String> defaultEntry : defaultEntries.entrySet()){
if(!configEntries.containsKey(defaultEntry.getKey())){
newEntries.add(defaultEntry.getValue());
}
}
if(newEntries.size() > fertilizerList.length){
Collections.sort(newEntries);
property.set(newEntries.toArray(new String[newEntries.size()]));
return checkConfig(property, defaultEntries);
}
return fertilizerMap.build();
}
private Map<String, String> parseConfig(String[] fertilizerList, ImmutableMap.Builder<ItemStack, Integer> fertilizerMap){
Map<String, String> configEntries = new HashMap<>();
for(String entry : fertilizerList){
String[] spited = entry.split(";");
if(spited.length < 2){
Log.error("Foretsry failed to parse a entry of the fertilizer config.");
continue;
}
String itemName = spited[0];
ItemStack fertilizerItem = ItemStackUtil.parseItemStackString(itemName, OreDictionary.WILDCARD_VALUE);
if(fertilizerItem == null || fertilizerItem.isEmpty()){
Log.error("Foretsry failed to parse a entry of the fertilizer config, because the item doesn't exists.");
continue;
}
String value = spited[1];
int fertilizerValue = Integer.parseInt(value);
if(fertilizerValue > 0) {
fertilizerMap.put(fertilizerItem, fertilizerValue);
}
configEntries.put(itemName, value);
}
return configEntries;
}
private Set<String> getItemStrings() {
Set<String> itemStrings = new HashSet<>(fertilizers.size());
private Map<String, String> getItemStrings() {
Map<String, String> itemStrings = new HashMap<>(fertilizers.size());
for (Entry<ItemStack, Integer> itemStack : fertilizers.entrySet()) {
String itemString = ItemStackUtil.getStringForItemStack(itemStack.getKey());
itemString += ";" + itemStack.getValue();
itemStrings.add(itemString);
itemStrings.put(itemString, itemString + ";" + itemStack.getValue());
}
return itemStrings;
}
private static class FertilizerConfig{
private static final FertilizerConfig DUMMY = new FertilizerConfig(Collections.emptyMap());
private final Map<ItemStack, Integer> fertilizers;
private FertilizerConfig(Map<ItemStack, Integer> fertilizers) {
this.fertilizers = fertilizers;
}
private int getFertilizeValue(ItemStack itemStack) {
for (Entry<ItemStack, Integer> fertilizer : fertilizers.entrySet()) {
ItemStack fertilizerStack = fertilizer.getKey();
if (ItemStackUtil.isIdenticalItem(fertilizerStack, itemStack)) {
return fertilizer.getValue();
}
}
return 0;
}
}
}