Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload to CurseForge
env:
RELEASE_BODY: ${{ github.event.release.body }}
run: |
VERSION=${{ github.event.release.tag_name }}

Expand All @@ -61,7 +63,7 @@ jobs:
echo "Found CurseForge version IDs for game version $ENGINE_PREFIX: $GAME_VERSION_IDS"

# Use the Github release body as the changelog
CHANGELOG=$(jq -Rs . <<< "${{ github.event.release.body }}")
CHANGELOG=$(printf "%s" "$RELEASE_BODY" | jq -Rs .)
ADDON_FILENAME=Canopy-$VERSION.mcaddon

# Upload the addon
Expand Down
3 changes: 1 addition & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"mode": "listen",
"targetModuleUuid": "3d753132-e3c9-4305-a995-eae30b486093",
"localRoot": "${workspaceFolder}/Canopy [BP]/scripts",
"port": 19144,
"preLaunchTask": "regolith: watch"
"port": 19144
}
]
}
151 changes: 151 additions & 0 deletions Canopy [BP]/entities/ender_pearl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
{
"format_version": "1.12.0",
"minecraft:entity": {
"description": {
"identifier": "minecraft:ender_pearl",
"is_spawnable": false,
"is_summonable": false,
"is_experimental": false
},
"component_groups": {
"minecraft:no_spawn": {
"minecraft:projectile": {
"on_hit": {
"teleport_owner": { },
"remove_on_hit": { }
},
"power": 1.5,
"gravity": 0.025,
"angle_offset": 0.0,
"inertia": 1,
"liquid_inertia": 1
}
},
"canopy:tick_world_r2": {
"minecraft:tick_world": {
"never_despawn": true,
"radius": 2
}
},
"canopy:tick_world_r3": {
"minecraft:tick_world": {
"never_despawn": true,
"radius": 3
}
},
"canopy:tick_world_r4": {
"minecraft:tick_world": {
"never_despawn": true,
"radius": 4
}
},
"canopy:tick_world_r5": {
"minecraft:tick_world": {
"never_despawn": true,
"radius": 5
}
},
"canopy:tick_world_r6": {
"minecraft:tick_world": {
"never_despawn": true,
"radius": 6
}
}
},

"components": {
"minecraft:collision_box": {
"width": 0.25,
"height": 0.25
},
"minecraft:projectile": {
"on_hit": {
"teleport_owner": { },
"spawn_chance": {
"first_spawn_percent_chance": 5.0,
"first_spawn_count": 1,
"spawn_definition": "minecraft:endermite"
},
"remove_on_hit": { }
},
"power": 1.5,
"gravity": 0.025,
"angle_offset": 0.0,
"inertia": 1,
"liquid_inertia": 1
},
"minecraft:physics": {
},
"minecraft:pushable": {
"is_pushable": true,
"is_pushable_by_piston": true
},
"minecraft:conditional_bandwidth_optimization": {
"default_values": {
"max_optimized_distance": 80.0,
"max_dropped_ticks": 7,
"use_motion_prediction_hints": true
}
}
},

"events": {
"minecraft:entity_spawned": {
"sequence": [
{
"filters": {"test": "is_game_rule", "domain": "domobspawning", "value": false},
"add": {
"component_groups": [ "minecraft:no_spawn" ]
}
}
]
},
"canopy:start_ticking_r2": {
"add": {
"component_groups": [
"canopy:tick_world_r2"
]
}
},
"canopy:start_ticking_r3": {
"add": {
"component_groups": [
"canopy:tick_world_r3"
]
}
},
"canopy:start_ticking_r4": {
"add": {
"component_groups": [
"canopy:tick_world_r4"
]
}
},
"canopy:start_ticking_r5": {
"add": {
"component_groups": [
"canopy:tick_world_r5"
]
}
},
"canopy:start_ticking_r6": {
"add": {
"component_groups": [
"canopy:tick_world_r6"
]
}
},
"canopy:stop_ticking": {
"remove": {
"component_groups": [
"canopy:tick_world_r2",
"canopy:tick_world_r3",
"canopy:tick_world_r4",
"canopy:tick_world_r5",
"canopy:tick_world_r6"
]
}
}
}
}
}
63 changes: 57 additions & 6 deletions Canopy [BP]/entities/minecart.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,39 @@
"looping": false,
"time": 10,
"time_down_event": {
"event": "canopy:disable_ticking"
"event": "canopy:stop_ticking"
}
}
},
"canopy:ticking": {
"canopy:tick_world_r2": {
"minecraft:tick_world": {
"never_despawn": true,
"radius": 2
}
},
"canopy:tick_world_r3": {
"minecraft:tick_world": {
"never_despawn": true,
"radius": 3
}
},
"canopy:tick_world_r4": {
"minecraft:tick_world": {
"never_despawn": true,
"radius": 4
}
},
"canopy:tick_world_r5": {
"minecraft:tick_world": {
"never_despawn": true,
"radius": 5
}
},
"canopy:tick_world_r6": {
"minecraft:tick_world": {
"never_despawn": true,
"radius": 6
}
}
},

Expand Down Expand Up @@ -73,14 +97,41 @@
}
},
"events": {
"canopy:tick_tenSeconds": {
"canopy:tick_tenSeconds_r2": {
"add": {
"component_groups": [ "canopy:tick_world_r2", "canopy:ticking_timer"]
}
},
"canopy:tick_tenSeconds_r3": {
"add": {
"component_groups": [ "canopy:tick_world_r3", "canopy:ticking_timer"]
}
},
"canopy:tick_tenSeconds_r4": {
"add": {
"component_groups": [ "canopy:tick_world_r4", "canopy:ticking_timer"]
}
},
"canopy:tick_tenSeconds_r5": {
"add": {
"component_groups": [ "canopy:tick_world_r5", "canopy:ticking_timer"]
}
},
"canopy:tick_tenSeconds_r6": {
"add": {
"component_groups": [ "canopy:ticking", "canopy:ticking_timer"]
"component_groups": [ "canopy:tick_world_r6", "canopy:ticking_timer"]
}
},
"canopy:disable_ticking": {
"canopy:stop_ticking": {
"remove": {
"component_groups": [ "canopy:ticking", "canopy:ticking_timer" ]
"component_groups": [
"canopy:tick_world_r2",
"canopy:tick_world_r3",
"canopy:tick_world_r4",
"canopy:tick_world_r5",
"canopy:tick_world_r6",
"canopy:ticking_timer"
]
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions Canopy [BP]/manifest.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"format_version": 2,
"header": {
"name": "Canopy [BP] v1.5.4",
"name": "Canopy [BP] v1.5.5",
"description": "Technical informatics & features addon by §aForestOfLight§r.",
"uuid": "7f6b23df-a583-476b-b0e4-87457e65f7c0",
"version": [1, 5, 4],
"min_engine_version": [1, 26, 0]
"version": [1, 5, 5],
"min_engine_version": [1, 26, 10]
},
"modules": [
{
Expand All @@ -26,7 +26,7 @@
"dependencies": [
{
"module_name": "@minecraft/server",
"version": "2.6.0-beta"
"version": "2.7.0-beta"
},
{
"module_name": "@minecraft/server-ui",
Expand All @@ -38,7 +38,7 @@
},
{
"uuid": "bcf34368-ed0c-4cf7-938e-582cccf9950d",
"version": [1, 5, 4]
"version": [1, 5, 5]
}
],
"metadata": {
Expand Down
4 changes: 2 additions & 2 deletions Canopy [BP]/scripts/constants.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const PACK_VERSION = '1.5.4';
const MC_VERSION = '1.26.0.2';
const PACK_VERSION = '1.5.5';
const MC_VERSION = '1.26.10.4';

export { PACK_VERSION, MC_VERSION };
8 changes: 4 additions & 4 deletions Canopy [BP]/scripts/include/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function getClosestTarget(player, blockRayResult, entityRayResult) {
}

export function parseName(target, includePrefix = true) {
if (target.typeId.replace('minecraft:', '') === 'player')
if (target.typeId === 'minecraft:player')
return `§o${target.name}§r`;
return includePrefix ? target.typeId : target.typeId.replace('minecraft:', '');
}
Expand All @@ -56,10 +56,10 @@ export function getColorCode(color) {
case 'cyan': return '§3';
case 'light_blue': return '§b';
case 'blue': return '§9';
case 'purple': return '§5';
case 'purple': return '§u';
case 'pink': return '§d';
case 'magenta': return '§d';
case 'brown': return '§6';
case 'magenta': return '§5';
case 'brown': return '§n';
case 'black': return '§0';
case 'white': return '§f';
case 'light_gray': return '§7';
Expand Down
4 changes: 3 additions & 1 deletion Canopy [BP]/scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import './src/commands/scriptevents/generator'
import './src/rules/infodisplay/InfoDisplay'
import './src/rules/explosionNoBlockDamage'
import './src/rules/autoItemPickup'
import './src/rules/universalChunkLoading'
import './src/rules/minecartChunkLoading'
import './src/rules/creativeNoTileDrops'
import './src/rules/flippinArrows'
import './src/rules/tntPrimeMomentum'
Expand Down Expand Up @@ -78,6 +78,8 @@ import './src/rules/echoShardsEnableShriekers'
import './src/rules/collisionBoxes'
import './src/rules/potionBoostedBreeding'
import './src/rules/serverSideCollisionBoxes'
import './src/rules/entitySeparation'
import './src/rules/enderPearlChunkLoading'

// Load Time Processes
import './src/onStart'
Expand Down
6 changes: 3 additions & 3 deletions Canopy [BP]/scripts/src/classes/BiomeEdgeRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export class BiomeEdgeRenderer {
changeInFinalAxis[finalAxis] = quadHeight;
const bound = new Vector(...changeInMiddleAxis).add(new Vector(...changeInFinalAxis));

const worldLocation = Vector.from(this.blockVolume.getMin()).add(new Vector(...localLocation));
const worldLocation = Vector.from(this.blockVolume.getMin()).add(bound.multiply(0.5)).add(new Vector(...localLocation));
worldLocation.dimension = this.dimension;
const sidedBox = new DebugBox(worldLocation);
sidedBox.bound = bound;
Expand Down Expand Up @@ -168,7 +168,7 @@ export class BiomeEdgeRenderer {
}

renderAnalysisLocation(location) {
const dimensionLocation = Vector.from(location);
const dimensionLocation = Vector.from(location).add(new Vector(0.5, 0.5, 0.5));
dimensionLocation.dimension = this.dimension;
const tempBox = new DebugBox(dimensionLocation);
tempBox.color = { red: 1, green: 1, blue: 1 };
Expand All @@ -181,7 +181,7 @@ export class BiomeEdgeRenderer {
drawAnalysisBoundingBox() {
if (this.analysisBoundingBoxShape)
this.analysisBoundingBoxShape.remove();
const dimensionLocation = Vector.from(this.blockVolume.getMin());
const dimensionLocation = Vector.from(this.blockVolume.getMin()).add(Vector.from(this.blockVolume.getSpan()).multiply(0.5));
dimensionLocation.dimension = this.dimension;
const boundingBox = new DebugBox(dimensionLocation);
boundingBox.bound = this.blockVolume.getSpan();
Expand Down
2 changes: 1 addition & 1 deletion Canopy [BP]/scripts/src/classes/HSSFinder.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class HSSFinder {
const top = this.findStructureTop(dimension, flooredLocation, "minecraft:fortress");
const height = top.y - bottom.y + 1;

const dimensionLocation = bottom;
const dimensionLocation = bottom.add(new Vector(0.5, height * 0.5, 0.5));
dimensionLocation.dimension = dimension;
const box = new DebugBox(dimensionLocation);
box.bound = new Vector(1, height, 1);
Expand Down
Loading
Loading