Skip to content

Commit

Permalink
many things
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel99j2 committed Oct 7, 2024
1 parent 8594717 commit c0cebd2
Show file tree
Hide file tree
Showing 86 changed files with 730 additions and 182 deletions.
Binary file removed assets.zip
Binary file not shown.
33 changes: 15 additions & 18 deletions assets/magmanetwork/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,12 @@
"chat.tag.modified": "Message has been modified. Original:",
"chat.tag.not_secure": "Cannot be reported, Courtesy of No Chat Reports",
"chat.tag.system": "Server message.",
"unused!!!!_container.repair.expensive": "Enchantment Cost: 40+",
"death.fell.accident.water": "%1$s died in the most obscure manner",
"death.attack.sonic_boom": "%1$s was obliterated by a sonically-charged shriek from %2$s",
"disconnect.disconnected": "Disconnected",
"disconnect.exceeded_packet_rate": "Exceeded packet rate limit",
"disconnect.genericReason": "%s",
"disconnect.kicked": "Connection Lost",
"disconnect.loginFailedInfo.invalidSession": "Invalid session. Please try again.",
"disconnect.lost": "Connection Lost",
"disconnect.spam": "Kicked for spamming",
"effect.duration.infinite": "**:**",
"filled_map.unknown": "Id #?",
"gui.socialInteractions.tooltip.report.not_reportable": "This player can't be reported, courtesy of No Chat Reports",
"menu.disconnect": "Disconnect",
"multiplayer.disconnect.banned_ip.reason": "%s",
"multiplayer.disconnect.banned.reason": "%s",
"multiplayer.disconnect.generic": "Disconnected",
"multiplayer.disconnect.illegal_characters": "Invalid characters in chat",
"multiplayer.disconnect.kicked": "Kicked by an operator",
"multiplayer.disconnect.server_shutdown": "Server closed\nCheck the discord for more info.",
"multiplayer.unsecureserver.toast": "Welcome",
"multiplayer.unsecureserver.toast.title": "Thanks for joining Magma Network!",
"pack.source.builtin": "built-in",
Expand Down Expand Up @@ -57,7 +43,12 @@
"server.ui.head.8": "\u3c28",
"server.ui.head.9": "\u3c29",
"subtitles.block.copper_door.jammed": "Door Jammed",
"___": "Mod Lang",
"___": "GUI Lang",
"title.magmanetwork.config": "Magma Network Config",
"category.magmanetwork.options": "Options:",
"gui.magmanetwork.minecart_title": "Minecart",
"gui.magmanetwork.name.if-noclip": "No-Clip: %s",
"____": "Mod Lang",
"entity.magmanetwork.firefly": "Firefly",
"item.magmanetwork.firefly_in_a_bottle": "Firefly in a bottle",
"entity.magmanetwork.blast_furnace_minecart": "Minecart with Blast Furnace",
Expand All @@ -81,8 +72,6 @@
"category.magmanetwork.keybinds": "Magma Network",
"key.magmanetwork.dash": "Dash",
"subtitles.block.note_block.fart": "Fart Block Farts!",
"gui.magmanetwork.minecart_title": "Minecart",
"gui.magmanetwork.name.if-noclip": "No-Clip: %s",
"block.magmanetwork.sleeping_bag": "Sleeping Bag",
"block.magmanetwork.blackstone_piston": "Blackstone Piston",
"block.magmanetwork.blackstone_sticky_piston": "Blackstone Sticky Piston",
Expand All @@ -91,5 +80,13 @@
"item.magmanetwork.gun": "Gun",
"subtitles.item.gun.fire": "Gun fires",
"subtitles.item.gun.reload": "Gun reloads",
"entity.magmanetwork.bullet": "Bullet"
"entity.magmanetwork.bullet": "Bullet",
"item.magmanetwork.north_compass": "North Compass",
"item.magmanetwork.pipe_bomb": "Pipe Bomb",
"effect.magmanetwork.milk": "Milk",
"item.minecraft.potion.effect.milk": "Milk Bottle",
"item.minecraft.splash_potion.effect.milk": "Splash Milk Bottle",
"item.minecraft.lingering_potion.effect.milk": "Lingering Milk Bottle",
"item.minecraft.tipped_arrow.effect.milk": "Milk-Tipped Arrow",
"entity.magmanetwork.crate": "Crate"
}
39 changes: 39 additions & 0 deletions assets/magmanetwork/models/item/server/beacon/beam1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"credit": "Made by Daniel99j, with Blockbench",
"textures": {
"0": "magmanetwork:item/server/invisible",
"3": "magmanetwork:item/server/beacon_beam_outline",
"particle": "magmanetwork:item/server/invisible",
"layer2": "magmanetwork:item/server/beacon_beam"
},
"ambientocclusion": false,
"elements": [
{
"from": [6, 0, 6],
"to": [10, 16, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#layer2", "tintindex": 1},
"east": {"uv": [0, 0, 16, 16], "texture": "#layer2", "tintindex": 1},
"south": {"uv": [0, 0, 16, 16], "texture": "#layer2", "tintindex": 1},
"west": {"uv": [0, 0, 16, 16], "texture": "#layer2", "tintindex": 1},
"up": {"uv": [12, 4, 8, 0], "texture": "#0"},
"down": {"uv": [12, 4, 8, 8], "texture": "#0"}
}
},
{
"name": "cube_outline",
"from": [12, 16, 12],
"to": [4, 0, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 4]},
"faces": {
"north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"},
"east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"},
"south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"},
"west": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"},
"up": {"uv": [12, 4, 8, 8], "rotation": 180, "texture": "#0"},
"down": {"uv": [12, 4, 8, 0], "rotation": 180, "texture": "#0"}
}
}
]
}
129 changes: 0 additions & 129 deletions assets/magmanetwork/models/item/server/blast_furnace_minecart.json

This file was deleted.

4 changes: 2 additions & 2 deletions assets/magmanetwork/models/item/server/gun.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,10 @@
"translation": [0, 5.5, -1]
},
"firstperson_righthand": {
"translation": [0, 3.5, 0]
"translation": [-9, 5.75, 0]
},
"firstperson_lefthand": {
"translation": [0, 3.5, 0]
"translation": [-9, 5.75, 0]
},
"ground": {
"translation": [0, 5, 0]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_00"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_01"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_02"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_03"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_04"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_05"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_06"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_07"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_08"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_09"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_10"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_11"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_12"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_13"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_14"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_15"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_16"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_17"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_18"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_19"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "magmanetwork:item/server/north_compass/north_compass_20"
}
}
Loading

0 comments on commit c0cebd2

Please sign in to comment.