-
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix slotless item handler crash when running without commoncaps
- Loading branch information
1 parent
8b83a60
commit 8b530d4
Showing
5 changed files
with
78 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
src/main/java/org/cyclops/colossalchests/modcompat/CommonCapabilitiesModCompat.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package org.cyclops.colossalchests.modcompat; | ||
|
|
||
| import net.minecraftforge.common.capabilities.Capability; | ||
| import net.minecraftforge.common.capabilities.ICapabilityProvider; | ||
| import net.minecraftforge.common.util.LazyOptional; | ||
| import net.minecraftforge.items.CapabilityItemHandler; | ||
| import net.minecraftforge.items.IItemHandler; | ||
| import org.cyclops.colossalchests.Capabilities; | ||
| import org.cyclops.colossalchests.ColossalChests; | ||
| import org.cyclops.colossalchests.Reference; | ||
| import org.cyclops.colossalchests.tileentity.TileColossalChest; | ||
| import org.cyclops.commoncapabilities.api.capability.itemhandler.ISlotlessItemHandler; | ||
| import org.cyclops.cyclopscore.datastructure.Wrapper; | ||
| import org.cyclops.cyclopscore.inventory.IndexedSlotlessItemHandlerWrapper; | ||
| import org.cyclops.cyclopscore.modcompat.ICompatInitializer; | ||
| import org.cyclops.cyclopscore.modcompat.IModCompat; | ||
| import org.cyclops.cyclopscore.modcompat.capabilities.CapabilityConstructorRegistry; | ||
| import org.cyclops.cyclopscore.modcompat.capabilities.DefaultCapabilityProvider; | ||
| import org.cyclops.cyclopscore.modcompat.capabilities.SimpleCapabilityConstructor; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| /** | ||
| * Mod compat for the Common Capabilities mod. | ||
| * @author rubensworks | ||
| * | ||
| */ | ||
| public class CommonCapabilitiesModCompat implements IModCompat { | ||
|
|
||
| @Override | ||
| public String getId() { | ||
| return Reference.MOD_COMMONCAPABILITIES; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isEnabledDefault() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public String getComment() { | ||
| return "If slotless item handlers should be registered to colossal chests."; | ||
| } | ||
|
|
||
| @Override | ||
| public ICompatInitializer createInitializer() { | ||
| return () -> { | ||
| CapabilityConstructorRegistry registry = ColossalChests._instance.getCapabilityConstructorRegistry(); | ||
| // Worker | ||
| registry.registerTile(TileColossalChest.class, | ||
| new SimpleCapabilityConstructor<ISlotlessItemHandler, TileColossalChest>() { | ||
| @Override | ||
| public Capability<ISlotlessItemHandler> getCapability() { | ||
| return Capabilities.SLOTLESS_ITEMHANDLER; | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public ICapabilityProvider createProvider(TileColossalChest host) { | ||
| // Wrapper hack because Java otherwise complains that the optionalSlotlessItemHandler may not be initialized yet, and it won't compile. | ||
| Wrapper<LazyOptional<ISlotlessItemHandler>> optionalSlotlessItemHandler = new Wrapper<>(); | ||
| optionalSlotlessItemHandler.set(LazyOptional.of(() -> { | ||
| LazyOptional<IItemHandler> optionalItemHandler = host.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY); | ||
| optionalItemHandler.addListener((o) -> optionalSlotlessItemHandler.get().invalidate()); | ||
| return new IndexedSlotlessItemHandlerWrapper(optionalItemHandler.orElse(null), | ||
| (IndexedSlotlessItemHandlerWrapper.IInventoryIndexReference) host.getInventory()); | ||
| })); | ||
| return new DefaultCapabilityProvider<>(this::getCapability, optionalSlotlessItemHandler.get()); | ||
| } | ||
| }); | ||
| }; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters