Skip to content

Commit 28f2ed6

Browse files
MuradAkhMuradAkh
committed
1.18.2.2 Release
2 parents 6f78959 + 0ead29c commit 28f2ed6

7 files changed

Lines changed: 25 additions & 24 deletions

File tree

‎forge/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies {
4646
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
4747

4848
modApi "dev.murad.littlelogistics:littlelogistics:${rootProject.ll_version}"
49-
modApi "com.jozufozu.flywheel:Flywheel-Forge:${rootProject.flywheel_version}"
49+
modApi "com.jozufozu.flywheel:flywheel-forge-1.18.2:${rootProject.flywheel_version}"
5050
modApi "com.tterrag.registrate:Registrate:${registrate_version}"
5151
modApi ("curse.maven:create-${forge_create_project_id}:${forge_create_version}") { transitive = false }
5252
}

‎forge/src/main/java/ca/edtoaster/littlecontraptions/block/BargeAssemblerBlock.java‎

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

33

44
import ca.edtoaster.littlecontraptions.setup.LCBlockEntityTypes;
5-
import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock;
6-
import com.simibubi.create.content.contraptions.wrench.IWrenchable;
5+
import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock;
6+
import com.simibubi.create.content.equipment.wrench.IWrenchable;
77
import dev.murad.shipping.entity.custom.vessel.VesselEntity;
88
import dev.murad.shipping.util.TickerUtil;
99
import net.minecraft.core.BlockPos;

‎forge/src/main/java/ca/edtoaster/littlecontraptions/block/BargeAssemblerBlockEntity.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import ca.edtoaster.littlecontraptions.entity.ContraptionBargeEntity;
44
import ca.edtoaster.littlecontraptions.setup.LCBlockEntityTypes;
55
import ca.edtoaster.littlecontraptions.setup.LCBlocks;
6-
import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
7-
import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity;
8-
import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock;
9-
import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerTileEntity;
10-
import com.simibubi.create.content.contraptions.components.structureMovement.mounted.MountedContraption;
11-
import com.simibubi.create.foundation.tileEntity.SmartTileEntity;
12-
import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
13-
import com.simibubi.create.foundation.tileEntity.behaviour.CenteredSideValueBoxTransform;
14-
import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform;
6+
import com.simibubi.create.content.contraptions.AssemblyException;
7+
import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
8+
import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlock;
9+
import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlockEntity;
10+
import com.simibubi.create.content.contraptions.mounted.MountedContraption;
11+
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
12+
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
13+
import com.simibubi.create.foundation.blockEntity.behaviour.CenteredSideValueBoxTransform;
14+
import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
1515
import com.simibubi.create.foundation.utility.VecHelper;
1616
import net.minecraft.core.BlockPos;
1717
import net.minecraft.core.Direction;
@@ -25,7 +25,7 @@
2525

2626
import java.util.List;
2727

28-
public class BargeAssemblerBlockEntity extends SmartTileEntity {
28+
public class BargeAssemblerBlockEntity extends SmartBlockEntity {
2929
private static final int assemblyCooldown = 8;
3030

3131
// TODO: this isn't set on reload
@@ -82,7 +82,7 @@ protected void assemble(Level world, BlockPos pos, ContraptionBargeEntity barge)
8282
.isEmpty())
8383
return;
8484

85-
CartAssemblerTileEntity.CartMovementMode mode = CartAssemblerTileEntity.CartMovementMode.ROTATE;
85+
CartAssemblerBlockEntity.CartMovementMode mode = CartAssemblerBlockEntity.CartMovementMode.ROTATE;
8686

8787
MountedContraption contraption = new MountedContraption(mode);
8888
try {
@@ -173,7 +173,7 @@ protected ValueBoxTransform getMovementModeSlot() {
173173
}
174174

175175
@Override
176-
public void addBehaviours(List<TileEntityBehaviour> behaviours) {
176+
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
177177
// movementMode = new ScrollOptionBehaviour<>(CartAssemblerTileEntity.CartMovementMode.class,
178178
// Lang.translate("contraptions.cart_movement_mode"), this, getMovementModeSlot());
179179
// movementMode.requiresWrench();

‎forge/src/main/java/ca/edtoaster/littlecontraptions/entity/BargeController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ca.edtoaster.littlecontraptions.entity;
22

3-
import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
3+
import com.simibubi.create.content.contraptions.minecart.capability.MinecartController;
44
import dev.murad.shipping.capability.StallingCapability;
55
import net.minecraft.nbt.CompoundTag;
66
import net.minecraftforge.common.util.LazyOptional;

‎forge/src/main/java/ca/edtoaster/littlecontraptions/entity/ContraptionBargeEntity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package ca.edtoaster.littlecontraptions.entity;
22

3-
import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.CapabilityMinecartController;
4-
import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController;
53
import ca.edtoaster.littlecontraptions.setup.LCEntityTypes;
64
import ca.edtoaster.littlecontraptions.setup.LCItems;
5+
import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController;
6+
import com.simibubi.create.content.contraptions.minecart.capability.MinecartController;
77
import dev.murad.shipping.entity.custom.vessel.barge.AbstractBargeEntity;
88
import net.minecraft.util.Mth;
99
import net.minecraft.world.entity.Entity;

‎forge/src/main/java/ca/edtoaster/littlecontraptions/setup/LCPonder.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.simibubi.create.foundation.ponder.PonderRegistrationHelper;
1010
import com.simibubi.create.foundation.ponder.PonderRegistry;
1111
import com.simibubi.create.foundation.ponder.PonderTag;
12+
import com.simibubi.create.infrastructure.ponder.AllPonderTags;
1213
import com.tterrag.registrate.util.entry.BlockEntry;
1314
import com.tterrag.registrate.util.entry.ItemEntry;
1415
import dev.murad.shipping.setup.ModBlocks;
@@ -22,7 +23,7 @@ public class LCPonder {
2223
public static PonderTag LC_TUGS;
2324
public static PonderTag LC_LOCOS;
2425

25-
private static CreateRegistrate createRegistrate = CreateRegistrate.lazy(LCMod.MOD_ID).get();
26+
private static final CreateRegistrate createRegistrate = CreateRegistrate.create(LCMod.MOD_ID);
2627

2728
public static final BlockEntry<BargeAssemblerBlock> BARGE_ASSEMBLER_ENTRY = new BlockEntry<>(createRegistrate, LCBlocks.BARGE_ASSEMBLER);
2829
public static final BlockEntry<Block> CORNER_GUIDE_RAIL_BLOCK_BLOCK_ENTRY = new BlockEntry<>(createRegistrate, ModBlocks.GUIDE_RAIL_CORNER);
@@ -67,7 +68,7 @@ public static void register() {
6768
HELPER.forComponents(STEAM_LOCOMOTIVE_ENTRY, ENERGY_LOCOMOTIVE_ITEM_ENTRY, LOCO_ROUTE_ENTRY, AUTO_SWITCH, AUTO_TEE)
6869
.addStoryBoard("loco_route", LocomotiveScenes::routeScene);
6970

70-
PonderRegistry.TAGS.forTag(PonderTag.MOVEMENT_ANCHOR)
71+
PonderRegistry.TAGS.forTag(AllPonderTags.MOVEMENT_ANCHOR)
7172
.add(BARGE_ASSEMBLER_ENTRY);
7273

7374
PonderRegistry.TAGS.forTag(LC_LOCOS)

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ architectury_version = 4.1.34
4545
ll_version = mc1.18.2-v1.2.4
4646
ll_version_range = [mc1.18.2-v1.2.4,)
4747

48-
create_version = mc1.18.2_v0.4.1+111
49-
create_version_range = [mc1.18.2_v0.4.1+111,)
48+
create_version = 0.5.1
49+
create_version_range = [0.5.1,)
5050

5151
registrate_version = MC1.18.2-1.1.3
5252
forge_create_project_id = 328085
53-
forge_create_version = 3934676
53+
forge_create_version = 4625533
5454

55-
flywheel_version = 1.18-0.6.2.64
55+
flywheel_version = 0.6.9-101
5656

5757

5858
# Forge

0 commit comments

Comments
 (0)