Merge branch '1.20.x/security-sea-raft' into 1.20.4

Changelog.md

@@ -2,6 +2,8 @@
 
 - New: Server config setting "allow_camera_night_vision" to set whether players are able to activate night vision without having the actual potion effect
 - New: Pressing "Enter" while typing a player name in an Allowlist/Denylist Module will now add the player to the list without needing to press the "Add Player" button
+- New: Security Sea Boats: Chest boats with a passcode-protected chest
+- New: Damage Type Tag "securitycraft:security_sea_boat_vulnerable_to" to define which damage types the Security Sea Boat can be destroyed by
 - Change: The cameraSpeed client side config setting has been moved to be a per-block option, accessible with the Universal Block Modifier
 - Change: Some SecurityCraft tip messages have been reworded for clarity
 - Change: Increased suffocation damage inside reinforced blocks no longer affects non-player entities and players owning the reinforced blocks
@@ -10,6 +12,11 @@
 - Change: When picking up a placed sentry, the resulting sentry item will now be named according to the custom name of the removed sentry
 - API: Changed constructors for IntOption and DoubleOption, they are now always sliders by default
 - API: Removed FloatOption. Use DoubleOption instead
+- API: IModuleInventory is no longer hardcoded to just block entities
+- API: New method ICodebreakable#handleCodebreaking to define behavior when a codebreaker is used to break the code
+- API: The BlockState parameters in ICodebreakable's methods have been removed
+- API: New Option "EntityDataWrappedOption" that connects an EntityDataAccessor with an Option, and corresponding converter method "wrapForEntityData"
+- API: New method Option#getValueText for getting a textual representation of the option's value
 - Fix: Trying to place a Panic Button on top of powdered snow crashes the game
 - Fix: Occasional crash when opening the inventory in creative mode in certain situations
 - Fix: Reinforced fence gates don't properly retain their owner when reloading the world

src/generated/resources/assets/securitycraft/models/item/acacia_security_sea_boat.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "securitycraft:item/acacia_security_sea_boat"
+  }
+}

src/generated/resources/assets/securitycraft/models/item/bamboo_security_sea_raft.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "securitycraft:item/bamboo_security_sea_raft"
+  }
+}

src/generated/resources/assets/securitycraft/models/item/birch_security_sea_boat.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "securitycraft:item/birch_security_sea_boat"
+  }
+}

src/generated/resources/assets/securitycraft/models/item/cherry_security_sea_boat.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "securitycraft:item/cherry_security_sea_boat"
+  }
+}

src/generated/resources/assets/securitycraft/models/item/dark_oak_security_sea_boat.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "securitycraft:item/dark_oak_security_sea_boat"
+  }
+}

src/generated/resources/assets/securitycraft/models/item/jungle_security_sea_boat.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "securitycraft:item/jungle_security_sea_boat"
+  }
+}

src/generated/resources/assets/securitycraft/models/item/mangrove_security_sea_boat.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "securitycraft:item/mangrove_security_sea_boat"
+  }
+}

src/generated/resources/assets/securitycraft/models/item/oak_security_sea_boat.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "securitycraft:item/oak_security_sea_boat"
+  }
+}

src/generated/resources/assets/securitycraft/models/item/spruce_security_sea_boat.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "securitycraft:item/spruce_security_sea_boat"
+  }
+}

src/generated/resources/data/securitycraft/advancements/recipes/transportation/acacia_security_sea_boat.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_keypad_chest": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "securitycraft:keypad_chest"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "securitycraft:acacia_security_sea_boat"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_keypad_chest"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "securitycraft:acacia_security_sea_boat"
+    ]
+  }
+}

src/generated/resources/data/securitycraft/advancements/recipes/transportation/bamboo_security_sea_raft.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_keypad_chest": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "securitycraft:keypad_chest"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "securitycraft:bamboo_security_sea_raft"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_keypad_chest"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "securitycraft:bamboo_security_sea_raft"
+    ]
+  }
+}

src/generated/resources/data/securitycraft/advancements/recipes/transportation/birch_security_sea_boat.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_keypad_chest": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "securitycraft:keypad_chest"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "securitycraft:birch_security_sea_boat"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_keypad_chest"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "securitycraft:birch_security_sea_boat"
+    ]
+  }
+}

src/generated/resources/data/securitycraft/advancements/recipes/transportation/cherry_security_sea_boat.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_keypad_chest": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "securitycraft:keypad_chest"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "securitycraft:cherry_security_sea_boat"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_keypad_chest"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "securitycraft:cherry_security_sea_boat"
+    ]
+  }
+}

src/generated/resources/data/securitycraft/advancements/recipes/transportation/dark_oak_security_sea_boat.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_keypad_chest": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "securitycraft:keypad_chest"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "securitycraft:dark_oak_security_sea_boat"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_keypad_chest"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "securitycraft:dark_oak_security_sea_boat"
+    ]
+  }
+}

src/generated/resources/data/securitycraft/advancements/recipes/transportation/jungle_security_sea_boat.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_keypad_chest": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "securitycraft:keypad_chest"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "securitycraft:jungle_security_sea_boat"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_keypad_chest"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "securitycraft:jungle_security_sea_boat"
+    ]
+  }
+}

src/generated/resources/data/securitycraft/advancements/recipes/transportation/mangrove_security_sea_boat.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_keypad_chest": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "securitycraft:keypad_chest"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "securitycraft:mangrove_security_sea_boat"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_keypad_chest"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "securitycraft:mangrove_security_sea_boat"
+    ]
+  }
+}

src/generated/resources/data/securitycraft/advancements/recipes/transportation/oak_security_sea_boat.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_keypad_chest": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "securitycraft:keypad_chest"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "securitycraft:oak_security_sea_boat"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_keypad_chest"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "securitycraft:oak_security_sea_boat"
+    ]
+  }
+}