Merge pull request #60 from ForestOfLight/dev

v1.5.1

Author: ForestOfLight

Canopy [BP]/manifest.json

@@ -1,10 +1,10 @@
 {
 	"format_version": 2,
 	"header": {
-		"name": "Canopy [BP] v1.5.0",
+		"name": "Canopy [BP] v1.5.1",
 		"description": "Technical informatics & features addon by §aForestOfLight§r.",
 		"uuid": "7f6b23df-a583-476b-b0e4-87457e65f7c0",
-		"version": [1, 5, 0],
+		"version": [1, 5, 1],
 		"min_engine_version": [1, 21, 120]
 	},
 	"modules": [
@@ -38,11 +38,13 @@
 		},
 		{
 			"uuid": "bcf34368-ed0c-4cf7-938e-582cccf9950d",
-			"version": [1, 5, 0]
+			"version": [1, 5, 1]
 		}
 	],
 	"metadata": {
 		"authors": [ "ForestOfLight" ],
-		"license": "MIT"
+		"license": "MIT",
+    	"url": "https://github.com/ForestOfLight/Canopy",
+		"product_type": "addon"
 	}
 }

Canopy [BP]/scripts/constants.js

@@ -1,4 +1,4 @@
-const PACK_VERSION = '1.5.0';
+const PACK_VERSION = '1.5.1';
 const MC_VERSION = '1.21.120.4';
 
 export { PACK_VERSION, MC_VERSION };

Canopy [BP]/scripts/src/commands/camera.js

@@ -152,6 +152,8 @@ function endCameraView(player) {
 }
 
 function spectateAction(player) {
+    if (world.isHardcore)
+        return player.sendMessage({ translate: 'commands.camera.spectate.hardcore' });
     if (player.getDynamicProperty('isViewingCamera'))
         return player.sendMessage({ translate: 'commands.camera.spectate.viewing' });
     system.run(() => {

Canopy [BP]/scripts/src/commands/canopy.js

@@ -6,16 +6,16 @@ import { forceShow } from "../../include/utils";
 const cmd = new Command({
     name: 'canopy',
     description: { translate: 'commands.canopy' },
-    usage: 'canopy <menu/rule/version> [true/false]',
+    usage: 'canopy <menu/rule/version> [true/false/integer/float]',
     args: [
         { type: 'string|array', name: 'ruleIDs' },
         { type: 'boolean|float|integer', name: 'newValue' }
     ],
     callback: canopyCommand,
     helpEntries: [
         { usage: 'canopy menu', description: { translate: 'commands.canopy.menu' } },
-        { usage: 'canopy <rule> [true/false]', description: { translate: 'commands.canopy.single' } },
-        { usage: 'canopy <[rule1,rule2,...]> [true/false]', description: { translate: 'commands.canopy.multiple' } },
+        { usage: 'canopy <rule> [true/false/integer/float]', description: { translate: 'commands.canopy.single' } },
+        { usage: 'canopy <[rule1,rule2,...]> [true/false/integer/float]', description: { translate: 'commands.canopy.multiple' } },
         { usage: 'canopy version', description: { translate: 'commands.canopy.version' } }
     ],
     opOnly: true

Canopy [BP]/scripts/src/rules/flippinArrows.js

@@ -75,7 +75,7 @@ function isFlippableOnPlace(block) {
 }
 
 function isStair(block) {
-    return block.permutation.getState('upside_down_bit') !== void 0;
+    return block.permutation.getState('weirdo_direction') !== void 0;
 }
 
 function isSlab(block) {

Canopy [BP]/scripts/src/rules/infodisplay/PeekInventory.js

@@ -9,7 +9,7 @@ class PeekInventory extends InfoDisplayElement {
     constructor(player, displayLine) {
 		const ruleData = { identifier: 'peekInventory', 
 			description: { translate: 'rules.infoDisplay.peekInventory' }, 
-			contingentRules: ['lookingAt'], 
+			contingentRules: ['target'], 
 			globalContingentRules: ['allowPeekInventory'] 
 		};
         super(ruleData, displayLine, false);

Canopy [BP]/scripts/src/rules/infodisplay/SignalStrength.js

@@ -5,7 +5,7 @@ class SignalStrength extends InfoDisplayElement {
     player;
 
     constructor(player, displayLine) {
-        const ruleData = { identifier: 'signalStrength', description: { translate: 'rules.infoDisplay.signalStrength' }, contingentRules: ['lookingAt'] };
+        const ruleData = { identifier: 'signalStrength', description: { translate: 'rules.infoDisplay.signalStrength' }, contingentRules: ['target'] };
         super(ruleData, displayLine, false);
         this.player = player;
     }

Canopy [RP]/manifest.json

@@ -1,11 +1,11 @@
 {
   "format_version": 2,
   "header": {
-    "name": "Canopy [RP] v1.5.0",
+    "name": "Canopy [RP] v1.5.1",
     "description": "Technical informatics & features addon by §aForestOfLight§r.",
     "uuid": "bcf34368-ed0c-4cf7-938e-582cccf9950d",
-    "version": [1, 5, 0],
-    "min_engine_version": [1, 21, 100]
+    "version": [1, 5, 1],
+    "min_engine_version": [1, 21, 120]
   },
   "modules": [
     {
@@ -17,11 +17,13 @@
   "dependencies": [
     {
       "uuid": "7f6b23df-a583-476b-b0e4-87457e65f7c0",
-      "version": [1, 5, 0]
+      "version": [1, 5, 1]
     }
   ],
   "metadata": {
     "authors": [ "ForestOfLight" ],
-    "license": "MIT"
+    "license": "MIT",
+    "url": "https://github.com/ForestOfLight/Canopy",
+    "product_type": "addon"
   }
 }

Canopy [RP]/texts/en_US.lang

@@ -54,6 +54,7 @@ commands.camera.spectate.viewing=§cYou cannot spectate while viewing a camera.
 commands.camera.spectate.gamemode=§cYou cannot change your gamemode while spectating.
 commands.camera.spectate.started=§aSpectating
 commands.camera.spectate.ended=§7Spectating ended
+commands.camera.spectate.hardcore=§cPrevented you from spectating. Spectating in hardcore mode has a soft-locking bug. This is a Mojang issue.
 commands.camera.invalidaction=§cInvalid camera action.
 
 commands.canopy=Enable or disable a rule.
@@ -65,8 +66,8 @@ commands.canopy.menu.busy=§8Close your chat window to access the form.
 commands.canopy.menu.timeout=§8Form timed out after %s ticks.
 commands.canopy.menu.canceled=§8Form canceled. Rules were not updated.
 commands.canopy.menu.submit=§aApply
-commands.canopy.single=Enables or disables a single rule.
-commands.canopy.multiple=Enables or disables multiple rules.
+commands.canopy.single=Modifies the value of a single rule.
+commands.canopy.multiple=Modifies the value of multiple rules.
 commands.canopy.infodisplayRule=§cThe rule '%1' is part of the InfoDisplay, and must be toggled using %2info. Use %2help for more information.
 
 commands.changedimension=Teleports entities to the specified dimension.