Revert "Merge branch 'next' into main"

This reverts commit 1194e78, reversing
changes made to 2aa5f8d.

.gitignore

@@ -41,3 +41,4 @@ build
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+

Changelog.md

@@ -11,10 +11,6 @@ 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 items, 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
@@ -24,50 +20,39 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
   - penetratesGlass
   - explosionBreak
   - penetrableBlocks
-  - knockbackOnHit
+  - knockbackOnHi
+  - hipFireSpread
   - ammoCounterX 
   - ammoCounterY
   - ammoCounterSize
   - ammoCounterBackgroundReverse
-- New BalancePackage Configuration: (You need to regenerate a balance package and modify it again)
-  - inaccuracy
-  - hipFireSpread
-  - hipFireSpreadMultiplier
 - Durability to all vests as a temporary measure to resolve vest-related issues
 - Smelting of sulfur into gunpowder
 - .50 AE in the Ammo Press
-- Crafting recipes for the APC9, M1014, Supernova and tactical night vision goggles
+- Crafting recipes for the M1014, Supernova and tactical night vision goggles
 - Crafting of grenades (excluding gas grenade) in the ammo press (Once overhauled, they will be moved on the workbench)
 - 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**)
-- Custom death Messages when shot with a gun
-- Added status messages for `No ammunition`, `No magazine`, `Tracking`, `Firearm mode`, `Zoom` and `Explodes in`
-- Added the .277 FURY bullet for the NGSW-R
-- Browning Auto 5 now ejects shotgun shells 
-- Added `reconcileAmmunition` & `reconcileAttachments` gamerules, they are true by default and should only be used for debugging purposes, for example, when you have weapons that appear to "desync" / glitch out
-- Added small delay to inputs after closing a GUI to prevent accidentally shooting weapons
-- Added the gold and dark color variants of the Desert Eagle
-- Added Hardness values to props
+- Shells life got increased to 1606 with no performance impact in extreme cases
 
 ### Changed
 
-- Overhauled the textures of the AAC Honey Badger, Bushmaster ACR, Beowulf, AUG, Remington 870, AS-50, S7-10, M79, HK 417, M16A1, FN F2000, 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, OKP-7 Sight, and Eotech Hybrid HHS™ II Sight
+- Overhauled textures of AAC Honey Badger, Bushmaster ACR, Beowulf, HK 417, M16A1, 100rnd 5.56x45mm NATO STANAG Drum Magazine and the pink camo skin
 - Overhauled animations and sound effects of the M40A6 and Uzi
-- Sidearms can now be carried in backpacks
-- Added keybindings to switching cameras on the tablet
+- 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
 - 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
+  - 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), this can be bypassed by sneaking
+- 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 
-- Weapons are now rendered in 3D in the inventory. This means there will be a small freeze when opening the Creative Menu. This will be improved over time as we optimize rendering.
+- 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
 - Reduced the stack size of M202 rockets and RPG7 rockets to 4 and 2, respectively
 - Increased magazine capacity of bandits on Hard difficulty
 - Bullets are now able to penetrate:
@@ -80,36 +65,20 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
   - Redstone Repeaters
   - Cactus
   - Cake
-- Bullets collision has been enhanced to work better with mods
-- Updated `MCmod.info` description and credits
+- Bullets collision has been enhanced to work compatibly with mods
+- 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 positioned correctly everywhere
-- The weapon stats in the modification GUI are now updated instantly
-- Terrorist spawns are now lower by default
-- Flashbangs do not flash trough walls anymore
+- Explosive projectiles are now linked to the player who launched them meaning that the kill message will say who killed whom
 
 ### Fixed
 
-- Fixed modifying the number of bullets through memory
-- Fixed some issues with incorrect weapon shell throwing
-- Fixed the perspective issue with MP7ironsightsstanding
 - Fixed entity generation issue (now modifying the entity's health and generation rate requires restarting the game)
-- Fixed Minecraft armor making you invulnerable to bullets (less realistic, but they aren't anyway lol)
-- Fixed soldiers and terrorists spawning with Minecraft armor
+- Fixed Minecraft armor making you invulnerable to bullets (less realistic but they aren't anyway lol)
 - Fixed issue with config for bullets breaking glass being ignored
 - Fixed bullet's being able to penetrate:
   - Glass
@@ -124,23 +93,8 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
 - 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 visual bugs:
-  - Fixed 3rd person hovering weapons such as the MP7, CZ-805 Bren, and Python and Taurus revolvers
-  - Fixed m249 accessories floating
-  - The P90 is no longer compatible with the bipod and the magazine of the terminator conversion kit has been fixed
-  - Fixed the attachment of the Long Deagle
-  - Fixed m16 stock and m38 front sight on guns like M4A1, Beowulf .50Cal and AR-10
-  - Fixed visual bugs with grips on the m40a6 and Malyuk
-  - Fixed visual bugs with sight on the Taurus
-  - Fixed Stock visual bugs on Origin-12
-  - Fixed sights like PSO-1 and OKP-7 on ak-74 and ak-101
-  - Fixed the visual bugs of the F2000
-  - Adjusted when aiming the HK-P12 with the accessories and re-added the USP Match Compensator accessory
-  - Fixed Bipod in ARX-160
-  - Fixed Vector Stock Adapter
-  - Adjusted slide recoil on m17
-  - Fixed muzzle flash for Dragunov, F2000 and AK-101
-  - Fixed texture bullet
+- 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 and M40A6 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 prop hitboxes not lining up with their models:
   - Fridge (open/closed)
@@ -149,64 +103,27 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
   - Dumpster
   - Sandbag
   - Duel Floodlight
-  - Single Floodlight
-  - Shelf Top
-  - Server Rack Top (left/right)
-  - Laptop
-  - Desk Shelf
-  - Desk Shelf (Alt2)
-  - Impaled Body
-  - Hanging Body
-  - Office Chair
-  - Office Chair 2
-  - Home Chair
-  - White Desk Middle
-  - Medical Create
-  - Camera Rotated
-- Fixed position of the backpacks in inventory
-- Fixed the client ticker "corruption" state
-- Fixed melee attack and heavy melee attack being switched
-- Fixed inputs not updating if you switched to another hotbar slot while holding the input
-- Fixed oreDictionary not working properly under the craftmappings
-- Fixed the height of the Ammo Counter being 1 pixel too high
-- Fixed the flashbang missing sound
-- Fixed the flashbang missing knockback
-- Fixed the flashbang missing particles
-- Fixed flashbang not flashing in every direction
-- Fixed the exposure decreasing on the client side even when the game is paused
-- Fixed spectators being able to shoot weapons
-- Fixed the spawning position of the shells
-- Bullet spawning maths which was making the bullets spawn in inaccurate position
 
 ### Removed
 
-- Removed headshot mechanic; it was currently broken and will come back in the future
 - 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
 - Removed Bloom
-- Deleted broken Hescobastion and UMP45GFL props
-- Removed the vanilla ability to disable shaders with F4 (this allowed for flash to be disabled)
-- Removed the `WIP` status of the flashbang as it is fully usable and reliable
 
 ### 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
-- As a result of networking improvements, MWC should use less bandwidth and consume less resources as well as have less latency
-- Losslessly compressed assets as a result, the jar size decreased (35.3MB -> 27.57MB)
+- 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
+- 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
-- Overhauled the networking, MWC as a whole should be more responsive and use less bandwidth
-- Optimized a majority of the models as a result,the jar size decreased (27.57MB -> 21.55MB)
 
 ### Internal
 
 - Switched to [Raven](https://github.com/eigenraven) amazing [RetroFuturaGradle](https://github.com/GTNewHorizons/RetroFuturaGradle)
-- Now uses Red Core
-- Updated to Gradle 8.2
+- Updated to Gradle 8.1.1
 - Cleaned up build.gradle & gradle.properties
 - Gradle now automatically updates the version and id in `ModReference.java`
 - Updated Forge version
@@ -217,14 +134,6 @@ and this project follows to [Ragnarök Versioning Convention](https://gist.githu
 - [WIP] Renamed unintelligible variables to more readable names
 - Overhauled the internal process of item and block creation
 - Changed name and mod id
-- Overhauled the networking
-
-### Balance Pack
-
-The new balance pack manager version is `1.3`. 
-
-- Added `inaccuracy`
-- Removed `headshotMultiplier`
 
 ##### Credits
 
@@ -239,8 +148,8 @@ The whole official Modern Warfare Dev Team:
 
 And the people who contributed to Modern Warfare Cubed:
 - [AhmedKrm](https://github.com/AhmedKrm) for Turkish translation ([#107](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/107))
-- [Braiam23](https://github.com/Braiam23) for revamping textures, Spanish translation, fix various visual bugs & model optimization ([#100](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/100), [#110](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/110), [#222](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/222), [#239](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/239)),
+- [Braiam23](https://github.com/Braiam23) for revamping textures & Spanish translation ([#100](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/100), [#110](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/110))
 - [strubium](https://github.com/strubium) for adding recipes & nerfs & crafting improvements & revamping textures ([#117](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/117), [#109](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/109), [#116](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/116), [#92](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/92), [#115](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/115), [#97](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/97))
 - [Skyy](https://github.com/BurnhamR) for losslessly compressing assets & major refactors ([#53](https://github.com/Paneedah/paneedah-modern-warfare/pull/53), [#55](https://github.com/Paneedah/paneedah-modern-warfare/pull/55), [#59](https://github.com/Paneedah/paneedah-modern-warfare/pull/59), [#58](https://github.com/Paneedah/paneedah-modern-warfare/pull/58))
-- [notdeadpool456](https://github.com/notdeadpool456) for adding the .277 FURY bullet, crafting recipes & nerfs ([#75](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/75), [#76](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/76))
+- [notdeadpool456](https://github.com/notdeadpool456) for adding crafting recipes & nerfs ([#75](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/75), [#76](https://github.com/Cubed-Development/Modern-Warfare-Cubed/pull/76))
 - [333mhz](https://github.com/333mhz) for corrections in the English translation & adding blocks to the creative tab & cleanup

build.gradle

@@ -6,8 +6,6 @@ plugins {
     id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7'
     id 'com.gtnewhorizons.retrofuturagradle' version '1.+'
     id 'com.matthewprenger.cursegradle' version '1.4.0'
-    id 'me.champeau.jmh' version '0.7.2'
-    id 'io.freefair.lombok' version '8.4'
 }
 
 // Add version to the jar name
@@ -34,7 +32,7 @@ minecraft {
 
     username = 'Desoroxxx'
 
-    extraRunJvmArguments.addAll('-Xmx4G', '-Xms4G', '-Dforge.logging.console.level=debug', '-Dmixin.hotSwap=true', '-Dmixin.checks.interfaces=true', '-Dmixin.debug.export=true', '-Dfml.coreMods.load=com.paneedah.mwc.asm.MWCPlugin')
+    extraRunJvmArguments.addAll('-Xmx4G', '-Xms4G', '-Dforge.logging.console.level=debug', '-Dmixin.hotSwap=true', '-Dmixin.checks.interfaces=true', '-Dmixin.debug.export=true')
 
     injectedTags.put('ID', project.id)
     injectedTags.put('VERSION', project.version)
@@ -67,26 +65,17 @@ repositories {
 }
 
 dependencies {
-    implementation 'Red-Studio-Ragnarok:Red-Core:0.4-Dev-2'
-    sources 'Red-Studio-Ragnarok:Red-Core:0.4-Dev-2:sources@jar'
+    implementation 'Red-Studio-Ragnarok:Red-Core:0.2'
+    sources 'Red-Studio-Ragnarok:Red-Core:0.2:sources@jar'
 
-    jmh 'org.openjdk.jmh:jmh-core:1.36'
-    jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.36'
-
-    final String mixin = modUtils.enableMixins('zone.rong:mixinbooter:8.4', "mixins.${project.id}.refmap.json")
+    String mixin = modUtils.enableMixins('zone.rong:mixinbooter:8.3', "mixins.${project.id}.refmap.json")
     api (mixin) { transitive = false }
     annotationProcessor 'org.ow2.asm:asm-debug-all:5.2'
     annotationProcessor 'com.google.guava:guava:24.1.1-jre'
     annotationProcessor 'com.google.code.gson:gson:2.8.6'
     annotationProcessor (mixin) { transitive = false }
 }
 
-jmh {
-    warmupIterations = 5
-    iterations = 10
-    fork = 1
-}
-
 def at = project.files("src/main/resources/META-INF/${project.id}_at.cfg")
 
 tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(at)
@@ -119,7 +108,7 @@ jar {
     manifest.attributes([
             'ModSide': 'BOTH',
             'FMLAT': "${project.id}_at.cfg",
-            'FMLCorePlugin': "com.paneedah.mwc.asm.MWCPlugin",
+            'FMLCorePlugin': "com.paneedah.weaponlib.core.WeaponlibCorePlugin",
             'FMLCorePluginContainsFMLMod': 'true',
             'ForceLoadAsMod': 'true'
     ])

gradle.properties

@@ -9,4 +9,4 @@ org.gradle.caching = true
 # Mod Constants
 # Versioning must follow Ragnarök versioning convention: https://shor.cz/ragnarok_versioning_convention
 id = mwc
-version = 0.1-Dev-15
+version = 0.1-Dev-14

qodana.yaml

@@ -1,11 +1,8 @@
 version: "1.0"
-linter: jetbrains/qodana-jvm-community:2023.2
+linter: jetbrains/qodana-jvm-community:2023.1
 profile:
   name: qodana.recommended
-fixesStrategy: cleanup
 include:
-  - name: VulnerableLibrariesGlobal
-  - name: CheckDependencyLicenses
   - name: DuplicateBranchesInSwitch
   - name: CommentedOutCode
   - name: UnnecessaryModifier
@@ -34,8 +31,6 @@ include:
   - name: ManualMinMaxCalculation
   - name: FinalStaticMethod
 exclude:
-  - name: QodanaSanity
-  - name: JavadocReference
   - name: All
     paths:
       - src/main/java/com/paneedah/mwc/models

settings.gradle

@@ -18,5 +18,5 @@ pluginManagement {
 
 plugins {
     // Automatic toolchain provisioning
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
 }