Update item tree to 1.4, update doc

briankchan · Oct 21, 2012 · 001b820 · 001b820
1 parent bd36608
commit 001b820
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 31 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.43'
+version = '1.44'
 # The full version, including alpha/beta/rc tags.
-release = '1.43'
+release = '1.44'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.txt b/docs/index.txt
@@ -52,7 +52,7 @@ Just start playing Minecraft, you can already use most features of the mod. Noti
 Inventory sorting
 ~~~~~~~~~~~~~~~~~
 
-Trigger the sorting in your inventory by using the **middle click**, or by pressing **R** (by default), at any time. If you want to change the shortcut, check the *Controls* menu in your options. 
+Trigger the sorting in your inventory by using the **middle click**, or by pressing **R** (by default), at any time. If you want to change the shortcut, you can do that from the "..." menu in your inventory. 
 
 Chests sorting
 ~~~~~~~~~~~~~~
@@ -182,7 +182,7 @@ Items defined by IDs and damage
 
 Some items are not only defined by IDs, but also by specific "damage values"::
 
-	 <sexyWools>
+   <sexyWools>
      <magentaWool id="35" damage="2" />
      <pinkWool id="35" damage="6" />
      <purpleWool id="35" damage="10" />
@@ -193,7 +193,7 @@ Categories defined by id ranges
 
 You can also define categories by entering a range of IDs. Useful for mods::
 
-	 <camelOre>
+   <camelOre>
      <camelOreBlocks min="96" max="158" />
      <camelOreItems min="358" max="443" />
    </camelOre>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>net.jimeowan</groupId>
 	<artifactId>inventory-tweaks</artifactId>
-	<version>1.43b-1.3.2</version>
+	<version>1.44-1.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Inventory Tweaks</name>
 

diff --git a/src/DefaultTree.dat b/src/DefaultTree.dat
@@ -6,9 +6,13 @@
 |==============================================================|
 
 # Q: WHAT IS THIS?
-# A: This file is used to store all the keywords you can use to create item rules, but also to define the item orders.
+# A: This file is used to store all the keywords you can use to create item rules, but also to define the items order.
 # You can move/change all that you want, but it's recommended not to delete any default item.
 
+# Q: MY CUSTOM FILE WAS REPLACED =(
+# A: Since a new major version of Minecraft appeared, I silently updated the tree... BUT!
+# I kept a backup of your version in the same directory. Sorry for the trouble, feel free to import your changes in the new file.
+
 # Q: THE FILE IS BROKEN AND I DON'T KNOW WHAT TO DO =(
 # A: Just delete this file, the default tree will be reloaded next time you sort something!
 
@@ -19,7 +23,7 @@
 # Thanks to Larandar & Lunaqua for their contributions.
 -->
 <!-- Note: 'stuff' matches everything, even items that don't appear here -->
-<stuff treeVersion="1.3.0">
+<stuff treeVersion="1.4.0">
   <equipment>
     <weapon>
       <sword>
@@ -66,6 +70,7 @@
       </hoe>
       <shears id="359" />
       <fishingRod id="346" />
+      <carrotOnAStick id="398" />
     </tool>
     <armor>
       <helmet>
@@ -195,6 +200,10 @@
         <netherBrickFence id="113" />
         <fenceGate id="107" />
       </fence>
+      <stoneWall>
+        <cobblestoneWall id="139" damage="0" />
+        <mossyCobblestoneWall id="139" damage="1" />
+      </stoneWall>
       <sign id="63" />
       <jackOLantern id="91" />
       <constructionBlock>
@@ -300,7 +309,10 @@
         <pressurePlateWood id="72" />
         <pressurePlateStone id="70" />
       </pressurePlates>
-      <stoneButton id="77" />
+	  <buttons>
+		<stoneButton id="77" />
+		<woodenButton id="143" />
+	  <button>
       <doors>
         <doorWood id="324" />
         <woodenDoor id="324" />
@@ -348,6 +360,7 @@
       <blazeRod id="369" />
       <ghastTear id="370" />
       <goldNugget id="371" />
+      <netherStar id="399" />
     </huntingResources>
     <farmingResources>
       <milk id="335" />
@@ -393,8 +406,10 @@
 	      <chest id="54" />
 	      <enderChest id="130" />
       </chests>
-      <bed id="26" />
+      <beacon id="138" />
+      <anvil id="145" />
       <jukebox id="84" />
+      <bed id="26" />
       <readableBooks>
         <bookAndQuill id="386" />
         <writtenBook id="387" />
@@ -418,6 +433,7 @@
     <instrument>
       <clock id="347" />
       <compass id="345" />
+      <emptyMap id="395" />
       <map id="358" />
     </instrument>
     <vehicle>
@@ -438,7 +454,13 @@
       <painting id="321" />
       <sign id="323" />
       <bookShelf id="47" />
+      <flowerPot id="390" />
+      <itemFrame id="389" />
+      <frame id="389" />
+      <head id="397" />
       <musicDisc min="2256" max="2266" />
+      <flowerPotBlock id="140" />
+      <headBlock id="144" />
     </decoration>
     <food>
       <edibleFood>
@@ -448,24 +470,32 @@
           <cookedFish id="350" />
           <steak id="364" />
           <cookedChicken id="366" />
+		  <bakedPotato id="392" />
         </cookedFood>
         <bread id="297" />
+        <pumpkinPie id="400" />
         <melonSlice id="360" />
+		<carrot>
+			<carrot id="391" />
+			<goldenCarrot id="396" />
+		</carrot>
+        <apple>
+          <appleRed id="260" />
+          <appleGolden id="322" />
+        </apple>
+        <cookie id="357" />
         <rawFood>
           <rawPorkchop id="319" />
           <rawFish id="349" />
           <rawBeef id="363" />
           <rawChicken id="365" />
+		  <potato id="392" />
         </rawFood>
-        <apple>
-          <appleRed id="260" />
-          <appleGolden id="322" />
-        </apple>
-        <cookie id="357" />
       </edibleFood>
       <poisonedFood>
         <rottenFlesh id="367" />
         <spiderEye id="375" />
+		<poisonedPotato id="392" />
       </poisonedFood>
       <unedibleFood>
         <cake id="354" />
@@ -514,13 +544,17 @@
       <reed id="83" />
       <melon id="103" />
       <pumpkin id="86" />
+      <cocoaPod id="127" />
       <cocoaPlant id="127" />
       <tallGrass id="31" />
       <deadShrub id="32" />
       <deadBush id="32" />
       <seedBlock id="59" />
       <pumpkinStem id="104" />
       <melonStem id="105" />
+      <carrotBlock id="141" />
+      <potatoBlock id="142" />
+      <potatoesBlock id="142" />
       <lilyPad id="111" />
     </plant>
     <potion>

diff --git a/src/InvTweaksConfig.java b/src/InvTweaksConfig.java
@@ -509,14 +509,6 @@ private void loadProperties() throws IOException {
                 properties.put(entry.getKey(), entry.getValue());
             }
 
-            // XXX 1.30 patch: rename wrong shortcuts
-            if (properties.contains(PROP_SHORTCUT_DROP) && ((String) properties.get(PROP_SHORTCUT_DROP)).contains("META")) {
-                properties.setProperty(PROP_SHORTCUT_DROP, "LALT, RALT");
-            }
-            if (properties.contains(PROP_SHORTCUT_DROP) && ((String) properties.get(PROP_SHORTCUT_ONE_ITEM)).contains("CTRL")) {
-                properties.setProperty(PROP_SHORTCUT_ONE_ITEM, "LCONTROL, RCONTROL");
-            }
-
             // Retro-compatibility: rename autoreplace
             if (properties.contains("enableAutoreplaceSound")) {
                 properties.put(PROP_OBSOLETE_ENABLE_AUTO_REFILL_SOUND, 

diff --git a/src/InvTweaksConfigInventoryRuleset.java b/src/InvTweaksConfigInventoryRuleset.java
@@ -250,18 +250,23 @@ public boolean isDebugEnabled() {
 	private Vector<String> getKeywordVariants(String keyword) {
 		Vector<String> variants = new Vector<String>();
 
-		if (keyword.endsWith("es")) // ex: torches => torch
+		if (keyword.endsWith("es")) { // ex: torches => torch
 			variants.add(keyword.substring(0, keyword.length()-2));
-		if (keyword.endsWith("s")) // ex: wools => wool
+        }
+		if (keyword.endsWith("s")) { // ex: wools => wool
 			variants.add(keyword.substring(0, keyword.length()-1));
+        }
 
-		if (keyword.contains("en")) // ex: wooden => wood
+		if (keyword.contains("en")) { // ex: wooden => wood
 			variants.add(keyword.replaceAll("en", ""));
+		}
 		else {
-			if (keyword.contains("wood"))
+			if (keyword.contains("wood")) {
 				variants.add(keyword.replaceAll("wood", "wooden"));
-			if (keyword.contains("gold"))
+			}
+			if (keyword.contains("gold")) {
 				variants.add(keyword.replaceAll("gold", "golden"));
+			}
 		}
 
 		// Swap words

diff --git a/src/doc/README.txt b/src/doc/README.txt
@@ -5,5 +5,5 @@
 
 Need help?
 
-* Official website: http://modding.kalam-alami.net
+* Official website: http://modding.kalam-alami.net/invtweaks
 * Minecraft Forum thread: http://www.minecraftforum.net/topic/323444-inventory-tweaks
diff --git a/src/invtweaks/InvTweaksConst.java b/src/invtweaks/InvTweaksConst.java
@@ -8,11 +8,11 @@
 public class InvTweaksConst {
 
     // Mod version
-    public static final String MOD_VERSION = "1.43b (1.3.2)";
+    public static final String MOD_VERSION = "1.44 (1.4.0)";
 
     // Mod tree version
     // Change only when the tree evolves significantly enough to need to override all configs
-    public static final String TREE_VERSION = "1.3.0";
+    public static final String TREE_VERSION = "1.4.0";
 
 
     // Timing constants