Equipment Overhaul

.github/workflows/code_quality.yml

@@ -0,0 +1,20 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  qodana:
+    timeout-minutes: 45
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2023.1.6
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

.gitignore

@@ -20,3 +20,24 @@ build
 
 # Forge
 run
+
+# Dependencies
+node_modules
+
+# Production
+build
+
+# Generated files
+.docusaurus
+.cache-loader
+
+# Misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

Changelog.md

@@ -11,6 +11,10 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
 
 **If you are upgrading from either Vic's Modern Warfare or Modern Warfare Cubed Version 0.1-Dev-6 or under all Modern Warfare related item, blocks weapons etc... will disappear from your save either back up your world or start a new one.**
 
+**When updating to this version from an existing world all tan variants of every back as well as the F5 Switchblade will disappear, they aren't being removed then just changed internally**
+
+**When updating to this version from an existing world all equipment placed in the equipment inventory will disappear 
+
 ### Highlight
 
 ### Added
@@ -20,6 +24,12 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
   - penetratesGlass
   - explosionBreak
   - penetrableBlocks
+  - knockbackOnHi
+  - hipFireSpread
+  - ammoCounterX 
+  - ammoCounterY
+  - ammoCounterSize 
+  - ammoCounterBackgroundReverse
 - Durability to all vests as a temporary measure to resolve vest-related issues
 - Smelting of sulfur into gunpowder
 - .50 AE in the Ammo Press
@@ -28,19 +38,23 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
 - Weapon system version to weapon tooltips
 - Added the Workbench and the Ammo Press to the Creative Tab
 - Translations for Chinese, Spanish, and Turkish languages
-- GitHub URL in `mcmod.info`
+- GitHub URL in `MCmod.info`
 - Proning in single player mode (**Note: Currently unanimated; player will appear standing**)
+- Added keybindings to switching cameras on the tablet
 
 ### Changed
 
-- Overhauled textures of AAC Honey Badger, Beowulf, HK 417, M16A1 and the pink camo skin
+- Overhauled textures of AAC Honey Badger, Beowulf, HK 417, M16A1, 100rnd 5.56x45mm NATO STANAG Drum Magazine and the pink camo skin
+- Overhauled the texture of the Leupold Scope, EOTech Holographic A65 Sight, Aim Point Comp M5 Sight, OKP-7 Sight, Bijia Reflex Sight, RMR Sight and Eotech Hybrid HHS™ II Sight
+- Overhauled animations and sound effects of the M40A6 and Uzi
+- You can now carry sidearms in carryable inventories
 - Reworked the config system:
   - Old XML config has been removed, and all configs have been consolidated into a new JSON config. Issues with some non-functioning configs have been resolved
   - Adjusted craftingmappings.json to now only override recipes, rather than removing all recipes
 - Temporarily nerfed all vests as a part of vest problem mitigation
 - Nerfed XP gains from smelting ores
 - Reloading now only stops once the gun is fully reloaded or no compatible ammunition remains in inventory
-- Players in creative mode can now reload without the need for ammunition or magazine (The highest capacity magazine will be selected for weapons with multiple compatible magazines)
+- Players in creative mode can now reload without the need for ammunition or magazine (The highest capacity magazine will be selected for weapons with multiple compatible magazines) this can be bypassed by sneaking
 - Grenades in creative mode are now infinite 
 - Expanded crafting to accommodate any type of planks
 - Weapons are now rendered in 3D in the inventory, this means that there will be a small freeze when first opening the Creative Menu this will be improved over time as we optimize rendering
@@ -57,12 +71,29 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
   - Cactus
   - Cake
 - Bullets collision has been enhanced to work compatibly with mods
-- Updated `mcmod.info` description and credits
+- Updated `MCmod.info` description and credits
 - Migrated the config setting for bullets breaking glass into the new config file (ModernWarfareCubed.cfg)
 - Forge configuration `Emissive Item Rendering` is now forced to be off (This does not influence Optifine emissive item rendering)
+- OptiFine configuration `Fast Render` is now forced to be off
+- Changed categories of some weapons
+- Magazines are created empty
+- Shells life go increased 1606% no performance impact in extreme cases
+- The position of the bullet when shooting is now centered when aiming
+- Explosive projectiles are now linked to the player who launched them meaning that the kill message will say who killed whom
+- Renamed `Armor` creative tab to `Equipment`
+- Renamed `Ammunition` creative tab to `Ammunition & Magazines`
+- Renamed `Grenades` creative tab to `Throwables`
+- Renamed `MWC Camera` and `MWC Tablet` to `Camera` and `Tablet`
+- When a thrown camera hits the ground it now only drops the camera item if the thrower is not in creative mode
+- Merged the Gadget creative tab into the `Equipment` creative tab
+- Debug commands are now only accessible to oped players (Oped of level 4)
+- Rewritten the rendering system, items are now positions correctly everywhere
 
 ### Fixed
 
+- Fixed entity generation issue (now modifying the entity's health and generation rate requires restarting the game)
+- Fixed Minecraft armor making you invulnerable to bullet (less realistic, but they aren't anyway lol)
+- Fixed soldiers and terrorists spawning with Minecraft armor
 - Fixed issue with config for bullets breaking glass being ignored
 - Fixed bullet's being able to penetrate:
   - Glass
@@ -75,10 +106,17 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
 - Fixed crashes caused by certain shaders
 - Fixed duplication issues related to copper, gunpowder, and ammo
 - Fixed a problem where the carryable inventory tab was shifting the entire inventory to the left for no reasons
+- Fixed turrets spawning without weapons
+- Fixed 7.62x54mm SVD magazine using 7.62x39mm bullets
+- Fixed 3rd person hovering weapons such as the MP7, CZ-805 Bren, and Python and Taurus revolvers
+- Fixed visual bugs for weapons like FN F2000 when aiming the gun, M4A1 with "M16 Stock", Malyuk with grip accessories, beowulf50Cal with m38 front sight, revolver related accessories and general bipod adjustments on weapons
+- Fixed the attachment of the Long Deagle
+- Fixed position of the backpacks in inventory
 
 ### Removed
 
 - Removed all arcade guns (These will be moved to a sister mod at a later time)
+- Removed the SA80
 - Removed the mission system
 - Removed most of the compatibility layer
 - Removed FXAA
@@ -87,6 +125,7 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
 ### Optimization
 
 - As a result of a BIG code cleanup MWC as a whole should now be slightly faster, load slightly faster and use slightly less resources
+- As a result of the equipment overhaul MWC should use less ram and lag less when rendering equipment
 - Losslessly compressed assets as a result the jar size decreased (35.3MB -> 27.57MB)
 - Improved ShaderLoader
 - Reduced overhead due to the removal of most of the compatibility layer leading to increased performance

README.md

@@ -7,7 +7,7 @@
     <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg">
   </a>
 
-  <a href="https://www.curseforge.com/minecraft/mc-mods/modern-warfare-cubed">
+  <a href="https://www.curseforge.com/minecraft/MC-mods/modern-warfare-cubed">
     <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/curseforge_vector.svg">
   </a>
 

assets/templates/EquipmentTemplate.bbmodel

@@ -0,0 +1 @@
+{"meta":{"format_version":"4.5","model_format":"modded_entity","box_uv":true},"name":"EquipmentTemplate","model_identifier":"EquipmentTemplate","modded_entity_version":"1.12","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":64},"elements":[{"name":"head","box_uv":true,"rescale":false,"locked":false,"from":[-4,24,-4],"to":[4,32,4],"autouv":0,"color":0,"origin":[0,0,0],"faces":{"north":{"uv":[8,8,16,16],"texture":0},"east":{"uv":[0,8,8,16],"texture":0},"south":{"uv":[24,8,32,16],"texture":0},"west":{"uv":[16,8,24,16],"texture":0},"up":{"uv":[16,8,8,0],"texture":0},"down":{"uv":[24,0,16,8],"texture":0}},"type":"cube","uuid":"6f13f891-06cf-e19a-5bfb-4021d04628a1"},{"name":"headWear","box_uv":true,"rescale":false,"locked":false,"from":[-4,25,-4],"to":[4,33,4],"autouv":0,"color":0,"visibility":false,"inflate":0.5,"origin":[0,0,0],"uv_offset":[32,0],"faces":{"north":{"uv":[40,8,48,16],"texture":0},"east":{"uv":[32,8,40,16],"texture":0},"south":{"uv":[56,8,64,16],"texture":0},"west":{"uv":[48,8,56,16],"texture":0},"up":{"uv":[48,8,40,0],"texture":0},"down":{"uv":[56,0,48,8],"texture":0}},"type":"cube","uuid":"a5d11f97-9622-a4a1-06ca-dfd77e930c07"},{"name":"body","box_uv":true,"rescale":false,"locked":false,"from":[-4,12,-2],"to":[4,24,2],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[16,16],"faces":{"north":{"uv":[20,20,28,32],"texture":0},"east":{"uv":[16,20,20,32],"texture":0},"south":{"uv":[32,20,40,32],"texture":0},"west":{"uv":[28,20,32,32],"texture":0},"up":{"uv":[28,20,20,16],"texture":0},"down":{"uv":[36,16,28,20],"texture":0}},"type":"cube","uuid":"95618d67-2d8c-401f-67bb-feb15100ac3a"},{"name":"rightArm","box_uv":true,"rescale":false,"locked":false,"from":[4,12,-2],"to":[8,24,2],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[40,16],"faces":{"north":{"uv":[44,20,48,32],"texture":0},"east":{"uv":[40,20,44,32],"texture":0},"south":{"uv":[52,20,56,32],"texture":0},"west":{"uv":[48,20,52,32],"texture":0},"up":{"uv":[48,20,44,16],"texture":0},"down":{"uv":[52,16,48,20],"texture":0}},"type":"cube","uuid":"8cd81bdd-5399-67ca-d25c-4274e1ad8362"},{"name":"leftArm","box_uv":true,"rescale":false,"locked":false,"from":[-8,12,-2],"to":[-4,24,2],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[32,48],"faces":{"north":{"uv":[36,52,40,64],"texture":0},"east":{"uv":[32,52,36,64],"texture":0},"south":{"uv":[44,52,48,64],"texture":0},"west":{"uv":[40,52,44,64],"texture":0},"up":{"uv":[40,52,36,48],"texture":0},"down":{"uv":[44,48,40,52],"texture":0}},"type":"cube","uuid":"d9f37c22-f200-492b-108e-c459fd121f54"},{"name":"rightLeg","box_uv":true,"rescale":false,"locked":false,"from":[-0.10000000000000009,0,-2],"to":[3.9,12,2],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[0,16],"faces":{"north":{"uv":[4,20,8,32],"texture":0},"east":{"uv":[0,20,4,32],"texture":0},"south":{"uv":[12,20,16,32],"texture":0},"west":{"uv":[8,20,12,32],"texture":0},"up":{"uv":[8,20,4,16],"texture":0},"down":{"uv":[12,16,8,20],"texture":0}},"type":"cube","uuid":"2eabc46d-9723-871c-b121-fb35c75575dd"},{"name":"leftLeg","box_uv":true,"rescale":false,"locked":false,"from":[-3.9,0,-2],"to":[0.10000000000000009,12,2],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[16,48],"faces":{"north":{"uv":[20,52,24,64],"texture":0},"east":{"uv":[16,52,20,64],"texture":0},"south":{"uv":[28,52,32,64],"texture":0},"west":{"uv":[24,52,28,64],"texture":0},"up":{"uv":[24,52,20,48],"texture":0},"down":{"uv":[28,48,24,52],"texture":0}},"type":"cube","uuid":"ddb08cd6-d76c-355b-1d7a-c4b17f35481d"}],"outliner":[{"name":"head","origin":[0,24,0],"color":0,"uuid":"2365b5dc-bc75-24fb-74f1-9dc4d2761bb7","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["6f13f891-06cf-e19a-5bfb-4021d04628a1","a5d11f97-9622-a4a1-06ca-dfd77e930c07"]},{"name":"body","origin":[0,24,0],"color":0,"uuid":"89f77902-1712-be95-a53b-1edf2dcbead0","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["95618d67-2d8c-401f-67bb-feb15100ac3a"]},{"name":"rightArm","origin":[5,22,0],"color":0,"uuid":"d7446aad-8dba-ba18-4d47-78bac08d3eed","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["8cd81bdd-5399-67ca-d25c-4274e1ad8362"]},{"name":"leftArm","origin":[-5,22,0],"color":0,"uuid":"f58329b8-5a6a-c285-648e-759b9db5e470","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["d9f37c22-f200-492b-108e-c459fd121f54"]},{"name":"rightLeg","origin":[1.9,12,0],"color":0,"uuid":"9f24cee6-053f-66d3-aa0c-fb770ec089eb","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["2eabc46d-9723-871c-b121-fb35c75575dd"]},{"name":"leftLeg","origin":[-1.9,12,0],"color":0,"uuid":"ee41adbe-dca2-bbd6-a4d0-111e604100be","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["ddb08cd6-d76c-355b-1d7a-c4b17f35481d"]}],"textures":[{"path":"","name":"steve.png","folder":"","namespace":"","id":"0","particle":false,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":false,"uuid":"5d951001-6952-6c63-3ca2-275a5aea8f0e","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAidJREFUeF7tW71KxEAQ3oCgkN4LRERR8AFsrre0s/ER7H0O7wqtrO4JtPIhDsHuGkHwBwM5sb3CSlmSg9y47mTdLLtJvmuumGQz+fab2W+ys5Fgfnez12/dJZPRlXaEm8lFxD3Dp511TgIw3N9S+jh9ehcSgHSQKO3ZPBcAAAxACLBhhhzgEQF2dpAEu74MHuUj7TqfzM60BL2+v9Ta104/tfaNvTHLQpcREkkAhoNN9To//xASgJ0kVtpf8oWQAMS720r74vlNSADW0wOl/St7FACgDQw4PywYcJsVE3mSFv/jh54woPcAIAd0PQnqlpnOL4P05Wn9T+t9rrx1/f3A1j/6vr9ESFX60nq/Tn3vWjrb+gcACAJKBlSv6XwI0FqAJj2q9am2P45LVVSiZpo0uVqBG5/zj5PaK7XAlGh/qvWptpdaXjq4rCXo/TTeuPHo9dz43Hh1ag0AUK0GwQCEwGr9XyfGkAOQBLEKYBmEDig/qrZWCFUVWO+ksMtv7m0Y2+umRAgAAYAQZsGnD2CAT/RDeDYYEMIs+PQBDPCJfgjPBgNCmAWfPoABPtEP4dlgQAiz4NOHxhlgu39ve78pmE4AWJ4vsO0v+M/9AMAQAScMaLK/wLQ/wfD9hTUArvsLbPf/OUAaAeCvfQHbvcU693MNEACAQQAM4CjC2V02WCAEyHkEVY8ScoDleQPkAC7GOTtyQOXMUdNdZkiCbUmCLvsLXEvhH3DxfIynINy/AAAAAElFTkSuQmCC"}]}