From af88f75de7a8385fcd95317c8010ddd21f0d34ae Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Sat, 9 Jun 2018 21:53:28 -0400 Subject: [PATCH] First run at forge port --- build.gradle | 58 +++++++++---------- .../com/minelittlepony/MineLittlePony.java | 10 ++-- 2 files changed, 31 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index d234d2c6..e571d7ac 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { } } -apply plugin: 'net.minecraftforge.gradle.liteloader' +apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'org.spongepowered.mixin' group = 'com.minelittlepony' @@ -27,8 +27,8 @@ targetCompatibility = 1.8 sourceCompatibility = 1.8 minecraft { - version = "1.12.2" - mappings = 'snapshot_20170919' + version = "1.12.2-14.23.4.2705" + mappings = 'snapshot_20180606' runDir = 'run' replace '@VERSION@', project.version } @@ -43,50 +43,44 @@ sourceSets { ext.refMap = 'minelp.mixin.refmap.json' } } - -litemod.json { - mcversion = '1.12.r2' - author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221' - description = 'Mine Little Pony turns players and mobs into ponies' - description.minelittlepony = '''\ - Mine Little Pony turns players and mobs into ponies - Press F9 ingame to access settings'''.stripIndent() - description.hdskinsmod = '''\ - Separate skin server for Mine Little Pony that also supports HD skins. - Access via button on the main menu.'''.stripIndent() - - mixinConfigs += [ - 'minelp.mixin.json', - 'hdskins.mixin.json' - ] +repositories { + maven { + url = 'https://repo.spongepowered.org/maven' + } } +dependencies { + compile('org.spongepowered:mixin:0.7.8-SNAPSHOT') {transitive = false} +} +//litemod.json { +// mcversion = '1.12.r2' +// author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221' +// description = 'Mine Little Pony turns players and mobs into ponies' +// description.minelittlepony = '''\ +// Mine Little Pony turns players and mobs into ponies +// Press F9 ingame to access settings'''.stripIndent() +// description.hdskinsmod = '''\ +// Separate skin server for Mine Little Pony that also supports HD skins. +// Access via button on the main menu.'''.stripIndent() +// +// mixinConfigs += [ +// 'minelp.mixin.json', +// 'hdskins.mixin.json' +// ] +//} jar { from sourceSets.hdskins.output - from litemod } sourceJar { // add hdskins sources from sourceSets.hdskins.allSource } -task srgJar(type: Jar) { - from sourceSets.main.output - from sourceSets.hdskins.output - from litemod - classifier "mc$minecraft.version-srg" - baseName "mod-${project.name.toLowerCase()}" -} task skinZip(type: Zip) { from fileTree('skins') baseName 'Pony Skin Resources' version 'v1' } -reobf { - srgJar { - mappingType = 'SEARGE' - } -} mixin { defaultObfuscationEnv notch } diff --git a/src/main/java/com/minelittlepony/MineLittlePony.java b/src/main/java/com/minelittlepony/MineLittlePony.java index 7ab8e845..2fd40e63 100644 --- a/src/main/java/com/minelittlepony/MineLittlePony.java +++ b/src/main/java/com/minelittlepony/MineLittlePony.java @@ -20,6 +20,7 @@ import org.lwjgl.input.Keyboard; /** * Static MineLittlePony singleton class. Everything's controlled from up here. */ +@Mod(modid = "minelittlepony", name = MineLittlePony.MOD_NAME, version = MineLittlePony.MOD_VERSION, clientSideOnly = true) public class MineLittlePony { public static final Logger logger = LogManager.getLogger("MineLittlePony"); @@ -38,7 +39,8 @@ public class MineLittlePony { private final PonyRenderManager renderManager; - MineLittlePony() { + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { instance = this; LiteLoader.getInput().registerKeyBinding(SETTINGS_GUI); @@ -60,10 +62,8 @@ public class MineLittlePony { SkinServer.defaultServers.add(MINELP_LEGACY_SERVER); } - /** - * Called when the game is ready. - */ - void postInit(Minecraft minecraft) { + @Mod.EventHandler + public void postInit(FMLPostInitializationEvent event) { HDSkinManager manager = HDSkinManager.INSTANCE; // manager.setSkinUrl(SKIN_SERVER_URL);