sapdon 2.0.2 → 2.1.0

package/src/core/ui/systems/server_form.js

@@ -3,98 +3,109 @@ import { DataBindingObject } from "../DataBindingObject.js";
 import { UISystem } from "./UISystem.js";
 import { Panel } from "../elements/Panel.js";
 
+export const ServerFormSystem = new UISystem("server_form:server_form","ui/");
 
-export const ServerFromSystem = new UISystem("server_form:server_form","ui/");
+export class ServerUISystem  {
+  static #binding_map = new Map();
 
-/*
-    const user_custom_ui_list = ServerUISystem.getAllUISystem();
-    //文本化处理
-    const user_custom_ui_text = user_custom_ui_list.map(({form_name,ui_system})=>{
-        return form_name;
+  static #binding_title_list = [];
+
+  static addBindingTitle(title_name){
+    this.#binding_title_list.push(title_name);
+  }
+
+  static getBindingTitleList(){
+    //console.log("arrr:",Array.from(this.#binding_map.keys()))
+    return  this.#binding_title_list.concat(Array.from(this.#binding_map.keys()));
+
+  }
+
+  static getBindingContentList(){
+    return  Array.from(this.#binding_map.values());
+  }
+
+  static bindingTitlewithContent(title_name, content){
+    //添加绑定
+    this.#binding_map.set(title_name,content);
+    this.#updateServerFormSystem();
+  }
+
+  static #updateServerFormSystem(){
+     //文本化处理
+    //console.log("ttttt:",this.getBindingTitleList())
+    const user_custom_ui_text = this.getBindingTitleList().map((title_name)=>{
+      console.log("title_name",title_name)
+      return `'${title_name}'`;
     }).join('-');
 
-    console.log("custom_ui:",user_custom_ui_list)
-*/
-//对原表单进行合理隐藏
-export const updateServerFormSystem = (user_custom_ui_list)=>{
+    const long_form = new UIElement("long_form")
+      .addModification({
+          array_name: "bindings",
+          operation:Modifications.OPERATION.INSERT_BACK,
+          value:[
+              new DataBindingObject().setBindingName("#title_text"),
+              new DataBindingObject().setBindingType("view")
+              .setSourcePropertyName(`((#title_text - ${user_custom_ui_text}) = #title_text)`)
+              .setTargetPropertyName("#visible")
+          ]
+      });
 
-  //文本化处理
-const user_custom_ui_text = user_custom_ui_list.map(({form_name,ui_system})=>{
-    return `'${form_name}'`;
-}).join('-');
+    const custom_server_form_factory =  new Panel("custom_server_form_factory");
+        custom_server_form_factory.factory.setName("server_form_factory") //工程名被绑定至表单，不可改动
+        .setControlIds({"long_form": "@server_form.custom_root_panel"});
 
-const long_form = new UIElement("long_form")
-    .addModification({
-        array_name: "bindings",
+    //加入自定义表单内容
+    const main_screen_content = new UIElement("main_screen_content")
+      .addModification({
+        array_name: "controls",
         operation:Modifications.OPERATION.INSERT_BACK,
         value:[
-            new DataBindingObject().setBindingName("#title_text"),
-            new DataBindingObject().setBindingType("view")
-            .setSourcePropertyName(`((#title_text - ${user_custom_ui_text}) = #title_text)`)
-            .setTargetPropertyName("#visible")
+          custom_server_form_factory.serialize()
         ]
     });
-  
-const custom_server_form_factory =  new Panel("custom_server_form_factory");
-      custom_server_form_factory.factory.setName("server_form_factory") //工程名被绑定至表单，不可改动
-      .setControlIds({"long_form": "@server_form.custom_root_panel"});
-
-//加入自定义表单内容
-const main_screen_content = new UIElement("main_screen_content")
-    .addModification({
-      array_name: "controls",
-      operation:Modifications.OPERATION.INSERT_BACK,
-      value:[
-        custom_server_form_factory.serialize()
-      ]
-  });
-
-//自定义ui模板
-const custom_ui_template = new Panel("custom_ui_template")
-      custom_ui_template.dataBinding.addDataBinding(
-        new DataBindingObject().setBindingName("#title_text")
-      ).addDataBinding(
-        new DataBindingObject().setBindingType("view")
-        .setSourcePropertyName("(#title_text = $binding_text)")
-        .setTargetPropertyName("#visible")
-      )
-      custom_ui_template.control.addControl(
-        new UIElement("main",undefined,"$main_content").serialize()
+
+    //自定义ui模板
+    const custom_ui_template = new Panel("custom_ui_template")
+        custom_ui_template.dataBinding.addDataBinding(
+          new DataBindingObject().setBindingName("#title_text")
+        ).addDataBinding(
+          new DataBindingObject().setBindingType("view")
+          .setSourcePropertyName("(#title_text = $binding_text)")
+          .setTargetPropertyName("#visible")
+        )
+        custom_ui_template.control.addControl(
+          new UIElement("main",undefined,"$main_content").serialize()
+        )
+
+    //类似于 root ，决定什么时候加载自定义界面 ，不可改动
+    const custom_form_root = new Panel("custom_form_root")
+        //custom_form_root.addVariable("title_needs_to_contain",user_custom_ui_text)
+        custom_form_root.dataBinding.addDataBinding(
+          new DataBindingObject().setBindingType("view")
+          .setSourceControlName("custom_root_panel")
+          .setSourcePropertyName(`(not ((#title_text - ${user_custom_ui_text}) = #title_text))`)
+          .setTargetPropertyName("#visible")
+        );
+
+    //用户自定义ui内容绑定
+    this.#binding_map.forEach((content,key)=>{
+      //加入 root
+      custom_form_root.control.addControl(
+        new UIElement("custom_ui_"+key,undefined,"custom_ui_template")
+        .addVariable("main_content",content)
+        .addVariable("binding_text",key).serialize()
       )
+    })
 
-//类似于 root ，决定什么时候加载自定义界面 ，不可改动
-const custom_form_root = new Panel("custom_form_root")
-      //custom_form_root.addVariable("title_needs_to_contain",user_custom_ui_text)
-      custom_form_root.dataBinding.addDataBinding(
-        new DataBindingObject().setBindingType("view")
-        .setSourceControlName("custom_root_panel")
-        .setSourcePropertyName(`(not ((#title_text - ${user_custom_ui_text}) = #title_text))`)
-        .setTargetPropertyName("#visible")
-      );
-
-//用户自定义ui注册
-user_custom_ui_list.forEach(({form_name,ui_system}) => {
-  //注册
-  ServerFromSystem.addElement(ui_system);
-  //加入 root
-  custom_form_root.control.addControl(
-    new UIElement("custom_ui_"+form_name,undefined,"custom_ui_template")
-    .addVariable("main_content",ui_system.id)
-    .addVariable("binding_text",form_name).serialize()
-  )
-});
-
-//类似于 sreen，必要，不可改动
-const custom_root_panel = new Panel("custom_root_panel");
-      custom_root_panel.dataBinding.addDataBinding(new DataBindingObject().setBindingName("#title_text"))
-      custom_root_panel.control.addControl(custom_form_root.serialize())
-   
-
-
-ServerFromSystem
-  .addElement(custom_ui_template)   
-  .addElement(long_form)
-  .addElement(custom_root_panel)
-  .addElement(main_screen_content)
-}
-//console.log(JSON.stringify(ServerFromSystem.toJson(),null,2))
+    //类似于 sreen，必要，不可改动
+    const custom_root_panel = new Panel("custom_root_panel");
+        custom_root_panel.dataBinding.addDataBinding(new DataBindingObject().setBindingName("#title_text"))
+        custom_root_panel.control.addControl(custom_form_root.serialize())
+    
+    ServerFormSystem
+    .addElement(custom_ui_template)   
+    .addElement(long_form)
+    .addElement(custom_root_panel)
+    .addElement(main_screen_content)
+  }
+}

package/src/templates/test_sapdon/build.config

@@ -1,29 +1,29 @@
-{
-  "defaultConfig": {
-    "buildMode":"development",
-    "buildEntry": "main.mjs",
-    "scriptEntry": "scripts/index.js",
-    "buildDir": "dev/",
-    "dependencies": [
-      {
-        "module_name": "@minecraft/server",
-        "version": "1.8.0"
-      }
-    ]
-  },
-  "libraries": [
-    {
-      "path": "lib/"
-    }
-  ],
-  "resources": [
-    {
-      "path": "res/"
-    }
-  ],
-  "scripts": [
-    {
-      "path": "scripts/"
-    }
-  ]
+{
+  "defaultConfig": {
+    "buildMode":"development",
+    "buildEntry": "main.mjs",
+    "scriptEntry": "scripts/index.js",
+    "buildDir": "dev/",
+    "dependencies": [
+      {
+        "module_name": "@minecraft/server",
+        "version": "1.8.0"
+      }
+    ]
+  },
+  "libraries": [
+    {
+      "path": "lib/"
+    }
+  ],
+  "resources": [
+    {
+      "path": "res/"
+    }
+  ],
+  "scripts": [
+    {
+      "path": "scripts/"
+    }
+  ]
 }

package/src/templates/test_sapdon/res/animations/animation_item.animation.json

@@ -0,0 +1,34 @@
+{
+	"format_version": "1.8.0",
+	"animations": {
+		"animation.animation_item.default": {
+			"loop": true,
+			"bones": {
+				"body": {
+					"position": [0, 8, 0]
+				},
+				"rightitem": {
+					"rotation": [-80, 0, 0],
+					"position": [0, -3, 2]
+				}
+			}
+		},
+		"animation.animation_item.rotating": {
+			"loop": true,
+			"animation_length": 10,
+			"bones": {
+				"body": {
+					"rotation": {
+						"0.0": [0, 0, 0],
+						"10.0": [0, 360, 0]
+					},
+					"position": [0, 8, 0]
+				},
+				"rightitem": {
+					"rotation": [-80, 0, 0],
+					"position": [0, -3, 2]
+				}
+			}
+		}
+	}
+}

package/src/templates/test_sapdon/res/animations/large_item.animation.json

@@ -0,0 +1,27 @@
+{
+    "format_version": "1.10.0",
+    "animations": {
+        "animation.large_item.hold": {
+            "loop": true,
+            "bones": {
+                "rightitem": {
+                    "position": [
+                        "c.is_first_person ? -6 : 1",
+                        "c.is_first_person ? 0 : -1",
+                        "c.is_first_person ? -1 : -6"
+                    ],
+                    "rotation": [
+                        "c.is_first_person ? 45 : 15",
+                        "c.is_first_person ? -15 : 0",
+                        "c.is_first_person ? 30 : -165"
+                    ],
+                    "scale": [
+                        "c.is_first_person ? 1 : 0.5",
+                        "c.is_first_person ? 1 : 0.5",
+                        "c.is_first_person ? 1 : 0.5"
+                    ]
+                }
+            }
+        }
+    }
+}

package/src/templates/test_sapdon/res/models/entity/animation/animation_item.geo.json

@@ -0,0 +1,26 @@
+{
+	"format_version": "1.12.0",
+	"minecraft:geometry": [
+		{
+			"description": {
+				"identifier": "geometry.animation_item",
+				"texture_width": 32,
+				"texture_height": 32,
+				"visible_bounds_width": 5,
+				"visible_bounds_height": 3.5,
+				"visible_bounds_offset": [0, 1.25, 0]
+			},
+			"bones": [
+				{
+					"name": "body",
+					"pivot": [0, 0, 0]
+				},
+				{
+					"name": "rightitem",
+					"parent": "body",
+					"pivot": [-0.3, 8, 0]
+				}
+			]
+		}
+	]
+}

package/src/templates/test_sapdon/res/models/entity/animation/large_item.geo.json

@@ -0,0 +1,28 @@
+{
+    "format_version": "1.16.0",
+    "minecraft:geometry": [
+        {
+            "description": {
+                "identifier": "geometry.large_item",
+                "texture_width": 16,
+                "texture_height": 16,
+                "visible_bounds_width": 2,
+                "visible_bounds_height": 1.5,
+                "visible_bounds_offset": [0, 0.25, 0]
+            },
+            "bones": [
+                {
+                    "name": "rightitem",
+                    "pivot": [0, 0, 0],
+                    "texture_meshes": [
+                        {
+                            "texture": "default",
+                            "position": [0, 0, 0],
+                            "local_pivot": [8, 0, 8]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

package/src/templates/test_sapdon/scripts/custom_components/cropComponent.js

@@ -0,0 +1,50 @@
+import { EquipmentSlot, GameMode, world } from "@minecraft/server";
+
+/**
+ * @param {number} min The minimum integer
+ * @param {number} max The maximum integer
+ * @returns {number} A random integer between the `min` and `max` parameters (inclusive)
+ */
+const randomInt = (min, max) => Math.floor(Math.random() * (max - min + 1)) + min;
+
+const maxGrowth = 3;
+
+/** @type {import("@minecraft/server").BlockCustomComponent} */
+export const CustomCropGrowthBlockComponent = {
+    onRandomTick({ block }) {
+        const growthChance = 1 / 3;
+        if (Math.random() > growthChance) return;
+
+        const growth = block.permutation.getState("sapdon:block_variant_tag");
+        block.setPermutation(block.permutation.withState("sapdon:block_variant_tag", growth + 1));
+    },
+    onPlayerInteract({ block, dimension, player }) {
+        if (!player) return;
+
+        const equippable = player.getComponent("minecraft:equippable");
+        if (!equippable) return;
+
+        const mainhand = equippable.getEquipmentSlot(EquipmentSlot.Mainhand);
+        if (!mainhand.hasItem() || mainhand.typeId !== "minecraft:bone_meal") return;
+
+        if (player.getGameMode() === GameMode.creative) {
+            // Grow crop fully
+            block.setPermutation(block.permutation.withState("sapdon:block_variant_tag", maxGrowth));
+        } else {
+            let growth = block.permutation.getState("sapdon:block_variant_tag");
+
+            // Add random amount of growth
+            growth += randomInt(1, maxGrowth - growth);
+            block.setPermutation(block.permutation.withState("sapdon:block_variant_tag", growth));
+
+            // Decrement stack
+            if (mainhand.amount > 1) mainhand.amount--;
+            else mainhand.setItem(undefined);
+        }
+
+        // Play effects
+        const effectLocation = block.center();
+        dimension.playSound("item.bone_meal.use", effectLocation);
+        dimension.spawnParticle("minecraft:crop_growth_emitter", effectLocation);
+    },
+};

package/src/templates/test_sapdon/scripts/custom_components/items/gui_book.js

@@ -0,0 +1,37 @@
+import { world } from "@minecraft/server";
+import { ActionFormData} from "@minecraft/server-ui";
+
+const item_ui_list ={
+    "thaumcraft:thaumonomicon":"guidebook"
+};
+
+var page_index = 0;
+/** @type {import("@minecraft/server").ItemCustomComponent} */
+export const GuiBookItemComponent = {
+    onUse({itemStack,source}){
+        if(source.typeId != "minecraft:player") return
+        showGuidebook(source,item_ui_list[itemStack.typeId])
+    }
+}
+
+function showGuidebook(target,ui){
+    const form = new ActionFormData()
+    .title(ui)
+    .body("page_index"+ page_index)
+    .button("test1")
+    .button("test2")
+    
+    form.show(target).then((response) => {
+        if (response.selection === 0) {
+            page_index--;
+            world.sendMessage("上一页")
+            showGuidebook(target,ui)
+
+        }
+        else if (response.selection === 1) {
+            page_index++;
+            world.sendMessage("下一页")
+            showGuidebook(target,ui)
+        }
+    });
+}

package/src/templates/test_sapdon/scripts/custom_components/registry.js

@@ -0,0 +1,25 @@
+
+import { BlockWithEntityComponent } from "./block/block_with_entity.js";
+import { CustomCropGrowthBlockComponent } from "./cropComponent.js";
+import { GuiBookItemComponent } from "./items/gui_book.js";
+import { world } from "@minecraft/server";
+
+export const registerCustomItemComponent = ()=>{
+    world.beforeEvents.worldInitialize.subscribe(({ itemComponentRegistry }) => {
+        itemComponentRegistry.registerCustomComponent("sapdon:guibook",GuiBookItemComponent);
+    });
+}
+
+export const registerCustomBlockComponent = ()=>{
+    world.beforeEvents.worldInitialize.subscribe(({ blockComponentRegistry }) => {
+        blockComponentRegistry.registerCustomComponent(
+            "sapdon:block_with_entity",
+            BlockWithEntityComponent
+        );
+        blockComponentRegistry.registerCustomComponent(
+            "sapdon:crop_growth",
+            CustomCropGrowthBlockComponent
+        );
+    });
+}
+

package/examples/masterball/dev/masterball_BP/masterball_BP_1_20_20/entities/sapdon_projectile_masterball.json

@@ -1,56 +0,0 @@
-{
-  "format_version": "1.16.0",
-  "minecraft:entity": {
-    "description": {
-      "identifier": "sapdon:projectile_masterball",
-      "is_spawnable": true,
-      "is_summonable": true,
-      "runtime_identifier": "minecraft:snowball"
-    },
-    "components": {
-      "minecraft:collision_box": {
-        "width": 0.25,
-        "height": 0.25
-      },
-      "minecraft:projectile": {
-        "on_hit": {
-          "impact_damage": {
-            "filter": "blaze",
-            "damage": 3,
-            "knockback": true
-          },
-          "remove_on_hit": {},
-          "particle_on_hit": {
-            "particle_type": "snowballpoof",
-            "num_particles": 6,
-            "on_entity_hit": true,
-            "on_other_hit": true
-          }
-        },
-        "anchor": 1,
-        "power": 1.5,
-        "gravity": 0.03,
-        "angle_offset": 0,
-        "offset": [
-          0,
-          -0.1,
-          0
-        ]
-      },
-      "minecraft:physics": {},
-      "minecraft:pushable": {
-        "is_pushable": true,
-        "is_pushable_by_piston": true
-      },
-      "minecraft:conditional_bandwidth_optimization": {
-        "default_values": {
-          "max_optimized_distance": 100,
-          "max_dropped_ticks": 7,
-          "use_motion_prediction_hints": true
-        }
-      }
-    },
-    "component_groups": {},
-    "events": {}
-  }
-}

package/examples/masterball/dev/masterball_BP/masterball_BP_1_20_20/items/sapdon_caught_masterball.json

@@ -1,32 +0,0 @@
-{
-  "format_version": "1.21.40",
-  "minecraft:item": {
-    "description": {
-      "identifier": "sapdon:caught_masterball",
-      "menu_category": {
-        "category": "none",
-        "is_hidden_in_commands": true
-      }
-    },
-    "components": {
-      "minecraft:icon": "masterball",
-      "minecraft:max_stack_size": 1,
-      "minecraft:glint": true,
-      "minecraft:display_name": {
-        "value": "捕捉到的大师球"
-      },
-      "minecraft:projectile": {
-        "minimum_critical_power": 1,
-        "projectile_entity": "sapdon:projectile_masterball"
-      },
-      "minecraft:throwable": {
-        "do_swing_animation": true,
-        "launch_power_scale": 1,
-        "max_draw_duration": 0,
-        "max_launch_power": 1,
-        "min_draw_duration": 0,
-        "scale_power_by_draw_duration": false
-      }
-    }
-  }
-}

package/examples/masterball/dev/masterball_BP/masterball_BP_1_20_20/items/sapdon_uncaught_masterball.json

@@ -1,31 +0,0 @@
-{
-  "format_version": "1.21.40",
-  "minecraft:item": {
-    "description": {
-      "identifier": "sapdon:uncaught_masterball",
-      "menu_category": {
-        "category": "items",
-        "is_hidden_in_commands": false
-      }
-    },
-    "components": {
-      "minecraft:icon": "masterball",
-      "minecraft:max_stack_size": 64,
-      "minecraft:display_name": {
-        "value": "大师球"
-      },
-      "minecraft:projectile": {
-        "minimum_critical_power": 1,
-        "projectile_entity": "sapdon:projectile_masterball"
-      },
-      "minecraft:throwable": {
-        "do_swing_animation": true,
-        "launch_power_scale": 1,
-        "max_draw_duration": 0,
-        "max_launch_power": 1,
-        "min_draw_duration": 0,
-        "scale_power_by_draw_duration": false
-      }
-    }
-  }
-}