fixed engineer table

Author: RealAntEngineer

src/generated/resources/data/creatingspace/recipe/engine_recipe/exhaust_pack/aerospike.json

@@ -63,7 +63,7 @@
       ]
     }
   ],
-  "transitionalItem": {
+  "transitional_item": {
     "id": "creatingspace:incomplete_exhaust_pack"
   }
 }

src/generated/resources/data/creatingspace/recipe/engine_recipe/exhaust_pack/bell_nozzle.json

@@ -63,7 +63,7 @@
       ]
     }
   ],
-  "transitionalItem": {
+  "transitional_item": {
     "id": "creatingspace:incomplete_exhaust_pack"
   }
 }

src/main/java/com/rae/creatingspace/content/rocket/engine/table/EngineFabricationBlueprint.java

@@ -5,7 +5,6 @@
 import com.rae.creatingspace.content.rocket.engine.design.PropellantType;
 import com.rae.creatingspace.init.MiscInit;
 import com.rae.creatingspace.init.ingameobject.PropellantTypeInit;
-import net.minecraft.core.HolderLookup;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
@@ -15,8 +14,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.component.CustomData;
-import net.minecraft.world.level.Level;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -28,7 +26,7 @@ public EngineFabricationBlueprint(Properties properties) {
     }
 
     @Override
-    public void appendHoverText(ItemStack itemStack, @Nullable TooltipContext context, List<Component> components, TooltipFlag tooltipFlag) {
+    public void appendHoverText(ItemStack itemStack, @NotNull TooltipContext context, @NotNull List<Component> components, @NotNull TooltipFlag tooltipFlag) {
         //TODO make this method static somewhere (repetition for the engine, for the engine blueprint then for every item)
         CustomData data = itemStack.get(DataComponents.CUSTOM_DATA);
         if (data!=null) {
@@ -69,25 +67,23 @@ public ItemStack getBlueprintForEngine(int throatArea, int expansionRatio, int m
         PowerPackType powerPackType = MiscInit.getSyncedPowerPackRegistry().get(powerPackTypeLocation);
         ItemStack defaultInstance = super.getDefaultInstance();
         CustomData data = defaultInstance.get(DataComponents.CUSTOM_DATA);
-        CompoundTag nbt = new CompoundTag();
-        if (data!=null) {
-            nbt = data.copyTag();
-            CompoundTag engineInfo = new CompoundTag();
-            engineInfo.putInt("thrust", thrust);
-            assert exhaustPackType != null;
-            engineInfo.putInt("mass", exhaustPackType.getMass((float) throatArea / 1000, expansionRatio));//size will be defined in the exhaust and powerPack as a coef (0.5 fo reach right now)
-            engineInfo.putFloat("efficiency", efficiency);
-            engineInfo.put("propellantType", ResourceLocation.CODEC.encodeStart(NbtOps.INSTANCE, propellantTypeLocation).getOrThrow());
+        CompoundTag nbt = data==null?new CompoundTag():data.copyTag();
+        CompoundTag engineInfo = new CompoundTag();
+        engineInfo.putInt("thrust", thrust);
+        assert exhaustPackType != null;
+        engineInfo.putInt("mass", exhaustPackType.getMass((float) throatArea / 1000, expansionRatio));//size will be defined in the exhaust and powerPack as a coef (0.5 fo reach right now)
+        engineInfo.putFloat("efficiency", efficiency);
+        engineInfo.put("propellantType", ResourceLocation.CODEC.encodeStart(NbtOps.INSTANCE, propellantTypeLocation).getOrThrow());
+
+        CompoundTag recipeData = new CompoundTag();
+        recipeData.put("exhaustPackType", ResourceLocation.CODEC.encodeStart(NbtOps.INSTANCE, exhaustPackTypeLocation).getOrThrow());
+        recipeData.put("powerPackType", ResourceLocation.CODEC.encodeStart(NbtOps.INSTANCE, powerPackTypeLocation).getOrThrow());
+        recipeData.putInt("size", throatArea);
+        recipeData.putInt("expansionRatio", expansionRatio);
+        recipeData.putInt("materialLevel", materialLevel);
+        nbt.put("blockEntity", engineInfo);
+        nbt.put("engineRecipeData", recipeData);
 
-            CompoundTag recipeData = new CompoundTag();
-            recipeData.put("exhaustPackType", ResourceLocation.CODEC.encodeStart(NbtOps.INSTANCE, exhaustPackTypeLocation).getOrThrow());
-            recipeData.put("powerPackType", ResourceLocation.CODEC.encodeStart(NbtOps.INSTANCE, powerPackTypeLocation).getOrThrow());
-            recipeData.putInt("size", throatArea);
-            recipeData.putInt("expansionRatio", expansionRatio);
-            recipeData.putInt("materialLevel", materialLevel);
-            nbt.put("blockEntity", engineInfo);
-            nbt.put("engineRecipeData", recipeData);
-        }
         defaultInstance.set(DataComponents.CUSTOM_DATA,CustomData.of(nbt));
         return defaultInstance;
     }

src/main/java/com/rae/creatingspace/content/rocket/engine/table/EngineerTableScreen.java

@@ -309,6 +309,7 @@ private void craftEngine(BlockPos blockEntityPos, ResourceLocation propellantTyp
         float efficiency = isp / Objects.requireNonNull(getSyncedPropellantRegistry().get(propellantType)).getMaxISP();
         ItemStack engineBlueprint = ((EngineFabricationBlueprint) ItemInit.ENGINE_BLUEPRINT.get().asItem())
                 .getBlueprintForEngine(engineSizeInput.getState(), expansionRatioSlider.getValueInt(), materialLevel, (int) thrust, efficiency, propellantType, exhaustType, powerPackType);
+        System.out.println(engineBlueprint.getComponents());
         CatnipServices.NETWORK
                 .sendToServer(
                         EngineerTableCraft