Skip to content

Commit 023b232

Browse files
fix network issue 1
1 parent 81d2375 commit 023b232

File tree

8 files changed

+20
-19
lines changed

8 files changed

+20
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ private void stopRocket() {
860860

861861
@Override
862862
public @Nullable AbstractContainerMenu createMenu(int i, Inventory inventory, Player player) {
863-
return RocketMenu.create(i,inventory,this);
863+
return ScheduleMakingMenu.create(i,inventory,this);
864864
}
865865

866866
public enum RocketStatus implements StringRepresentable {

src/main/java/com/rae/creatingspace/content/rocket/RocketMenu.java renamed to src/main/java/com/rae/creatingspace/content/rocket/ScheduleMakingMenu.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,26 @@
33
import com.rae.creatingspace.init.graphics.MenuTypesInit;
44
import com.simibubi.create.foundation.gui.menu.MenuBase;
55
import net.minecraft.client.Minecraft;
6-
import net.minecraft.network.FriendlyByteBuf;
76
import net.minecraft.network.RegistryFriendlyByteBuf;
87
import net.minecraft.world.entity.Entity;
98
import net.minecraft.world.entity.player.Inventory;
109
import net.minecraft.world.entity.player.Player;
1110
import net.minecraft.world.inventory.MenuType;
1211
import net.minecraft.world.item.ItemStack;
1312

14-
public class RocketMenu extends MenuBase<RocketContraptionEntity> {
13+
public class ScheduleMakingMenu extends MenuBase<RocketContraptionEntity> {
1514

16-
public RocketMenu(MenuType<?> type, int id, Inventory inv, RegistryFriendlyByteBuf extraData) {
15+
public ScheduleMakingMenu(MenuType<?> type, int id, Inventory inv, RegistryFriendlyByteBuf extraData) {
1716
super(type, id, inv, extraData);
1817
}
1918

20-
public RocketMenu(MenuType<?> type, int id, Inventory inv, RocketContraptionEntity be) {
19+
public ScheduleMakingMenu(MenuType<?> type, int id, Inventory inv, RocketContraptionEntity be) {
2120
super(type, id, inv, be);
2221
}
2322

2423

25-
public static RocketMenu create(int id, Inventory inv, RocketContraptionEntity be) {
26-
return new RocketMenu(MenuTypesInit.ROCKET_MENU.get(), id, inv, be);
24+
public static ScheduleMakingMenu create(int id, Inventory inv, RocketContraptionEntity be) {
25+
return new ScheduleMakingMenu(MenuTypesInit.ROCKET_MENU.get(), id, inv, be);
2726
}
2827

2928
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import java.util.*;
5353
import java.util.function.Consumer;
5454

55-
public class ScheduleMakingScreen extends AbstractSimiContainerScreen<RocketMenu> {
55+
public class ScheduleMakingScreen extends AbstractSimiContainerScreen<ScheduleMakingMenu> {
5656
//TODO transform hard coded schedule stuff to widgets
5757
//beginning of schedule logic
5858
private static final int CARD_HEADER = 22;
@@ -83,7 +83,7 @@ public class ScheduleMakingScreen extends AbstractSimiContainerScreen<RocketMenu
8383
private EditBox Xinput;
8484
private EditBox Zinput;
8585
IconButton validateSetting;
86-
public ScheduleMakingScreen(RocketMenu container, Inventory inv, Component title) {
86+
public ScheduleMakingScreen(ScheduleMakingMenu container, Inventory inv, Component title) {
8787
//TODO this screen will swith bwn normal selection (single trip), schedule and rocket overview.
8888
super(container, inv, Component.translatable("gui.destination_screen.title"));
8989
this.rocketContraption = container.contentHolder;

src/main/java/com/rae/creatingspace/content/rocket/contraption/behaviour/interaction/RocketControlInteraction.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package com.rae.creatingspace.content.rocket.contraption.behaviour.interaction;
22

3-
import com.rae.creatingspace.content.rocket.RocketMenu;
43
import com.rae.creatingspace.content.rocket.RocketContraptionEntity;
54
import com.simibubi.create.api.behaviour.interaction.MovingInteractionBehaviour;
65
import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
76
import net.minecraft.core.BlockPos;
8-
import net.minecraft.network.chat.Component;
97
import net.minecraft.server.level.ServerPlayer;
108
import net.minecraft.world.InteractionHand;
11-
import net.minecraft.world.SimpleMenuProvider;
129
import net.minecraft.world.entity.Entity;
1310
import net.minecraft.world.entity.player.Player;
1411

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.rae.creatingspace.content.rocket.network;
22

33
import com.rae.creatingspace.content.rocket.RocketContraptionEntity;
4+
import com.rae.creatingspace.init.PacketInit;
45
import io.netty.buffer.ByteBuf;
56
import net.createmod.catnip.net.base.ClientboundPacketPayload;
67
import net.minecraft.client.player.LocalPlayer;
@@ -33,6 +34,6 @@ public void handle(LocalPlayer player) {
3334

3435
@Override
3536
public PacketTypeProvider getTypeProvider() {
36-
return null;
37+
return PacketInit.UPDATE_ROCKET;
3738
}
3839
}

src/main/java/com/rae/creatingspace/init/PacketInit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public enum PacketInit implements BasePacketPayload.PacketTypeProvider {
3535
<T extends BasePacketPayload> PacketInit(Class<T> clazz, StreamCodec<? super RegistryFriendlyByteBuf, T> codec) {
3636
String name = this.name().toLowerCase(Locale.ROOT);
3737
this.type = new CatnipPacketRegistry.PacketType<>(
38-
new CustomPacketPayload.Type<>(Create.asResource(name)),
38+
new CustomPacketPayload.Type<>(CreatingSpace.resource(name)),
3939
clazz, codec
4040
);
4141
}

src/main/java/com/rae/creatingspace/init/graphics/MenuTypesInit.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.rae.creatingspace.CreatingSpace;
44
import com.rae.creatingspace.content.rocket.engine.table.EngineerTableMenu;
5-
import com.rae.creatingspace.content.rocket.RocketMenu;
5+
import com.rae.creatingspace.content.rocket.ScheduleMakingMenu;
66
import com.rae.creatingspace.content.life_support.spacesuit.UpgradableEquipmentMenu;
77
import com.rae.creatingspace.content.rocket.engine.table.EngineerTableScreen;
88
import com.rae.creatingspace.content.rocket.ScheduleMakingScreen;
@@ -15,9 +15,12 @@
1515
import net.minecraft.world.inventory.AbstractContainerMenu;
1616

1717
public class MenuTypesInit {
18-
public static final MenuEntry<EngineerTableMenu> ENGINEER_TABLE = register("engineer_table", EngineerTableMenu::new, () -> EngineerTableScreen::new);
19-
public static final MenuEntry<RocketMenu> ROCKET_MENU = register("rocket_menu", RocketMenu::new, () -> ScheduleMakingScreen::new);
20-
public static final MenuEntry<UpgradableEquipmentMenu> UPGRADABLE_EQUIPMENT = register("upgradable_equipment", UpgradableEquipmentMenu::new, () -> UpgradableEquipementScreen::new);
18+
public static final MenuEntry<EngineerTableMenu> ENGINEER_TABLE =
19+
register("engineer_table", EngineerTableMenu::new, () -> EngineerTableScreen::new);
20+
public static final MenuEntry<ScheduleMakingMenu> ROCKET_MENU =
21+
register("rocket_menu", ScheduleMakingMenu::new, () -> ScheduleMakingScreen::new);
22+
public static final MenuEntry<UpgradableEquipmentMenu> UPGRADABLE_EQUIPMENT =
23+
register("upgradable_equipment", UpgradableEquipmentMenu::new, () -> UpgradableEquipementScreen::new);
2124

2225
private static <C extends AbstractContainerMenu, S extends Screen & MenuAccess<C>> MenuEntry<C> register(
2326
String name, MenuBuilder.ForgeMenuFactory<C> factory, NonNullSupplier<MenuBuilder.ScreenFactory<C, S>> screenFactory) {

src/main/java/com/rae/creatingspace/legacy/utilities/packet/NewRocketAssemblePacket.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.rae.creatingspace.legacy.utilities.packet;
22

33
import com.rae.creatingspace.content.rocket.rocket_control.RocketControlsBlockEntity;
4+
import com.rae.creatingspace.init.PacketInit;
45
import com.simibubi.create.foundation.networking.BlockEntityConfigurationPacket;
56
import net.minecraft.core.BlockPos;
67
import net.minecraft.network.RegistryFriendlyByteBuf;
@@ -42,6 +43,6 @@ protected void applySettings(ServerPlayer player, RocketControlsBlockEntity cont
4243

4344
@Override
4445
public PacketTypeProvider getTypeProvider() {
45-
return null;
46+
return PacketInit.ASSEMBLE_ROCKET_2;
4647
}
4748
}

0 commit comments

Comments
 (0)