Skip to content

Commit a9109eb

Browse files
deshtdesht
committed
chore: updated to new ftb library layout
1 parent 7294fda commit a9109eb

File tree

141 files changed

+1212
-1098
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+1212
-1098
lines changed

‎common/src/main/java/dev/ftb/mods/ftbquests/MethodsReturnNonnullByDefault.java‎

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

‎common/src/main/java/dev/ftb/mods/ftbquests/block/entity/BaseBarrierBlockEntity.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
package dev.ftb.mods.ftbquests.block.entity;
22

3-
import com.mojang.serialization.Codec;
4-
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
import dev.architectury.networking.NetworkManager;
6-
import dev.architectury.platform.Platform;
7-
import dev.ftb.mods.ftblibrary.config.ConfigGroup;
8-
import dev.ftb.mods.ftblibrary.config.ItemStackConfig;
9-
import dev.ftb.mods.ftbquests.api.FTBQuestsAPI;
10-
import dev.ftb.mods.ftbquests.block.QuestBarrierBlock;
11-
import dev.ftb.mods.ftbquests.client.FTBQuestsClient;
12-
import dev.ftb.mods.ftbquests.net.BlockConfigResponseMessage;
13-
import dev.ftb.mods.ftbquests.registry.ModBlocks;
14-
import dev.ftb.mods.ftbquests.registry.ModDataComponents;
153
import net.minecraft.ChatFormatting;
164
import net.minecraft.core.BlockPos;
175
import net.minecraft.core.HolderLookup;
@@ -20,7 +8,6 @@
208
import net.minecraft.core.registries.BuiltInRegistries;
219
import net.minecraft.core.registries.Registries;
2210
import net.minecraft.nbt.CompoundTag;
23-
import net.minecraft.nbt.NbtOps;
2411
import net.minecraft.network.RegistryFriendlyByteBuf;
2512
import net.minecraft.network.chat.Component;
2613
import net.minecraft.network.codec.ByteBufCodecs;
@@ -29,8 +16,8 @@
2916
import net.minecraft.network.protocol.game.ClientGamePacketListener;
3017
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
3118
import net.minecraft.network.protocol.game.ClientboundSoundPacket;
32-
import net.minecraft.resources.ResourceKey;
3319
import net.minecraft.resources.Identifier;
20+
import net.minecraft.resources.ResourceKey;
3421
import net.minecraft.server.MinecraftServer;
3522
import net.minecraft.server.level.ServerLevel;
3623
import net.minecraft.server.level.ServerPlayer;
@@ -49,12 +36,25 @@
4936
import net.minecraft.world.level.storage.ValueInput;
5037
import net.minecraft.world.level.storage.ValueOutput;
5138
import net.minecraft.world.phys.Vec3;
52-
import org.jetbrains.annotations.Nullable;
39+
import com.mojang.serialization.Codec;
40+
import com.mojang.serialization.codecs.RecordCodecBuilder;
41+
42+
import dev.architectury.networking.NetworkManager;
43+
import dev.architectury.platform.Platform;
44+
45+
import dev.ftb.mods.ftblibrary.client.config.EditableConfigGroup;
46+
import dev.ftb.mods.ftblibrary.client.config.editable.EditableItemStack;
47+
import dev.ftb.mods.ftbquests.api.FTBQuestsAPI;
48+
import dev.ftb.mods.ftbquests.block.QuestBarrierBlock;
49+
import dev.ftb.mods.ftbquests.client.FTBQuestsClient;
50+
import dev.ftb.mods.ftbquests.net.BlockConfigResponseMessage;
51+
import dev.ftb.mods.ftbquests.registry.ModBlocks;
52+
import dev.ftb.mods.ftbquests.registry.ModDataComponents;
5353

54-
import java.util.List;
5554
import java.util.Objects;
5655
import java.util.Optional;
5756
import java.util.function.Consumer;
57+
import org.jetbrains.annotations.Nullable;
5858

5959
import static dev.ftb.mods.ftbquests.block.QuestBarrierBlock.OPEN;
6060

@@ -150,10 +150,10 @@ public void updateFromString(String objStr) {
150150

151151
public abstract boolean isOpen(Player player);
152152

153-
protected abstract void addConfigEntries(ConfigGroup cg);
153+
protected abstract void addConfigEntries(EditableConfigGroup cg);
154154

155-
public ConfigGroup fillConfigGroup() {
156-
ConfigGroup group = new ConfigGroup("ftbquests.barrier", accepted -> {
155+
public EditableConfigGroup fillConfigGroup() {
156+
EditableConfigGroup group = new EditableConfigGroup("ftbquests.barrier", accepted -> {
157157
if (accepted) {
158158
NetworkManager.sendToServer(new BlockConfigResponseMessage(getBlockPos(), saveWithoutMetadata(getLevel().registryAccess())));
159159
}
@@ -163,14 +163,14 @@ public ConfigGroup fillConfigGroup() {
163163
addConfigEntries(group);
164164

165165
if (Platform.isForgeLike()) {
166-
ConfigGroup appearance = group.getOrCreateSubgroup("appearance").setNameKey("ftbquests.quest.appearance");
167-
appearance.add("skin", new ItemStackConfig(true, true), getSkin(), this::setSkin, ItemStack.EMPTY)
166+
EditableConfigGroup appearance = group.getOrCreateSubgroup("appearance").setNameKey("ftbquests.quest.appearance");
167+
appearance.add("skin", new EditableItemStack(true, true), getSkin(), this::setSkin, ItemStack.EMPTY)
168168
.withFilter(stack -> stack.getItem() instanceof BlockItem)
169169
.setNameKey("block.ftbquests.screen.skin");
170170
appearance.addBool("invis_when_open", isInvisibleWhenOpen(), this::setInvisibleWhenOpen, false).setNameKey("block.ftbquests.barrier.invis_when_open");
171171
}
172172

173-
ConfigGroup teleport = group.getOrCreateSubgroup("teleport").setNameKey("ftbquests.barrier.teleport");
173+
EditableConfigGroup teleport = group.getOrCreateSubgroup("teleport").setNameKey("ftbquests.barrier.teleport");
174174
teleport.addBool("enabled", teleportData.enabled, v -> teleportData = teleportData.withEnabled(v), false);
175175
teleport.addBool("relative", teleportData.relative, v -> teleportData = teleportData.withRelative(v), false);
176176
teleport.addInt("dest_x", teleportData.dest.getX(), v -> teleportData = teleportData.withDestX(v), 0, Integer.MIN_VALUE, Integer.MAX_VALUE);

‎common/src/main/java/dev/ftb/mods/ftbquests/block/entity/DetectorBlockEntity.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
package dev.ftb.mods.ftbquests.block.entity;
22

3-
import dev.architectury.hooks.level.entity.PlayerHooks;
4-
import dev.ftb.mods.ftbquests.quest.QuestObjectBase;
5-
import dev.ftb.mods.ftbquests.quest.ServerQuestFile;
6-
import dev.ftb.mods.ftbquests.registry.ModBlockEntityTypes;
7-
import dev.ftb.mods.ftbquests.util.ProgressChange;
83
import net.minecraft.core.BlockPos;
9-
import net.minecraft.core.HolderLookup;
10-
import net.minecraft.nbt.CompoundTag;
114
import net.minecraft.server.level.ServerPlayer;
125
import net.minecraft.world.level.Level;
136
import net.minecraft.world.level.block.entity.BlockEntity;
@@ -16,6 +9,13 @@
169
import net.minecraft.world.level.storage.ValueOutput;
1710
import net.minecraft.world.phys.AABB;
1811

12+
import dev.architectury.hooks.level.entity.PlayerHooks;
13+
14+
import dev.ftb.mods.ftbquests.quest.QuestObjectBase;
15+
import dev.ftb.mods.ftbquests.quest.ServerQuestFile;
16+
import dev.ftb.mods.ftbquests.registry.ModBlockEntityTypes;
17+
import dev.ftb.mods.ftbquests.util.ProgressChange;
18+
1919
public class DetectorBlockEntity extends BlockEntity {
2020
private long objectId = 0L;
2121
private int radius = 8;

‎common/src/main/java/dev/ftb/mods/ftbquests/block/entity/LootCrateOpenerBlockEntity.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
11
package dev.ftb.mods.ftbquests.block.entity;
22

3-
import com.mojang.serialization.Codec;
4-
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
import dev.ftb.mods.ftbquests.item.LootCrateItem;
6-
import dev.ftb.mods.ftbquests.quest.loot.LootCrate;
7-
import dev.ftb.mods.ftbquests.quest.loot.WeightedReward;
8-
import dev.ftb.mods.ftbquests.registry.ModBlockEntityTypes;
9-
import dev.ftb.mods.ftbquests.registry.ModDataComponents;
103
import net.minecraft.core.BlockPos;
11-
import net.minecraft.core.HolderLookup;
124
import net.minecraft.core.UUIDUtil;
135
import net.minecraft.core.component.DataComponentGetter;
146
import net.minecraft.core.component.DataComponentMap;
15-
import net.minecraft.nbt.CompoundTag;
16-
import net.minecraft.nbt.ListTag;
17-
import net.minecraft.nbt.Tag;
187
import net.minecraft.server.level.ServerPlayer;
198
import net.minecraft.world.item.ItemStack;
209
import net.minecraft.world.item.component.ItemContainerContents;
2110
import net.minecraft.world.level.block.entity.BlockEntity;
2211
import net.minecraft.world.level.block.state.BlockState;
2312
import net.minecraft.world.level.storage.ValueInput;
2413
import net.minecraft.world.level.storage.ValueOutput;
14+
import com.mojang.serialization.Codec;
15+
import com.mojang.serialization.codecs.RecordCodecBuilder;
16+
17+
import dev.ftb.mods.ftbquests.item.LootCrateItem;
18+
import dev.ftb.mods.ftbquests.quest.loot.LootCrate;
19+
import dev.ftb.mods.ftbquests.quest.loot.WeightedReward;
20+
import dev.ftb.mods.ftbquests.registry.ModBlockEntityTypes;
21+
import dev.ftb.mods.ftbquests.registry.ModDataComponents;
2522

26-
import java.util.*;
23+
import java.util.ArrayList;
24+
import java.util.LinkedHashMap;
25+
import java.util.List;
26+
import java.util.Map;
27+
import java.util.UUID;
28+
import org.jspecify.annotations.Nullable;
2729

2830
public class LootCrateOpenerBlockEntity extends BlockEntity {
2931
private static final ItemEntry EMPTY_ENTRY = new ItemEntry(ItemStack.EMPTY);
3032
private static final int MAX_ITEM_TYPES = 64;
3133

34+
@Nullable
3235
private UUID owner = null;
3336
private final Map<ItemEntry, Integer> outputs = new LinkedHashMap<>();
3437

@@ -89,6 +92,7 @@ protected void collectImplicitComponents(DataComponentMap.Builder builder) {
8992
ItemContainerContents.fromItems(outputs.keySet().stream().map(ItemEntry::stack).toList()));
9093
}
9194

95+
@Nullable
9296
public UUID getOwner() {
9397
return owner;
9498
}

‎common/src/main/java/dev/ftb/mods/ftbquests/block/entity/QuestBarrierBlockEntity.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package dev.ftb.mods.ftbquests.block.entity;
22

3-
import dev.ftb.mods.ftblibrary.config.ConfigGroup;
3+
import net.minecraft.core.BlockPos;
4+
import net.minecraft.world.entity.player.Player;
5+
import net.minecraft.world.level.block.state.BlockState;
6+
7+
import dev.ftb.mods.ftblibrary.client.config.EditableConfigGroup;
48
import dev.ftb.mods.ftbquests.api.FTBQuestsAPI;
59
import dev.ftb.mods.ftbquests.quest.BaseQuestFile;
610
import dev.ftb.mods.ftbquests.quest.Quest;
711
import dev.ftb.mods.ftbquests.quest.QuestObjectType;
812
import dev.ftb.mods.ftbquests.registry.ModBlockEntityTypes;
9-
import dev.ftb.mods.ftbquests.util.ConfigQuestObject;
10-
import net.minecraft.core.BlockPos;
11-
import net.minecraft.world.entity.player.Player;
12-
import net.minecraft.world.level.block.state.BlockState;
13+
import dev.ftb.mods.ftbquests.client.config.EditableQuestObject;
1314

1415
public class QuestBarrierBlockEntity extends BaseBarrierBlockEntity {
1516
private Quest cachedQuest = null;
@@ -41,8 +42,8 @@ public boolean isOpen(Player player) {
4142
}
4243

4344
@Override
44-
protected void addConfigEntries(ConfigGroup cg) {
45-
cg.add("quest", new ConfigQuestObject<>(QuestObjectType.QUEST), getQuest(), this::setQuest, null)
45+
protected void addConfigEntries(EditableConfigGroup cg) {
46+
cg.add("quest", new EditableQuestObject<>(QuestObjectType.QUEST), getQuest(), this::setQuest, null)
4647
.setNameKey("ftbquests.quest");
4748
}
4849

‎common/src/main/java/dev/ftb/mods/ftbquests/block/entity/StageBarrierBlockEntity.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package dev.ftb.mods.ftbquests.block.entity;
22

3-
import dev.ftb.mods.ftblibrary.config.ConfigGroup;
4-
import dev.ftb.mods.ftblibrary.integration.stages.StageHelper;
5-
import dev.ftb.mods.ftbquests.registry.ModBlockEntityTypes;
63
import net.minecraft.core.BlockPos;
74
import net.minecraft.world.entity.player.Player;
85
import net.minecraft.world.level.block.state.BlockState;
96

7+
import dev.ftb.mods.ftblibrary.client.config.EditableConfigGroup;
8+
import dev.ftb.mods.ftblibrary.integration.stages.StageHelper;
9+
import dev.ftb.mods.ftbquests.registry.ModBlockEntityTypes;
10+
1011
public class StageBarrierBlockEntity extends BaseBarrierBlockEntity {
1112
public StageBarrierBlockEntity(BlockPos blockPos, BlockState blockState) {
1213
super(ModBlockEntityTypes.STAGE_BARRIER.get(), blockPos, blockState);
@@ -18,7 +19,7 @@ public boolean isOpen(Player player) {
1819
}
1920

2021
@Override
21-
protected void addConfigEntries(ConfigGroup cg) {
22+
protected void addConfigEntries(EditableConfigGroup cg) {
2223
cg.addString("stage", objStr, s -> objStr = s, "").setNameKey("ftbquests.task.ftbquests.gamestage");
2324
}
2425
}

‎common/src/main/java/dev/ftb/mods/ftbquests/block/entity/TaskScreenBlockEntity.java‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
package dev.ftb.mods.ftbquests.block.entity;
22

3-
import com.mojang.serialization.Codec;
4-
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
import dev.architectury.networking.NetworkManager;
6-
import dev.ftb.mods.ftblibrary.config.BooleanConfig;
7-
import dev.ftb.mods.ftblibrary.config.ConfigGroup;
8-
import dev.ftb.mods.ftblibrary.config.ItemStackConfig;
9-
import dev.ftb.mods.ftbquests.api.FTBQuestsAPI;
10-
import dev.ftb.mods.ftbquests.block.TaskScreenBlock;
11-
import dev.ftb.mods.ftbquests.client.FTBQuestsClient;
12-
import dev.ftb.mods.ftbquests.net.BlockConfigResponseMessage;
13-
import dev.ftb.mods.ftbquests.quest.BaseQuestFile;
14-
import dev.ftb.mods.ftbquests.quest.QuestObjectBase;
15-
import dev.ftb.mods.ftbquests.quest.TeamData;
16-
import dev.ftb.mods.ftbquests.quest.task.Task;
17-
import dev.ftb.mods.ftbquests.registry.ModBlockEntityTypes;
18-
import dev.ftb.mods.ftbquests.registry.ModBlocks;
19-
import dev.ftb.mods.ftbquests.registry.ModDataComponents;
20-
import dev.ftb.mods.ftbquests.util.ConfigQuestObject;
21-
import dev.ftb.mods.ftbteams.api.FTBTeamsAPI;
223
import net.minecraft.ChatFormatting;
234
import net.minecraft.core.BlockPos;
245
import net.minecraft.core.Direction;
@@ -42,11 +23,32 @@
4223
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
4324
import net.minecraft.world.level.storage.ValueInput;
4425
import net.minecraft.world.level.storage.ValueOutput;
45-
import org.jetbrains.annotations.NotNull;
46-
import org.jetbrains.annotations.Nullable;
26+
import com.mojang.serialization.Codec;
27+
import com.mojang.serialization.codecs.RecordCodecBuilder;
28+
29+
import dev.architectury.networking.NetworkManager;
30+
31+
import dev.ftb.mods.ftblibrary.client.config.EditableConfigGroup;
32+
import dev.ftb.mods.ftblibrary.client.config.editable.EditableBoolean;
33+
import dev.ftb.mods.ftblibrary.client.config.editable.EditableItemStack;
34+
import dev.ftb.mods.ftbquests.api.FTBQuestsAPI;
35+
import dev.ftb.mods.ftbquests.block.TaskScreenBlock;
36+
import dev.ftb.mods.ftbquests.client.FTBQuestsClient;
37+
import dev.ftb.mods.ftbquests.net.BlockConfigResponseMessage;
38+
import dev.ftb.mods.ftbquests.quest.BaseQuestFile;
39+
import dev.ftb.mods.ftbquests.quest.QuestObjectBase;
40+
import dev.ftb.mods.ftbquests.quest.TeamData;
41+
import dev.ftb.mods.ftbquests.quest.task.Task;
42+
import dev.ftb.mods.ftbquests.registry.ModBlockEntityTypes;
43+
import dev.ftb.mods.ftbquests.registry.ModBlocks;
44+
import dev.ftb.mods.ftbquests.registry.ModDataComponents;
45+
import dev.ftb.mods.ftbquests.client.config.EditableQuestObject;
46+
import dev.ftb.mods.ftbteams.api.FTBTeamsAPI;
4747

4848
import java.util.Optional;
4949
import java.util.UUID;
50+
import org.jetbrains.annotations.NotNull;
51+
import org.jetbrains.annotations.Nullable;
5052

5153
import static dev.ftb.mods.ftbquests.block.TaskScreenBlock.FACING;
5254

@@ -218,21 +220,21 @@ private void applySavedData(TaskScreenSaveData data) {
218220
textShadow = data.textShadow;
219221
}
220222

221-
public ConfigGroup fillConfigGroup(TeamData data) {
222-
ConfigGroup cg0 = new ConfigGroup("task_screen", accepted -> {
223+
public EditableConfigGroup fillConfigGroup(TeamData data) {
224+
EditableConfigGroup cg0 = new EditableConfigGroup("task_screen", accepted -> {
223225
if (accepted) {
224226
NetworkManager.sendToServer(new BlockConfigResponseMessage(getBlockPos(), saveWithoutMetadata(getLevel().registryAccess())));
225227
}
226228
});
227229

228230
cg0.setNameKey(getBlockState().getBlock().getDescriptionId());
229-
ConfigGroup cg = cg0.getOrCreateSubgroup("screen");
230-
cg.add("task", new ConfigQuestObject<>(o -> isSuitableTask(data, o), this::formatLine), getTask(), this::setTask, null).setNameKey("ftbquests.task");
231-
cg.add("skin", new ItemStackConfig(true, true), getSkin(), this::setSkin, ItemStack.EMPTY).setNameKey("block.ftbquests.screen.skin");
232-
cg.add("text_shadow", new BooleanConfig(), isTextShadow(), this::setTextShadow, false).setNameKey("block.ftbquests.screen.text_shadow");
233-
cg.add("indestructible", new BooleanConfig(), isIndestructible(), this::setIndestructible, false).setNameKey("block.ftbquests.screen.indestructible");
234-
cg.add("input_only", new BooleanConfig(), isInputOnly(), this::setInputOnly, false).setNameKey("block.ftbquests.screen.input_only");
235-
cg.add("input_icon", new ItemStackConfig(true, true), getInputModeIcon(), this::setInputModeIcon, ItemStack.EMPTY).setNameKey("block.ftbquests.screen.input_mode_icon");
231+
EditableConfigGroup cg = cg0.getOrCreateSubgroup("screen");
232+
cg.add("task", new EditableQuestObject<>(o -> isSuitableTask(data, o), this::formatLine), getTask(), this::setTask, null).setNameKey("ftbquests.task");
233+
cg.add("skin", new EditableItemStack(true, true), getSkin(), this::setSkin, ItemStack.EMPTY).setNameKey("block.ftbquests.screen.skin");
234+
cg.add("text_shadow", new EditableBoolean(), isTextShadow(), this::setTextShadow, false).setNameKey("block.ftbquests.screen.text_shadow");
235+
cg.add("indestructible", new EditableBoolean(), isIndestructible(), this::setIndestructible, false).setNameKey("block.ftbquests.screen.indestructible");
236+
cg.add("input_only", new EditableBoolean(), isInputOnly(), this::setInputOnly, false).setNameKey("block.ftbquests.screen.input_only");
237+
cg.add("input_icon", new EditableItemStack(true, true), getInputModeIcon(), this::setInputModeIcon, ItemStack.EMPTY).setNameKey("block.ftbquests.screen.input_mode_icon");
236238

237239
return cg0;
238240
}
@@ -241,7 +243,7 @@ private Component formatLine(Task task) {
241243
if (task == null) return Component.empty();
242244

243245
Component questTxt = Component.literal(" [").append(task.getQuest().getTitle()).append("]").withStyle(ChatFormatting.GREEN);
244-
return ConfigQuestObject.formatEntry(task).copy().append(questTxt);
246+
return EditableQuestObject.formatEntry(task).copy().append(questTxt);
245247
}
246248

247249
private boolean isSuitableTask(TeamData data, QuestObjectBase o) {

‎common/src/main/java/dev/ftb/mods/ftbquests/block/entity/package-info.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
@dev.ftb.mods.ftbquests.MethodsReturnNonnullByDefault
2-
package dev.ftb.mods.ftbquests.block.entity;
1+
2+
@NullMarked
3+
package dev.ftb.mods.ftbquests.block.entity;
4+
5+
import org.jspecify.annotations.NullMarked;

‎common/src/main/java/dev/ftb/mods/ftbquests/block/package-info.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
@dev.ftb.mods.ftbquests.MethodsReturnNonnullByDefault
2-
package dev.ftb.mods.ftbquests.block;
1+
2+
@NullMarked
3+
package dev.ftb.mods.ftbquests.block;
4+
5+
import org.jspecify.annotations.NullMarked;

‎common/src/main/java/dev/ftb/mods/ftbquests/client/AutoPinTarget.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package dev.ftb.mods.ftbquests.client;
22

3-
import dev.ftb.mods.ftblibrary.config.NameMap;
43
import net.minecraft.network.chat.Component;
54

5+
import dev.ftb.mods.ftblibrary.util.NameMap;
6+
67
public enum AutoPinTarget {
78
QUEST_BOOK("file"),
89
CHAPTER("chapter");

0 commit comments

Comments
 (0)