Merge pull request #36 from 1whohears/1.19.2-dev

1.19.2 dev v0.8.2

Author: 1whohears

build.gradle

@@ -18,7 +18,7 @@ apply plugin: 'maven-publish'
 
 group = 'com.onewhohears.dscombat'
 archivesBaseName = 'dscombat-1.19.2'
-version = '0.8.1'
+version = '0.8.2'
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 

src/main/java/com/onewhohears/dscombat/entity/aircraft/EntityAircraft.java

@@ -786,9 +786,13 @@ public void addMoment(Vec3 moment, boolean control) {
 		double x = moment.x, y = moment.y, z = moment.z;
 		if (control) {
 			Vec3 av = getAngularVel();
-			x = getControlMomentComponent(m.x, moment.x, av.x, getControlMaxDeltaPitch(), Ix);
+			// FIXME 2 this is causing rotations to not be smooth reverting to origional
+			/*x = getControlMomentComponent(m.x, moment.x, av.x, getControlMaxDeltaPitch(), Ix);
 			y = getControlMomentComponent(m.y, moment.y, av.y, getControlMaxDeltaYaw(), Iy);
-			z = getControlMomentComponent(m.z, moment.z, av.z, getControlMaxDeltaRoll(), Iz);
+			z = getControlMomentComponent(m.z, moment.z, av.z, getControlMaxDeltaRoll(), Iz);*/
+			x = getControlMomentComponent(m.x, moment.x, av.x, getMaxDeltaPitch(), Ix);
+			y = getControlMomentComponent(m.y, moment.y, av.y, getMaxDeltaYaw(), Iy);
+			z = getControlMomentComponent(m.z, moment.z, av.z, getMaxDeltaRoll(), Iz);
 		}
 		setMoment(m.add(x, y, z));
 	}

src/main/resources/data/dscombat/recipes/bomb_rack.json

@@ -2,7 +2,7 @@
 	"type": "minecraft:crafting_shaped",
 	"key": {
 		"L": {
-			"item": "minecraft:level"
+			"item": "minecraft:lever"
 		},
 		"D": {
 			"item": "minecraft:dropper"

src/main/resources/data/dscombat/recipes/heavy_fuel_tank.json

@@ -8,7 +8,7 @@
 			"item": "minecraft:smooth_stone"
 		},
 		"C": {
-			"item": "dscombat:cauldron"
+			"item": "minecraft:cauldron"
 		}
 	},
 	"pattern": [

src/main/resources/data/dscombat/recipes/large_propeller.json

@@ -4,9 +4,6 @@
 		"P": {
 			"item": "dscombat:propeller"
 		},
-		"B": {
-			"item": "minecraft:iron_block"
-		},
 		"I": {
 			"item": "minecraft:iron_ingot"
 		}