Merge pull request #4 from factorio-item-browser/develop

Version 1.1.0

Author: BluePsyduck

.gitattributes

@@ -0,0 +1,8 @@
+/docker export-ignore
+/test export-ignore
+
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/docker-compose.yml export-ignore
+/phpunit.xml export-ignore

.travis.yml

@@ -0,0 +1,17 @@
+language: php
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 7.2
+
+install:
+  - composer update --no-interaction
+
+script:
+#  - vendor/bin/phpunit --coverage-clover=coverage.xml
+  - vendor/bin/phpcs -np --colors
+
+#after_success:
+#  - bash <(curl -s https://codecov.io/bash)
+

CHANGELOG.md

@@ -0,0 +1,17 @@
+# Changelog
+
+## 1.1.0 - 2018-07-20
+
+### Added
+
+- Export of crafting category for recipes.
+- Export of machine data.
+
+### Fixed
+
+- Icon tint color possibly using a range of 0-255 instead of 0-1.
+- Using not the original size of the icons.
+
+## 1.0.0 - 2018-05-13
+
+- Initial release of the export.

README.md

@@ -1,6 +1,6 @@
 # Factorio Item Browser - Export
 
+[![Latest Stable Version](https://poser.pugx.org/factorio-item-browser/export/v/stable)](https://packagist.org/packages/factorio-item-browser/export) [![License](https://poser.pugx.org/factorio-item-browser/export/license)](https://packagist.org/packages/factorio-item-browser/export) [![Build Status](https://travis-ci.org/factorio-item-browser/export.svg?branch=master)](https://travis-ci.org/factorio-item-browser/export) [![codecov](https://codecov.io/gh/factorio-item-browser/export/branch/master/graph/badge.svg)](https://codecov.io/gh/factorio-item-browser/export)
+
 This project is the exporting part of the Factorio Item Browser, generating all the needed data to be imported into the
 database.
-
-*TBC*

composer.json

@@ -15,12 +15,15 @@
   "require": {
     "php": "^7.2",
     "bluepsyduck/common": "^1.0",
-    "factorio-item-browser/export-data": "^1.1",
+    "factorio-item-browser/export-data": "^1.2",
     "zendframework/zend-config-aggregator": "^1.0",
     "zendframework/zend-i18n": "^2.7",
     "zendframework/zend-servicemanager": "^3.3",
     "zfcampus/zf-console": "^1.3"
   },
+  "require-dev": {
+    "squizlabs/php_codesniffer": "^3.3"
+  },
   "autoload": {
     "psr-4": {
       "FactorioItemBrowser\\Export\\": "src"
@@ -29,9 +32,14 @@
   "scripts": {
     "install-factorio": "bin/install-factorio.sh",
     "run": "@php bin/cli.php",
+    "phpcbf": "phpcbf -p --colors",
+    "phpcs": "phpcs -p --colors",
     "post-autoload-dump": [
       "mkdir -p data/cache data/export factorio/instances",
       "chmod 0777 data/cache data/export factorio/instances factorio/mods/Dump_1.0.0"
+    ],
+    "test": [
+      "@phpcs"
     ]
   }
 }

composer.lock

@@ -34,6 +34,7 @@
 
             Merger\IconMerger::class => InvokableFactory::class,
             Merger\ItemMerger::class => InvokableFactory::class,
+            Merger\MachineMerger::class => InvokableFactory::class,
             Merger\MergerManager::class => Merger\MergerManagerFactory::class,
             Merger\RecipeMerger::class => InvokableFactory::class,
 
@@ -44,11 +45,13 @@
 
             Parser\IconParser::class => Parser\AbstractParserFactory::class,
             Parser\ItemParser::class => Parser\AbstractParserFactory::class,
+            Parser\MachineParser::class => Parser\AbstractParserFactory::class,
             Parser\ParserManager::class => Parser\ParserManagerFactory::class,
             Parser\RecipeParser::class => Parser\AbstractParserFactory::class,
 
             Reducer\IconReducer::class => InvokableFactory::class,
             Reducer\ItemReducer::class => InvokableFactory::class,
+            Reducer\MachineReducer::class => InvokableFactory::class,
             Reducer\RecipeReducer::class => InvokableFactory::class,
             Reducer\ReducerManager::class => Reducer\ReducerManagerFactory::class,
 

config/autoload/dependencies.global.php

@@ -27,5 +27,5 @@
         'numberOfInstances' => 4
     ],
     'name' => 'Factorio Item Browser Export',
-    'version' => '1.0.0'
+    'version' => '1.1.0'
 ];

config/autoload/export.global.php

@@ -20,6 +20,19 @@ script.on_init(function()
     dumper.dump('FLUIDS', dump)
 
 
+    dump = {}
+    for _, machine in pairs(game.entity_prototypes) do
+        if (machine.valid and (machine.crafting_categories ~= nil)) then
+            -- Only allow the player called "player" and ignore all other pseudo-players
+            if (machine.type ~= 'player' or machine.name == 'player') then
+                local preparedMachine = dumper.prepareMachinePrototype(machine)
+                dump[machine.name] = preparedMachine
+            end
+        end
+    end
+    dumper.dump('MACHINES', dump)
+
+
     dump = {}
     game.difficulty_settings.recipe_difficulty = defines.difficulty_settings.recipe_difficulty.normal
     for _, recipe in pairs(game.recipe_prototypes) do

factorio/mods/Dump_1.0.0/control.lua

@@ -1,20 +1,28 @@
 local dumper = require 'dumper'
-local dump = {}
+local dumpIcons = {}
+local dumpFluidBoxes = {}
 
-local function searchPrototypes(items)
-    if (type(items) == 'table') then
-        for _, item in pairs(items) do
-            if item.type ~= nil and item.name ~= nil then
-                local icons = dumper.prepareIcon(item)
-                if (icons ~= nil) then
-                    dump[icons.type .. '|' .. icons.name] = icons;
+-- Recursively searches for any prototypes to be dumped.
+-- @param {table} prototypes
+local function searchPrototypes(prototypes)
+    if (type(prototypes) == 'table') then
+        for _, prototype in pairs(prototypes) do
+            if prototype.type ~= nil and prototype.name ~= nil then
+                local icons = dumper.prepareIcon(prototype)
+                local fluidBoxes = dumper.prepareFluidBoxes(prototype)
+                if icons ~= nil then
+                    dumpIcons[icons.type .. '|' .. icons.name] = icons;
+                end
+                if fluidBoxes ~= nil then
+                    dumpFluidBoxes[fluidBoxes.type .. '|' .. fluidBoxes.name] = fluidBoxes;
                 end
             else
-                searchPrototypes(item)
+                searchPrototypes(prototype)
             end
         end
     end
 end
 
 searchPrototypes(data.raw)
-dumper.dump('ICONS', dump)
+dumper.dump('ICONS', dumpIcons)
+dumper.dump('FLUID_BOXES', dumpFluidBoxes)