Update timetracking

runelite · Mar 21, 2024 · 9b9dd80 · 9b9dd80
1 parent 0f09d7c
commit 9b9dd80
Show file tree

Hide file tree

Showing 12 changed files with 253 additions and 413 deletions.
diff --git a/src/modules/timetracking/BirdHouse.js b/src/modules/timetracking/BirdHouse.js
@@ -76,7 +76,6 @@ export class BirdHouse_$WRAPPER {
   }
 }
 BirdHouse['__class'] = 'timetracking.BirdHouse'
-BirdHouse['__interfaces'] = ['java.lang.Comparable', 'java.io.Serializable']
 BirdHouse['_$wrappers'] = {
   0: new BirdHouse_$WRAPPER(0, 'NORMAL', 'Bird House', ItemID.BIRD_HOUSE),
   1: new BirdHouse_$WRAPPER(1, 'OAK', 'Oak Bird House', ItemID.OAK_BIRD_HOUSE),

diff --git a/src/modules/timetracking/BirdHouseSpace.js b/src/modules/timetracking/BirdHouseSpace.js
@@ -17,7 +17,7 @@ export class BirdHouseSpace_$WRAPPER {
       this.__name = null
     }
     if (this.varp === undefined) {
-      this.varp = null
+      this.varp = 0
     }
     this.__name = name
     this.varp = varp
@@ -39,10 +39,6 @@ export class BirdHouseSpace_$WRAPPER {
   }
 }
 BirdHouseSpace['__class'] = 'timetracking.BirdHouseSpace'
-BirdHouseSpace['__interfaces'] = [
-  'java.lang.Comparable',
-  'java.io.Serializable'
-]
 BirdHouseSpace['_$wrappers'] = {
   0: new BirdHouseSpace_$WRAPPER(
     0,

diff --git a/src/modules/timetracking/BirdHouseState.js b/src/modules/timetracking/BirdHouseState.js
@@ -53,10 +53,6 @@ export class BirdHouseState_$WRAPPER {
   }
 }
 BirdHouseState['__class'] = 'timetracking.BirdHouseState'
-BirdHouseState['__interfaces'] = [
-  'java.lang.Comparable',
-  'java.io.Serializable'
-]
 BirdHouseState['_$wrappers'] = {
   0: new BirdHouseState_$WRAPPER(0, 'SEEDED'),
   1: new BirdHouseState_$WRAPPER(1, 'BUILT'),

diff --git a/src/modules/timetracking/BirdHouseTracker.js b/src/modules/timetracking/BirdHouseTracker.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 /* eslint-disable */
-import { VarPlayer } from './VarPlayer'
 export class BirdHouseTracker {
   loadFromConfig(getConfiguration) {
     const birdHouseData = new Map()
@@ -31,9 +30,7 @@ export class BirdHouseTracker {
         const key =
           TimeTrackingConfig.BIRD_HOUSE +
           '.' +
-          VarPlayer['_$wrappers'][
-            BirdHouseSpace['_$wrappers'][space].getVarp()
-          ].getId()
+          BirdHouseSpace['_$wrappers'][space].getVarp()
         const storedValue = (target =>
           typeof target === 'function'
             ? target(TimeTrackingConfig.CONFIG_GROUP, key)

diff --git a/src/modules/timetracking/FarmingPatch.js b/src/modules/timetracking/FarmingPatch.js
@@ -9,7 +9,7 @@ export class FarmingPatch {
       this.name = null
     }
     if (this.varbit === undefined) {
-      this.varbit = null
+      this.varbit = 0
     }
     if (this.implementation === undefined) {
       this.implementation = null

diff --git a/src/modules/timetracking/FarmingRegion.js b/src/modules/timetracking/FarmingRegion.js
@@ -1,7 +1,7 @@
 // @ts-nocheck
 /* eslint-disable */
 export class FarmingRegion {
-  constructor(name, regionID, ...patches) {
+  constructor(name, regionID, definite, ...patches) {
     if (this.name === undefined) {
       this.name = null
     }
@@ -19,7 +19,7 @@ export class FarmingRegion {
     this.patches = patches
     this.varbits = (s => {
       let a = []
-      while (s-- > 0) a.push(null)
+      while (s-- > 0) a.push(0)
       return a
     })(patches.length)
     for (let i = 0; i < patches.length; i++) {

diff --git a/src/modules/timetracking/FarmingTracker.js b/src/modules/timetracking/FarmingTracker.js
@@ -1,6 +1,5 @@
 // @ts-nocheck
 /* eslint-disable */
-import { Varbits } from './Varbits'
 export class FarmingTracker {
   predictPatch(patch, getConfiguration) {
     const unixNow = (n => (n < 0 ? Math.ceil(n) : Math.floor(n)))(
@@ -24,10 +23,7 @@ export class FarmingTracker {
               TimeTrackingConfig.CONFIG_GROUP,
               TimeTrackingConfig.BOTANIST
             ))(getConfiguration)
-    const key =
-      patch.getRegion().getRegionID() +
-      '.' +
-      Varbits['_$wrappers'][patch.getVarbit()].getId()
+    const key = patch.getRegion().getRegionID() + '.' + patch.getVarbit()
     const storedValue = (target =>
       typeof target === 'function'
         ? target(TimeTrackingConfig.CONFIG_GROUP, key)