mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-03 23:22:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mc-1.21.x' into mc-1.21.y

Browse Source
This commit is contained in:
Jonathan Coates
2025-03-18 09:29:30 +00:00
parent 8ade1c38ac ffa6eadc26
commit 995a6e7379
172 changed files with 1278 additions and 9618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
projects/forge/src/main/java/dan200/computercraft/ComputerCraft.java
View File

@@ -53,6 +53,8 @@ import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.capabilities.ItemCapability;
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;
import net.neoforged.neoforge.items.wrapper.InvWrapper;
import net.neoforged.neoforge.items.wrapper.SidedInvWrapper;
import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
import net.neoforged.neoforge.network.registration.PayloadRegistrar;
import net.neoforged.neoforge.registries.DataPackRegistryEvent;
@@ -61,6 +63,7 @@ import net.neoforged.neoforge.registries.RegistryBuilder;
import org.jspecify.annotations.Nullable;
import java.nio.file.Path;
import java.util.List;
import java.util.function.BiFunction;
@Mod(ComputerCraftAPI.MOD_ID)
@@ -147,6 +150,21 @@ public final class ComputerCraft {
ModRegistry.registerPeripherals(new BlockComponentImpl<>(event, PeripheralCapability.get()));
ModRegistry.registerWiredElements(new BlockComponentImpl<>(event, WiredElementCapability.get()));
ModRegistry.registerMedia(new ItemComponentImpl<>(event, MediaCapability.get()));
// Register inventories for our block entities.
var unsidedContainers = List.of(
ModRegistry.BlockEntities.TURTLE_NORMAL,
ModRegistry.BlockEntities.TURTLE_ADVANCED,
ModRegistry.BlockEntities.DISK_DRIVE
);
for (var inv : unsidedContainers) {
event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, inv.get(), (be, side) -> new InvWrapper(be));
}
event.registerBlockEntity(
Capabilities.ItemHandler.BLOCK, ModRegistry.BlockEntities.PRINTER.get(),
(be, side) -> side == null ? new InvWrapper(be) : new SidedInvWrapper(be, side)
);
}
private record BlockComponentImpl<T, C extends @Nullable Object>(

6
projects/forge/src/main/java/dan200/computercraft/shared/ForgeCommonHooks.java
View File

@@ -18,6 +18,7 @@ import net.neoforged.neoforge.event.LootTableLoadEvent;
import net.neoforged.neoforge.event.RegisterCommandsEvent;
import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
import net.neoforged.neoforge.event.entity.living.LivingDropsEvent;
import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent;
import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
import net.neoforged.neoforge.event.level.ChunkEvent;
import net.neoforged.neoforge.event.level.ChunkTicketLevelUpdatedEvent;
@@ -106,4 +107,9 @@ public class ForgeCommonHooks {
public static void onLivingDrops(LivingDropsEvent event) {
event.getDrops().removeIf(itemEntity -> CommonHooks.onLivingDrop(event.getEntity(), itemEntity.getItem()));
}
@SubscribeEvent
public static void onItemTooltip(ItemTooltipEvent event) {
CommonHooks.onItemTooltip(event.getItemStack(), event.getContext(), event.getFlags(), event.getToolTip());
}
}