v 0.2.0 - Изменение названия

This reverts commit 764ef33897.

.gitignore

@@ -2,3 +2,5 @@
 MWRecipes.mcpack
 resource_pack.mcaddon
 MWAlko.mcaddon
+MWAlkoB.mcpack
+MWAlkoR.mcpack

behavior_pack/items/mw_alko_absent.json

@@ -1,15 +1,23 @@
 {
-  "format_version": "1.10",
+  "format_version": "1.17.0",
   "minecraft:item": {
     "description": {
       "identifier": "mw_alko:absent",
-      "category": "items"
+      "category": "Equipment"
     },
     "components": {
+      "minecraft:icon": {
+				"texture": "mw_alko",
+        "frame": 1
+			},
+      "minecraft:display_name": {
+				"value": "Абсент"
+			},
+      "minecraft:render_offsets": "potion",
+      "minecraft:use_animation": "drink",
       "minecraft:hand_equipped": false,
       "minecraft:max_stack_size": 1,
       "minecraft:foil": false,
-      "minecraft:stack_by_data": true,
       "minecraft:food": {
         "saturation_modifier": "low",
         "nutrition": 4,
@@ -40,10 +48,25 @@
             "amplifier": 0
           }
         ],
+        "on_consume": {
+					"event": "mw_alko:effect"
+				},
         "remove_effects": [],
         "using_converts_to": "mw_alko:bottle"
       },
-      "minecraft:use_duration": 32
-    }
+      "minecraft:use_duration": 2
+    },
+    "events": {
+			"mw_alko:effect": {
+				"run_command": {
+					"command": [
+						"effect @s nausea 300 3 true",
+            "effect @s slowness 60 1 true",
+            "effect @s strength 90 1 true",
+            "effect @s poison 4 2 true"
+					]
+				}
+			}
+		}
   }
 }

behavior_pack/items/mw_alko_alcohol.json

@@ -1,43 +1,44 @@
 {
-  "format_version": "1.10",
+  "format_version": "1.17.0",
   "minecraft:item": {
     "description": {
       "identifier": "mw_alko:alcohol",
-      "category": "items"
+      "category": "Equipment"
     },
     "components": {
+      "minecraft:icon": {
+				"texture": "mw_alko",
+        "frame": 2
+			},
+      "minecraft:display_name": {
+				"value": "Самогон"
+			},
+      "minecraft:use_animation": "drink",
       "minecraft:hand_equipped": false,
       "minecraft:max_stack_size": 1,
       "minecraft:foil": false,
-      "minecraft:stack_by_data": true,
       "minecraft:food": {
         "saturation_modifier": "low",
         "nutrition": 4,
         "can_always_eat": true,
-        "effects": [
-          {
-            "name": "nausea",
-            "chance": 1,
-            "duration": 120,
-            "amplifier": 0
-          },
-          {
-            "name": "slowness",
-            "chance": 1,
-            "duration": 30,
-            "amplifier": 0
-          },
-          {
-            "name": "poison",
-            "chance": 1,
-            "duration": 4,
-            "amplifier": 1
-          }
-        ],
+        "on_consume": {
+					"event": "mw_alko:effect"
+				},
         "remove_effects": [],
         "using_converts_to": "mw_alko:bottle"
       },
-      "minecraft:use_duration": 32
-    }
+      "minecraft:use_duration": 3
+    },
+    "events": {
+			"mw_alko:effect": {
+				"run_command": {
+					"command": [
+						"effect @s nausea 120 0 true",
+            "effect @s poison 4 1 true",
+            "effect @s slowness 30 0 true"
+					]
+				}
+			}
+		}
   }
 }

behavior_pack/items/mw_alko_beer.json

@@ -1,37 +1,42 @@
 {
-  "format_version": "1.10",
+  "format_version": "1.17.0",
   "minecraft:item": {
     "description": {
       "identifier": "mw_alko:beer",
-      "category": "items"
+      "category": "Equipment"
     },
     "components": {
+      "minecraft:icon": {
+				"texture": "mw_alko",
+        "frame": 6
+			},
+      "minecraft:display_name": {
+				"value": "Пиво"
+			},
+      "minecraft:use_animation": "drink",
       "minecraft:hand_equipped": false,
       "minecraft:max_stack_size": 1,
       "minecraft:foil": false,
-      "minecraft:stack_by_data": true,
       "minecraft:food": {
         "saturation_modifier": "normal",
         "nutrition": 4,
         "can_always_eat": true,
-        "effects": [
-          {
-            "name": "nausea",
-            "chance": 1,
-            "duration": 80,
-            "amplifier": 0
-          },
-          {
-            "name": "strength",
-            "chance": 1,
-            "duration": 20,
-            "amplifier": 0
-          }
-        ],
-        "remove_effects": [],
+        "on_consume": {
+					"event": "mw_alko:effect"
+				},
         "using_converts_to": "mw_alko:bottle"
       },
-      "minecraft:use_duration": 32
-    }
+      "minecraft:use_duration": 2
+    },
+    "events": {
+			"mw_alko:effect": {
+				"run_command": {
+					"command": [
+						"effect @s nausea 80 0 true",
+            "effect @s strength 20 0 true"
+					]
+				}
+			}
+		}
   }
 }

behavior_pack/items/mw_alko_bottle.json

@@ -1,11 +1,18 @@
 {
-  "format_version": "1.16.0",
+  "format_version": "1.17.0",
   "minecraft:item": {
     "description": {
       "identifier": "mw_alko:bottle",
-      "category": "items"
+      "category": "Items"
     },
     "components": {
+      "minecraft:icon": {
+				"texture": "mw_alko",
+        "frame": 0
+			},
+      "minecraft:display_name": {
+				"value": "Бутылка"
+			},
       "minecraft:hand_equipped": false,
       "minecraft:max_stack_size": 64,
       "minecraft:foil": false

behavior_pack/items/mw_alko_bottle_water.json

@@ -1,15 +1,22 @@
 {
-  "format_version": "1.10",
+  "format_version": "1.17.0",
   "minecraft:item": {
     "description": {
       "identifier": "mw_alko:bottle_water",
-      "category": "items"
+      "category": "Equipment"
     },
     "components": {
+      "minecraft:icon": {
+				"texture": "mw_alko",
+        "frame": 3
+			},
+      "minecraft:display_name": {
+				"value": "Бутылка с водой"
+			},
+      "minecraft:use_animation": "drink",
       "minecraft:hand_equipped": false,
       "minecraft:max_stack_size": 1,
       "minecraft:foil": false,
-      "minecraft:stack_by_data": true,
       "minecraft:food": {
         "saturation_modifier": "normal",
         "nutrition": 4,
@@ -18,7 +25,7 @@
         "remove_effects": [],
         "using_converts_to": "mw_alko:bottle"
       },
-      "minecraft:use_duration": 32
+      "minecraft:use_duration": 3
     }
   }
 }

behavior_pack/items/mw_alko_vine.json

@@ -1,37 +1,43 @@
 {
-  "format_version": "1.10",
+  "format_version": "1.17.0",
   "minecraft:item": {
     "description": {
       "identifier": "mw_alko:vine",
-      "category": "items"
+      "category": "Equipment"
     },
     "components": {
+      "minecraft:icon": {
+				"texture": "mw_alko",
+        "frame": 4
+			},
+      "minecraft:display_name": {
+				"value": "Вино"
+			},
+      "minecraft:use_animation": "drink",
       "minecraft:hand_equipped": false,
       "minecraft:max_stack_size": 1,
       "minecraft:foil": false,
-      "minecraft:stack_by_data": true,
       "minecraft:food": {
         "saturation_modifier": "normal",
         "nutrition": 4,
         "can_always_eat": true,
-        "effects": [
-          {
-            "name": "nausea",
-            "chance": 1,
-            "duration": 80,
-            "amplifier": 0
-          },
-          {
-            "name": "strength",
-            "chance": 1,
-            "duration": 20,
-            "amplifier": 0
-          }
-        ],
+        "on_consume": {
+					"event": "mw_alko:effect"
+				},
         "remove_effects": [],
         "using_converts_to": "mw_alko:bottle"
       },
-      "minecraft:use_duration": 32
-    }
+      "minecraft:use_duration": 3
+    },
+    "events": {
+			"mw_alko:effect": {
+				"run_command": {
+					"command": [
+						"effect @s nausea 80 0 true",
+            "effect @s strength 20 0 true"
+					]
+				}
+			}
+		}
   }
 }

behavior_pack/items/mw_alko_vodka.json

@@ -1,43 +1,44 @@
 {
-  "format_version": "1.10",
+  "format_version": "1.17.0",
   "minecraft:item": {
     "description": {
       "identifier": "mw_alko:vodka",
-      "category": "items"
+      "category": "Equipment"
     },
     "components": {
+      "minecraft:icon": {
+				"texture": "mw_alko",
+        "frame": 5
+			},
+      "minecraft:display_name": {
+				"value": "Водка"
+			},
+      "minecraft:use_animation": "drink",
       "minecraft:hand_equipped": false,
       "minecraft:max_stack_size": 1,
       "minecraft:foil": false,
-      "minecraft:stack_by_data": true,
       "minecraft:food": {
         "saturation_modifier": "low",
         "nutrition": 4,
         "can_always_eat": true,
-        "effects": [
-          {
-            "name": "nausea",
-            "chance": 1,
-            "duration": 100,
-            "amplifier": 0
-          },
-          {
-            "name": "slowness",
-            "chance": 1,
-            "duration": 20,
-            "amplifier": 0
-          },
-          {
-            "name": "strength",
-            "chance": 1,
-            "duration": 30,
-            "amplifier": 1
-          }
-        ],
+        "on_consume": {
+					"event": "mw_alko:effect"
+				},
         "remove_effects": [],
         "using_converts_to": "mw_alko:bottle"
       },
-      "minecraft:use_duration": 32
-    }
+      "minecraft:use_duration": 3
+    },
+    "events": {
+			"mw_alko:effect": {
+				"run_command": {
+					"command": [
+						"effect @s nausea 100 0 true",
+            "effect @s strength 30 0 true",
+            "effect @s slowness 20 0 true"
+					]
+				}
+			}
+		}
   }
 }

behavior_pack/manifest.json

@@ -1,40 +1 @@
-{
-  "format_version": 2,
-  "header": {
-    "description": "Система алкоголя для MW",
-    "name": "MW Alko",
-    "uuid": "e9eba44a-91d6-41de-a242-76c8c7d0e83b",
-    "version": [
-      0,
-      1,
-      0
-    ],
-    "min_engine_version": [
-      1,
-      17,
-      40
-    ]
-  },
-  "modules": [
-    {
-      "description": "Система алкоголя для MW",
-      "type": "data",
-      "uuid": "115c640d-fbfd-48af-8e50-115c5bb6485e",
-      "version": [
-        0,
-        1,
-        0
-      ]
-    }
-  ],
-  "dependencies": [
-    {
-      "uuid": "8b764b0b-89b1-45df-8f83-9204bccf7184",
-      "version": [
-        0,
-        1,
-        0
-      ]
-    }
-  ]
-}
+{"format_version": 2, "header": {"description": "Сборник изменений для MW", "name": "MW Different", "uuid": "e9eba44a-91d6-41de-a242-76c8c7d0e83b", "version": [0, 2, 0], "min_engine_version": [1, 17, 0]}, "modules": [{"description": "Сборник изменений для MW", "type": "data", "uuid": "115c640d-fbfd-48af-8e50-115c5bb6485e", "version": [0, 2, 0]}], "dependencies": [{"uuid": "8b764b0b-89b1-45df-8f83-9204bccf7184", "version": [0, 2, 0]}]}

behavior_pack/recipes/mw_alko_bottle.json

@@ -2,7 +2,7 @@
   "format_version": "1.12",
   "minecraft:recipe_shaped": {
     "description": {
-      "identifier": "bottle_87a7cd4d"
+      "identifier": "mw_alko:bottle"
     },
     "tags": [
       "crafting_table"

behavior_pack/recipes/mw_alko_bottle_water.json

@@ -2,7 +2,7 @@
   "format_version": "1.12",
   "minecraft:recipe_shaped": {
     "description": {
-      "identifier": "bottle_water_728c58b6"
+      "identifier": "mw_alko:bottle_water"
     },
     "tags": [
       "crafting_table"

builder.py

@@ -0,0 +1,50 @@
+import json
+import shutil
+import os
+
+databr = json.load(open("behavior_pack\manifest.json", "r", encoding='utf-8'))
+datarr = json.load(open("resource_pack\manifest.json", "r", encoding='utf-8'))
+
+changenum = input("Какую цифру версии повысить[1.2.3]> ")
+
+info_ver = databr["header"]["version"]
+
+if changenum == "3":
+    num = info_ver[2] + 1
+    info_ver[2] = num
+elif changenum == "2":
+    num = info_ver[1] + 1
+    info_ver[1] = num
+    info_ver[2] = 0
+elif changenum == "1":
+    num = info_ver[0] + 1
+    info_ver[0] = num
+    info_ver[1] = 0
+    info_ver[2] = 0
+else:
+    print("Нет изменений в версии")
+
+databr["header"]["version"] = info_ver
+databr["modules"][0]["version"] = info_ver
+databr["dependencies"][0]["version"] = info_ver
+
+datarr["header"]["version"] = info_ver
+datarr["modules"][0]["version"] = info_ver
+datarr["dependencies"][0]["version"] = info_ver
+
+json.dump(databr, open("behavior_pack\manifest.json", "w", encoding='utf-8'), ensure_ascii=False)
+json.dump(datarr, open("resource_pack\manifest.json", "w", encoding='utf-8'), ensure_ascii=False)
+
+zip_name_behavior = 'MWAlkoB'
+directory_name_behavior = 'behavior_pack'
+shutil.make_archive(zip_name_behavior, 'zip', directory_name_behavior)
+shutil.move("MWAlkoB.zip", "MWAlkoB.mcpack")
+zip_name_resource = 'MWAlkoR'
+directory_name_resource = 'resource_pack'
+shutil.make_archive(zip_name_resource, 'zip', directory_name_resource)
+shutil.move("MWAlkoR.zip", "MWAlkoR.mcpack")
+
+opeo_file_q = input("""Открыть файлы в Minecraft["+" для открытия]? >""")
+if opeo_file_q == "+":
+    os.startfile("MWAlkoB.mcpack")
+    os.startfile("MWAlkoR.mcpack")

resource_pack/items/mw_alko_absent.json

@@ -1,14 +0,0 @@
-{
-  "format_version": "1.10",
-  "minecraft:item": {
-    "description": {
-      "identifier": "mw_alko:absent",
-      "category": "Equipment"
-    },
-    "components": {
-      "minecraft:icon": "mw_alko_absent",
-      "minecraft:use_animation": "drink",
-      "minecraft:render_offsets": "miscellaneous"
-    }
-  }
-}

resource_pack/items/mw_alko_alcohol.json

@@ -1,14 +0,0 @@
-{
-  "format_version": "1.10",
-  "minecraft:item": {
-    "description": {
-      "identifier": "mw_alko:vodka",
-      "category": "Equipment"
-    },
-    "components": {
-      "minecraft:icon": "mw_alko_vodka",
-      "minecraft:use_animation": "drink",
-      "minecraft:render_offsets": "miscellaneous"
-    }
-  }
-}

resource_pack/items/mw_alko_beer.json

@@ -1,14 +0,0 @@
-{
-  "format_version": "1.10",
-  "minecraft:item": {
-    "description": {
-      "identifier": "mw_alko:beer",
-      "category": "Equipment"
-    },
-    "components": {
-      "minecraft:icon": "mw_alko_beer",
-      "minecraft:use_animation": "drink",
-      "minecraft:render_offsets": "miscellaneous"
-    }
-  }
-}

resource_pack/items/mw_alko_bottle.json

@@ -1,13 +0,0 @@
-{
-  "format_version": "1.10.0",
-  "minecraft:item": {
-    "description": {
-      "identifier": "mw_alko:bottle",
-      "category": "Equipment"
-    },
-    "components": {
-      "minecraft:icon": "mw_alko_bottle",
-      "minecraft:render_offsets": "apple"
-    }
-  }
-}

resource_pack/items/mw_alko_bottle_water.json

@@ -1,14 +0,0 @@
-{
-  "format_version": "1.10",
-  "minecraft:item": {
-    "description": {
-      "identifier": "mw_alko:bottle_water",
-      "category": "Equipment"
-    },
-    "components": {
-      "minecraft:icon": "mw_alko_bottle_water",
-      "minecraft:use_animation": "drink",
-      "minecraft:render_offsets": "miscellaneous"
-    }
-  }
-}

resource_pack/items/mw_alko_vine.json

@@ -1,14 +0,0 @@
-{
-  "format_version": "1.10",
-  "minecraft:item": {
-    "description": {
-      "identifier": "mw_alko:vine",
-      "category": "Equipment"
-    },
-    "components": {
-      "minecraft:icon": "mw_alko_vine",
-      "minecraft:use_animation": "drink",
-      "minecraft:render_offsets": "miscellaneous"
-    }
-  }
-}

resource_pack/items/mw_alko_vodka.json

@@ -1,14 +0,0 @@
-{
-  "format_version": "1.10",
-  "minecraft:item": {
-    "description": {
-      "identifier": "mw_alko:alcohol",
-      "category": "Equipment"
-    },
-    "components": {
-      "minecraft:icon": "mw_alko_alcohol",
-      "minecraft:use_animation": "drink",
-      "minecraft:render_offsets": "miscellaneous"
-    }
-  }
-}

resource_pack/manifest.json

@@ -1,40 +1 @@
-{
-  "format_version": 2,
-  "header": {
-    "description": "Система алкоголя для MW",
-    "name": "MW Alko",
-    "uuid": "8b764b0b-89b1-45df-8f83-9204bccf7184",
-    "version": [
-      0,
-      1,
-      0
-    ],
-    "min_engine_version": [
-      1,
-      17,
-      40
-    ]
-  },
-  "modules": [
-    {
-      "description": "Система алкоголя для MW",
-      "type": "resources",
-      "uuid": "397e7227-43f5-4b31-9681-6a81cd09a9d0",
-      "version": [
-        0,
-        1,
-        0
-      ]
-    }
-  ],
-  "dependencies": [
-    {
-      "uuid": "e9eba44a-91d6-41de-a242-76c8c7d0e83b",
-      "version": [
-        0,
-        1,
-        0
-      ]
-    }
-  ]
-}
+{"format_version": 2, "header": {"description": "Сборник изменений для MW", "name": "MW Different", "uuid": "8b764b0b-89b1-45df-8f83-9204bccf7184", "version": [0, 2, 0], "min_engine_version": [1, 17, 0]}, "modules": [{"description": "Сборник изменений для MW", "type": "resources", "uuid": "397e7227-43f5-4b31-9681-6a81cd09a9d0", "version": [0, 2, 0]}], "dependencies": [{"uuid": "e9eba44a-91d6-41de-a242-76c8c7d0e83b", "version": [0, 2, 0]}]}

resource_pack/textures/item_texture.json

@@ -2,96 +2,16 @@
   "resource_pack_name": "vanilla",
   "texture_name": "atlas.items",
   "texture_data": {
-    "egg_camel": {
-      "textures": "textures/items/egg_camel"
-    },
-    "egg_lion": {
-      "textures": "textures/items/egg_lion"
-    },
-    "egg_penguin": {
-      "textures": "textures/items/egg_penguin"
-    },
-    "egg_tiger": {
-      "textures": "textures/items/egg_tiger"
-    },
-    "egg_elephant": {
-      "textures": "textures/items/egg_elephant"
-    },
-    "egg_deer": {
-      "textures": "textures/items/egg_deer"
-    },
-    "egg_panther": {
-      "textures": "textures/items/egg_panther"
-    },
-    "egg_frog": {
-      "textures": "textures/items/egg_frog"
-    },
-    "egg_crocodile": {
-      "textures": "textures/items/egg_crocodile"
-    },
-    "egg_mouse": {
-      "textures": "textures/items/egg_mouse"
-    },
-    "gallardo": {
-      "textures": "textures/items/gallardo"
-    },
-    "bench": {
-      "textures": "textures/items/bench"
-    },
-    "christmas_tree": {
-      "textures": "textures/items/christmas_tree"
-    },
-    "tivi": {
-      "textures": "textures/items/tivi"
-    },
-    "closet": {
-      "textures": "textures/items/closet"
-    },
-    "laptop": {
-      "textures": "textures/items/laptop"
-    },
-    "piano": {
-      "textures": "textures/items/piano"
-    },
-    "armchairs": {
-      "textures": "textures/items/armchairs"
-    },
-    "chair": {
-      "textures": "textures/items/chair"
-    },
-    "big_table": {
-      "textures": "textures/items/big_table"
-    },
-    "small_table": {
-      "textures": "textures/items/small_table"
-    },
-    "drone": {
-      "textures": "textures/items/drone"
-    },
-    "colorful_gifts": {
-      "textures": "textures/items/colorful_gifts"
-    },
-    "mw_alko_bottle_water": {
-      "textures": "textures/items/pamobile/mw_alko_bottle_water"
-    },
-    "mw_alko_alcohol": {
-      "textures": "textures/items/pamobile/mw_alko_alcohol"
-    },
-    "mw_alko_bottle": {
-      "textures": "textures/items/pamobile/mw_alko_bottle"
-    },
-    "mw_alko_vodka": {
-      "textures": "textures/items/pamobile/mw_alko_vodka"
-    },
-    "mw_alko_vine": {
-      "textures": "textures/items/pamobile/mw_alko_vine"
-    },
-    "mw_alko_beer": {
-      "textures": "textures/items/pamobile/mw_alko_beer"
-    },
-    "mw_alko_absent": {
-      "textures": "textures/items/pamobile/mw_alko_absent"
+    "mw_alko": {
+      "textures": [
+        "textures/items/alko/mw_alko_bottle",
+        "textures/items/alko/mw_alko_absent",
+        "textures/items/alko/mw_alko_alcohol",
+        "textures/items/alko/mw_alko_bottle_water",
+        "textures/items/alko/mw_alko_vine",
+        "textures/items/alko/mw_alko_vodka",
+        "textures/items/alko/mw_alko_beer"
+      ]
     }
   }
-  }
 }