fixed engineer table crash

Author: RealAntEngineer

diagram.uml

@@ -33,6 +33,8 @@
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.AddReloadListenerEvent;
 import net.neoforged.neoforge.registries.DataPackRegistryEvent;
+import net.neoforged.neoforge.registries.NewRegistryEvent;
+import net.neoforged.neoforge.registries.RegistryBuilder;
 import org.slf4j.Logger;
 
 @Mod(CreatingSpace.MODID)
@@ -58,6 +60,12 @@ public CreatingSpace(IEventBus modEventBus, ModContainer modContainer) {
             event.dataPackRegistry(PropellantTypeInit.Keys.PROPELLANT_TYPE,PropellantType.DIRECT_CODEC, PropellantType.DIRECT_CODEC);
             LOGGER.debug("added reload for CS registries");
         });
+        /*modEventBus.addListener((NewRegistryEvent event) -> {
+            //event.create(new RegistryBuilder<>(RocketAccessibleDimension.REGISTRY_KEY).sync(true));
+            //event.create(new RegistryBuilder<>(MiscInit.Keys.POWER_PACK_TYPE));
+            //event.create(new RegistryBuilder<>(MiscInit.Keys.EXHAUST_PACK_TYPE));
+            event.create(new RegistryBuilder<>(PropellantTypeInit.Keys.PROPELLANT_TYPE));
+                });*/
         REGISTRATE.registerEventListeners(modEventBus);
 
         TagsInit.init();

src/main/java/com/rae/creatingspace/CreatingSpace.java

@@ -859,7 +859,7 @@ private void stopRocket() {
     }
 
     @Override
-    public @Nullable AbstractContainerMenu createMenu(int i, Inventory inventory, Player player) {
+    public @Nullable AbstractContainerMenu createMenu(int i, @NotNull Inventory inventory, @NotNull Player player) {
         return ScheduleMakingMenu.create(i,inventory,this);
     }
 

src/main/java/com/rae/creatingspace/content/rocket/RocketContraptionEntity.java

@@ -27,7 +27,6 @@ public static ScheduleMakingMenu create(int id, Inventory inv, RocketContraption
 
     @Override
     protected RocketContraptionEntity createOnClient(RegistryFriendlyByteBuf extraData) {
-        //System.out.println("create on client");
         int entityID = extraData.readVarInt();
         Entity entityByID = Minecraft.getInstance().level.getEntity(entityID);
         if (!(entityByID instanceof RocketContraptionEntity rocketEntity))

src/main/java/com/rae/creatingspace/content/rocket/ScheduleMakingMenu.java

@@ -79,10 +79,10 @@ protected void write(CompoundTag nbt, HolderLookup.Provider registries, boolean
             try {
                 nbt.put("propellantType", ResourceLocation.CODEC.encodeStart(NbtOps.INSTANCE,
                         PropellantTypeInit.getSyncedPropellantRegistry().getKey(propellantType)).getOrThrow());
-            } catch (Throwable ignored){
-                nbt.put("propellantType", ResourceLocation.CODEC.encodeStart(NbtOps.INSTANCE,PropellantTypeInit.METHALOX.getId() ).getOrThrow());
-                CreatingSpace.LOGGER.warn("catch exeption will saving engine : "+propellantType);
-                CreatingSpace.LOGGER.warn("exeption : "+ignored.getMessage());
+            } catch (Throwable error){
+                CreatingSpace.LOGGER.warn("catch exception will saving engine : "+propellantType);
+                CreatingSpace.LOGGER.warn("exeption : "+error.getMessage());
+                nbt.put("propellantType", ResourceLocation.CODEC.encodeStart(NbtOps.INSTANCE,CreatingSpace.resource("methalox")).getOrThrow());//PropellantTypeInit.METHALOX.getId()));
             }
             super.write(nbt,registries, clientPacket);
         }
@@ -101,10 +101,10 @@ public void setFromNbt(CompoundTag nbt) {
             try {
                 propellantType = PropellantTypeInit.getSyncedPropellantRegistry().getOptional(ResourceLocation.CODEC.parse(NbtOps.INSTANCE, nbt.get("propellantType")).getOrThrow())
                         .orElse(PropellantTypeInit.METHALOX.get());
-            } catch (Throwable ignored){
+            } catch (Throwable error){
                 propellantType = PropellantTypeInit.METHALOX.get();
-                CreatingSpace.LOGGER.warn("catch exeption will loading engine : "+propellantType);
-                CreatingSpace.LOGGER.warn("exeption : "+ignored.getMessage());
+                CreatingSpace.LOGGER.warn("catch exception will loading engine : "+propellantType);
+                CreatingSpace.LOGGER.warn("exeption : "+ error.getMessage());
             }
         }
 

src/main/java/com/rae/creatingspace/content/rocket/engine/RocketEngineBlockEntity.java

@@ -49,15 +49,13 @@ public static EngineerTableMenu create(int id, Inventory inv, RocketEngineerTabl
 
     @Override
     protected RocketEngineerTableBlockEntity createOnClient(RegistryFriendlyByteBuf extraData) {
-        //System.out.println("create on client");
         ClientLevel world = Minecraft.getInstance().level;
         assert world != null;
         BlockEntity blockEntity = world.getBlockEntity(extraData.readBlockPos());
         if (blockEntity instanceof RocketEngineerTableBlockEntity engineerTable) {
             engineerTable.readClient(Objects.requireNonNull(extraData.readNbt()), world.registryAccess());
             return engineerTable;
         }
-        //System.out.println("fail");
         return null;
     }
 

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

@@ -48,8 +48,8 @@ public BlockState getStateForPlacement(@NotNull BlockPlaceContext context) {
         if (level.isClientSide)
             return InteractionResult.SUCCESS;
         BlockEntity blockentity = level.getBlockEntity(pos);
-        if (blockentity instanceof RocketEngineerTableBlockEntity) {
-            player.openMenu((MenuProvider)blockentity);
+        if (blockentity instanceof RocketEngineerTableBlockEntity be) {
+            player.openMenu(be, be::sendToMenu);
         }
         return super.useWithoutItem(state, level, pos, player, hitResult);
     }

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

@@ -14,6 +14,7 @@
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
@@ -75,7 +76,7 @@ public RocketEngineerTableBlockEntity(BlockEntityType<?> p_155228_, BlockPos p_1
     }
 
     @Override
-    public AbstractContainerMenu createMenu(int id, Inventory inv, Player player) {
+    public AbstractContainerMenu createMenu(int id, @NotNull Inventory inv, @NotNull Player player) {
         return EngineerTableMenu.create(id, inv, this);
     }
 
@@ -144,6 +145,10 @@ public void readScreenData(SyncData screenInfo) {
         propellantType = screenInfo.propellantType;
     }
 
+    @Override
+    public void sendToMenu(RegistryFriendlyByteBuf buffer) {
+        super.sendToMenu(buffer);
+    }
 
     @Override
     public void write(CompoundTag tag, HolderLookup.Provider registries, boolean clientPacket) {

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

@@ -11,7 +11,7 @@
 import net.minecraft.server.level.ServerPlayer;
 
 public class RocketEngineerTableSync extends BlockEntityConfigurationPacket<RocketEngineerTableBlockEntity> {
-    private CompoundTag syncData;
+    private final CompoundTag syncData;
     public static final StreamCodec<RegistryFriendlyByteBuf, RocketEngineerTableSync> STREAM_CODEC = StreamCodec.composite(
             BlockPos.STREAM_CODEC, packet -> packet.pos,
             ByteBufCodecs.COMPOUND_TAG, packet -> packet.syncData,

src/main/java/com/rae/creatingspace/content/rocket/network/RocketEngineerTableSync.java

@@ -20,6 +20,10 @@ public class PropellantTypeInit {
     public static final DeferredRegister<PropellantType> DEFERRED_PROPELLANT_TYPE =
             DeferredRegister.create(Keys.PROPELLANT_TYPE, CreatingSpace.MODID);
 
+    static {
+        //DEFERRED_PROPELLANT_TYPE.makeRegistry((builder) -> builder.sync(true));
+    }
+
                     //.dataPackRegistry(PropellantType.DIRECT_CODEC, PropellantType.DIRECT_CODEC));
     public static final DeferredHolder<PropellantType,PropellantType> METHALOX = DEFERRED_PROPELLANT_TYPE
             .register("methalox", () -> new PropellantType(
@@ -45,6 +49,7 @@ public class PropellantTypeInit {
     public static Registry<PropellantType> getSyncedPropellantRegistry() {
         return getSideAwareRegistry(Keys.PROPELLANT_TYPE);
     }
+
     public static void register(IEventBus modEventBus) {
         DEFERRED_PROPELLANT_TYPE.register(modEventBus);
     }