diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 6fcdd61..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "resources/mcpe-default-addon"] - path = resources/mcpe-default-addon - url = https://github.com/dktapps/mcpe-default-addon.git diff --git a/README.md b/README.md index 3bf6db7..eb4d4d5 100644 --- a/README.md +++ b/README.md @@ -46,4 +46,14 @@ Welcome user to the home of a new PocketMine World Generator which features 9 ne ### These two biomes now are a bit better by the additions of bushes. +----- + +# Notice: + +### To generate loot like in vanilla MCPE, you have to put the default behaviour pack contents of the game into the "addon" folder. +### Due to legal issues we are not able to include these directly into the repository. +### You can get them here: https://aka.ms/behaviorpacktemplate or here https://github.com/dktapps/mcpe-default-addon for an optimised version +### The folder has to look like this: + + All content here is copyrighted (C) Ad5001 2017. Infos about this copyright can be found in the license file. \ No newline at end of file diff --git a/imgs/addon_setup.png b/imgs/addon_setup.png new file mode 100644 index 0000000..9073c6c Binary files /dev/null and b/imgs/addon_setup.png differ diff --git a/processingLoots.json b/processingLoots.json deleted file mode 100644 index 0637a08..0000000 --- a/processingLoots.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/resources/mcpe-default-addon b/resources/mcpe-default-addon deleted file mode 160000 index f74c058..0000000 --- a/resources/mcpe-default-addon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f74c0588519ea390f5a09270d9c5d28d53e2de57 diff --git a/src/Ad5001/BetterGen/Main.php b/src/Ad5001/BetterGen/Main.php index 92d0e68..aae520b 100644 --- a/src/Ad5001/BetterGen/Main.php +++ b/src/Ad5001/BetterGen/Main.php @@ -88,7 +88,8 @@ class Main extends PluginBase implements Listener { Generator::addGenerator(BetterNormal::class, "betternormal"); if ($this->isOtherNS()) $this->getLogger()->warning("Tesseract detected. Note that Tesseract is not up to date with the generation structure and some generation features may be limited or not working"); @mkdir($this->getDataFolder()); - if (!in_array($this->getDataFolder() . 'resources\mcpe-default-addon\.', $this->getResources())) $this->getLogger()->alert('The loot files are missing! Make sure you got all files / did git clone --recursive'); + @mkdir($this->getDataFolder() . 'addon'); + if ((($files = @scandir($this->getDataFolder() . 'addon')) && count($files) <= 2)) $this->getLogger()->alert('The loot files are missing, this means no loot will generate! You can get them here: https://aka.ms/behaviorpacktemplate or here https://github.com/dktapps/mcpe-default-addon for an optimised version'); } /** @@ -324,7 +325,7 @@ class Main extends PluginBase implements Listener { if (!$tile instanceof TileChest) return; //Check if lootchest (or already generated loot) if (!isset($tile->namedtag->generateLoot)) return; - $table = new LootTable($config = new Config(self::getInstance()->getDataFolder() . '\\resources\\mcpe-default-addon\\' . $tile->namedtag->generateLoot . '.json')); + $table = new LootTable($config = new Config(self::getInstance()->getDataFolder() . 'addon\\' . $tile->namedtag->generateLoot . '.json', Config::DETECT, [])); $size = $tile->getInventory()->getSize(); $loot = $table->getRandomLoot($random); $items = array_pad($loot, $size, Item::get(0)); diff --git a/src/Ad5001/BetterGen/loot/LootTable.php b/src/Ad5001/BetterGen/loot/LootTable.php index 51bcfbd..c7d94f7 100644 --- a/src/Ad5001/BetterGen/loot/LootTable.php +++ b/src/Ad5001/BetterGen/loot/LootTable.php @@ -56,7 +56,7 @@ class LootTable { $val = $rolls["entries"][$this->getRandomWeightedElement($array)]; //typecheck if ($val["type"] == "loot_table") { - $loottable = new LootTable(new Config(Main::getInstance()->getDataFolder() . '\\resources\\mcpe-default-addon\\' . $val["name"] . ".json")); + $loottable = new LootTable(new Config(Main::getInstance()->getDataFolder() . 'addon\\' . $val["name"] . ".json", Config::DETECT, [])); $items = array_merge($items, $loottable->getRandomLoot($random)); unset($loottable); } elseif ($val["type"] == "item") {