Skip to content

Commit 7d3be82

Browse files
mrh0mrh0
committed
wip porting, compiles!
1 parent 7f70b15 commit 7d3be82

File tree

17 files changed

+70
-60
lines changed

17 files changed

+70
-60
lines changed

‎src/main/java/com/mrh0/createaddition/CreateAddition.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.mrh0.createaddition.network.EnergyNetworkPacketPayload;
77
import com.mrh0.createaddition.network.ObservePacketPayload;
88
import com.mrh0.createaddition.network.ServerPayloadHandler;
9+
import com.mrh0.createaddition.network.ClientPayloadHandler;
910
import com.mrh0.createaddition.ponder.CAPonderPlugin;
1011
import com.mrh0.createaddition.trains.schedule.CASchedule;
1112
import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
@@ -30,6 +31,7 @@
3031
import net.neoforged.fml.config.ModConfig;
3132
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
3233
import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent;
34+
import net.neoforged.fml.loading.FMLPaths;
3335
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
3436
import net.neoforged.neoforge.event.RegisterCommandsEvent;
3537
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -96,7 +98,7 @@ public CreateAddition(IEventBus eventBus, ModContainer container) {
9698
//MinecraftForge.EVENT_BUS.register(this);
9799

98100
container.registerConfig(ModConfig.Type.COMMON, CommonConfig.COMMON_CONFIG);
99-
//CommonConfig.loadConfig(CommonConfig.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("createaddition-common.toml"));
101+
CommonConfig.loadConfig(CommonConfig.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("createaddition-common.toml"));
100102

101103
IE_ACTIVE = ModList.get().isLoaded("immersiveengineering");
102104
CC_ACTIVE = ModList.get().isLoaded("computercraft");
@@ -168,7 +170,7 @@ public static void register(final RegisterPayloadHandlersEvent event) {
168170
ObservePacketPayload.TYPE,
169171
ObservePacketPayload.STREAM_CODEC,
170172
new DirectionalPayloadHandler<>(
171-
ClientPayloadHandler::handleDataOnMain,
173+
ClientPayloadHandler::handleObservePayload,
172174
ServerPayloadHandler::handleObservePayload
173175
)
174176
);
@@ -177,8 +179,8 @@ public static void register(final RegisterPayloadHandlersEvent event) {
177179
EnergyNetworkPacketPayload.TYPE,
178180
EnergyNetworkPacketPayload.STREAM_CODEC,
179181
new DirectionalPayloadHandler<>(
180-
ClientPayloadHandler::handleDataOnMain,
181-
ServerPayloadHandler::handleDataOnMain
182+
ClientPayloadHandler::handleEnergyNetworkPayload,
183+
ServerPayloadHandler::handleEnergyNetworkPayload
182184
)
183185
);
184186
}

‎src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlock.java‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,9 @@ protected void createBlockStateDefinition(Builder<Block, BlockState> builder) {
6565

6666
@Override
6767
public void onPlace(BlockState state, Level world, BlockPos pos, BlockState p_220082_4_, boolean p_220082_5_) {
68-
if (world.isClientSide)
69-
return;
68+
if (world.isClientSide) return;
7069
BlockEntity tileEntity = world.getBlockEntity(pos.above());
71-
if (!(tileEntity instanceof BasinBlockEntity basin))
72-
return;
70+
if (!(tileEntity instanceof BasinBlockEntity basin)) return;
7371
basin.notifyChangeOfContents();
7472
}
7573

@@ -101,17 +99,15 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
10199

102100
if (AllItems.GOGGLES.isIn(heldItem) && heat != BlazeBurnerBlock.HeatLevel.NONE)
103101
return onBlockEntityUseItemOn(level, pos, be -> {
104-
if (be.goggles)
105-
return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
102+
if (be.goggles) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
106103
be.goggles = true;
107104
be.notifyUpdate();
108105
return ItemInteractionResult.SUCCESS;
109106
});
110107

111108
if (heldItem.isEmpty() && heat != BlazeBurnerBlock.HeatLevel.NONE)
112109
return onBlockEntityUseItemOn(level, pos, be -> {
113-
if (!be.goggles)
114-
return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
110+
if (!be.goggles) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
115111
be.goggles = false;
116112
be.notifyUpdate();
117113
return ItemInteractionResult.SUCCESS;
@@ -137,25 +133,21 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
137133

138134
public static InteractionResultHolder<ItemStack> tryInsert(BlockState state, Level level, BlockPos pos,
139135
ItemStack stack, boolean doNotConsume, boolean forceOverflow, boolean simulate) {
140-
if (!state.hasBlockEntity())
141-
return InteractionResultHolder.fail(ItemStack.EMPTY);
136+
if (!state.hasBlockEntity()) return InteractionResultHolder.fail(ItemStack.EMPTY);
142137

143138
BlockEntity te = level.getBlockEntity(pos);
144139
if (!(te instanceof LiquidBlazeBurnerBlockEntity burnerTE))
145140
return InteractionResultHolder.fail(ItemStack.EMPTY);
146141

147142
if (burnerTE.isCreativeFuel(stack)) {
148-
if (!simulate)
149-
burnerTE.applyCreativeFuel();
143+
if (!simulate) burnerTE.applyCreativeFuel();
150144
return InteractionResultHolder.success(ItemStack.EMPTY);
151145
}
152-
if (!burnerTE.tryUpdateFuel(stack, forceOverflow, simulate))
153-
return InteractionResultHolder.fail(ItemStack.EMPTY);
146+
if (!burnerTE.tryUpdateFuel(stack, forceOverflow, simulate)) return InteractionResultHolder.fail(ItemStack.EMPTY);
154147

155148
if (!doNotConsume) {
156149
ItemStack container = stack.hasCraftingRemainingItem() ? stack.getCraftingRemainingItem() : ItemStack.EMPTY;
157-
if (!level.isClientSide) {
158-
stack.shrink(1);
150+
if (!level.isClientSide) {stack.shrink(1);
159151
}
160152
return InteractionResultHolder.success(container);
161153
}
@@ -170,8 +162,7 @@ public VoxelShape getShape(BlockState state, BlockGetter getter, BlockPos pos, C
170162
@Override
171163
public VoxelShape getCollisionShape(BlockState state, BlockGetter getter, BlockPos pos,
172164
CollisionContext context) {
173-
if (context == CollisionContext.empty())
174-
return AllShapes.HEATER_BLOCK_SPECIAL_COLLISION_SHAPE;
165+
if (context == CollisionContext.empty()) return AllShapes.HEATER_BLOCK_SPECIAL_COLLISION_SHAPE;
175166
return getShape(state, getter, pos, context);
176167
}
177168

@@ -193,11 +184,8 @@ protected boolean isPathfindable(BlockState state, PathComputationType pathCompu
193184

194185
@OnlyIn(Dist.CLIENT)
195186
public void animateTick(BlockState state, Level world, BlockPos pos, Random random) {
196-
if (random.nextInt(10) != 0)
197-
return;
198-
if (!state.getValue(HEAT_LEVEL)
199-
.isAtLeast(BlazeBurnerBlock.HeatLevel.SMOULDERING))
200-
return;
187+
if (random.nextInt(10) != 0) return;
188+
if (!state.getValue(HEAT_LEVEL).isAtLeast(BlazeBurnerBlock.HeatLevel.SMOULDERING)) return;
201189
world.playLocalSound((float) pos.getX() + 0.5F, (float) pos.getY() + 0.5F,
202190
(float) pos.getZ() + 0.5F, SoundEvents.CAMPFIRE_CRACKLE, SoundSource.BLOCKS,
203191
0.5F + random.nextFloat(), random.nextFloat() * 0.7F + 0.6F, false);

‎src/main/java/com/mrh0/createaddition/blocks/modular_accumulator/CAConnectivityHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ private static <T extends BlockEntity & IMultiBlockEntityContainer> void splitMu
347347
}
348348

349349
if (be instanceof ModularAccumulatorBlockEntity ienergy && ienergy.hasAccumulator())
350-
be.getCapability(Capabilities.EnergyStorage)
351-
.invalidate();
350+
be.invalidateCapabilities();
351+
//be.getCapability(Capabilities.EnergyStorage).invalidate();
352352

353353
if (tryReconnect)
354354
formMulti(be.getType(), level, cache == null ? new SearchCache<>() : cache, frontier);

‎src/main/java/com/mrh0/createaddition/blocks/rolling_mill/RollingMillBlock.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,23 +83,25 @@ public RollingMillBlock(Properties properties) {
8383
}
8484

8585
@Override
86-
public void updateEntityAfterFallOn(BlockGetter worldIn, Entity entityIn) {
87-
super.updateEntityAfterFallOn(worldIn, entityIn);
86+
public void updateEntityAfterFallOn(BlockGetter getter, Entity entityIn) {
87+
super.updateEntityAfterFallOn(getter, entityIn);
8888

8989
if (entityIn.level().isClientSide) return;
9090
if (!(entityIn instanceof ItemEntity itemEntity)) return;
9191
if (!entityIn.isAlive()) return;
9292

9393
RollingMillBlockEntity rollingMill = null;
9494
for (BlockPos pos : Iterate.hereAndBelow(entityIn.blockPosition())) {
95-
rollingMill = getBlockEntity(worldIn, pos);
95+
rollingMill = getBlockEntity(getter, pos);
9696
}
9797
if (rollingMill == null) return;
9898

99-
LazyOptional<IItemHandler> capability = rollingMill.getCapability(Capabilities.ItemHandler);
100-
if (!capability.isPresent()) return;
99+
if (rollingMill.getLevel() == null) return;
100+
var capability = rollingMill.getLevel().getCapability(Capabilities.ItemHandler.BLOCK, rollingMill.getBlockPos(), null);
101101

102-
ItemStack remainder = capability.orElse(new ItemStackHandler()).insertItem(0, itemEntity.getItem(), false);
102+
if (capability == null) return;
103+
104+
ItemStack remainder = capability.insertItem(0, itemEntity.getItem(), false);
103105
if (remainder.isEmpty())
104106
itemEntity.remove(RemovalReason.KILLED);
105107
if (remainder.getCount() < itemEntity.getItem().getCount())

‎src/main/java/com/mrh0/createaddition/blocks/tesla_coil/TeslaCoilBlockEntity.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
import com.mrh0.createaddition.index.CARecipes;
99
import com.mrh0.createaddition.index.CASounds;
1010
import com.mrh0.createaddition.recipe.charging.ChargingRecipe;
11+
import com.mrh0.createaddition.recipe.rolling.RollingRecipe;
1112
import com.mrh0.createaddition.sound.CASoundScapes;
1213
import com.mrh0.createaddition.util.Util;
1314
import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation;
1415
import com.simibubi.create.content.kinetics.belt.behaviour.BeltProcessingBehaviour;
1516
import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackHandlerBehaviour;
1617
import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
18+
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
1719
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
1820
import net.createmod.catnip.platform.CatnipServices;
1921
import net.minecraft.core.BlockPos;
@@ -229,6 +231,7 @@ private boolean chargeRecipe(ItemStack stack, TransportedItemStack transported,
229231
outList.add(result);
230232
handler.handleProcessingOnItem(transported, TransportedItemStackHandlerBehaviour.TransportedResult.convertToAndLeaveHeld(outList, remainingStack));
231233
chargeAccumulator = 0;
234+
232235
if (CommonConfig.AUDIO_ENABLED.get()) level.playSound(null, worldPosition, CASounds.LITTLE_ZAP.get(), SoundSource.BLOCKS, 0.1f, 1f);
233236
}
234237
return true;

‎src/main/java/com/mrh0/createaddition/config/CommonConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,6 @@ public static void loadConfig(ModConfigSpec spec, java.nio.file.Path path) {
240240
.writingMode(WritingMode.REPLACE)
241241
.build();
242242
configData.load();
243-
spec.setConfig(configData);
243+
spec.correct(configData);
244244
}
245245
}

‎src/main/java/com/mrh0/createaddition/debug/CADebugger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class CADebugger {
1414
public CADebugger() {}
1515

1616
public static void tick() {
17-
if (!Minecraft.getInstance().options.renderDebug) return;
17+
if (Minecraft.getInstance().getDebugOverlay().showDebugScreen()) return;
1818
IDebugDrawer drawer = getSelected();
1919
if (drawer == null) return;
2020
drawer.drawDebug();

‎src/main/java/com/mrh0/createaddition/event/ClientEventHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class ClientEventHandler {
1919
public static boolean clientRenderHeldWire = false;
2020

2121
@SubscribeEvent
22-
public static void playerRendererEvent(ClientTickEvent evt) {
22+
public static void playerRendererEvent(ClientTickEvent.Post evt) {
2323
if(ClientMinecraftWrapper.getPlayer() == null) return;
2424
ItemStack stack = ClientMinecraftWrapper.getPlayer().getInventory().getSelected();
2525
if(stack.isEmpty()) return;
@@ -28,7 +28,7 @@ public static void playerRendererEvent(ClientTickEvent evt) {
2828
}
2929

3030
@SubscribeEvent
31-
public static void tickSoundscapes(ClientTickEvent event) {
31+
public static void tickSoundscapes(ClientTickEvent.Post event) {
3232
CASoundScapes.tick();
3333
}
3434

‎src/main/java/com/mrh0/createaddition/event/GameEvents.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@
2525
@EventBusSubscriber
2626
public class GameEvents {
2727
@SubscribeEvent
28-
public static void levelTickEvent(LevelTickEvent evt) {
28+
public static void levelTickEvent(LevelTickEvent.Pre evt) {
2929
if(evt.getLevel().isClientSide()) return;
3030
// if (evt == Phase.END) return;
3131
EnergyNetworkManager.tickWorld(evt.getLevel());
3232
}
3333

3434
@SubscribeEvent
35-
public static void serverTickEvent(ServerTickEvent evt) {
35+
public static void serverTickEvent(ServerTickEvent.Pre evt) {
3636
//if (evt.phase == Phase.END) return;
3737
// Using ServerTick instead of WorldTick because some contraptions can switch worlds.
3838
PortableEnergyManager.tick();
3939
}
4040

4141
@SubscribeEvent
42-
public static void clientTickEvent(ClientTickEvent evt) {
42+
public static void clientTickEvent(ClientTickEvent.Post evt) {
4343
//if (evt.phase == Phase.START) return;
4444
ObservePacketPayload.tick();
4545
CADebugger.tick();

‎src/main/java/com/mrh0/createaddition/index/CABlocks.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,12 @@ public class CABlocks {
200200
.transform(customItemModel())
201201
.register();
202202

203+
203204
public static final BlockEntry<DigitalAdapterBlock> DIGITAL_ADAPTER = CreateAddition.REGISTRATE
204205
.block("digital_adapter", DigitalAdapterBlock::new)
205206
.initialProperties(SharedProperties::softMetal)
206207
.transform(displaySource(CADisplaySources.DIGITAL_ADAPTER))
207-
.item(DigitalAdapterBlockItem::new)
208+
//.item(DigitalAdapterBlockItem::new)
208209
//.transform(customItemModel())
209210
.register();
210211

0 commit comments

Comments
 (0)