Add GUmpStudio plugin and refactor class name Object to UObject

MrMoonKr · Sep 20, 2018 · 5fe72ff · 5fe72ff
1 parent 70bf18e
commit 5fe72ff
Show file tree

Hide file tree

Showing 156 changed files with 334 additions and 185 deletions.
diff --git a/core/types/anvil.type.php b/core/types/anvil.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeAnvil extends Object {
+class TypeAnvil extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/archerybutte.type.php b/core/types/archerybutte.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeArcheryButte extends Object {
+class TypeArcheryButte extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/armor.type.php b/core/types/armor.type.php
@@ -3,7 +3,7 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeArmor extends Object {
+class TypeArmor extends UObject {
 	public function typeStart() {
         $this->equiped = false;
         $this->layer   = LayersDefs::INNER_TORSO;

diff --git a/core/types/armorleather.type.php b/core/types/armorleather.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeArmorLeather extends Object {
+class TypeArmorLeather extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/bandage.type.php b/core/types/bandage.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeBandage extends Object {
+class TypeBandage extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/beard.type.php b/core/types/beard.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeBeard extends Object {
+class TypeBeard extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/bed.type.php b/core/types/bed.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeBed extends Object {
+class TypeBed extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/bedroll.type.php b/core/types/bedroll.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeBedroll extends Object {
+class TypeBedroll extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/beehive.type.php b/core/types/beehive.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeBeeHive extends Object {
+class TypeBeeHive extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/blood.type.php b/core/types/blood.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeBlood extends Object {
+class TypeBlood extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/board.type.php b/core/types/board.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeBoard extends Object {
+class TypeBoard extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/bone.type.php b/core/types/bone.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeBone extends Object {
+class TypeBone extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/book.type.php b/core/types/book.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeBook extends Object {
+class TypeBook extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/campfire.type.php b/core/types/campfire.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeCampfire extends Object {
+class TypeCampfire extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/carpentry.type.php b/core/types/carpentry.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeCarpentry extends Object {
+class TypeCarpentry extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/chair.type.php b/core/types/chair.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeChair extends Object {
+class TypeChair extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/clock.type.php b/core/types/clock.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeClock extends Object {
+class TypeClock extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/cloth.type.php b/core/types/cloth.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeCloth extends Object {
+class TypeCloth extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/clothbolt.type.php b/core/types/clothbolt.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeClothBolt extends Object {
+class TypeClothBolt extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/clothing.type.php b/core/types/clothing.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeClothing extends Object {
+class TypeClothing extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/coin.type.php b/core/types/coin.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeCoin extends Object {
+class TypeCoin extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/container.type.php b/core/types/container.type.php
@@ -3,7 +3,7 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeContainer extends Object {
+class TypeContainer extends UObject {
     public $gump;
     /* access properties */
     public $owner;
@@ -14,8 +14,8 @@ class TypeContainer extends Object {
     /* Weight properties */
     public $maxWeightCapacity;
     public $actualWeight;
-    /* Inside objects */
-    public $objects = [];
+    /* Inside UObjects */
+    public $UObjects = [];
 
     public function typeStart() {
         $this->actualCarry  = 0;
@@ -29,15 +29,15 @@ public function click($client = null) {
             return false;
         }
 
-        return $this->message($this->name . " (".count($this->objects)." item ". (count($this->objects) > 1 ? "s" : "") .")", 0, 3, $client);
+        return $this->message($this->name . " (".count($this->UObjects)." item ". (count($this->UObjects) > 1 ? "s" : "") .")", 0, 3, $client);
     }
 
     public function dclick($client = null) {
         return $this->open($client);
     }
 
-    public function addItem($client = false, Object $object, $position = false, $noUpdate = false) {
-        if (!$object || !$client) {
+    public function addItem($client = false, UObject $UObject, $position = false, $noUpdate = false) {
+        if (!$UObject || !$client) {
             return false;
         }
 
@@ -48,47 +48,47 @@ public function addItem($client = false, Object $object, $position = false, $noU
             ];
         }
 
-        $object->position['x'] = $position['x'];
-        $object->position['y'] = $position['y'];
-        $object->position['z'] = null;
-        $object->position['map'] = null;
-        $object->holder = $this->serial;
-        $object->save();
+        $UObject->position['x'] = $position['x'];
+        $UObject->position['y'] = $position['y'];
+        $UObject->position['z'] = null;
+        $UObject->position['map'] = null;
+        $UObject->holder = $this->serial;
+        $UObject->save();
 
-        $this->objects[] = $object->serial;
+        $this->UObjects[] = $UObject->serial;
         $this->save();
 
-        if (Map::isValidSerial($object->serial)) {
-            Map::updateObjectHolder($object);
+        if (Map::isValidSerial($UObject->serial)) {
+            Map::updateUObjectHolder($UObject);
         } else {
-            Map::addHoldedObject($object);
+            Map::addHoldedUObject($UObject);
         }
 
         if (Map::isValidSerial($this->serial)) {
-            Map::updateObjectHolder($this);
+            Map::updateUObjectHolder($this);
         } else {
-            Map::addHoldedObject($this);
+            Map::addHoldedUObject($this);
         }
 
         if (!$noUpdate) {
-            $this->addItemToOpenedContainer($client, $object);
+            $this->addItemToOpenedContainer($client, $UObject);
             // $this->renderItems($client);
         }
 
         return true;
     }
 
-    public function removeItem($client = false, $objectSerial = false) {
-        if (!$objectSerial || !$client) {
+    public function removeItem($client = false, $UObjectSerial = false) {
+        if (!$UObjectSerial || !$client) {
             return false;
         }
 
-        if(($key = array_search($objectSerial, $this->objects)) !== false) {
-            unset($this->objects[$key]);
+        if(($key = array_search($UObjectSerial, $this->UObjects)) !== false) {
+            unset($this->UObjects[$key]);
             $this->save();
         }
 
-        Map::updateObjectHolder($this);
+        Map::updateUObjectHolder($this);
         return true;
     }
 
@@ -103,21 +103,21 @@ public function drawContainer($client) {
         $packet .= "007F";
         Sockets::out($client, $packet);
 
-        if (count($this->objects) > 0) {
+        if (count($this->UObjects) > 0) {
             $this->renderItems($client);
         }
 
         return true;
     }
 
-    public function addItemToOpenedContainer($client = false, Object $instance) {
+    public function addItemToOpenedContainer($client = false, UObject $instance) {
         $packet = new packet_0x25($client, $instance);
         $packet->send();
     }
 
     public function renderItems($client) {
-        $tmpPacket = str_pad(dechex(count($this->objects)), 4, "0", STR_PAD_LEFT);
-        foreach ($this->objects as $key => $serial) {
+        $tmpPacket = str_pad(dechex(count($this->UObjects)), 4, "0", STR_PAD_LEFT);
+        foreach ($this->UObjects as $key => $serial) {
             $instance = Map::getBySerial($serial);
 
             $tmpPacket .= str_pad($instance->serial, 8, "0", STR_PAD_LEFT);

diff --git a/core/types/corpse.type.php b/core/types/corpse.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeCorpse extends Object {
+class TypeCorpse extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/cotton.type.php b/core/types/cotton.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeCotton extends Object {
+class TypeCotton extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/crops.type.php b/core/types/crops.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeCrops extends Object {
+class TypeCrops extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/crystalball.type.php b/core/types/crystalball.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeCrystalBall extends Object {
+class TypeCrystalBall extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/deed.type.php b/core/types/deed.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeDeed extends Object {
+class TypeDeed extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/dirt.type.php b/core/types/dirt.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeDirt extends Object {
+class TypeDirt extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/door.type.php b/core/types/door.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeDoor extends Object {
+class TypeDoor extends UObject {
 	public function typeStart() {}
 }
diff --git a/core/types/drink.type.php b/core/types/drink.type.php
@@ -3,6 +3,6 @@
  * Ultima PHP - OpenSource Ultima Online Server written in PHP
  * Version: 0.1 - Pre Alpha
  */
-class TypeDrink extends Object {
+class TypeDrink extends UObject {
 	public function typeStart() {}
 }