diff --git a/build.gradle b/build.gradle index 87d9111..152bc62 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,8 @@ } dependencies { - compileCommon 'org.ultramine.core:ultramine_core-1.7.10:0.1.0-beta.11' +// compileCommon 'org.ultramine.core:ultramine_core-1.7.10:0.1.0-beta.11' + compile 'org.ultramine.core:ultramine_core-1.7.10:0.2.0-indev' compileCommon 'org.codehaus.groovy:groovy-all:2.4.4' diff --git a/settings.gradle b/settings.gradle index d7f5c74..c03e475 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,3 @@ rootProject.name = project_name + (concat_mc_version_to=='name' ? ('-'+minecraft_version) : '') + +includeBuild('../ultramine_core') \ No newline at end of file diff --git a/src/main/java/org/ultramine/mods/scripting/ScriptLoader.java b/src/main/java/org/ultramine/mods/scripting/ScriptLoader.java index 1669ba7..cc3beb3 100644 --- a/src/main/java/org/ultramine/mods/scripting/ScriptLoader.java +++ b/src/main/java/org/ultramine/mods/scripting/ScriptLoader.java @@ -94,11 +94,11 @@ "net.minecraft.tileentity.TileEntity", "net.minecraft.world.WorldServer", - "org.ultramine.economy.CurrencyRegistry", - "org.ultramine.economy.Currency", - "org.ultramine.economy.IHoldings", - "org.ultramine.economy.Account", - "org.ultramine.economy.Accounts", +// "org.ultramine.economy.CurrencyRegistry", +// "org.ultramine.economy.Currency", +// "org.ultramine.economy.IHoldings", +// "org.ultramine.economy.Account", +// "org.ultramine.economy.Accounts", "org.ultramine.server.data.player.PlayerData", "org.ultramine.server.world.WorldDescriptor" ); diff --git a/src/main/java/org/ultramine/mods/scripting/runtime/ScriptBaseClass.java b/src/main/java/org/ultramine/mods/scripting/runtime/ScriptBaseClass.java index e66d30b..3599152 100644 --- a/src/main/java/org/ultramine/mods/scripting/runtime/ScriptBaseClass.java +++ b/src/main/java/org/ultramine/mods/scripting/runtime/ScriptBaseClass.java @@ -10,6 +10,7 @@ import net.minecraft.util.IChatComponent; import org.ultramine.commands.HandlerBasedCommand; import org.ultramine.commands.syntax.ArgumentsPatternParser; +import org.ultramine.core.permissions.MinecraftPermissions; import org.ultramine.mods.scripting.ClosureCommandHandler; import org.ultramine.mods.scripting.ScriptContainer; import org.ultramine.mods.scripting.ScriptLoader; @@ -21,7 +22,6 @@ import org.ultramine.mods.scripting.event.proxy.IEventRegProxy; import org.ultramine.mods.scripting.event.IGlobalEventRegistry; import org.ultramine.mods.scripting.event.IEventSource; -import org.ultramine.permission.MinecraftPermissions; import java.util.ArrayList; import java.util.Arrays;