Skip to content

Commit

Permalink
Merge pull request #38 from ModMaker101/development
Browse files Browse the repository at this point in the history
keeping the weapons in the main
  • Loading branch information
ModMaker101 authored Aug 2, 2024
2 parents 844c239 + b5c7472 commit 25d8706
Show file tree
Hide file tree
Showing 60 changed files with 46 additions and 799 deletions.
3 changes: 0 additions & 3 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@
{
"filter": "run_counter"
},
{
"filter": "minimize"
},
{
"filter": "bump_manifest"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@
"knockback": true,
"semi_random_diff_damage": false,
"destroy_on_hit": true
}
},
"remove_on_hit": {},
"particle_on_hit": {
"particle_type": "iconcrack",
"num_particles": 3,
"on_entity_hit": true,
"on_other_hit": true
}
},
"liquid_inertia": 0.99,
"power": 4,
Expand Down
1 change: 1 addition & 0 deletions packs/BP/nBehavior/items/jutsu/fireball_jutsu.item.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"identifier": "naruto:fireball_jutsu",
"category": "Equipment"
},

"components": {
"minecraft:creative_category": {
"parent": "itemGroup.name.sword"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,24 @@
"texture": "kunai"
},
"minecraft:display_name": {
"value": "Kunai"
"value": "Kunai\n§l----------\nthis is cool"
},
"minecraft:hand_equipped": true,
"minecraft:damage": 3
"minecraft:damage": 3,
"minecraft:on_use": {
"on_use": {
"event": "sound"
}
}
},
"events": {
"sound": {
"run_command": {
"command": [
"playsound kunai @a[x=~,y=~,z=~,r=10]"
]
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"components": {
"minecraft:max_stack_size": 32,
"minecraft:display_name": {
"value": "Shuriken"
"value": "Shuriken\nwhatever you want"
},
"minecraft:icon": {
"texture": "shuriken"
Expand Down
62 changes: 0 additions & 62 deletions packs/BP/nBehavior/scripts/chakra/chakraAPI.js

This file was deleted.

14 changes: 0 additions & 14 deletions packs/BP/nBehavior/scripts/chakra/chakraVisuals.js

This file was deleted.

27 changes: 0 additions & 27 deletions packs/BP/nBehavior/scripts/chakra/jutsuHandler.js

This file was deleted.

19 changes: 11 additions & 8 deletions packs/BP/nBehavior/scripts/main.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
//js files
import "./server.say"
import "./ui/test1"

//chakra


//animations
import { world } from "@minecraft/server";
// Exporting a message to be sent to the player
export let ingMessage = "§lThanks For Downloading §2Minecraft Bedrock §eNaruto Mod";
// Function to send the message to a player
function sendMessageToPlayer(player) {
player.sendMessage(ingMessage);
}
// Listen for the playerSpawn event
world.afterEvents.playerSpawn.subscribe((event) => {
sendMessageToPlayer(event.player);
});
13 changes: 0 additions & 13 deletions packs/BP/nBehavior/scripts/server.say.js

This file was deleted.

60 changes: 0 additions & 60 deletions packs/BP/nBehavior/scripts/ui/test1.js

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion packs/RP/nResource/models/entity/weapons/kunai.geo.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format_version": "1.21.0",
"format_version": "1.12.0",
"minecraft:geometry": [
{
"description": {
Expand Down
File renamed without changes.
28 changes: 8 additions & 20 deletions packs/RP/nResource/sounds/sound_definitions.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,25 @@
}
]
},
"off": {
"max_distance": 64.0,
"ramen": {
"max_distance": 5.0,
"sounds": [
{
"name": "sounds/off",
"name": "sounds/ramen",
"stream": true,
"volume": 0.1,
"load_on_low_memory": true
}
]
},
"blast": {
"max_distance": 64.0,
"kunai": {
"max_distance": 3.0,
"sounds": [
{
"name": "sounds/blast",
"name": "sounds/kunai",
"stream": true,
"volume": 0.1,
"load_on_low_memory": true
"volume": 0.6
}
]
},
"ramen":{
"max_distance": 5.0,
"sounds":[
{
"name":"sounds/ramen",
"stream": true,
"volume":0.1,
"load_on_low_memory":true
}
]
}
}
}
2 changes: 0 additions & 2 deletions weaponspack/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion weaponspack/.mcattributes

This file was deleted.

56 changes: 0 additions & 56 deletions weaponspack/config.json

This file was deleted.

Loading

0 comments on commit 25d8706

Please sign in to comment.