From 5a10d8a0b2e2f6cef62cdd81cf06219604407eca Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 26 Dec 2017 19:30:14 -0800 Subject: [PATCH] Fix "Invalid property value detected" error logs from Buildcraft --- gradle.properties | 4 +-- .../arboriculture/blocks/PropertyTree.java | 28 +++++++++++-------- .../blocks/properties/PropertyAllele.java | 15 ++++++++++ .../blocks/PropertyCocoon.java | 28 ++++++++++--------- 4 files changed, 48 insertions(+), 27 deletions(-) mode change 100755 => 100644 gradle.properties diff --git a/gradle.properties b/gradle.properties old mode 100755 new mode 100644 index ae40dcc03..74f6b64dc --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ mcversion=1.12.2 -forgeversion=14.23.1.2577 +forgeversion=14.23.1.2582 mcp_mappings=snapshot_20170918 curse_project_id=59751 tesla_version=1.0.60 tesla_mcversion=1.12 -jei_version=4.8.0.103 +jei_version=4.8.5.138 jei_mcversion=1.12.2 ic2_version=2.8.24-ex112 diff --git a/src/main/java/forestry/arboriculture/blocks/PropertyTree.java b/src/main/java/forestry/arboriculture/blocks/PropertyTree.java index f542be262..9b2afe05e 100755 --- a/src/main/java/forestry/arboriculture/blocks/PropertyTree.java +++ b/src/main/java/forestry/arboriculture/blocks/PropertyTree.java @@ -10,12 +10,13 @@ ******************************************************************************/ package forestry.arboriculture.blocks; -import com.google.common.base.MoreObjects; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; +import com.google.common.base.Optional; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -23,6 +24,7 @@ import forestry.core.blocks.properties.PropertyAllele; import forestry.core.config.Constants; public class PropertyTree extends PropertyAllele { + private static final Map namesMap = new HashMap<>(); public PropertyTree(String name) { super(name); @@ -33,16 +35,6 @@ public class PropertyTree extends PropertyAllele { return IAlleleTreeSpecies.class; } - @Override - public String toString() { - return MoreObjects.toStringHelper(this).add("name", this.name).add("clazz", IAlleleTreeSpecies.class).add("values", this.getAllowedValues()).toString(); - } - - @Override - public int hashCode() { - return 31 * IAlleleTreeSpecies.class.hashCode() + this.name.hashCode(); - } - @Override public List getAllowedValues() { List trees = new ArrayList<>(); @@ -59,4 +51,16 @@ public class PropertyTree extends PropertyAllele { return value.getUID().replace(Constants.MOD_ID + ".tree", "").toLowerCase(Locale.ENGLISH); } + @Override + public Optional parseValue(String value) { + if (namesMap.isEmpty()) { + List allowedValues = getAllowedValues(); + for (IAlleleTreeSpecies allowedValue : allowedValues) { + String propertyName = getName(allowedValue); + namesMap.put(propertyName, allowedValue); + } + } + return Optional.fromNullable(namesMap.get(value)); + } + } diff --git a/src/main/java/forestry/core/blocks/properties/PropertyAllele.java b/src/main/java/forestry/core/blocks/properties/PropertyAllele.java index f14825d44..508f20fc1 100644 --- a/src/main/java/forestry/core/blocks/properties/PropertyAllele.java +++ b/src/main/java/forestry/core/blocks/properties/PropertyAllele.java @@ -12,6 +12,7 @@ package forestry.core.blocks.properties; import java.util.List; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -30,6 +31,20 @@ public abstract class PropertyAllele> implements IP return this.name; } + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("name", this.name) + .add("clazz", getValueClass()) + .add("values", this.getAllowedValues()) + .toString(); + } + + @Override + public final int hashCode() { + return 31 * getValueClass().hashCode() + this.name.hashCode(); + } + @Override public Optional parseValue(String value) { IAllele allele = AlleleManager.alleleRegistry.getAllele(value); diff --git a/src/main/java/forestry/lepidopterology/blocks/PropertyCocoon.java b/src/main/java/forestry/lepidopterology/blocks/PropertyCocoon.java index a8a0bb53f..2866a8f2d 100755 --- a/src/main/java/forestry/lepidopterology/blocks/PropertyCocoon.java +++ b/src/main/java/forestry/lepidopterology/blocks/PropertyCocoon.java @@ -10,18 +10,19 @@ ******************************************************************************/ package forestry.lepidopterology.blocks; -import com.google.common.base.MoreObjects; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; -import forestry.api.arboriculture.IAlleleTreeSpecies; +import com.google.common.base.Optional; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.lepidopterology.IAlleleButterflyCocoon; import forestry.core.blocks.properties.PropertyAllele; public class PropertyCocoon extends PropertyAllele { + private static final Map namesMap = new HashMap<>(); public PropertyCocoon(String name) { super(name); @@ -32,16 +33,6 @@ public class PropertyCocoon extends PropertyAllele { return IAlleleButterflyCocoon.class; } - @Override - public String toString() { - return MoreObjects.toStringHelper(this).add("name", this.name).add("clazz", IAlleleButterflyCocoon.class).add("values", this.getAllowedValues()).toString(); - } - - @Override - public int hashCode() { - return 31 * IAlleleTreeSpecies.class.hashCode() + this.name.hashCode(); - } - @Override public List getAllowedValues() { List trees = new ArrayList<>(); @@ -58,4 +49,15 @@ public class PropertyCocoon extends PropertyAllele { return value.getCocoonName(); } + @Override + public Optional parseValue(String value) { + if (namesMap.isEmpty()) { + List allowedValues = getAllowedValues(); + for (IAlleleButterflyCocoon allowedValue : allowedValues) { + String propertyName = getName(allowedValue); + namesMap.put(propertyName, allowedValue); + } + } + return Optional.fromNullable(namesMap.get(value)); + } }