Skip to content

Commit 735de0d

Browse files
Ale32bitAle32bit
committed
Refactor project structure and merge package registry initialization.
1 parent e2d8a2a commit 735de0d

65 files changed

Lines changed: 564 additions & 644 deletions

File tree

Some content is hidden

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

‎common/src/main/java/me/alexdevs/classicPeripherals/ClassicPeripherals.java‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
package me.alexdevs.classicPeripherals;
22

3-
import me.alexdevs.classicPeripherals.block.ModBlocks;
43
import me.alexdevs.classicPeripherals.core.StateSaverAndLoader;
5-
import me.alexdevs.classicPeripherals.item.ModItems;
6-
import me.alexdevs.classicPeripherals.luaApi.ModLuaApiProvider;
7-
import me.alexdevs.classicPeripherals.luaApi.PocketNfcAccess;
4+
import me.alexdevs.classicPeripherals.registry.ModRegistry;
5+
import me.alexdevs.classicPeripherals.registry.luaApi.PocketNfcAccess;
86
import me.alexdevs.classicPeripherals.platform.Registrar;
97
import me.alexdevs.classicPeripherals.platform.RegistrySupplier;
108
import me.alexdevs.classicPeripherals.platform.Services;
11-
import me.alexdevs.classicPeripherals.recipe.ModRecipes;
12-
import me.alexdevs.classicPeripherals.screen.ModScreenHandlers;
13-
import me.alexdevs.classicPeripherals.tiles.ModBlockTiles;
149
import net.minecraft.core.registries.Registries;
1510
import net.minecraft.network.chat.Component;
1611
import net.minecraft.server.MinecraftServer;
@@ -35,32 +30,26 @@ public class ClassicPeripherals {
3530
public static final RegistrySupplier<CreativeModeTab> CREATIVE_TAB = CREATIVE_TABS.register("classicperipherals",
3631
() -> CreativeModeTab.builder(CreativeModeTab.Row.TOP, 0)
3732
.title(Component.translatable("itemGroup.classicperipherals"))
38-
.icon(() -> ModBlocks.TOWER_HEAD.get().asItem().getDefaultInstance())
33+
.icon(() -> ModRegistry.Blocks.TOWER_HEAD.get().asItem().getDefaultInstance())
3934
.displayItems((parameters, entries) -> {
40-
entries.accept(ModBlocks.TOWER_BASE.get());
41-
entries.accept(ModBlocks.TOWER_SEGMENT.get());
42-
entries.accept(ModBlocks.TOWER_HEAD.get());
43-
entries.accept(ModBlocks.ANTENNA.get());
44-
entries.accept(ModItems.COPPER_COIL.get());
45-
entries.accept(ModBlocks.NFC_READER.get());
46-
entries.accept(ModItems.NFC_CARD.get());
47-
entries.accept(ModBlocks.RFID_SCANNER.get());
48-
entries.accept(ModItems.RFID_BADGE.get());
49-
entries.accept(ModBlocks.CRYPTOGRAPHIC_ACCELERATOR.get());
50-
entries.accept(ModBlocks.SCANNER.get());
35+
entries.accept(ModRegistry.Blocks.TOWER_BASE.get());
36+
entries.accept(ModRegistry.Blocks.TOWER_SEGMENT.get());
37+
entries.accept(ModRegistry.Blocks.TOWER_HEAD.get());
38+
entries.accept(ModRegistry.Blocks.ANTENNA.get());
39+
entries.accept(ModRegistry.Items.COPPER_COIL.get());
40+
entries.accept(ModRegistry.Blocks.NFC_READER.get());
41+
entries.accept(ModRegistry.Items.NFC_CARD.get());
42+
entries.accept(ModRegistry.Blocks.RFID_SCANNER.get());
43+
entries.accept(ModRegistry.Items.RFID_BADGE.get());
44+
entries.accept(ModRegistry.Blocks.CRYPTOGRAPHIC_ACCELERATOR.get());
45+
entries.accept(ModRegistry.Blocks.SCANNER.get());
5146
})
5247
.build());
5348

5449
private static @Nullable StateSaverAndLoader stateSaverAndLoader;
5550

5651
public static void init() {
57-
ModComponents.initialize();
58-
ModBlocks.initialize();
59-
ModItems.initialize();
60-
ModBlockTiles.initialize();
61-
ModRecipes.initialize();
62-
ModScreenHandlers.initialize();
63-
ModLuaApiProvider.initialize();
52+
ModRegistry.initialize();
6453
}
6554

6655
public static void onServerStarted(MinecraftServer server) {

‎common/src/main/java/me/alexdevs/classicPeripherals/ModComponents.java‎

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

‎common/src/main/java/me/alexdevs/classicPeripherals/block/ModBlocks.java‎

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

‎common/src/main/java/me/alexdevs/classicPeripherals/client/screen/ScannerScreen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.alexdevs.classicPeripherals.client.screen;
22

33
import me.alexdevs.classicPeripherals.ClassicPeripherals;
4-
import me.alexdevs.classicPeripherals.screen.ScannerMenu;
4+
import me.alexdevs.classicPeripherals.registry.screen.ScannerMenu;
55
import net.minecraft.client.gui.GuiGraphics;
66
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
77
import net.minecraft.network.chat.Component;

‎common/src/main/java/me/alexdevs/classicPeripherals/core/ItemDataHandler.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.alexdevs.classicPeripherals.core;
22

33
import me.alexdevs.classicPeripherals.ClassicPeripherals;
4-
import me.alexdevs.classicPeripherals.ModComponents;
5-
import me.alexdevs.classicPeripherals.item.IDataItem;
4+
import me.alexdevs.classicPeripherals.registry.ModRegistry;
5+
import me.alexdevs.classicPeripherals.registry.item.IDataItem;
66
import net.minecraft.core.component.DataComponents;
77
import net.minecraft.nbt.Tag;
88
import net.minecraft.network.chat.Component;
@@ -32,15 +32,15 @@ private static void setData(UUID id, ItemData data) {
3232
}
3333

3434
public static Optional<UUID> getId(ItemStack stack) {
35-
var uuid = stack.getOrDefault(ModComponents.DATAHOLDER_UUID.get(), null);
35+
var uuid = stack.getOrDefault(ModRegistry.DataComponents.DATAHOLDER_UUID.get(), null);
3636
return Optional.ofNullable(uuid);
3737

3838
}
3939

4040
public static UUID getOrCreateId(ItemStack stack) {
4141
var uuid = getId(stack).orElseGet(() -> {
4242
var id = UUID.randomUUID();
43-
stack.set(ModComponents.DATAHOLDER_UUID.get(), id);
43+
stack.set(ModRegistry.DataComponents.DATAHOLDER_UUID.get(), id);
4444
return id;
4545
});
4646

@@ -71,11 +71,11 @@ public static void setData(ItemStack stack, String data) {
7171
}
7272

7373
public static boolean isReadOnly(ItemStack stack) {
74-
return stack.getComponents().getOrDefault(ModComponents.DATAHOLDER_READONLY.get(), false);
74+
return stack.getComponents().getOrDefault(ModRegistry.DataComponents.DATAHOLDER_READONLY.get(), false);
7575
}
7676

7777
public static void setReadOnly(ItemStack stack, boolean readOnly) {
78-
stack.set(ModComponents.DATAHOLDER_READONLY.get(), readOnly);
78+
stack.set(ModRegistry.DataComponents.DATAHOLDER_READONLY.get(), readOnly);
7979
}
8080

8181
public static void setLabel(ItemStack stack, String title) {
@@ -87,11 +87,11 @@ public static void clearLabel(ItemStack stack) {
8787
}
8888

8989
public static void setColor(ItemStack stack, int color) {
90-
stack.set(ModComponents.DATAHOLDER_COLOR.get(), color & 0x00_FFFFFF);
90+
stack.set(ModRegistry.DataComponents.DATAHOLDER_COLOR.get(), color & 0x00_FFFFFF);
9191
}
9292

9393
public static int getColor(ItemStack stack) {
94-
return 0xFF_000000 | stack.getComponents().getOrDefault(ModComponents.DATAHOLDER_COLOR.get(), 0xFFFFFF);
94+
return 0xFF_000000 | stack.getComponents().getOrDefault(ModRegistry.DataComponents.DATAHOLDER_COLOR.get(), 0xFFFFFF);
9595
}
9696

9797
public static Optional<String> getPrivateKey(ItemStack stack) {
@@ -131,7 +131,7 @@ public static void setPrivateKey(ItemStack stack, String privateKey) {
131131
}
132132

133133
static boolean tryMigrate(ItemStack stack) {
134-
if (stack.has(ModComponents.DATAHOLDER_UUID.get())) {
134+
if (stack.has(ModRegistry.DataComponents.DATAHOLDER_UUID.get())) {
135135
return false;
136136
}
137137

@@ -146,7 +146,7 @@ static boolean tryMigrate(ItemStack stack) {
146146

147147
setData(legacyData.get().uuid(), data);
148148

149-
stack.set(ModComponents.DATAHOLDER_UUID.get(), legacyData.get().uuid());
149+
stack.set(ModRegistry.DataComponents.DATAHOLDER_UUID.get(), legacyData.get().uuid());
150150

151151
ItemDataHandler.setReadOnly(stack, legacyData.get().readonly());
152152
ItemDataHandler.setColor(stack, legacyData.get().color());
@@ -160,12 +160,12 @@ public static Optional<DataItemData> migrate(ItemStack stack) {
160160
return Optional.empty();
161161
}
162162

163-
if (stack.has(ModComponents.DATAHOLDER_UUID.get())) {
163+
if (stack.has(ModRegistry.DataComponents.DATAHOLDER_UUID.get())) {
164164
return Optional.empty();
165165
}
166166

167167
var customData = stack.get(DataComponents.CUSTOM_DATA);
168-
if ((customData == null || customData.isEmpty()) && !stack.has(ModComponents.DATAHOLDER_DATA.get())) {
168+
if ((customData == null || customData.isEmpty()) && !stack.has(ModRegistry.DataComponents.DATAHOLDER_DATA.get())) {
169169
return Optional.empty();
170170
}
171171

@@ -211,9 +211,9 @@ public static Optional<DataItemData> migrate(ItemStack stack) {
211211
}
212212
} else {
213213
uuid = UUID.randomUUID();
214-
if (stack.has(ModComponents.DATAHOLDER_DATA.get())) {
215-
data = stack.get(ModComponents.DATAHOLDER_DATA.get());
216-
stack.remove(ModComponents.DATAHOLDER_DATA.get());
214+
if (stack.has(ModRegistry.DataComponents.DATAHOLDER_DATA.get())) {
215+
data = stack.get(ModRegistry.DataComponents.DATAHOLDER_DATA.get());
216+
stack.remove(ModRegistry.DataComponents.DATAHOLDER_DATA.get());
217217
} else {
218218
return Optional.empty();
219219
}

‎common/src/main/java/me/alexdevs/classicPeripherals/core/RadioNetwork.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import me.alexdevs.classicPeripherals.ClassicPeripherals;
44
import me.alexdevs.classicPeripherals.integrations.SableIntegration;
5-
import me.alexdevs.classicPeripherals.peripherals.AbstractRadioPeripheral;
5+
import me.alexdevs.classicPeripherals.registry.peripherals.AbstractRadioPeripheral;
66

77
import java.util.*;
88
import java.util.concurrent.ConcurrentHashMap;

‎common/src/main/java/me/alexdevs/classicPeripherals/datagen/generators/BlockModelProvider.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import dan200.computercraft.api.ComputerCraftAPI;
44
import me.alexdevs.classicPeripherals.ClassicPeripherals;
5-
import me.alexdevs.classicPeripherals.block.ModBlocks;
6-
import me.alexdevs.classicPeripherals.block.NfcReaderBlock;
7-
import me.alexdevs.classicPeripherals.block.RfidScannerBlock;
8-
import me.alexdevs.classicPeripherals.block.ScannerBlock;
5+
import me.alexdevs.classicPeripherals.registry.ModRegistry;
6+
import me.alexdevs.classicPeripherals.registry.block.NfcReaderBlock;
7+
import me.alexdevs.classicPeripherals.registry.block.RfidScannerBlock;
8+
import me.alexdevs.classicPeripherals.registry.block.ScannerBlock;
99
import net.minecraft.data.models.BlockModelGenerators;
1010
import net.minecraft.data.models.blockstates.*;
1111
import net.minecraft.data.models.model.*;
@@ -38,17 +38,17 @@ public class BlockModelProvider {
3838
);
3939

4040
public static void addBlockModels(BlockModelGenerators generators) {
41-
generators.delegateItemModel(ModBlocks.TOWER_BASE.get(), getModelLocation(ModBlocks.TOWER_BASE.get()));
42-
generators.delegateItemModel(ModBlocks.TOWER_SEGMENT.get(), getModelLocation(ModBlocks.TOWER_SEGMENT.get()));
43-
generators.delegateItemModel(ModBlocks.TOWER_HEAD.get(), getModelLocation(ModBlocks.TOWER_HEAD.get(), "_off"));
44-
generators.delegateItemModel(ModBlocks.ANTENNA.get(), getModelLocation(ModBlocks.ANTENNA.get(), "_off"));
41+
generators.delegateItemModel(ModRegistry.Blocks.TOWER_BASE.get(), getModelLocation(ModRegistry.Blocks.TOWER_BASE.get()));
42+
generators.delegateItemModel(ModRegistry.Blocks.TOWER_SEGMENT.get(), getModelLocation(ModRegistry.Blocks.TOWER_SEGMENT.get()));
43+
generators.delegateItemModel(ModRegistry.Blocks.TOWER_HEAD.get(), getModelLocation(ModRegistry.Blocks.TOWER_HEAD.get(), "_off"));
44+
generators.delegateItemModel(ModRegistry.Blocks.ANTENNA.get(), getModelLocation(ModRegistry.Blocks.ANTENNA.get(), "_off"));
4545

46-
createNfcReaderModel(generators, ModBlocks.NFC_READER.get());
47-
createRfidScannerModel(generators, ModBlocks.RFID_SCANNER.get());
48-
createScannerModel(generators, ModBlocks.SCANNER.get());
46+
createNfcReaderModel(generators, ModRegistry.Blocks.NFC_READER.get());
47+
createRfidScannerModel(generators, ModRegistry.Blocks.RFID_SCANNER.get());
48+
createScannerModel(generators, ModRegistry.Blocks.SCANNER.get());
4949

50-
generators.createHorizontallyRotatedBlock(ModBlocks.CRYPTOGRAPHIC_ACCELERATOR.get(), TexturedModel.ORIENTABLE);
51-
generators.delegateItemModel(ModBlocks.CRYPTOGRAPHIC_ACCELERATOR.get(), getModelLocation(ModBlocks.CRYPTOGRAPHIC_ACCELERATOR.get()));
50+
generators.createHorizontallyRotatedBlock(ModRegistry.Blocks.CRYPTOGRAPHIC_ACCELERATOR.get(), TexturedModel.ORIENTABLE);
51+
generators.delegateItemModel(ModRegistry.Blocks.CRYPTOGRAPHIC_ACCELERATOR.get(), getModelLocation(ModRegistry.Blocks.CRYPTOGRAPHIC_ACCELERATOR.get()));
5252

5353
registerTurtleUpgrade(generators, "block/turtle_radio", "block/turtle_radio_face");
5454
registerTurtleUpgrade(generators, "block/turtle_crypto", "block/turtle_crypto_face");

0 commit comments

Comments
 (0)