- Added toString to the data values

- Added getPlayer to crafting inventory
- Added crafting inventory to recipe function
- Removed some print statements
- Renamed the global minetweaker variable to tweaker
- Bumped forge version to 1121 due to ore dictionary changes
- Added bracket handler for ore entries
- Enabled withTag(null)
- Fixed issues with the new ore dictionary implementation in Forge 1113+
- Fixed bug in Ore recipe conversion
- Fixed import errors not being detected and reported properly
- Fixed nested NBT tags not being converted properly
- Fixed something in any type implementation
- Added commas in function name generation
- Added class registries for IC2 and NEI integration
This commit is contained in:
Stan Hebben committed 2014-06-22 14:02:56 +02:00
1 parent 2de467d7d8
commit 3827eba3e2
39 files changed
+301 -50

No files matched your search

@@ -12,6 +12,7 @@ import stanhebben.zenscript.definitions.ParsedFunction;
import stanhebben.zenscript.expression.partial.IPartialExpression;
import stanhebben.zenscript.parser.Token;
import stanhebben.zenscript.statements.Statement;
import stanhebben.zenscript.symbols.IZenSymbol;
import stanhebben.zenscript.symbols.SymbolType;
import stanhebben.zenscript.type.ZenType;
@@ -105,7 +106,12 @@ public class ZenParsedFile {
}
if (type != null) {
environmentScript.putValue(imprt.getRename(), type.toSymbol());
IZenSymbol symbol = type.toSymbol();
if (symbol == null) {
environmentScript.error(imprt.getPosition(), "Not a valid type");
} else {
environmentScript.putValue(imprt.getRename(), type.toSymbol());
}
} else {
environmentScript.putValue(imprt.getRename(), new SymbolType(ZenType.ANY));
}