Add vintage lamp and improve backend

src/main/generated/data/new_soviet/advancements/recipes/decorations/light_bulb_lamp.json

@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "new_soviet:light_bulb"
+        "recipe": "new_soviet:light_bulb_lamp"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "new_soviet:light_bulb"
+      "new_soviet:light_bulb_lamp"
     ]
   },
   "sends_telemetry_event": false

src/main/generated/data/new_soviet/advancements/recipes/decorations/table_lamp.json

@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "new_soviet:lamp"
+        "recipe": "new_soviet:table_lamp"
       },
       "trigger": "minecraft:recipe_unlocked"
     },
@@ -31,13 +31,11 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
-    "has_white_wool": {
+    "has_wool": {
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:white_wool"
-            ]
+            "tag": "minecraft:wool"
           }
         ]
       },
@@ -48,13 +46,13 @@
     [
       "has_torch",
       "has_stick",
-      "has_white_wool",
+      "has_wool",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
-      "new_soviet:lamp"
+      "new_soviet:table_lamp"
     ]
   },
   "sends_telemetry_event": false

src/main/generated/data/new_soviet/advancements/recipes/decorations/vintage_lamp.json

@@ -0,0 +1,61 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_green_stained_glass": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:green_stained_glass"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_iron_nugget": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:iron_nugget"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "new_soviet:vintage_lamp"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_torch": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:torch"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_torch",
+      "has_iron_nugget",
+      "has_green_stained_glass",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "new_soviet:vintage_lamp"
+    ]
+  },
+  "sends_telemetry_event": false
+}

src/main/generated/data/new_soviet/loot_tables/blocks/table_lamp.json

@@ -11,7 +11,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "new_soviet:lamp"
+          "name": "new_soviet:table_lamp"
         }
       ],
       "rolls": 1.0

src/main/generated/data/new_soviet/loot_tables/blocks/vintage_lamp.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:vintage_lamp"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/recipes/light_bulb_lamp.json

@@ -18,7 +18,7 @@
     " Z "
   ],
   "result": {
-    "item": "new_soviet:light_bulb"
+    "item": "new_soviet:light_bulb_lamp"
   },
   "show_notification": true
 }

src/main/generated/data/new_soviet/recipes/table_lamp.json

@@ -9,7 +9,7 @@
       "item": "minecraft:torch"
     },
     "W": {
-      "item": "minecraft:white_wool"
+      "tag": "minecraft:wool"
     }
   },
   "pattern": [
@@ -19,7 +19,7 @@
   ],
   "result": {
     "count": 3,
-    "item": "new_soviet:lamp"
+    "item": "new_soviet:table_lamp"
   },
   "show_notification": true
 }

src/main/generated/data/new_soviet/recipes/vintage_lamp.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "G": {
+      "item": "minecraft:green_stained_glass"
+    },
+    "N": {
+      "item": "minecraft:iron_nugget"
+    },
+    "T": {
+      "item": "minecraft:torch"
+    }
+  },
+  "pattern": [
+    "NNN",
+    "GTG",
+    " N "
+  ],
+  "result": {
+    "count": 3,
+    "item": "new_soviet:vintage_lamp"
+  },
+  "show_notification": true
+}