Merge pull request #15 from 1whohears/1.19-dev

1.19 back port

Author: 1whohears

.gitattributes

@@ -3,3 +3,8 @@
 # are changed when only line endings change.
 src/generated/**/.cache/cache text eol=lf
 src/generated/**/*.json text eol=lf
+
+# ignore these files in merges
+build.gradle merge=ours
+src/main/resources/META-INF/mods.toml merge=ours
+$ git config --global merge.ours.driver true

.gitignore

@@ -25,3 +25,4 @@ build
 *.bak
 *.launch
 **/run/
+aoa_graphs/~$aoa_graphs.xlsx

README.md

@@ -1,62 +1,16 @@
+![2022-12-17_02 14 55](https://user-images.githubusercontent.com/79810154/208233270-e5a64a83-4427-475c-98bf-ee6c61a3649d.png)
+
 # Diamond Star Combat
 
-A Minecraft Aircraft Combat mod inspired by Mcheli. Planes, Radars, Missiles, Explosions! Customize your vehicle's weapon loadout. You can use a radar to shoot a missile at a target beyond your render distance. Shoot heat seeking missiles at nearby planes and use flares to defend yourself in dynamic dog fights. Use uhh...real life inspired flight physics to pull of baller maneuvers. Or shoot laser guided bombs at enemies on the ground. 
+A Minecraft Aircraft Combat mod inspired by Mcheli. Planes, Radars, Missiles, Explosions! Customize your vehicle's weapon loadout. You can use a radar to shoot a missile at a target beyond your render distance. 
+Shoot heat seeking missiles at nearby planes and use flares to defend yourself in dynamic dog fights. Use semi-realistic flight physics to perform epic maneuvers, or shoot laser guided bombs at enemies on the ground. 
+
+Please go to the __**[WIKI](https://github.com/1whohears/DiamondStarCombat/wiki)**__ for ***Controls*** and other information!
 
-Join the discord for development updates and let me know if you want to contribute to the project. Scroll down for a few words I have on contributing.
+Join the discord for development updates. Additionally, I appreciate any and all feedback and discord is the best way to send me some! Also definetly join if you'd like to contribute to the mod!
 
 https://discord.gg/dWgQTRxCJm
 
-Check out my channel where I'll post guides and other videos showing of the mod! 
+Check out my youtube where I'll post guides and other videos showing the mod! 
 
 https://youtu.be/P4Flz0XOtTk
-
-![2022-12-17_02 14 55](https://user-images.githubusercontent.com/79810154/208233270-e5a64a83-4427-475c-98bf-ee6c61a3649d.png)
-
-## Controls
-
-Here are the flight control keys by default.
-
-- Yaw Left/Right = A/D
-- Pitch Up/Down = W/S
-- Roll Left/Right = Left/Right Arrow Keys
-- Throttle Up/Down = Up/Down Arrow Keys
-
-When you first get in a plane you are in free look mode. Which means when you move the mouse, the camera changes direction. You may notice that it's annoying to switch hands between the mouse and the arrow keys. That is why I added this next key. 
-
-- Flip Controls = Left Alt
-
-If the controls are kept at default then pressing Left Alt swaps WASD with the arrow keys. So while holding Left Alt, W is Throttle Up, A is Roll left, and the Down Arrow is Pitch Down for example. This allows the pilot to quickly roll or change throttle without moving your hands. 
-
-There is one more condition where controls gets swapped and that is switching to mouse mode.
-
-- Mouse Mode = Left Control
-
-Now the movements of your mouse are mapped to Pitch and Yaw and WASD control Throttle and Roll. 
-
-Other Controls
-
-- Switch Seat = ;
-- Switch Weapon = G
-- Flare = V
-- Landing Gear = L
-- Open Plane Inventory = U
-- Center Mouse = Right Alt
-- Special (Breaks/Hover) = Space
-
-## Parts System
-
-If the aircraft is on the ground you can press the Plane Menu Button which is U by default. This allows you to add/remove/customize the plane's internal parts. You theoretically give any aircraft any weapon load out. You can also customize the radars, fuel tanks, and engines. However every part has weight and if you make your aircraft too heavy it may not get of the ground or be prone to drop out of the sky during turns. 
-
-## Still Beta Contribute Please
-
-This mod is far from finished. Most of the core for the mod is complete. However, there is still a lot of work to do, and I can't do everything. I believe this project could be so much more if others help develope it. So here is an incomplete list of stuff I want to add and would appreciate assistance. Please let me know in the discord server if you plan on contributing. I or someone else may already be working on your idea and we'd be happy to have an extra keyboard! Also note this list is not static or final, and if you think of something that's not here let me know!
-
-- I will be adding comments around the mod in an attempt to explain how it works. 
-- I want to add more planes, helicopters, cars, tanks, boats, anti air defenses and any other vehicle type you think would be cool. Someone better at modeling than me could make an f22, mig 29, the Ornithopter from Dune, or an X-Wing from Star Wars for example. Make what you think would be cool!
-- My item textures sorta suck. So similar to the previous point, if someone better than me at making textures wants to redo some of them please.
-- I want to add models for weapons that hang on aircraft wings, so there is another visual component for weapons. 
-- I want to add turret seats so passengers can shoot. 
-- The plane physics are definitely not final. Open to feedback.
-- Open to feedback on anything actually. Did you find a bug. Could certain functions be more efficient? Is my code bad?
-- Pvp balance is something I really want to get right. Let me know if something should be nerfed or buffed. 
-- If you don't want to add your content to the base mod I want it to be easy for developers to make addons for this mod. But I haven't put much thought into it yet because I'm trying to build up the base content for this mod. Let me know if something is making addon development difficult. 

aoa_graphs/aoa_graphs.xlsx

@@ -1,6 +1,5 @@
 buildscript {
     repositories {
-        // These repositories are only for Gradle plugins, put any other repositories in the repository block further below
         maven { url = 'https://maven.minecraftforge.net' }
         maven { url = 'https://maven.parchmentmc.org' }
         mavenCentral()
@@ -13,58 +12,27 @@ buildscript {
 
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
-// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+// DO NOT CHANGE ABOVE
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '0.3.0-1.19'
-group = 'com.onewhohears.dscombat' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = 'dscombat'
+group = 'com.onewhohears.dscombat'
+archivesBaseName = 'dscombat-1.19'
+version = '0.5.6'
 
-// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
-    // The mappings can be changed at any time and must be in the following format.
-    // Channel:   Version:
-    // official   MCVersion             Official field/method names from Mojang mapping files
-    // parchment  YYYY.MM.DD-MCVersion  Open community-sourced parameter names and javadocs layered on top of official
-    //
-    // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
-    // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
-    //
-    // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
-    // Additional setup is needed to use their mappings: https://github.com/ParchmentMC/Parchment/wiki/Getting-Started
-    //
-    // Use non-default mappings at your own risk. They may not always work.
-    // Simply re-run your setup task after changing the mappings to update your workspace.
-    //mappings channel: 'official', version: '1.18.2'
-    mappings channel: 'parchment', version: '1.18.2-2022.08.07-1.19'
-
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
-
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
+    //mappings channel: 'parchment', version: '2022.11.27-1.19.2'
+    mappings channel: 'official', version: '1.19'
+    
     runs {
         client {
             workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            // The markers can be added/remove as needed separated by commas.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
             property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
-
-            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
             property 'forge.enabledGameTestNamespaces', 'dscombat'
-
             mods {
                 dscombat {
                     source sourceSets.main
@@ -74,42 +42,21 @@ minecraft {
 
         server {
             workingDirectory project.file('run')
-
             property 'forge.logging.markers', 'REGISTRIES'
-
             property 'forge.logging.console.level', 'debug'
-
-            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
             property 'forge.enabledGameTestNamespaces', 'dscombat'
-
             mods {
                 dscombat {
                     source sourceSets.main
                 }
             }
         }
 
-        // This run config launches GameTestServer and runs all registered gametests, then exits.
-        // By default, the server will crash when no gametests are provided.
-        // The gametest system is also enabled by default for other run configs under the /test command.
         gameTestServer {
             workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            // The markers can be added/remove as needed separated by commas.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
             property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
-
-            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
             property 'forge.enabledGameTestNamespaces', 'dscombat'
-
             mods {
                 dscombat {
                     source sourceSets.main
@@ -119,14 +66,9 @@ minecraft {
 
         data {
             workingDirectory project.file('run')
-
             property 'forge.logging.markers', 'REGISTRIES'
-
             property 'forge.logging.console.level', 'debug'
-
-            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
             args '--mod', 'dscombat', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
             mods {
                 dscombat {
                     source sourceSets.main
@@ -136,58 +78,30 @@ minecraft {
     }
 }
 
-// Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
-    // Put repositories for dependencies here
-    // ForgeGradle automatically adds the Forge maven and Maven Central for you
-
-    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
-    // flatDir {
-    //     dir 'libs'
-    // }
 }
 
 dependencies {
-    // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft 'net.minecraftforge:forge:1.19-41.1.0'
-
-    // Real mod deobf dependency examples - these get remapped to your current mappings
-    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
-    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
-    // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
-
-    // Examples using mod jars from ./libs
-    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
-
-    // For more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
 }
 
-// Example for how to get properties into the manifest for reading at runtime.
 jar {
-    manifest {
-        attributes([
-                "Specification-Title"     : "dscombat",
-                "Specification-Vendor"    : "dscombatsareus",
-                "Specification-Version"   : "1", // We are version 1 of ourselves
-                "Implementation-Title"    : project.name,
-                "Implementation-Version"  : project.jar.archiveVersion,
-                "Implementation-Vendor"   : "dscombatsareus",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
-    }
+	manifest {
+		attributes([
+        	"Specification-Title"     : "Diamond Star Combat",
+			"Specification-Vendor"    : "1whohears",
+			"Specification-Version"   : version, 
+			"Implementation-Title"    : "Diamond Star Combat",
+			"Implementation-Version"  : version,
+			"Implementation-Vendor"   : "1whohears",
+			"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+		])
+	}
 }
 
-// Example configuration to allow publishing using the maven-publish plugin
-// This is the preferred method to reobfuscate your jar file
 jar.finalizedBy('reobfJar')
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-// publish.dependsOn('reobfJar')
 
 publishing {
     publications {
@@ -203,5 +117,5 @@ publishing {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+    options.encoding = 'UTF-8'
 }