X-Git-Url: https://deadsoftware.ru/gitweb?p=cavecraft.git;a=blobdiff_plain;f=libs%2FLib_items_store.java;h=ed2190b480c5a4b592a11c8e60ec9998604c97f1;hp=01e2720487ef629745e621962c596a78b1e52d6a;hb=4d7cf2ab1e10d9926d03afb5a3f883bcf5312469;hpb=9115be0a19d5716f33a2e2cba76f3447ce0f4c2f

diff --git a/libs/Lib_items_store.java b/libs/Lib_items_store.java
index 01e2720..ed2190b 100644
--- a/libs/Lib_items_store.java
+++ b/libs/Lib_items_store.java
@@ -35,7 +35,7 @@ class Lib_items_store
      item_tex = new byte[len];
      item_max = new int[len];
      item_info = new byte[len];
-	 item_flags = new byte[len];
+     item_flags = new byte[len];
     } catch(Exception e) {e.printStackTrace();}
    }
 
@@ -49,41 +49,14 @@ class Lib_items_store
 	 item_flags[id] = (byte) flags;
     } catch(Exception e) {e.printStackTrace();}
    }
-
-  public static int getitemtype(int id)
-   {
-    try {
-     return (int) item_type[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
-   }
-
-  public static int getitemtex(int id)
-   {
-    try {
-     return (int) item_tex[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
-   }
-
+/*
   public static int getitemmax(int id)
    {
     try{
      return item_max[id];
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
-   }
-
-  public static int getiteminfo(int id)
-   {
-    try {
-     return (int) item_info[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
-   }
-   
-  public static int getitemflags(int id)
-   {
-    try {
-     return (int) item_flags[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
+*/
 
 /*Blocks*/
 
@@ -119,60 +92,60 @@ class Lib_items_store
    {
     try {
      return (int) block_tex[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
   public static int getblockhp(int id)
    {
     try {
      return block_hp[id];
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
   public static int getblockcoll(int id)
    {
     try {
      return (int) block_coll[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
   public static int getblocktool(int id)
    {
     try {
      return (int) block_tool[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
   public static int getblocklvl(int id)
    {
     try {
      return (int) block_lvl[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
   public static int getblockflags(int id)
    {
     try {
      return (int) block_flags[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
   public static int getblocktr(int id)
    {
     try {
      return (int) block_tr[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
   public static int getblockli(int id)
    {
     try {
      return (int) block_li[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
  /*Craft*/
-  public static void reset_crafts(int len)
+  public static void resetcrafts(int len)
    {
     try {
      craftIN_item = new byte[4][len];
@@ -183,7 +156,7 @@ class Lib_items_store
     } catch(Exception e) {e.printStackTrace();}
    }
 
-  public static void set_craft(int id, int item0, int sum0, int item1, int sum1,  int item2, int sum2, int item3, int sum3, int outitem, int outsum, int flag)
+  public static void setcraft(int id, int item0, int sum0, int item1, int sum1,  int item2, int sum2, int item3, int sum3, int outitem, int outsum, int flag)
    {
     try {
      craftIN_item[0][id] = (byte) item0;
@@ -200,74 +173,91 @@ class Lib_items_store
     } catch(Exception e) {e.printStackTrace();}
    }
 
-  public static void set_craftin_item(int id, int num, int item)
+  public static void setcraftin(int id, int num, int item, int sum)
+  {
+     try {
+       craftIN_item[num][id] = (byte) item;
+       craftIN_sum[num][id] = (byte) sum;
+     } catch(Exception e) {}
+  }
+
+  public static void setcraftout(int id, int item, int sum, int flag)
+  {
+     try {
+       craftOUT_item[id] = (byte) item;
+       craftOUT_sum[id] = (byte) item;
+       craftOUT_flag[id] = (byte) flag;
+     } catch(Exception e) {}
+  }
+
+  public static void setcraftinitem(int id, int num, int item)
    {
     try {
      craftIN_item[num][id] = (byte) item;
-    } catch(Exception e) {/*e.printStackTrace();*/}
+    } catch(Exception e) {}
    }
 
-  public static void set_craftin_sum(int id, int num, int sum)
+  public static void setcraftinsum(int id, int num, int sum)
    {
     try {
      craftIN_sum[num][id] = (byte) sum;
-    } catch(Exception e) {/*e.printStackTrace();*/}
+    } catch(Exception e) {}
    }
 
-  public static void set_craftout_item(int id, int item)
+  public static void setcraftoutitem(int id, int item)
    {
     try {
      craftOUT_item[id] = (byte) item;
-    } catch(Exception e) {/*e.printStackTrace();*/}
+    } catch(Exception e) {}
    }
 
-  public static void set_craftout_sum(int id, int sum)
+  public static void setcraftoutsum(int id, int sum)
    {
     try {
      craftOUT_sum[id] = sum;
-    } catch(Exception e) {/*e.printStackTrace();*/}
+    } catch(Exception e) {}
    }
 
-  public static void set_craftout_flag(int id, int flag)
+  public static void setcraftoutflag(int id, int flag)
    {
     try {
      craftOUT_flag[id] = (byte) flag;
-    } catch(Exception e) {/*e.printStackTrace();*/}
+    } catch(Exception e) {}
    }
 
-  public static int get_craftin_item(int id, int num)
+  public static int getcraftinitem(int id, int num)
    {
     try {
      return craftIN_item[num][id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
-  public static int get_craftin_sum(int id, int num)
+  public static int getcraftinsum(int id, int num)
    {
     try {
      return craftIN_sum[num][id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
-  public static int get_craftout_item(int id)
+  public static int getcraftoutitem(int id)
    {
     try {
      return craftOUT_item[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
-  public static int get_craftout_sum(int id)
+  public static int getcraftoutsum(int id)
    {
     try {
      return craftOUT_sum[id];
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
-  public static int get_craftout_flag(int id)
+  public static int getcraftoutflag(int id)
    {
     try {
      return craftOUT_flag[id] & 0xFF;
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0xFF;}
+    } catch(Exception e) { return 0xFF;}
    }
 
 /*Tools*/
@@ -295,28 +285,28 @@ class Lib_items_store
    {
     try {
      return tool_type[item_info[id]];
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
   public static int gettoollvl(int id)
    {
     try {
      return tool_lvl[item_info[id]];
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
   public static int gettoolspeed(int id)
    {
     try {
      return tool_speed[item_info[id]];
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
   public static int gettooldamg(int id)
    {
     try {
      return tool_damg[item_info[id]];
-    } catch(Exception e) {/*e.printStackTrace();*/ return 0;}
+    } catch(Exception e) { return 0;}
    }
 
- }
\ No newline at end of file
+ }