Skip to content

Commit dd77c3b

Browse files
MotionlessTrainMotionlessTrain
committed
It compiles!
1 parent 3eceaa4 commit dd77c3b

File tree

12 files changed

+39
-39
lines changed

12 files changed

+39
-39
lines changed

‎.changeset/odd-icons-taste.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"CreateColonies": patch
3+
---
4+
5+
chore: 1.21 changes + structurize changes

‎src/main/java/nl/motionlesstrain/createcolonies/CommonConfig.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package nl.motionlesstrain.createcolonies;
22

3+
import net.neoforged.fml.ModContainer;
34
import net.neoforged.fml.ModLoadingContext;
45
import net.neoforged.fml.config.ModConfig;
56
import net.neoforged.fml.event.config.ModConfigEvent;
@@ -20,8 +21,8 @@ public class CommonConfig {
2021
SPEC = builder.build();
2122
}
2223

23-
public static void registerConfig() {
24-
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, SPEC);
24+
public static void registerConfig(ModContainer container) {
25+
container.registerConfig(ModConfig.Type.COMMON, SPEC);
2526
}
2627
public static void loadSettings(final ModConfigEvent event) {
2728
if (event.getConfig().getSpec() == SPEC) {

‎src/main/java/nl/motionlesstrain/createcolonies/CreateColonies.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package nl.motionlesstrain.createcolonies;
22

3-
import net.minecraft.client.gui.screens.MenuScreens;
43
import net.neoforged.api.distmarker.Dist;
54
import net.neoforged.bus.api.IEventBus;
6-
import net.neoforged.fml.DistExecutor;
75
import net.neoforged.fml.ModContainer;
86
import net.neoforged.fml.common.Mod;
9-
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
107
import net.neoforged.neoforge.capabilities.Capabilities;
118
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
9+
import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
1210
import nl.motionlesstrain.createcolonies.compatibility.Minecolonies;
1311
import nl.motionlesstrain.createcolonies.gui.SchematicTableScreen;
1412
import nl.motionlesstrain.createcolonies.hooks.HooksInitialiser;
@@ -40,11 +38,8 @@ public CreateColonies(final IEventBus modEventBus, final ModContainer container)
4038
modEventBus.addListener(CreateColoniesResources.CreativeTab::fillCreativeTab);
4139
modEventBus.addListener(PlacementHandlers::initialiseHandlers);
4240

43-
// Physical client only registries
44-
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> modEventBus.addListener(ClientSide::clientSetup));
45-
4641
// Register our config
47-
CommonConfig.registerConfig();
42+
CommonConfig.registerConfig(container);
4843
modEventBus.addListener(CommonConfig::loadSettings);
4944

5045
// Network message registration
@@ -74,10 +69,14 @@ private void registerCapabilities(RegisterCapabilitiesEvent event) {
7469
);
7570
}
7671

77-
static class ClientSide {
78-
private static void clientSetup(FMLClientSetupEvent event) {
79-
event.enqueueWork(() ->
80-
MenuScreens.register(schematicTableMenu.get(), SchematicTableScreen::new));
72+
@Mod(value=MODID, dist=Dist.CLIENT)
73+
public static class ClientSide {
74+
public ClientSide(final IEventBus modEventBus) {
75+
modEventBus.addListener(this::registerScreen);
76+
}
77+
78+
private void registerScreen(RegisterMenuScreensEvent event) {
79+
event.register(schematicTableMenu.get(), SchematicTableScreen::new);
8180
}
8281
}
8382
}

‎src/main/java/nl/motionlesstrain/createcolonies/gui/SchematicTableScreen.java‎

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

2222
public class SchematicTableScreen extends AbstractContainerScreen<SchematicTableMenu> {
2323

24-
private static final ResourceLocation BACKGROUND_LOCATION = new ResourceLocation(MODID,
24+
private static final ResourceLocation BACKGROUND_LOCATION = ResourceLocation.fromNamespaceAndPath(MODID,
2525
"textures/gui/container/schematic_table_screen.png");
2626

2727
public SchematicTableScreen(SchematicTableMenu menu, Inventory playerInv, Component title) {
@@ -72,7 +72,7 @@ protected void renderBg(@NotNull GuiGraphics guiGraphics, float partialTick, int
7272

7373
@Override
7474
public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
75-
this.renderBackground(graphics);
75+
this.renderBackground(graphics, mouseX, mouseY, partialTick);
7676

7777
final boolean pointsRight = menu.pointsToBlueprint();
7878
if (this.pointsRight != pointsRight) {

‎src/main/java/nl/motionlesstrain/createcolonies/network/messages/SaveNBTFileMessage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void handle(SaveNBTFileMessage message, @NotNull IPayloadContext context)
5050
final Path gamePath = Minecraft.getInstance().gameDirectory.toPath();
5151
final Path saveFile = gamePath.resolve(message.filePath);
5252
try {
53-
NbtIo.writeCompressed(message.fileContents, saveFile.toFile());
53+
NbtIo.writeCompressed(message.fileContents, saveFile);
5454
final @Nullable Player player = Minecraft.getInstance().player;
5555
if (player != null) {
5656
player.displayClientMessage(Component.translatable("nl.motionlesstrain.createcolonies.convert.confirm"), false);

‎src/main/java/nl/motionlesstrain/createcolonies/placementhandlers/BeltPlacementHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package nl.motionlesstrain.createcolonies.placementhandlers;
22

3-
import com.ldtteam.structurize.api.util.constant.Constants;
3+
import com.ldtteam.structurize.api.RotationMirror;
4+
import com.ldtteam.structurize.api.constants.Constants;
45
import com.ldtteam.structurize.placement.handlers.placement.IPlacementHandler;
5-
import com.ldtteam.structurize.util.PlacementSettings;
66
import com.simibubi.create.content.kinetics.belt.BeltBlock;
77
import com.simibubi.create.content.kinetics.belt.BeltPart;
88
import net.minecraft.core.BlockPos;
@@ -81,7 +81,7 @@ private record BeltInfo(BlockPos pos, BlockState state, @Nullable CompoundTag ta
8181

8282
private final Map<BlockPos, SortedMap<BlockPos, BeltInfo>> beltParts = new HashMap<>();
8383
@Override
84-
public ActionProcessingResult handle(Level world, BlockPos pos, BlockState blockState, @Nullable CompoundTag tileEntityData, boolean complete, BlockPos centerPos, @SuppressWarnings("removal") PlacementSettings settings) {
84+
public ActionProcessingResult handle(Level world, BlockPos pos, BlockState blockState, @Nullable CompoundTag tileEntityData, boolean complete, BlockPos centerPos, RotationMirror settings) {
8585
if (tileEntityData == null) return ActionProcessingResult.DENY;
8686

8787
final var controller = tileEntityData.getCompound("Controller");

‎src/main/java/nl/motionlesstrain/createcolonies/placementhandlers/ChainConveyorPlacementHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package nl.motionlesstrain.createcolonies.placementhandlers;
22

3+
import com.ldtteam.structurize.api.RotationMirror;
34
import com.ldtteam.structurize.blueprints.v1.Blueprint;
4-
import com.ldtteam.structurize.util.PlacementSettings;
55
import net.minecraft.core.BlockPos;
66
import net.minecraft.nbt.CompoundTag;
77
import net.minecraft.nbt.ListTag;
@@ -45,7 +45,7 @@ private record ConveyorInfo(BlockPos pos, BlockPos newBlockPos, CompoundTag bloc
4545
private Map<BlockPos, Map<BlockPos, ConveyorInfo>> connections = new HashMap<>();
4646

4747
@Override
48-
public ActionProcessingResult handle(Blueprint blueprint, Level world, BlockPos pos, BlockState blockState, @Nullable CompoundTag tileEntityData, boolean complete, BlockPos centerPos, PlacementSettings settings) {
48+
public ActionProcessingResult handle(Blueprint blueprint, Level world, BlockPos pos, BlockState blockState, @Nullable CompoundTag tileEntityData, boolean complete, BlockPos centerPos, RotationMirror settings) {
4949
if (tileEntityData != null) {
5050
final ListTag connections = tileEntityData.getList("Connections", Tag.TAG_COMPOUND);
5151
final ListTag newConnections = new ListTag();
@@ -61,7 +61,7 @@ public ActionProcessingResult handle(Blueprint blueprint, Level world, BlockPos
6161
final ConveyorInfo info = existingConnections.remove(newBlockPos);
6262
final ListTag infoConnections = info.blockEntity().getList("Connections", Tag.TAG_COMPOUND);
6363
infoConnections.add(BlockPosUtil.toNBT(info.newBlockPos()));
64-
handleTileEntityPlacement(info.blockEntity(), world, info.pos());
64+
handleTileEntityPlacement(info.blockEntity(), world, info.pos(), settings);
6565

6666
newConnections.add(BlockPosUtil.toNBT(newBlockPos));
6767
} else {

‎src/main/java/nl/motionlesstrain/createcolonies/placementhandlers/TrackPlacementHandler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package nl.motionlesstrain.createcolonies.placementhandlers;
22

3+
import com.ldtteam.structurize.api.RotationMirror;
34
import com.ldtteam.structurize.blueprints.v1.Blueprint;
4-
import com.ldtteam.structurize.util.PlacementSettings;
5-
import com.ldtteam.structurize.util.RotationMirror;
65
import net.minecraft.core.BlockPos;
76
import net.minecraft.nbt.CompoundTag;
87
import net.minecraft.nbt.ListTag;
@@ -75,7 +74,7 @@ public List<ItemStack> getRequiredItems(Level level, BlockPos blockPos, BlockSta
7574
};
7675

7776
@Override
78-
public ActionProcessingResult handle(Blueprint blueprint, Level world, BlockPos pos, BlockState blockState, @Nullable CompoundTag tileEntityData, boolean complete, BlockPos centerPos, PlacementSettings settings) {
77+
public ActionProcessingResult handle(Blueprint blueprint, Level world, BlockPos pos, BlockState blockState, @Nullable CompoundTag tileEntityData, boolean complete, BlockPos centerPos, RotationMirror settings) {
7978
final RotationMirror blueprintRotation = blueprint.getRotationMirror();
8079

8180
if (tileEntityData != null && tileEntityData.contains("Connections", Tag.TAG_LIST)) {

‎src/main/java/nl/motionlesstrain/createcolonies/placementhandlers/TrainBogeyPlacementHandler.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package nl.motionlesstrain.createcolonies.placementhandlers;
22

3-
import com.ldtteam.structurize.api.util.constant.Constants;
4-
import com.ldtteam.structurize.placement.handlers.placement.IPlacementHandler;
5-
import com.ldtteam.structurize.util.PlacementSettings;
63
import net.minecraft.core.BlockPos;
74
import net.minecraft.nbt.CompoundTag;
85
import net.minecraft.world.item.ItemStack;

‎src/main/java/nl/motionlesstrain/createcolonies/placementhandlers/TrainStationPlacementHandler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package nl.motionlesstrain.createcolonies.placementhandlers;
22

33

4+
import com.ldtteam.structurize.api.RotationMirror;
45
import com.ldtteam.structurize.blueprints.v1.Blueprint;
56
import com.ldtteam.structurize.placement.handlers.placement.PlacementHandlers;
6-
import com.ldtteam.structurize.util.PlacementSettings;
7-
import com.ldtteam.structurize.util.RotationMirror;
87
import com.simibubi.create.content.trains.track.TrackBlock;
98
import com.simibubi.create.content.trains.track.TrackShape;
109
import net.minecraft.core.BlockPos;
@@ -35,7 +34,7 @@ private Tuple<BlockPos, CompoundTag> fixTargetTrack(CompoundTag targetTrack, Rot
3534
}
3635

3736
@Override
38-
public ActionProcessingResult handle(Blueprint blueprint, Level world, BlockPos pos, BlockState blockState, @Nullable CompoundTag tileEntityData, boolean complete, BlockPos centerPos, PlacementSettings settings) {
37+
public ActionProcessingResult handle(Blueprint blueprint, Level world, BlockPos pos, BlockState blockState, @Nullable CompoundTag tileEntityData, boolean complete, BlockPos centerPos, RotationMirror settings) {
3938
if (tileEntityData != null && tileEntityData.contains("TargetTrack")) {
4039
final RotationMirror blueprintRotation = blueprint.getRotationMirror();
4140
final var newData = fixTargetTrack(tileEntityData.getCompound("TargetTrack"), blueprintRotation);

0 commit comments

Comments
 (0)