diff --git a/.gitignore b/.gitignore index 110f1aef..463f065f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ bin/ build/ run/ .classpath -.project \ No newline at end of file +.project +*.launch diff --git a/build.gradle b/build.gradle index f74db51d..928a5f21 100644 --- a/build.gradle +++ b/build.gradle @@ -1,25 +1,7 @@ -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - maven { - name = 'minecrell' - url = "http://repo.minecrell.net/snapshots" - } - } - dependencies { - classpath 'net.minecrell:VanillaGradle:3.0-SNAPSHOT' - } +plugins { + id 'net.minecraftforge.gradle.tweaker-client' version '2.0.1' } evaluationDependsOnChildren() -apply plugin: 'net.minecrell.vanilla' archivesBaseName = "mod_minelp" version = "1.8-UNOFFICIAL_mc1.8" @@ -27,22 +9,25 @@ version = "1.8-UNOFFICIAL_mc1.8" minecraft { version = "1.8" mappings = 'snapshot_20150606' - clientTweaker = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker' + tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker' + runDir = 'run' // fix reobf issues - srgExtra "FD: com/voxelmodpack/common/properties/gui/GuiVoxelBoxSettingsPanel/zLevel bub/e" - srgExtra "FD: com/voxelmodpack/common/gui/GuiControl/zLevel bub/e" - srgExtra "FD: com/voxelmodpack/common/gui/GuiScreenEx/zLevel bub/e" +// srgExtra "FD: com/voxelmodpack/common/properties/gui/GuiVoxelBoxSettingsPanel/zLevel bub/e" +// srgExtra "FD: com/voxelmodpack/common/gui/GuiControl/zLevel bub/e" +// srgExtra "FD: com/voxelmodpack/common/gui/GuiScreenEx/zLevel bub/e" } -project(':voxellib').dependencies { - compile fileTree("libs") + +repositories.flatDir { + dir 'voxellib/liteloader' } dependencies { compile project(':voxellib') } jar { extension 'litemod' + manifest.attributes.remove 'TweakClass' } -task standaloneJar(type:Jar, dependsOn: [reobf, project(':voxellib').reobf]) { +task standaloneJar(type:Jar, dependsOn: [reobfJar, project(':voxellib').reobfJar]) { extension "litemod" from zipTree(jar.archivePath) from project(':voxellib').jar.archivePath @@ -51,6 +36,3 @@ task standaloneJar(type:Jar, dependsOn: [reobf, project(':voxellib').reobf]) { artifacts { archives standaloneJar } -reobf { - setSrgMcp() -} diff --git a/libs/liteloader-1.8-SNAPSHOT-mcpnames.jar b/libs/liteloader-1.8-SNAPSHOT-mcpnames.jar deleted file mode 100644 index 069697c9..00000000 Binary files a/libs/liteloader-1.8-SNAPSHOT-mcpnames.jar and /dev/null differ diff --git a/src/main/java/com/minelittlepony/minelp/MineLittlePony.java b/src/main/java/com/minelittlepony/minelp/MineLittlePony.java index 49f9bf45..b351d176 100644 --- a/src/main/java/com/minelittlepony/minelp/MineLittlePony.java +++ b/src/main/java/com/minelittlepony/minelp/MineLittlePony.java @@ -168,7 +168,6 @@ public class MineLittlePony implements InitCompleteListener { if (pressed || skins) { minecraft.displayGuiScreen(new GuiSkinsMineLP()); } - } public static ModConfig getConfig() { diff --git a/src/main/java/com/minelittlepony/minelp/renderer/RenderPony.java b/src/main/java/com/minelittlepony/minelp/renderer/RenderPony.java index 20d077bf..f63e2ef6 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/RenderPony.java +++ b/src/main/java/com/minelittlepony/minelp/renderer/RenderPony.java @@ -37,7 +37,6 @@ public abstract class RenderPony extends RendererLivingEntity implements IRender throw new InstantiationError("Overlay classes must not be instantiated"); } - @SuppressWarnings("unused") @AppendInsns("") private void init(RenderManager renderManager, boolean useSmallArms) { this.playerModel = PMAPI.newPonyAdv; @@ -118,7 +117,6 @@ public abstract class RenderPony extends RendererLivingEntity implements IRender this.playerModel.armor.modelArmorChestplate.heldItemRight = this.playerModel.armor.modelArmor.heldItemRight = this.playerModel.model.heldItemRight = 0; } - @SuppressWarnings("unused") @AppendInsns("renderLivingAt") @Obfuscated({ "a", "func_77039_a" }) public void setupPlayerScale(AbstractClientPlayer player, double xPosition, double yPosition, double zPosition) { diff --git a/src/main/resources/assets/hdskins/lang/ru_RU.lang b/src/main/resources/assets/hdskins/lang/ru_RU.lang new file mode 100644 index 00000000..84a989f7 --- /dev/null +++ b/src/main/resources/assets/hdskins/lang/ru_RU.lang @@ -0,0 +1,16 @@ +hdskins.choose=Выберите файл +hdskins.manager=Помошник по работе со скинами +hdskins.error.unreadable=Нечитаемый файл +hdskins.error.ext=Файл не в png формате +hdskins.error.open=Ошибка при открытии файла скина +hdskins.error.invalid=Неверный файл скина +hdskins.error.select=Пожалуйста сначала выберите скин +hdskins.error.mojang=Ошибка Mojang API +hdskins.error.mojang.wait=Пожалуйста подождите 1 минуту... +hdskins.open.title=Выберите ваш скин +hdskins.fetch=Извлечение скина... +hdskins.failed=Загрузка скина завершилась неудачей +hdskins.request=Отправка запроса на сервер, пожалуйста подождите. +hdskins.upload=Загрузка скина, пожалуйста подождите. +hdskins.local=Локальный скин +hdskins.server=Скин на сервере \ No newline at end of file diff --git a/src/main/resources/assets/minelittlepony/lang/ru_RU.lang b/src/main/resources/assets/minelittlepony/lang/ru_RU.lang new file mode 100644 index 00000000..48392c69 --- /dev/null +++ b/src/main/resources/assets/minelittlepony/lang/ru_RU.lang @@ -0,0 +1,18 @@ +minelp.restart1=Если вы измените эти параметры, +minelp.restart2=то для их активации вы должны перезапустить игру! +minelp.options.title=Настроайки мода Mine Little Pony +minelp.options.ponylevel=Уровень понификации +minelp.options.ponylevel.pony=Только пони +minelp.options.ponylevel.human=Только люди +minelp.options.ponylevel.mix=Вперемешку +minelp.options.options=Опции +minelp.options.hd=Включить Mine Little Pony скин-сервер (требуется перезапуск) +minelp.options.sizes=Разрешить пони разных размеров и расс +minelp.options.ponyarmor=Использовать текстуры брони совместимые с модом +minelp.options.snuzzles=Показывать объёмные носы +minelp.options.showscale=Использовать более точное масштабирование +minelp.mobs.title=Пони-мобы +minelp.mobs.villagers=Пони-житель +minelp.mobs.zombies=Пони-зомби +minelp.mobs.zombiepigmen=Пони-свинозомби +minelp.mobs.skeletons=Пони-скелеты \ No newline at end of file diff --git a/voxellib/build.gradle b/voxellib/build.gradle index 669bacf4..85f129f3 100644 --- a/voxellib/build.gradle +++ b/voxellib/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'net.minecrell.vanilla' +apply plugin: 'net.minecraftforge.gradle.tweaker-client' archivesBaseName = "lib_voxelcommon" version = "4.4.0-mc1.8" @@ -6,12 +6,16 @@ version = "4.4.0-mc1.8" minecraft { version = "1.8" mappings = 'snapshot_20150606' - clientTweaker = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker' + tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker' +} +repositories.flatDir { + dir 'liteloader' +} +dependencies { + deobfCompile 'com.mumfrey:liteloader:1.8-SNAPSHOT:srg' } jar { extension 'litemod' archiveName = 'voxelcommon-2.4.0.jar' -} -reobf { - setSrgMcp() + manifest.attributes.remove 'TweakClass' } diff --git a/voxellib/liteloader/liteloader-1.8-SNAPSHOT-srg.jar b/voxellib/liteloader/liteloader-1.8-SNAPSHOT-srg.jar new file mode 100644 index 00000000..341ebbd0 Binary files /dev/null and b/voxellib/liteloader/liteloader-1.8-SNAPSHOT-srg.jar differ