Skip to content

Commit fcbe8d7

Browse files
authored
Revert "Add CC: Tweaked peripheral for ghost programmed circuit" (#4478)
1 parent ce64595 commit fcbe8d7

7 files changed

Lines changed: 2 additions & 67 deletions

File tree

dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ dependencies {
9393
modExtraLocalRuntime(forge.javd)
9494
modExtraLocalRuntime(forge.trenzalore)
9595
modExtraLocalRuntime(forge.curios)
96-
modExtraLocalRuntime(forge.cc.tweaked.forge.impl)
9796
// modExtraLocalRuntime(forge.worldstripper)
97+
// modExtraLocalRuntime(forge.cc.tweaked.forge.impl) for some reason this breaks create
9898

9999
modExtraLocalRuntime(forge.bundles.kjs)
100100

gradle/forge.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ftblibrary = "2001.2.4"
2121
ftbteams = "2001.3.0"
2222
ftbquests = "2001.4.11"
2323
ftbchunks = "2001.3.4"
24-
ccTweaked = "1.115.1"
24+
ccTweaked = "1.114.3"
2525
create = "6.0.6-150"
2626
ponder = "1.0.80"
2727
flywheel = "1.0.4"

src/main/java/com/gregtechceu/gtceu/api/blockentity/MetaMachineBlockEntity.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
88
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
99
import com.gregtechceu.gtceu.api.machine.MetaMachine;
10-
import com.gregtechceu.gtceu.api.machine.feature.IHasCircuitSlot;
1110
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
1211
import com.gregtechceu.gtceu.api.machine.trait.MachineTrait;
1312
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
@@ -180,15 +179,6 @@ public static <T> LazyOptional<T> getCapability(MetaMachine machine, @NotNull Ca
180179
return GTCapability.CAPABILITY_CONTROLLABLE.orEmpty(cap, LazyOptional.of(() -> controllable));
181180
}
182181
}
183-
} else if (cap == GTCapability.CAPABILITY_CIRCUIT_SLOT) {
184-
if (machine instanceof IHasCircuitSlot hasCircuitSlot) {
185-
return GTCapability.CAPABILITY_CIRCUIT_SLOT.orEmpty(cap, LazyOptional.of(() -> hasCircuitSlot));
186-
}
187-
for (MachineTrait trait : machine.getTraits()) {
188-
if (trait instanceof IHasCircuitSlot hasCircuitSlot) {
189-
return GTCapability.CAPABILITY_CIRCUIT_SLOT.orEmpty(cap, LazyOptional.of(() -> hasCircuitSlot));
190-
}
191-
}
192182
} else if (cap == GTCapability.CAPABILITY_RECIPE_LOGIC) {
193183
for (MachineTrait trait : machine.getTraits()) {
194184
if (trait instanceof RecipeLogic recipeLogic) {

src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.gregtechceu.gtceu.api.capability;
22

33
import com.gregtechceu.gtceu.api.capability.forge.GTCapability;
4-
import com.gregtechceu.gtceu.api.machine.feature.IHasCircuitSlot;
54
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
65
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
76

@@ -71,11 +70,6 @@ public static IControllable getControllable(Level level, BlockPos pos, @Nullable
7170
return getBlockEntityCapability(GTCapability.CAPABILITY_CONTROLLABLE, level, pos, side);
7271
}
7372

74-
@Nullable
75-
public static IHasCircuitSlot getCircuitSlot(Level level, BlockPos pos, @Nullable Direction side) {
76-
return getBlockEntityCapability(GTCapability.CAPABILITY_CIRCUIT_SLOT, level, pos, side);
77-
}
78-
7973
@Nullable
8074
public static RecipeLogic getRecipeLogic(Level level, BlockPos pos, @Nullable Direction side) {
8175
return getBlockEntityCapability(GTCapability.CAPABILITY_RECIPE_LOGIC, level, pos, side);

src/main/java/com/gregtechceu/gtceu/api/capability/forge/GTCapability.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.gregtechceu.gtceu.api.capability.forge;
22

33
import com.gregtechceu.gtceu.api.capability.*;
4-
import com.gregtechceu.gtceu.api.machine.feature.IHasCircuitSlot;
54
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
65
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
76

@@ -21,8 +20,6 @@ public class GTCapability {
2120
public static final Capability<IWorkable> CAPABILITY_WORKABLE = CapabilityManager.get(new CapabilityToken<>() {});
2221
public static final Capability<IControllable> CAPABILITY_CONTROLLABLE = CapabilityManager
2322
.get(new CapabilityToken<>() {});
24-
public static final Capability<IHasCircuitSlot> CAPABILITY_CIRCUIT_SLOT = CapabilityManager
25-
.get(new CapabilityToken<>() {});
2623
public static final Capability<RecipeLogic> CAPABILITY_RECIPE_LOGIC = CapabilityManager
2724
.get(new CapabilityToken<>() {});
2825
public static final Capability<IElectricItem> CAPABILITY_ELECTRIC_ITEM = CapabilityManager
@@ -56,7 +53,6 @@ public static void register(RegisterCapabilitiesEvent event) {
5653
event.register(IToolable.class);
5754
event.register(IWorkable.class);
5855
event.register(IControllable.class);
59-
event.register(IHasCircuitSlot.class);
6056
event.register(RecipeLogic.class);
6157
event.register(IElectricItem.class);
6258
event.register(ICleanroomReceiver.class);

src/main/java/com/gregtechceu/gtceu/integration/cctweaked/CCTweakedPlugin.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ public static void init() {
2020
ComputerCraftAPI.registerGenericSource(new WorkablePeripheral());
2121
ComputerCraftAPI.registerGenericSource(new CoverHolderPeripheral());
2222
ComputerCraftAPI.registerGenericSource(new CentralMonitorPeripheral());
23-
ComputerCraftAPI.registerGenericSource(new CircuitSlotPeripheral());
2423
ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_CONTROLLABLE);
2524
ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_ENERGY_INFO_PROVIDER);
2625
ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_TURBINE_MACHINE);
2726
ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_WORKABLE);
28-
ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_CIRCUIT_SLOT);
2927
ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_COVERABLE);
3028
ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_CENTRAL_MONITOR);
3129
PlaceholderHandler.addPlaceholder(new Placeholder("bufferText") {

src/main/java/com/gregtechceu/gtceu/integration/cctweaked/peripherals/CircuitSlotPeripheral.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)