-
-
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: computer craft compat no longer crashes when CC is not present
- Loading branch information
1 parent
09d74f6
commit 50d817f
Showing
7 changed files
with
202 additions
and
131 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
28 changes: 28 additions & 0 deletions
28
...undxr/createnumismatics/compat/computercraft/implementation/ActualComputerCraftProxy.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,28 @@ | ||
| /* | ||
| * Numismatics | ||
| * Copyright (c) 2024 The Railways Team | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package dev.ithundxr.createnumismatics.compat.computercraft.implementation; | ||
|
|
||
| import dev.architectury.injectables.annotations.ExpectPlatform; | ||
|
|
||
| public class ActualComputerCraftProxy { | ||
| @ExpectPlatform | ||
| public static void registerWithDependency() { | ||
| throw new AssertionError(); | ||
| } | ||
| } |
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
85 changes: 85 additions & 0 deletions
85
...enumismatics/compat/computercraft/implementation/fabric/ActualComputerCraftProxyImpl.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,85 @@ | ||
| /* | ||
| * Numismatics | ||
| * Copyright (c) 2024 The Railways Team | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package dev.ithundxr.createnumismatics.compat.computercraft.implementation.fabric; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import dan200.computercraft.api.detail.VanillaDetailRegistries; | ||
| import dan200.computercraft.api.peripheral.PeripheralLookup; | ||
| import dev.ithundxr.createnumismatics.compat.computercraft.ComputerCraftProxy; | ||
| import dev.ithundxr.createnumismatics.compat.computercraft.implementation.ComputerBehaviour; | ||
| import dev.ithundxr.createnumismatics.compat.computercraft.implementation.peripherals.BankTerminalPeripheral; | ||
| import dev.ithundxr.createnumismatics.content.bank.AuthorizedCardItem; | ||
| import dev.ithundxr.createnumismatics.content.bank.CardItem; | ||
| import dev.ithundxr.createnumismatics.content.bank.IDCardItem; | ||
| import dev.ithundxr.createnumismatics.registry.NumismaticsBlocks; | ||
| import dev.ithundxr.createnumismatics.registry.NumismaticsTags; | ||
| import dev.ithundxr.createnumismatics.util.Utils; | ||
| import net.minecraft.core.registries.Registries; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.UUID; | ||
|
|
||
| public class ActualComputerCraftProxyImpl { | ||
| public static void registerWithDependency() { | ||
| /* Comment if computercraft.implementation is not in the source set */ | ||
| ComputerCraftProxy.computerFactory = ComputerBehaviour::new; | ||
|
|
||
| PeripheralLookup.get().registerFallback((level, blockPos, blockState, blockEntity, direction) -> ComputerBehaviour.peripheralProvider(level, blockPos)); | ||
|
|
||
| Utils.runOnceRegistered(Registries.BLOCK, () -> { | ||
| PeripheralLookup.get().registerForBlocks( | ||
| (world, pos, state, blockEntity, context) -> BankTerminalPeripheral.INSTANCE, | ||
| NumismaticsBlocks.BANK_TERMINAL.get() | ||
| ); | ||
| }); | ||
|
|
||
| VanillaDetailRegistries.ITEM_STACK.addProvider((detailMap, stack) -> { | ||
| Map<Object, @Nullable Object> cardDetails = null; | ||
| if (NumismaticsTags.AllItemTags.CARDS.matches(stack)) { | ||
| UUID accountID = CardItem.get(stack); | ||
| if (accountID != null) { | ||
| cardDetails = Map.of( | ||
| "AccountID", accountID.toString() | ||
| ); | ||
| } | ||
| } else if (NumismaticsTags.AllItemTags.AUTHORIZED_CARDS.matches(stack)) { | ||
| AuthorizedCardItem.AuthorizationPair authorizationPair = AuthorizedCardItem.get(stack); | ||
| if (authorizationPair != null) { | ||
| UUID accountID = authorizationPair.accountID(); | ||
| UUID authorizationID = authorizationPair.authorizationID(); | ||
| cardDetails = Map.of( | ||
| "AccountID", accountID.toString(), | ||
| "AuthorizationID", authorizationID.toString() | ||
| ); | ||
| } | ||
| } else if (NumismaticsTags.AllItemTags.ID_CARDS.matches(stack)) { | ||
| UUID id = IDCardItem.get(stack); | ||
| if (id != null) { | ||
| cardDetails = Map.of( | ||
| "ID", id.toString() | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| if (cardDetails != null) | ||
| detailMap.put("numismatics", ImmutableMap.of("card", cardDetails)); | ||
| }); | ||
| } | ||
| } |
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
86 changes: 86 additions & 0 deletions
86
...tenumismatics/compat/computercraft/implementation/forge/ActualComputerCraftProxyImpl.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,86 @@ | ||
| /* | ||
| * Numismatics | ||
| * Copyright (c) 2024 The Railways Team | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package dev.ithundxr.createnumismatics.compat.computercraft.implementation.forge; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import dan200.computercraft.api.ForgeComputerCraftAPI; | ||
| import dan200.computercraft.api.detail.VanillaDetailRegistries; | ||
| import dev.ithundxr.createnumismatics.compat.computercraft.ComputerCraftProxy; | ||
| import dev.ithundxr.createnumismatics.compat.computercraft.implementation.ComputerBehaviour; | ||
| import dev.ithundxr.createnumismatics.compat.computercraft.implementation.peripherals.BankTerminalPeripheral; | ||
| import dev.ithundxr.createnumismatics.content.bank.AuthorizedCardItem; | ||
| import dev.ithundxr.createnumismatics.content.bank.CardItem; | ||
| import dev.ithundxr.createnumismatics.content.bank.IDCardItem; | ||
| import dev.ithundxr.createnumismatics.registry.NumismaticsBlocks; | ||
| import dev.ithundxr.createnumismatics.registry.NumismaticsTags; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import net.minecraftforge.common.util.LazyOptional; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.UUID; | ||
|
|
||
| public class ActualComputerCraftProxyImpl { | ||
| public static void registerWithDependency() { | ||
| /* Comment if computercraft.implementation is not in the source set */ | ||
| ComputerCraftProxy.computerFactory = ComputerBehaviour::new; | ||
|
|
||
| ForgeComputerCraftAPI.registerPeripheralProvider((level, pos, direction) -> { | ||
| BlockState state = level.getBlockState(pos); | ||
|
|
||
| if (NumismaticsBlocks.BANK_TERMINAL.has(state)) { | ||
| return LazyOptional.of(() -> BankTerminalPeripheral.INSTANCE); | ||
| } | ||
|
|
||
| return LazyOptional.empty(); | ||
| }); | ||
|
|
||
| VanillaDetailRegistries.ITEM_STACK.addProvider((detailMap, stack) -> { | ||
| Map<Object, @Nullable Object> cardDetails = null; | ||
| if (NumismaticsTags.AllItemTags.CARDS.matches(stack)) { | ||
| UUID accountID = CardItem.get(stack); | ||
| if (accountID != null) { | ||
| cardDetails = Map.of( | ||
| "AccountID", accountID.toString() | ||
| ); | ||
| } | ||
| } else if (NumismaticsTags.AllItemTags.AUTHORIZED_CARDS.matches(stack)) { | ||
| AuthorizedCardItem.AuthorizationPair authorizationPair = AuthorizedCardItem.get(stack); | ||
| if (authorizationPair != null) { | ||
| UUID accountID = authorizationPair.accountID(); | ||
| UUID authorizationID = authorizationPair.authorizationID(); | ||
| cardDetails = Map.of( | ||
| "AccountID", accountID.toString(), | ||
| "AuthorizationID", authorizationID.toString() | ||
| ); | ||
| } | ||
| } else if (NumismaticsTags.AllItemTags.ID_CARDS.matches(stack)) { | ||
| UUID id = IDCardItem.get(stack); | ||
| if (id != null) { | ||
| cardDetails = Map.of( | ||
| "ID", id.toString() | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| if (cardDetails != null) | ||
| detailMap.put("numismatics", ImmutableMap.of("card", cardDetails)); | ||
| }); | ||
| } | ||
| } |