Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java
#	src/main/java/carpet/helpers/EntityPlayerActionPack.java
This commit is contained in:
gnembon committed 2020-01-05 02:27:33 -04:00
commit 8725b59241
16 files changed
+352 -245

No files matched your search

@@ -4,6 +4,7 @@ import org.apache.commons.io.IOUtils;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Locale;
public class BundledModule implements ModuleInterface
{
@@ -13,9 +14,9 @@ public class BundledModule implements ModuleInterface
{
try
{
name = scriptName;
name = scriptName.toLowerCase(Locale.ROOT);
code = IOUtils.toString(
getClass().getClassLoader().getResourceAsStream("assets/carpet/scripts/"+scriptName+".sc"),
getClass().getClassLoader().getResourceAsStream("assets/carpet/scripts/"+name+".sc"),
StandardCharsets.UTF_8
);
}