Skip to content

Commit

Permalink
(REVERT THIS LATER) disable Curio Integration
Browse files Browse the repository at this point in the history
  • Loading branch information
Mari023 committed Nov 30, 2023
1 parent 95a6057 commit 36968cb
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 23 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if (tag != "") {
dependencies {
implementation("net.neoforged:neoforge:${neoforgeVersion}")

implementation("top.theillusivec4.curios:curios-forge:${curiosVersion}")
compileOnly("top.theillusivec4.curios:curios-forge:${curiosVersion}")
implementation("me.shedaniel.cloth:cloth-config-${modloader}:${clothVersion}")
implementation("dev.architectury:architectury-${modloader}:${architecturyVersion}")
implementation("maven.modrinth:ae2:${ae2Version}") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
import de.mari_023.ae2wtlib.wct.WCTMenu;
import de.mari_023.ae2wtlib.wct.WCTMenuHost;
import de.mari_023.ae2wtlib.wct.magnet_card.MagnetHandler;
import top.theillusivec4.curios.api.SlotContext;
import top.theillusivec4.curios.api.type.capability.ICurioItem;

import appeng.api.implementations.menuobjects.ItemMenuHost;
import appeng.api.networking.IGrid;
Expand All @@ -28,7 +26,7 @@

@Mixin(value = WirelessCraftingTerminalItem.class, remap = false)
public class CraftingTerminalItemMixin extends WirelessTerminalItem
implements IUniversalWirelessTerminalItem, ICurioItem {
implements IUniversalWirelessTerminalItem/* , ICurioItem */ {

public CraftingTerminalItemMixin() {
super(null, null);
Expand Down Expand Up @@ -71,7 +69,8 @@ public void inventoryTick(ItemStack itemStack, Level level, Entity entity, int i
MagnetHandler.handle(player, itemStack);
}

public void curioTick(SlotContext slotContext, ItemStack stack) {
inventoryTick(stack, slotContext.entity().level(), slotContext.entity(), 0, false);
}
/*
* public void curioTick(SlotContext slotContext, ItemStack stack) { inventoryTick(stack,
* slotContext.entity().level(), slotContext.entity(), 0, false); }
*/
}
11 changes: 5 additions & 6 deletions src/main/java/de/mari_023/ae2wtlib/wut/ItemWUT.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

import de.mari_023.ae2wtlib.TextConstants;
import de.mari_023.ae2wtlib.terminal.ItemWT;
import top.theillusivec4.curios.api.SlotContext;
import top.theillusivec4.curios.api.type.capability.ICurioItem;

import appeng.api.upgrades.IUpgradeInventory;
import appeng.api.upgrades.UpgradeInventories;
Expand All @@ -27,7 +25,7 @@
import appeng.core.definitions.AEItems;
import appeng.menu.locator.MenuLocator;

public class ItemWUT extends ItemWT implements ICurioItem {
public class ItemWUT extends ItemWT /* implements ICurioItem */ {
@Override
public InteractionResultHolder<ItemStack> use(final Level w, final Player player, final InteractionHand hand) {
if (WUTHandler.getCurrentTerminal(player.getItemInHand(hand)).isEmpty()) {
Expand Down Expand Up @@ -103,7 +101,8 @@ public IConfigManager getConfigManager(ItemStack target) {
return WUTHandler.wirelessTerminals.get(WUTHandler.getCurrentTerminal(target)).item().getConfigManager(target);
}

public void curioTick(SlotContext slotContext, ItemStack stack) {
inventoryTick(stack, slotContext.entity().level(), slotContext.entity(), 0, false);
}
/*
* public void curioTick(SlotContext slotContext, ItemStack stack) { inventoryTick(stack,
* slotContext.entity().level(), slotContext.entity(), 0, false); }
*/
}
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ side = "BOTH"

[[dependencies.ae2wtlib]]
modId = "curios"
mandatory = true
mandatory = false
versionRange = "*"
ordering = "AFTER"
side = "BOTH"
9 changes: 0 additions & 9 deletions src/main/resources/data/curios/tags/items/curio.json

This file was deleted.

0 comments on commit 36968cb

Please sign in to comment.