Restructure repository

Makefile

@@ -1,37 +0,0 @@
-# General makefile for factorio mods.
-#
-# Presumes the development work is done in a <factoriodir>/dev/<modname>/
-# directory where this makefile resides.  This directory must be parallel to
-# the <factoriodir>/mods/ directory where mods are installed. Run `make
-# install` from dev/<modname> to install the mod as a zip file. That zip file
-# should also be ready to upload to the mod portal
-
-.PHONY: copy lint-changelog install
-
-libdir = "../bzlib"
-libfiles = $(shell ls $(libdir)/*.lua | grep -o '[^/]*.lua')
-pwd = $(shell pwd)
-v = $(shell basename "$(pwd)")_$(shell jq -r .version info.json)
-
-link:
-	for f in $(libfiles) ; do \
-		echo "using $(libdir)/$$f" ;\
-		cp $(libdir)/$$f .; \
-	done; 
-
-copy: link
-	rm -rf ../$(v)
-	mkdir -p ../$(v)
-	cp -rf * ../$(v)
-	rm -f ../$(v).zip
-	cd ..; zip -9 -r -y $(v).zip $(v) -x "*.xcf" -x "*.git*" -x "*.bak" -x "*.blend*"
-
-install: lint-changelog copy
-	cp -f ../$(v).zip ../../mods/
-
-lint-changelog: copy
-	python3 ../da-changelog-tools_0.0.14/changelog-checker.py --changelog ../$(v).zip
-
-zorro:
-	python3 ../da-changelog-tools_0.0.14/changelog-checker.py --zorro --changelog ../$(v).zip
-

aluminum-ore.lua

@@ -1,84 +0,0 @@
-local resource_autoplace = require('resource-autoplace');
-
-local util = require("data-util");
-
-data.raw.planet.nauvis.map_gen_settings.autoplace_controls["aluminum-ore"] = {}
-data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["aluminum-ore"] = {}
-resource_autoplace.initialize_patch_set("aluminum-ore", true)
-
-data:extend({
-	{
-    type = "autoplace-control",
-    category = "resource",
-    name = "aluminum-ore",
-    richness = true,
-    order = "b-e"
-	},
-	{
-    type = "resource",
-    icon_size = 64, icon_mipmaps = 3,
-    name = "aluminum-ore",
-    icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png",
-    flags = {"placeable-neutral"},
-    order="a-b-a",
-    map_color = {r=1.00, g=0.80, b=0.50},
-    tree_removal_probability = 0.7,
-    tree_removal_max_distance = 32 * 32,
-    minable =
-    {
-      hardness = 1,
-      mining_particle = mods.bztitanium and "titanium-ore-particle" or "iron-ore-particle",
-      mining_time = 1,
-      result = "aluminum-ore"
-    },
-    collision_box = {{ -0.1, -0.1}, {0.1, 0.1}},
-    selection_box = {{ -0.5, -0.5}, {0.5, 0.5}},
-
-    autoplace = resource_autoplace.resource_autoplace_settings{
-      name = "aluminum-ore",
-      order = "b-z",
-      base_density = 6,
-      base_spots_per_km2 = 1,
-      has_starting_area_placement = true,
-      regular_rq_factor_multiplier = 1.2,
-      starting_rq_factor_multiplier = 1.7,
-    },
-
-    stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80},
-        stages =
-        {
-          sheet =
-          {
-      filename = "__bzaluminum2__/graphics/entity/ores/aluminum-ore.png",
-      priority = "extra-high",
-      size = 64,
-      frame_count = 8,
-      variation_count = 8,
-      hr_version =
-      {
-      filename = "__bzaluminum2__/graphics/entity/ores/hr-aluminum-ore.png",
-        priority = "extra-high",
-        size = 128,
-        frame_count = 8,
-        variation_count = 8,
-        scale = 0.5
-      }
-          }
-    },
-  },
-  {
-      type = "item",
-      name = "aluminum-ore",
-      icon_size = 64, icon_mipmaps = 3,
-      icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png",
-      pictures = {
-        {filename="__bzaluminum2__/graphics/icons/aluminum-ore.png", size=64, scale=0.5},
-        {filename="__bzaluminum2__/graphics/icons/aluminum-ore-2.png", size=64, scale=0.5},
-        {filename="__bzaluminum2__/graphics/icons/aluminum-ore-3.png", size=64, scale=0.5},
-        {filename="__bzaluminum2__/graphics/icons/aluminum-ore-4.png", size=64, scale=0.5},
-      },
-      subgroup = "raw-resource",
-      order = "t-c-a",
-      stack_size = 50
-  },
-})

bzaluminum2/aluminum-ore.lua

@@ -0,0 +1,76 @@
+local resource_autoplace = require('resource-autoplace');
+
+data.raw.planet.nauvis.map_gen_settings.autoplace_controls["aluminum-ore"] = {}
+data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["aluminum-ore"] = {}
+resource_autoplace.initialize_patch_set("aluminum-ore", true)
+
+data:extend({
+  {
+    type = "autoplace-control",
+    category = "resource",
+    name = "aluminum-ore",
+    richness = true,
+    order = "b-e"
+  },
+  {
+    type = "resource",
+    icon_size = 64,
+    icon_mipmaps = 3,
+    name = "aluminum-ore",
+    icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png",
+    flags = { "placeable-neutral" },
+    order = "a-b-a",
+    map_color = { r = 1.00, g = 0.80, b = 0.50 },
+    tree_removal_probability = 0.7,
+    tree_removal_max_distance = 32 * 32,
+    minable =
+    {
+      hardness = 1,
+      mining_particle = mods.bztitanium and "titanium-ore-particle" or "iron-ore-particle",
+      mining_time = 1,
+      result = "aluminum-ore"
+    },
+    collision_box = { { -0.1, -0.1 }, { 0.1, 0.1 } },
+    selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } },
+
+    autoplace = resource_autoplace.resource_autoplace_settings {
+      name = "aluminum-ore",
+      order = "b-z",
+      base_density = 6,
+      base_spots_per_km2 = 1,
+      has_starting_area_placement = true,
+      regular_rq_factor_multiplier = 1.2,
+      starting_rq_factor_multiplier = 1.7,
+    },
+
+    stage_counts = { 15000, 9500, 5500, 2900, 1300, 400, 150, 80 },
+    stages =
+    {
+      sheet =
+      {
+        filename = "__bzaluminum2__/graphics/entity/ores/hr-aluminum-ore.png",
+        priority = "extra-high",
+        size = 128,
+        frame_count = 8,
+        variation_count = 8,
+        scale = 0.5
+      }
+    },
+  },
+  {
+    type = "item",
+    name = "aluminum-ore",
+    icon_size = 64,
+    icon_mipmaps = 3,
+    icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png",
+    pictures = {
+      { filename = "__bzaluminum2__/graphics/icons/aluminum-ore.png", size = 64, scale = 0.5 },
+      { filename = "__bzaluminum2__/graphics/icons/aluminum-ore-2.png", size = 64, scale = 0.5 },
+      { filename = "__bzaluminum2__/graphics/icons/aluminum-ore-3.png", size = 64, scale = 0.5 },
+      { filename = "__bzaluminum2__/graphics/icons/aluminum-ore-4.png", size = 64, scale = 0.5 },
+    },
+    subgroup = "raw-resource",
+    order = "t-c-a",
+    stack_size = 50
+  },
+})

migrations/bzaluminum.0.2.0.json

@@ -1,7 +0,0 @@
-{
-  "item":
-  [
-    ["el_aluminum_item", "aluminum-plate"]
-  ]
-}
-