diff --git a/build.gradle b/build.gradle index e52e23af..bcdf79c8 100644 --- a/build.gradle +++ b/build.gradle @@ -126,7 +126,7 @@ task signJar(dependsOn: ["reobf", "devJar"]) { inputs.property "ee3_keystore_alias", ee3_keystore_alias inputs.property "keystore_password", keystore_password outputs.dir devJar.destinationDir - + // only sign if the keystore exists onlyIf { return keystore_location != "." && keystore_password != "" @@ -139,16 +139,27 @@ task signJar(dependsOn: ["reobf", "devJar"]) { logger.lifecycle "signing $file" ant.signjar( - destDir: file.getParentFile(), // same place it came from - jar: file, - keystore: keystore_location, - alias: ee3_keystore_alias, - storepass: keystore_password + destDir: file.getParentFile(), // same place it came from + jar: file, + keystore: keystore_location, + alias: ee3_keystore_alias, + storepass: keystore_password ) - } + } } } +task copyChicken(type: Copy, dependsOn: "extractUserDev") { + from { configurations.compile } + include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar", "**/*Waila*.jar" + exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_- + into file("./run/mods") // paralell to the assets dir + mustRunAfter "deobfBinJar" + mustRunAfter "repackMinecraft" +} +tasks.setupDevWorkspace.dependsOn copyChicken +tasks.setupDecompWorkspace.dependsOn copyChicken + uploadArchives { repositories { mavenDeployer { diff --git a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java index 5484049d..a2707b5a 100644 --- a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java +++ b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java @@ -94,6 +94,8 @@ public class EquivalentExchange3 // Register our fuels GameRegistry.registerFuelHandler(new FuelHandler()); + + FMLInterModComms.sendMessage("Waila", "register", "com.pahimar.ee3.waila.WailaDataProvider.callbackRegister"); } @EventHandler diff --git a/src/main/java/com/pahimar/ee3/waila/WailaDataProvider.java b/src/main/java/com/pahimar/ee3/waila/WailaDataProvider.java new file mode 100644 index 00000000..19df0cb1 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/waila/WailaDataProvider.java @@ -0,0 +1,42 @@ +package com.pahimar.ee3.waila; + +import com.pahimar.ee3.block.BlockAludel; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaRegistrar; +import net.minecraft.item.ItemStack; + +import java.util.List; + +public class WailaDataProvider implements IWailaDataProvider +{ + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) + { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currentTip, IWailaDataAccessor accessor, IWailaConfigHandler config) + { + return currentTip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currentTip, IWailaDataAccessor accessor, IWailaConfigHandler config) + { + return currentTip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currentTip, IWailaDataAccessor accessor, IWailaConfigHandler config) + { + return currentTip; + } + + public static void callbackRegister(IWailaRegistrar registrar) + { + registrar.registerHeadProvider(new WailaDataProvider(), BlockAludel.class); + } +}