From 223c44cef7e05f99496c06408e5f0d5e581667db Mon Sep 17 00:00:00 2001 From: Lucky3028 Date: Sat, 23 Dec 2023 17:21:23 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E3=83=AF=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=83=89=E3=81=94=E3=81=A8=E3=81=AEWG=E3=81=AE=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E5=B7=AE=E5=88=86=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-configs/worldguard-config.yaml | 370 ++++++++++++++++++ .../templates/debug-s1/seichiassist.yaml | 44 ++- 2 files changed, 413 insertions(+), 1 deletion(-) create mode 100644 seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/common-configs/worldguard-config.yaml diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/common-configs/worldguard-config.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/common-configs/worldguard-config.yaml new file mode 100644 index 000000000..68d0f915e --- /dev/null +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/common-configs/worldguard-config.yaml @@ -0,0 +1,370 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: common-worldguard-configs +data: + # メイン、Towny、建築専用 + main-Blacklist.txt: | + # + # WorldGuard blacklist + # + # The blacklist lets you block actions, blocks, and items from being used. + # You choose a set of "items to affect" and a list of "actions to perform." + # + ############################################################################### + # + # Example to block some ore mining and placement: + # [coalore,goldore,ironore] + # on-break=deny,log,kick + # on-place=deny,tell + # + # Events that you can detect: + # - on-break (when a block of this type is about to be broken) + # - on-destroy-with (the item/block held by the user while destroying) + # - on-place (a block is being placed) + # - on-use (an item like flint and steel or a bucket is being used) + # - on-interact (when a block in used (doors, chests, etc.)) + # - on-drop (an item is being dropped from the player's inventory) + # - on-acquire (an item enters a player's inventory via some method) + # - on-dispense (a dispenser is about to dispense an item) + # + # Actions (for events): + # - deny (deny completely, used blacklist mode) + # - allow (used in whitelist mode) + # - notify (notify admins with the 'worldguard.notify' permission) + # - log (log to console/file/database) + # - tell (tell a player that that's not allowed) + # - kick (kick player) + # - ban (ban player) + # + # Options: + # - ignore-groups (comma-separated list of groups to not affect) + # - ignore-perms (comma-separated list of permissions to not affect - make up + # your very own permissions!) + # - comment (message for yourself that is printed with 'log' and 'notify') + # - message (optional message to show the user instead; %s is the item name) + # + ############################################################################### + # + # For more information, see: + # http://wiki.sk89q.com/wiki/WorldGuard/Blacklist + # + ############################################################################### + # + # Some examples follow. + # REMEMBER: If a line has # in front, it will be ignored. + # + + # Deny lava buckets + #[lavabucket] + #ignore-perms=my.own.madeup.permission + #ignore-groups=admins,mods + #on-use=deny,tell + + # Deny some ore + #[coalore,goldore,ironore] + #ignore-groups=admins,mods + #on-break=notify,deny,log + + # Some funky data value tests + #[wood:0;>=2] + #ignore-groups=admins,mods + #on-break=notify,deny,log + + # 岩盤設置無効化 + [bedrock] + ignore-groups=admin + on-place=deny,log,tell + on-break=deny,log,tell + + # コーラスフルーツ無効化 + [chorus_fruit] + ignore-groups=admin + on-use=deny,log,tell + on-interact=deny,log,tell + + # オブザーバーブロック設置無効化 + [observer] + ignore-groups=admin + on-place=deny,log,tell + + # 第1～4整地 + world_SW-Blacklist.txt: | + # + # WorldGuard blacklist + # + # The blacklist lets you block actions, blocks, and items from being used. + # You choose a set of "items to affect" and a list of "actions to perform." + # + ############################################################################### + # + # Example to block some ore mining and placement: + # [coalore,goldore,ironore] + # on-break=deny,log,kick + # on-place=deny,tell + # + # Events that you can detect: + # - on-break (when a block of this type is about to be broken) + # - on-destroy-with (the item/block held by the user while destroying) + # - on-place (a block is being placed) + # - on-use (an item like flint and steel or a bucket is being used) + # - on-interact (when a block in used (doors, chests, etc.)) + # - on-drop (an item is being dropped from the player's inventory) + # - on-acquire (an item enters a player's inventory via some method) + # - on-dispense (a dispenser is about to dispense an item) + # + # Actions (for events): + # - deny (deny completely, used blacklist mode) + # - allow (used in whitelist mode) + # - notify (notify admins with the 'worldguard.notify' permission) + # - log (log to console/file/database) + # - tell (tell a player that that's not allowed) + # - kick (kick player) + # - ban (ban player) + # + # Options: + # - ignore-groups (comma-separated list of groups to not affect) + # - ignore-perms (comma-separated list of permissions to not affect - make up + # your very own permissions!) + # - comment (message for yourself that is printed with 'log' and 'notify') + # - message (optional message to show the user instead; %s is the item name) + # + ############################################################################### + # + # For more information, see: + # http://wiki.sk89q.com/wiki/WorldGuard/Blacklist + # + ############################################################################### + # + # Some examples follow. + # REMEMBER: If a line has # in front, it will be ignored. + # + + # Deny lava buckets + #[lavabucket] + #ignore-perms=my.own.madeup.permission + #ignore-groups=admins,mods + #on-use=deny,tell + + # Deny some ore + #[coalore,goldore,ironore] + #ignore-groups=admins,mods + #on-break=notify,deny,log + + # Some funky data value tests + #[wood:0;>=2] + #ignore-groups=admins,mods + #on-break=notify,deny,log + + # 岩盤設置無効化 + [bedrock] + ignore-groups=admin + on-place=deny,log,tell + on-break=deny,log,tell + + # オブザーバーブロック設置無効化 + [observer] + ignore-groups=admin + on-place=deny,log,tell + + # エンドクリスタル設置無効化 + [end_crystal] + ignore-groups=admin + on-use=deny,log,tell + + # エンド整地、ネザー整地 + world_SW_the_end-Blacklist.txt: | + # + # WorldGuard blacklist + # + # The blacklist lets you block actions, blocks, and items from being used. + # You choose a set of "items to affect" and a list of "actions to perform." + # + ############################################################################### + # + # Example to block some ore mining and placement: + # [coalore,goldore,ironore] + # on-break=deny,log,kick + # on-place=deny,tell + # + # Events that you can detect: + # - on-break (when a block of this type is about to be broken) + # - on-destroy-with (the item/block held by the user while destroying) + # - on-place (a block is being placed) + # - on-use (an item like flint and steel or a bucket is being used) + # - on-interact (when a block in used (doors, chests, etc.)) + # - on-drop (an item is being dropped from the player's inventory) + # - on-acquire (an item enters a player's inventory via some method) + # - on-dispense (a dispenser is about to dispense an item) + # + # Actions (for events): + # - deny (deny completely, used blacklist mode) + # - allow (used in whitelist mode) + # - notify (notify admins with the 'worldguard.notify' permission) + # - log (log to console/file/database) + # - tell (tell a player that that's not allowed) + # - kick (kick player) + # - ban (ban player) + # + # Options: + # - ignore-groups (comma-separated list of groups to not affect) + # - ignore-perms (comma-separated list of permissions to not affect - make up + # your very own permissions!) + # - comment (message for yourself that is printed with 'log' and 'notify') + # - message (optional message to show the user instead; %s is the item name) + # + ############################################################################### + # + # For more information, see: + # http://wiki.sk89q.com/wiki/WorldGuard/Blacklist + # + ############################################################################### + # + # Some examples follow. + # REMEMBER: If a line has # in front, it will be ignored. + # + + # Deny lava buckets + #[lavabucket] + #ignore-perms=my.own.madeup.permission + #ignore-groups=admins,mods + #on-use=deny,tell + + # Deny some ore + #[coalore,goldore,ironore] + #ignore-groups=admins,mods + #on-break=notify,deny,log + + # Some funky data value tests + #[wood:0;>=2] + #ignore-groups=admins,mods + #on-break=notify,deny,log + + # 岩盤設置無効化 + [bedrock] + ignore-groups=admin + on-place=deny,log,tell + on-break=deny,log,tell + + # ベッド設置無効化 + [bed] + ignore-groups=admin + on-use=deny,log,tell + + # オブザーバーブロック設置無効化 + [observer] + ignore-groups=admin + on-place=deny,log,tell + + # エンドクリスタル設置無効化 + [end_crystal] + ignore-groups=admin + on-use=deny,log,tell + + # メイン + main-config.yml: | + # + # WorldGuard's world configuration file + # + # This is a world configuration file. Anything placed into here will only + # affect this world. If you don't put anything in this file, then the + # settings will be inherited from the main configuration file. + # + # If you see {} below, that means that there are NO entries in this file. + # Remove the {} and add your own entries. + # + + regions: + max-region-count-per-player: + default: 5 + observer: 5 + max-claim-volume: 14745600 + # 第1、3整地 + world_SW-config.yml: | + # + # WorldGuard's world configuration file + # + # This is a world configuration file. Anything placed into here will only + # affect this world. If you don't put anything in this file, then the + # settings will be inherited from the main configuration file. + # + # If you see {} below, that means that there are NO entries in this file. + # Remove the {} and add your own entries. + # + + fire: + disable-lava-fire-spread: false + disable-all-fire-spread: false + # 第2整地 + world_SW_2-config.yml: | + # + # WorldGuard's world configuration file + # + # This is a world configuration file. Anything placed into here will only + # affect this world. If you don't put anything in this file, then the + # settings will be inherited from the main configuration file. + # + # If you see {} below, that means that there are NO entries in this file. + # Remove the {} and add your own entries. + # + + regions: + max-region-count-per-player: + default: 2 + observer: 2 + max-claim-volume: 14803200 + fire: + disable-lava-fire-spread: false + disable-all-fire-spread: false + # 第4整地 + world_SW_4-config.yml: | + # + # WorldGuard's world configuration file + # + # This is a world configuration file. Anything placed into here will only + # affect this world. If you don't put anything in this file, then the + # settings will be inherited from the main configuration file. + # + # If you see {} below, that means that there are NO entries in this file. + # Remove the {} and add your own entries. + # + + regions: + max-region-count-per-player: + default: 2 + observer: 2 + max-claim-volume: 296064000 + fire: + disable-lava-fire-spread: false + disable-all-fire-spread: false + # エンド整地、ネザー整地、Towny + world_SW_the_end-config.yml: | + # + # WorldGuard's world configuration file + # + # This is a world configuration file. Anything placed into here will only + # affect this world. If you don't put anything in this file, then the + # settings will be inherited from the main configuration file. + # + # If you see {} below, that means that there are NO entries in this file. + # Remove the {} and add your own entries. + # + + {} + # 建築専用 + world_build-config.yml: | + # + # WorldGuard's world configuration file + # + # This is a world configuration file. Anything placed into here will only + # affect this world. If you don't put anything in this file, then the + # settings will be inherited from the main configuration file. + # + # If you see {} below, that means that there are NO entries in this file. + # Remove the {} and add your own entries. + # + + regions: + max-region-count-per-player: + default: 20 + max-claim-volume: 14745600 diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml index 6d727c797..b4f7e32d6 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml @@ -278,10 +278,52 @@ spec: mountPath: /plugins/ClickTpa/config.yml subPath: ClickTpa-config.yml - # WorldGuard プラグインの設定ファイル + # WorldGuard プラグイン周りの設定ファイル - name: common-mcserver-plugin-configs mountPath: /plugins/WorldGuard/config.yml subPath: WorldGuard-config.yml + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world/Blacklist.txt + subPath: main-Blacklist.txt + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world/config.yml + subPath: main-config.yml + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW/Blacklist.txt + subPath: world_SW-Blacklist.txt + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW/config.yml + subPath: world_SW-config.yml + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW_2/Blacklist.txt + subPath: world_SW-Blacklist.txt + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW_2/config.yml + subPath: world_SW_2-config.yml + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW_3/Blacklist.txt + subPath: world_SW-Blacklist.txt + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW_3/config.yml + subPath: world_SW-config.yml + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW_4/Blacklist.txt + subPath: world_SW-Blacklist.txt + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW_4/config.yml + subPath: world_SW_4-config.yml + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW_nether/Blacklist.txt + subPath: world_SW_the_end-Blacklist.txt + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW_nether/config.yml + subPath: world_SW_the_end-config.yml + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW_the_end/Blacklist.txt + subPath: world_SW_the_end-Blacklist.txt + - name: common-worldguard-configs + mountPath: /plugins/WorldGuard/worlds/world_SW_the_end/config.yml + subPath: world_SW_the_end-config.yml # SeichiAssist プラグインの設定ファイル - name: seichiassist-config From ff5b85cb43256075ccab6bbc934b44c10aff2af8 Mon Sep 17 00:00:00 2001 From: Lucky3028 Date: Sat, 23 Dec 2023 17:24:12 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=AD=98=E5=9C=A8=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=83=AF=E3=83=BC=E3=83=AB=E3=83=89=E3=81=AB=E3=81=A4?= =?UTF-8?q?=E3=81=84=E3=81=A6=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92=E6=B6=88?= =?UTF-8?q?=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-configs/worldguard-config.yaml | 46 ++----------------- .../templates/debug-s1/seichiassist.yaml | 12 ----- 2 files changed, 4 insertions(+), 54 deletions(-) diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/common-configs/worldguard-config.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/common-configs/worldguard-config.yaml index 68d0f915e..deb850082 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/common-configs/worldguard-config.yaml +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/common-configs/worldguard-config.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: common-worldguard-configs data: - # メイン、Towny、建築専用 + # メイン main-Blacklist.txt: | # # WorldGuard blacklist @@ -88,7 +88,7 @@ data: ignore-groups=admin on-place=deny,log,tell - # 第1～4整地 + # 第1、2整地 world_SW-Blacklist.txt: | # # WorldGuard blacklist @@ -279,7 +279,7 @@ data: default: 5 observer: 5 max-claim-volume: 14745600 - # 第1、3整地 + # 第1整地 world_SW-config.yml: | # # WorldGuard's world configuration file @@ -316,28 +316,7 @@ data: fire: disable-lava-fire-spread: false disable-all-fire-spread: false - # 第4整地 - world_SW_4-config.yml: | - # - # WorldGuard's world configuration file - # - # This is a world configuration file. Anything placed into here will only - # affect this world. If you don't put anything in this file, then the - # settings will be inherited from the main configuration file. - # - # If you see {} below, that means that there are NO entries in this file. - # Remove the {} and add your own entries. - # - - regions: - max-region-count-per-player: - default: 2 - observer: 2 - max-claim-volume: 296064000 - fire: - disable-lava-fire-spread: false - disable-all-fire-spread: false - # エンド整地、ネザー整地、Towny + # エンド整地、ネザー整地 world_SW_the_end-config.yml: | # # WorldGuard's world configuration file @@ -351,20 +330,3 @@ data: # {} - # 建築専用 - world_build-config.yml: | - # - # WorldGuard's world configuration file - # - # This is a world configuration file. Anything placed into here will only - # affect this world. If you don't put anything in this file, then the - # settings will be inherited from the main configuration file. - # - # If you see {} below, that means that there are NO entries in this file. - # Remove the {} and add your own entries. - # - - regions: - max-region-count-per-player: - default: 20 - max-claim-volume: 14745600 diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml index b4f7e32d6..b2da5d3fe 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml @@ -300,18 +300,6 @@ spec: - name: common-worldguard-configs mountPath: /plugins/WorldGuard/worlds/world_SW_2/config.yml subPath: world_SW_2-config.yml - - name: common-worldguard-configs - mountPath: /plugins/WorldGuard/worlds/world_SW_3/Blacklist.txt - subPath: world_SW-Blacklist.txt - - name: common-worldguard-configs - mountPath: /plugins/WorldGuard/worlds/world_SW_3/config.yml - subPath: world_SW-config.yml - - name: common-worldguard-configs - mountPath: /plugins/WorldGuard/worlds/world_SW_4/Blacklist.txt - subPath: world_SW-Blacklist.txt - - name: common-worldguard-configs - mountPath: /plugins/WorldGuard/worlds/world_SW_4/config.yml - subPath: world_SW_4-config.yml - name: common-worldguard-configs mountPath: /plugins/WorldGuard/worlds/world_SW_nether/Blacklist.txt subPath: world_SW_the_end-Blacklist.txt