Skip to content

Commit 972aa5e

Browse files
SirEndiiSirEndii
committed
A lot of smaller things and remove the redstone integrator
1 parent d209e87 commit 972aa5e

33 files changed

+265
-634
lines changed

‎src/main/java/de/srendi/advancedperipherals/APCreativeTab.java‎

Lines changed: 41 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,59 @@
11
package de.srendi.advancedperipherals;
22

3+
import dan200.computercraft.api.pocket.IPocketUpgrade;
4+
import dan200.computercraft.api.turtle.ITurtleUpgrade;
5+
import dan200.computercraft.api.upgrades.UpgradeBase;
6+
import dan200.computercraft.api.upgrades.UpgradeData;
7+
import dan200.computercraft.shared.ModRegistry;
8+
import dan200.computercraft.shared.pocket.items.PocketComputerItem;
9+
import dan200.computercraft.shared.turtle.items.TurtleItem;
10+
import dan200.computercraft.shared.util.DataComponentUtil;
311
import de.srendi.advancedperipherals.common.setup.APBlocks;
412
import de.srendi.advancedperipherals.common.setup.APRegistration;
5-
import de.srendi.advancedperipherals.common.setup.CCRegistration;
6-
import de.srendi.advancedperipherals.common.util.inventory.ItemUtil;
7-
import net.minecraft.core.NonNullList;
8-
import net.minecraft.resources.ResourceLocation;
13+
import net.minecraft.core.Holder;
14+
import net.minecraft.core.HolderLookup;
15+
import net.minecraft.network.chat.Component;
916
import net.minecraft.world.item.CreativeModeTab;
1017
import net.minecraft.world.item.ItemStack;
11-
import org.jetbrains.annotations.NotNull;
18+
import net.neoforged.neoforge.registries.DeferredHolder;
1219

13-
import java.util.Collection;
14-
import java.util.Set;
20+
import java.util.Objects;
21+
import java.util.stream.Stream;
1522

16-
public class APCreativeTab extends CreativeModeTab {
23+
public class APCreativeTab {
1724

18-
public APCreativeTab() {
19-
super("advancedperipheralstab");
20-
}
25+
public static void populateCreativeTabBuilder(CreativeModeTab.Builder builder) {
26+
builder.displayItems((set, out) -> {
27+
APRegistration.ITEMS.getEntries().stream().map(DeferredHolder::get).forEach(out::accept);
2128

22-
@Override
23-
public void fillItemList(NonNullList<ItemStack> items) {
24-
APRegistration.ITEMS.getEntries().stream().map(RegistryObject::get).forEach(item -> items.add(new ItemStack(item)));
25-
items.addAll(pocketUpgrade(CCRegistration.ID.COLONY_POCKET));
26-
items.addAll(pocketUpgrade(CCRegistration.ID.CHATTY_POCKET));
27-
items.addAll(pocketUpgrade(CCRegistration.ID.PLAYER_POCKET));
28-
items.addAll(pocketUpgrade(CCRegistration.ID.ENVIRONMENT_POCKET));
29-
items.addAll(pocketUpgrade(CCRegistration.ID.GEOSCANNER_POCKET));
30-
31-
items.addAll(turtleUpgrade(CCRegistration.ID.CHATTY_TURTLE));
32-
items.addAll(turtleUpgrade(CCRegistration.ID.CHUNKY_TURTLE));
33-
items.addAll(turtleUpgrade(CCRegistration.ID.COMPASS_TURTLE));
34-
items.addAll(turtleUpgrade(CCRegistration.ID.SADDLE_TURTLE));
35-
items.addAll(turtleUpgrade(CCRegistration.ID.PLAYER_TURTLE));
36-
items.addAll(turtleUpgrade(CCRegistration.ID.ENVIRONMENT_TURTLE));
37-
items.addAll(turtleUpgrade(CCRegistration.ID.GEOSCANNER_TURTLE));
38-
39-
items.addAll(turtleUpgrade(CCRegistration.ID.WEAK_AUTOMATA));
40-
items.addAll(turtleUpgrade(CCRegistration.ID.OP_WEAK_AUTOMATA));
41-
items.addAll(turtleUpgrade(CCRegistration.ID.HUSBANDRY_AUTOMATA));
42-
items.addAll(turtleUpgrade(CCRegistration.ID.OP_HUSBANDRY_AUTOMATA));
43-
items.addAll(turtleUpgrade(CCRegistration.ID.END_AUTOMATA));
44-
items.addAll(turtleUpgrade(CCRegistration.ID.OP_END_AUTOMATA));
29+
addTurtle(out, ModRegistry.Items.TURTLE_NORMAL.get(), set.holders());
30+
addTurtle(out, ModRegistry.Items.TURTLE_ADVANCED.get(), set.holders());
31+
addPocket(out, ModRegistry.Items.POCKET_COMPUTER_NORMAL.get(), set.holders());
32+
addPocket(out, ModRegistry.Items.POCKET_COMPUTER_ADVANCED.get(), set.holders());
33+
});
34+
builder.icon(() -> new ItemStack(APBlocks.CHAT_BOX.get()));
35+
builder.title(Component.translatable("advancedperipherals.name"));
4536
}
4637

47-
private static Collection<ItemStack> pocketUpgrade(ResourceLocation pocketId) {
48-
return Set.of(ItemUtil.makePocket(ItemUtil.POCKET_NORMAL, pocketId.toString()),
49-
ItemUtil.makePocket(ItemUtil.POCKET_ADVANCED, pocketId.toString()));
38+
39+
// Friendly stolen from CC:Tweaked ModRegistry.class
40+
private static boolean isOurUpgrade(Holder.Reference<? extends UpgradeBase> upgrade) {
41+
String namespace = upgrade.key().location().getNamespace();
42+
return namespace.equals(AdvancedPeripherals.MOD_ID);
5043
}
5144

52-
private static Collection<ItemStack> turtleUpgrade(ResourceLocation pocketId) {
53-
return Set.of(ItemUtil.makeTurtle(ItemUtil.TURTLE_NORMAL, pocketId.toString()),
54-
ItemUtil.makeTurtle(ItemUtil.TURTLE_ADVANCED, pocketId.toString()));
45+
private static void addTurtle(CreativeModeTab.Output out, TurtleItem turtle, HolderLookup.Provider registries) {
46+
out.accept(new ItemStack(turtle));
47+
Stream<ItemStack> filteredItemStacks = registries.lookupOrThrow(ITurtleUpgrade.REGISTRY).listElements().filter(APCreativeTab::isOurUpgrade).map((x) -> DataComponentUtil.createStack(turtle, ModRegistry.DataComponents.RIGHT_TURTLE_UPGRADE.get(), UpgradeData.ofDefault(x)));
48+
Objects.requireNonNull(out);
49+
filteredItemStacks.forEach(out::accept);
5550
}
5651

57-
@Override
58-
@NotNull
59-
public ItemStack makeIcon() {
60-
return new ItemStack(APBlocks.CHAT_BOX.get());
52+
private static void addPocket(CreativeModeTab.Output out, PocketComputerItem pocket, HolderLookup.Provider registries) {
53+
out.accept(new ItemStack(pocket));
54+
Stream<ItemStack> filteredItemStacks = registries.lookupOrThrow(IPocketUpgrade.REGISTRY).listElements().filter(APCreativeTab::isOurUpgrade).map((x) -> DataComponentUtil.createStack(pocket, ModRegistry.DataComponents.POCKET_UPGRADE.get(), UpgradeData.ofDefault(x)));
55+
Objects.requireNonNull(out);
56+
filteredItemStacks.forEach(out::accept);
6157
}
58+
6259
}

‎src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public class AdvancedPeripherals {
3333
public static final String NAME = "Advanced Peripherals";
3434
public static final Logger LOGGER = LogManager.getLogger(NAME);
3535
public static final Random RANDOM = new Random();
36-
public static final APCreativeTab TAB = new APCreativeTab();
3736

3837
public AdvancedPeripherals(IEventBus modBus) {
3938
LOGGER.info("AdvancedPeripherals says hello!");
@@ -43,11 +42,11 @@ public AdvancedPeripherals(IEventBus modBus) {
4342

4443
modBus.addListener(this::registerCapabilities);
4544
modBus.addListener(ChunkManager::registerTicketController);
45+
modBus.addListener(this::onLoadComplete);
4646

4747
APRegistration.register(modBus);
4848
}
4949

50-
5150
public static void debug(String message) {
5251
if (APConfig.GENERAL_CONFIG.enableDebugMode.get())
5352
LOGGER.info("[DEBUG] {}", message);
@@ -67,13 +66,6 @@ public static ResourceLocation getRL(String resource) {
6766
return ResourceLocation.fromNamespaceAndPath(MOD_ID, resource);
6867
}
6968

70-
public void commonSetup(FMLCommonSetupEvent event) {
71-
event.enqueueWork(() -> {
72-
APNetworking.init();
73-
VillageStructures.init();
74-
});
75-
}
76-
7769
public void onLoadComplete(FMLLoadCompleteEvent event) {
7870
event.enqueueWork(() -> {
7971
if (APAddon.AE2.isLoaded()) {

‎src/main/java/de/srendi/advancedperipherals/client/ClientWorker.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package de.srendi.advancedperipherals.client;
22

33
import de.srendi.advancedperipherals.AdvancedPeripherals;
4-
import net.minecraftforge.api.distmarker.Dist;
5-
import net.minecraftforge.event.TickEvent;
6-
import net.minecraftforge.eventbus.api.SubscribeEvent;
7-
import net.minecraftforge.fml.common.Mod;
4+
import net.neoforged.api.distmarker.Dist;
5+
import net.neoforged.bus.api.SubscribeEvent;
6+
import net.neoforged.fml.common.EventBusSubscriber;
7+
import net.neoforged.neoforge.client.event.ClientTickEvent;
88

99
import java.util.Map;
1010
import java.util.concurrent.ConcurrentHashMap;
1111

12-
@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = AdvancedPeripherals.MOD_ID)
12+
@EventBusSubscriber(value = Dist.CLIENT, modid = AdvancedPeripherals.MOD_ID)
1313
public class ClientWorker {
1414

1515
private static final Map<String, Runnable> tasks = new ConcurrentHashMap<>();
@@ -23,12 +23,10 @@ public static void put(final String id, final Runnable task) {
2323
}
2424

2525
@SubscribeEvent
26-
public static void clientTick(TickEvent.ClientTickEvent event) {
27-
if (event.phase == TickEvent.Phase.END) {
28-
tasks.forEach((id, runnable) -> {
29-
tasks.remove(id, runnable);
30-
runnable.run();
31-
});
32-
}
26+
public static void clientTick(ClientTickEvent.Post event) {
27+
tasks.forEach((id, runnable) -> {
28+
tasks.remove(id, runnable);
29+
runnable.run();
30+
});
3331
}
3432
}

‎src/main/java/de/srendi/advancedperipherals/client/MetaTurtleUpgradeModeller.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
package de.srendi.advancedperipherals.client;
22

33
import com.mojang.blaze3d.vertex.PoseStack;
4+
import com.mojang.math.Axis;
45
import com.mojang.math.Transformation;
5-
import com.mojang.math.Vector3f;
66
import dan200.computercraft.api.client.TransformedModel;
77
import dan200.computercraft.api.client.turtle.TurtleUpgradeModeller;
88
import dan200.computercraft.api.turtle.ITurtleAccess;
99
import dan200.computercraft.api.turtle.TurtleSide;
1010
import de.srendi.advancedperipherals.common.util.DataStorageUtil;
1111
import de.srendi.advancedperipherals.lib.turtle.ClockwiseAnimatedTurtleUpgrade;
12+
import net.minecraft.core.component.DataComponentPatch;
1213
import org.jetbrains.annotations.NotNull;
1314
import org.jetbrains.annotations.Nullable;
1415

1516
public class MetaTurtleUpgradeModeller<T extends ClockwiseAnimatedTurtleUpgrade<?>> implements TurtleUpgradeModeller<T> {
1617

1718
@NotNull
1819
@Override
19-
public TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, @NotNull TurtleSide side) {
20+
public TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, DataComponentPatch dataComponentPatch) {
2021
if (upgrade.getLeftModel() == null) {
2122
PoseStack stack = new PoseStack();
2223
stack.pushPose();
2324
stack.translate(0.0f, 0.5f, 0.5f);
2425
if (turtle != null) {
2526
int rotationStep = DataStorageUtil.RotationCharge.get(turtle, side);
26-
stack.mulPose(Vector3f.XN.rotationDegrees(-10f * rotationStep));
27+
stack.mulPose(Axis.XN.rotationDegrees(-10f * rotationStep));
2728
}
2829
stack.translate(0.0f, -0.5f, -0.5f);
29-
stack.mulPose(Vector3f.YN.rotationDegrees(90));
30+
stack.mulPose(Axis.YN.rotationDegrees(90));
3031
if (side == TurtleSide.LEFT) {
3132
stack.translate(0, 0, -0.6);
3233
} else {

‎src/main/java/de/srendi/advancedperipherals/client/renderer/DistanceDetectorRenderer.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import com.mojang.blaze3d.vertex.PoseStack;
44
import com.mojang.blaze3d.vertex.VertexConsumer;
5-
import com.mojang.math.Matrix3f;
6-
import com.mojang.math.Matrix4f;
7-
import com.mojang.math.Vector3f;
5+
import com.mojang.math.Axis;
86
import de.srendi.advancedperipherals.common.blocks.base.BaseBlock;
97
import de.srendi.advancedperipherals.common.blocks.blockentities.DistanceDetectorEntity;
108
import de.srendi.advancedperipherals.common.util.EnumColor;
@@ -19,6 +17,9 @@
1917
import net.minecraft.util.Mth;
2018
import net.minecraft.world.phys.Vec3;
2119
import org.jetbrains.annotations.NotNull;
20+
import org.joml.Matrix3f;
21+
import org.joml.Matrix4f;
22+
import org.joml.Vector3f;
2223

2324
public class DistanceDetectorRenderer implements BlockEntityRenderer<DistanceDetectorEntity> {
2425

@@ -68,7 +69,7 @@ public static void renderBeaconBeam(DistanceDetectorEntity detectorEntity, PoseS
6869
float b = pColors[2];
6970
pPoseStack.pushPose();
7071
pPoseStack.mulPose(direction.getRotation());
71-
pPoseStack.mulPose(Vector3f.YP.rotationDegrees(degrees * 2.25F - 45.0F));
72+
pPoseStack.mulPose(Axis.YP.rotationDegrees(degrees * 2.25F - 45.0F));
7273
float f15 = -1.0F + time;
7374
float f16 = pHeight * pTextureScale * (0.5F / pBeamRadius) + f15;
7475
renderPart(pPoseStack, pBufferSource.getBuffer(RenderType.beaconBeam(pBeamLocation, false)), r, g, b, 1.0F, pYOffset, maxX, 0.0F, pBeamRadius, pBeamRadius, 0.0F, -pBeamRadius, 0.0F, 0.0F, -pBeamRadius, 0.0F, 1.0F, f16, f15);
@@ -83,22 +84,21 @@ public static void renderBeaconBeam(DistanceDetectorEntity detectorEntity, PoseS
8384
private static void renderPart(PoseStack pPoseStack, VertexConsumer pConsumer, float pRed, float pGreen, float pBlue, float pAlpha, int pMinY, float pMaxY, float pX0, float pZ0, float pX1, float pZ1, float pX2, float pZ2, float pX3, float pZ3, float pMinU, float pMaxU, float pMinV, float pMaxV) {
8485
PoseStack.Pose posestackPose = pPoseStack.last();
8586
Matrix4f matrix4f = posestackPose.pose();
86-
Matrix3f matrix3f = posestackPose.normal();
87-
renderQuad(matrix4f, matrix3f, pConsumer, pRed, pGreen, pBlue, pAlpha, pMinY, pMaxY, pX0, pZ0, pX1, pZ1, pMinU, pMaxU, pMinV, pMaxV);
88-
renderQuad(matrix4f, matrix3f, pConsumer, pRed, pGreen, pBlue, pAlpha, pMinY, pMaxY, pX3, pZ3, pX2, pZ2, pMinU, pMaxU, pMinV, pMaxV);
89-
renderQuad(matrix4f, matrix3f, pConsumer, pRed, pGreen, pBlue, pAlpha, pMinY, pMaxY, pX1, pZ1, pX3, pZ3, pMinU, pMaxU, pMinV, pMaxV);
90-
renderQuad(matrix4f, matrix3f, pConsumer, pRed, pGreen, pBlue, pAlpha, pMinY, pMaxY, pX2, pZ2, pX0, pZ0, pMinU, pMaxU, pMinV, pMaxV);
87+
renderQuad(matrix4f, posestackPose, pConsumer, pRed, pGreen, pBlue, pAlpha, pMinY, pMaxY, pX0, pZ0, pX1, pZ1, pMinU, pMaxU, pMinV, pMaxV);
88+
renderQuad(matrix4f, posestackPose, pConsumer, pRed, pGreen, pBlue, pAlpha, pMinY, pMaxY, pX3, pZ3, pX2, pZ2, pMinU, pMaxU, pMinV, pMaxV);
89+
renderQuad(matrix4f, posestackPose, pConsumer, pRed, pGreen, pBlue, pAlpha, pMinY, pMaxY, pX1, pZ1, pX3, pZ3, pMinU, pMaxU, pMinV, pMaxV);
90+
renderQuad(matrix4f, posestackPose, pConsumer, pRed, pGreen, pBlue, pAlpha, pMinY, pMaxY, pX2, pZ2, pX0, pZ0, pMinU, pMaxU, pMinV, pMaxV);
9191
}
9292

93-
private static void renderQuad(Matrix4f pPose, Matrix3f pNormal, VertexConsumer pConsumer, float pRed, float pGreen, float pBlue, float pAlpha, int pMinY, float pMaxY, float pMinX, float pMinZ, float pMaxX, float pMaxZ, float pMinU, float pMaxU, float pMinV, float pMaxV) {
93+
private static void renderQuad(Matrix4f pPose, PoseStack.Pose pNormal, VertexConsumer pConsumer, float pRed, float pGreen, float pBlue, float pAlpha, int pMinY, float pMaxY, float pMinX, float pMinZ, float pMaxX, float pMaxZ, float pMinU, float pMaxU, float pMinV, float pMaxV) {
9494
addVertex(pPose, pNormal, pConsumer, pRed, pGreen, pBlue, pAlpha, pMaxY, pMinX, pMinZ, pMaxU, pMinV);
9595
addVertex(pPose, pNormal, pConsumer, pRed, pGreen, pBlue, pAlpha, pMinY, pMinX, pMinZ, pMaxU, pMaxV);
9696
addVertex(pPose, pNormal, pConsumer, pRed, pGreen, pBlue, pAlpha, pMinY, pMaxX, pMaxZ, pMinU, pMaxV);
9797
addVertex(pPose, pNormal, pConsumer, pRed, pGreen, pBlue, pAlpha, pMaxY, pMaxX, pMaxZ, pMinU, pMinV);
9898
}
9999

100-
private static void addVertex(Matrix4f pPose, Matrix3f pNormal, VertexConsumer pConsumer, float pRed, float pGreen, float pBlue, float pAlpha, float pY, float pX, float pZ, float pU, float pV) {
101-
pConsumer.vertex(pPose, pX, pY, pZ).color(pRed, pGreen, pBlue, pAlpha).uv(pU, pV).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(15728880).normal(pNormal, 0.0F, 1.0F, 0.0F).endVertex();
100+
private static void addVertex(Matrix4f pPose, PoseStack.Pose pNormal, VertexConsumer pConsumer, float pRed, float pGreen, float pBlue, float pAlpha, float pY, float pX, float pZ, float pU, float pV) {
101+
pConsumer.addVertex(pPose, pX, pY, pZ).setColor(pRed, pGreen, pBlue, pAlpha).setUv(pU, pV).setOverlay(OverlayTexture.NO_OVERLAY).setLight(15728880).setNormal(pNormal, 0.0F, 1.0F, 0.0F);
102102
}
103103

104104
}

‎src/main/java/de/srendi/advancedperipherals/client/smartglasses/OverlayModuleOverlay.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,25 @@
33
import com.mojang.blaze3d.vertex.PoseStack;
44
import de.srendi.advancedperipherals.client.smartglasses.objects.twodim.ITwoDObjectRenderer;
55
import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.RenderableObject;
6-
import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.RectangleObject;
7-
import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.TextObject;
6+
import net.minecraft.client.DeltaTracker;
7+
import net.minecraft.client.gui.GuiGraphics;
8+
import net.minecraft.client.gui.LayeredDraw;
89

910
import java.util.ArrayList;
1011
import java.util.HashMap;
1112
import java.util.List;
1213
import java.util.Map;
1314
import java.util.TreeMap;
1415

15-
public class OverlayModuleOverlay implements IGuiOverlay {
16+
public class OverlayModuleOverlay implements LayeredDraw.Layer {
1617
public static final String ID = "overlay_module_overlay";
1718

1819
@Override
19-
public void render(ForgeGui gui, PoseStack poseStack, float partialTick, int screenWidth, int screenHeight) {
20+
public void render(GuiGraphics gui, DeltaTracker deltaTracker) {
21+
this.render(gui, gui.pose(), deltaTracker, gui.guiWidth(), gui.guiHeight());
22+
}
23+
24+
public void render(GuiGraphics gui, PoseStack poseStack, DeltaTracker deltaTracker, int screenWidth, int screenHeight) {
2025
poseStack.pushPose();
2126

2227
Map<Integer, Map<Class<? extends RenderableObject>, List<RenderableObject>>> prioritizedBatches = new TreeMap<>();
@@ -43,7 +48,7 @@ public void render(ForgeGui gui, PoseStack poseStack, float partialTick, int scr
4348
for (List<RenderableObject> batch : batchesForWeight.values()) {
4449

4550
if (!batch.isEmpty()) {
46-
((ITwoDObjectRenderer) batch.get(0).getRenderObject()).renderBatch(batch, gui, poseStack, partialTick, screenWidth, screenHeight);
51+
((ITwoDObjectRenderer) batch.get(0).getRenderObject()).renderBatch(batch, gui, poseStack, deltaTracker, screenWidth, screenHeight);
4752
}
4853
}
4954
}

‎src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/twodim/ITwoDObjectRenderer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
import com.mojang.blaze3d.vertex.PoseStack;
44
import de.srendi.advancedperipherals.client.smartglasses.objects.IObjectRenderer;
55
import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.RenderableObject;
6-
import net.neoforged.client.gui.overlay.ForgeGui;
6+
import net.minecraft.client.DeltaTracker;
7+
import net.minecraft.client.gui.GuiGraphics;
78

89
import java.util.List;
910

1011
public interface ITwoDObjectRenderer extends IObjectRenderer {
1112

12-
void renderBatch(List<RenderableObject> object, ForgeGui gui, PoseStack poseStack, float partialTick, int screenWidth, int screenHeight);
13+
void renderBatch(List<RenderableObject> object, GuiGraphics gui, PoseStack poseStack, DeltaTracker partialTick, int screenWidth, int screenHeight);
1314

1415
}

‎src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/operations/SingleOperation.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package de.srendi.advancedperipherals.common.addons.computercraft.operations;
22

33
import de.srendi.advancedperipherals.lib.peripherals.IPeripheralOperation;
4-
import net.neoforged.common.ForgeConfigSpec;
4+
import net.neoforged.neoforge.common.ModConfigSpec;
55

66
import java.util.HashMap;
77
import java.util.Map;
@@ -26,8 +26,8 @@ public enum SingleOperation implements IPeripheralOperation<SingleOperationConte
2626
private final int defaultCost;
2727
private final DistancePolicy distanceCostPolicy;
2828
private final CountPolicy countCostPolicy;
29-
private ForgeConfigSpec.IntValue cooldown;
30-
private ForgeConfigSpec.IntValue cost;
29+
private ModConfigSpec.IntValue cooldown;
30+
private ModConfigSpec.IntValue cost;
3131

3232
SingleOperation(int defaultCooldown, DistancePolicy distanceCooldownPolicy, CountPolicy countCooldownPolicy, int defaultCost, DistancePolicy distanceCostPolicy, CountPolicy countCostPolicy) {
3333
this.defaultCooldown = defaultCooldown;
@@ -72,7 +72,7 @@ public Map<String, Object> computerDescription() {
7272
}
7373

7474
@Override
75-
public void addToConfig(ForgeConfigSpec.Builder builder) {
75+
public void addToConfig(ModConfigSpec.Builder builder) {
7676
cooldown = builder.defineInRange(settingsName() + "Cooldown", defaultCooldown, 1_000, Integer.MAX_VALUE);
7777
cost = builder.defineInRange(settingsName() + "Cost", defaultCost, 0, Integer.MAX_VALUE);
7878
}

0 commit comments

Comments
 (0)