-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added firearm system and a firearm, started using geckolib
- Loading branch information
1 parent
ac9ae2a
commit a36b75d
Showing
103 changed files
with
4,722 additions
and
286 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| # Sets default memory used for gradle commands. Can be overridden by user or command line properties. | ||
| # This is required to provide enough memory for the Minecraft decompilation process. | ||
| org.gradle.jvmargs=-Xmx3G | ||
| org.gradle.daemon=true | ||
| org.gradle.daemon=true | ||
| org.gradle.java.home=C:/Program Files/AdoptOpenJDK/jdk-8.0.292.10-hotspot |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/industrialwarfare/models/item/ammo_generic.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "industrialwarfare:item/ammo_large_metal" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/industrialwarfare/models/item/part_bullet.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "industrialwarfare:item/part_bullet" | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
src/generated/resources/assets/industrialwarfare/sounds.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| { | ||
| "item.rifle.cycle_end": { | ||
| "subtitle": "subtitle.industrialwarfare.item.rifle.cycled", | ||
| "sounds": [ | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/cycle_end1", | ||
| "pitch": 0.9, | ||
| "attenuation_distance": 1 | ||
| }, | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/cycle_end1", | ||
| "attenuation_distance": 1 | ||
| }, | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/cycle_end2", | ||
| "pitch": 0.9, | ||
| "attenuation_distance": 1 | ||
| }, | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/cycle_end2", | ||
| "attenuation_distance": 1 | ||
| } | ||
| ] | ||
| }, | ||
| "item.rifle.cycle_start": { | ||
| "subtitle": "subtitle.industrialwarfare.item.rifle.cycled", | ||
| "sounds": [ | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/cycle_start1", | ||
| "pitch": 0.9, | ||
| "attenuation_distance": 1 | ||
| }, | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/cycle_start1", | ||
| "attenuation_distance": 1 | ||
| }, | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/cycle_start2", | ||
| "pitch": 0.9, | ||
| "attenuation_distance": 1 | ||
| }, | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/cycle_start2", | ||
| "attenuation_distance": 1 | ||
| } | ||
| ] | ||
| }, | ||
| "item.rifle.fired": { | ||
| "subtitle": "subtitle.industrialwarfare.item.rifle.fired", | ||
| "sounds": [ | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/fired", | ||
| "volume": 2.0, | ||
| "pitch": 0.8, | ||
| "attenuation_distance": 40 | ||
| }, | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/fired", | ||
| "volume": 2.0, | ||
| "pitch": 0.9, | ||
| "attenuation_distance": 40 | ||
| }, | ||
| { | ||
| "name": "industrialwarfare:firearms/rifle/fired", | ||
| "volume": 2.0, | ||
| "attenuation_distance": 40 | ||
| } | ||
| ] | ||
| } | ||
| } |
59 changes: 59 additions & 0 deletions
59
src/generated/resources/data/industrialwarfare/tags/blocks/shatterable.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "#minecraft:flower_pots", | ||
| "#minecraft:impermeable", | ||
| "#minecraft:ice", | ||
| "#forge:glass", | ||
| "#forge:glass/white", | ||
| "#forge:glass/orange", | ||
| "#forge:glass/magenta", | ||
| "#forge:glass/light_blue", | ||
| "#forge:glass/yellow", | ||
| "#forge:glass/pink", | ||
| "#forge:glass/gray", | ||
| "#forge:glass/light_gray", | ||
| "#forge:glass/colorless", | ||
| "#forge:glass/cyan", | ||
| "#forge:glass/purple", | ||
| "#forge:glass/blue", | ||
| "#forge:glass/brown", | ||
| "#forge:glass/green", | ||
| "#forge:glass/red", | ||
| "#forge:glass/black", | ||
| "#forge:glass_panes", | ||
| "#forge:glass_panes/white", | ||
| "#forge:glass_panes/orange", | ||
| "#forge:glass_panes/magenta", | ||
| "#forge:glass_panes/light_blue", | ||
| "#forge:glass_panes/yellow", | ||
| "#forge:glass_panes/pink", | ||
| "#forge:glass_panes/gray", | ||
| "#forge:glass_panes/light_gray", | ||
| "#forge:glass_panes/colorless", | ||
| "#forge:glass_panes/cyan", | ||
| "#forge:glass_panes/purple", | ||
| "#forge:glass_panes/blue", | ||
| "#forge:glass_panes/brown", | ||
| "#forge:glass_panes/green", | ||
| "#forge:glass_panes/red", | ||
| "#forge:glass_panes/black", | ||
| "minecraft:glass_pane", | ||
| "minecraft:white_stained_glass_pane", | ||
| "minecraft:orange_stained_glass_pane", | ||
| "minecraft:magenta_stained_glass_pane", | ||
| "minecraft:light_blue_stained_glass_pane", | ||
| "minecraft:yellow_stained_glass_pane", | ||
| "minecraft:pink_stained_glass_pane", | ||
| "minecraft:gray_stained_glass_pane", | ||
| "minecraft:light_gray_stained_glass_pane", | ||
| "minecraft:lime_stained_glass_pane", | ||
| "minecraft:cyan_stained_glass_pane", | ||
| "minecraft:purple_stained_glass_pane", | ||
| "minecraft:blue_stained_glass_pane", | ||
| "minecraft:brown_stained_glass_pane", | ||
| "minecraft:green_stained_glass_pane", | ||
| "minecraft:red_stained_glass_pane", | ||
| "minecraft:black_stained_glass_pane" | ||
| ] | ||
| } |
18 changes: 18 additions & 0 deletions
18
src/generated/resources/data/industrialwarfare/tags/items/attachments/firearm/melee.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "#industrialwarfare:entrenching_tools", | ||
| "minecraft:wooden_sword", | ||
| "minecraft:stone_sword", | ||
| "minecraft:iron_sword", | ||
| "minecraft:golden_sword", | ||
| "minecraft:diamond_sword", | ||
| "minecraft:netherite_sword", | ||
| "minecraft:wooden_axe", | ||
| "minecraft:stone_axe", | ||
| "minecraft:iron_axe", | ||
| "minecraft:golden_axe", | ||
| "minecraft:diamond_axe", | ||
| "minecraft:netherite_axe" | ||
| ] | ||
| } |
11 changes: 11 additions & 0 deletions
11
src/generated/resources/data/industrialwarfare/tags/items/entrenching_tools.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "minecraft:wooden_shovel", | ||
| "minecraft:stone_shovel", | ||
| "minecraft:iron_shovel", | ||
| "minecraft:golden_shovel", | ||
| "minecraft:diamond_shovel", | ||
| "minecraft:netherite_shovel" | ||
| ] | ||
| } |
Oops, something went wrong.