Skip to content

Commit

Permalink
Updated for LiteLoader 1.7.10.
Browse files Browse the repository at this point in the history
 * Tested against LiteLoader 1.7.10_03, Forge 10.13.0.1180,
   OptiFine HD A4 Ultra for Minecraft 1.7.10, Watson 0.8.0.104,
   Macro/Keybind 0.10.12 for 1.7.10, VoxelMap 1.2.3, Schematica.
  • Loading branch information
totemo committed Aug 14, 2014
1 parent baf4f32 commit 8cf5f33
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 20 deletions.
6 changes: 3 additions & 3 deletions build/build_watson_macros.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

<!-- The version of your mod, can be any string as long as it's valid as part of a file name -->
<!-- and should match the version string returned by your mod. -->
<property name="version" value="0.6.0" />
<property name="version" value="0.8.0" />

<!-- The Minecraft version the mod is for, appended to the output file name for reference -->
<property name="mcversion" value="1.7.2" />
<property name="mcversion" value="1.7.10" />

<!-- The version inserted into the mod metadata to tell the loader what version of MC this mod is for -->
<property name="litemodversion" value="1.7.2_02" />
<property name="litemodversion" value="1.7.10" />

<!-- Your name, this gets written into the mod metadata and jar metadata -->
<property name="author" value="totemo" />
Expand Down
4 changes: 2 additions & 2 deletions build/buildnumber.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Mon Feb 17 23:12:32 CST 2014
build.number=16
#Thu Aug 14 14:34:34 CST 2014
build.number=22
4 changes: 3 additions & 1 deletion build/litemod.template.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"__comment1__": "Do not edit litemod.json directly. Edit build/litemod.template.json and do an Ant build.",
"__comment2__": "Actual comments in this file confuse the JSON parser when deployed. :/",
"__comment3__": "Due to a bug in 1.7.10_03 dependency resolution, dependsOn must be left blank (was: macros,watson).",
"__comment4__": "If either dependency is missing, class resolution errors will prevent this mod from loading.",

"name": "${ant.project.name}",
"mcversion": "${litemodversion}",
"version": "${version}.${build.number}-mc${litemodversion}",
"revision": "${build.number}",
"author": "${author}",
"description": "Macro/Keybind Mod integration for Watson.",
"dependsOn": "watson,macros"
"dependsOn": ""
}
10 changes: 6 additions & 4 deletions res/litemod.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"__comment1__": "Do not edit litemod.json directly. Edit build/litemod.template.json and do an Ant build.",
"__comment2__": "Actual comments in this file confuse the JSON parser when deployed. :/",
"__comment3__": "Due to a bug in 1.7.10_03 dependency resolution, dependsOn must be left blank (was: macros,watson).",
"__comment4__": "If either dependency is missing, class resolution errors will prevent this mod from loading.",

"name": "watson_macros",
"mcversion": "1.7.2_02",
"version": "0.6.0.15-mc1.7.2_02",
"revision": "15",
"mcversion": "1.7.10",
"version": "0.8.0.21-mc1.7.10",
"revision": "21",
"author": "totemo",
"description": "Macro/Keybind Mod integration for Watson.",
"dependsOn": "watson,macros"
"dependsOn": ""
}
10 changes: 0 additions & 10 deletions src/io/totemo/watson/macro/MacroEventProviderWatson.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,11 @@ public class MacroEventProviderWatson implements IMacroEventProvider
*/
public static String ON_WATSON_DISPLAY = "onWatsonDisplay";

// /**
// * ID of the onWatsonDisplay event.
// */
// public static int ON_WATSON_DISPLAY_ID = 1250;

/**
* Name of the onWatsonDisplay event.
*/
public static String ON_WATSON_SELECTION = "onWatsonSelection";

// /**
// * ID of the onWatsonSelection event.
// */
// public static int ON_WATSON_SELECTION_ID = 1251;

// --------------------------------------------------------------------------
/**
* @see net.eq2online.macros.scripting.api.IMacrosAPIModule#onInit()
Expand Down

0 comments on commit 8cf5f33

Please sign in to comment.