Skip to content

Commit 850b46f

Browse files
committed
取消init,改用初始化
1 parent 0ed0cab commit 850b46f

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

src/main/java/org/polaris2023/wild_wind/common/init/ModInitializer.java

+16-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
import net.neoforged.neoforge.registries.DeferredHolder;
2929
import net.neoforged.neoforge.registries.DeferredItem;
3030
import net.neoforged.neoforge.registries.DeferredRegister;
31+
import org.polaris2023.wild_wind.common.init.items.ModBaseItems;
32+
import org.polaris2023.wild_wind.common.init.items.entity.ModMobBuckets;
33+
import org.polaris2023.wild_wind.common.init.items.entity.ModSpawnEggs;
34+
import org.polaris2023.wild_wind.common.init.items.foods.ModBaseFoods;
3135

3236
import java.util.Collection;
3337
import java.util.List;
@@ -81,7 +85,7 @@ public static void init(IEventBus bus) {
8185
init(bus, ModBlocks.class, BLOCKS);
8286
init(bus, ModEffects.class, EFFECTS);
8387
init(bus, ModPotions.class, POTIONS);
84-
init(bus, ModItems.class, ITEMS);
88+
init(bus, new Class[]{ModItems.class, ModBaseItems.class, ModBaseFoods.class, ModSpawnEggs.class, ModMobBuckets.class, ModMobBuckets.class}, ITEMS);
8589
init(bus, ModRecipes.class, RECIPES);
8690
init(bus, ModRecipeSerializes.class, RECIPES_SERIALIZERS);
8791
init(bus, ModCreativeTabs.class, TABS);
@@ -99,6 +103,17 @@ public static void init(IEventBus bus, Class<?> clazz, DeferredRegister<?>... re
99103
}
100104
}
101105

106+
public static void init(IEventBus bus, Class<?>[] classes, DeferredRegister<?>... registers) {
107+
try {
108+
for (Class<?> clazz : classes) {
109+
Class.forName(clazz.getName());
110+
}
111+
} catch (ClassNotFoundException ignored) {}
112+
for (DeferredRegister<?> register : registers) {
113+
register.register(bus);
114+
}
115+
}
116+
102117
static <E extends Entity> DeferredHolder<EntityType<?>, EntityType<E>> register(String name, EntityType.EntityFactory<E> factory, MobCategory category) {
103118
return ENTITIES.register(name, resourceLocation -> EntityType.Builder.of(factory, category).build(name));
104119
}

src/main/java/org/polaris2023/wild_wind/common/init/ModItems.java

-9
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,4 @@ public class ModItems {
5555
public static final DeferredItem<NetherMushroomStewItem> NETHER_MUSHROOM_STEW =
5656
register("nether_mushroom_stew", properties ->
5757
new NetherMushroomStewItem(properties.stacksTo(1), ModFoods.NETHER_MUSHROOM_STEW));
58-
59-
static {
60-
ModBaseItems.init();
61-
ModSpawnEggs.init();
62-
ModMobBuckets.init();
63-
ModBoats.init();
64-
65-
}
66-
6758
}

src/main/java/org/polaris2023/wild_wind/common/init/items/ModBaseItems.java

-4
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ public enum ModBaseItems implements Supplier<Item>, ItemLike {
4747
entry = ModInitializer.simpleItem(name().toLowerCase(Locale.ROOT), consumer);
4848
}
4949

50-
public static void init() {
51-
ModBaseFoods.init();
52-
}
53-
5450
@Override
5551
public Item get() {
5652
return entry.get();

src/main/java/org/polaris2023/wild_wind/common/init/items/entity/ModBoats.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ public class ModBoats {
3535
register("baobab_chest_boat", () -> new BoatItem(true, ModEnumExtensions.WILD_WIND_BAOBAB.getValue(), new Item.Properties().stacksTo(1)));
3636

3737

38-
public static void init() {}
38+
3939
}

src/main/java/org/polaris2023/wild_wind/common/init/items/entity/ModMobBuckets.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <T extends EntityType<?>> ModMobBuckets(Supplier<T> type, Supplier<Fluid> conten
4242
.component(DataComponents.BUCKET_ENTITY_DATA, CustomData.EMPTY)));
4343
}
4444

45-
public static void init() {}
45+
4646

4747
@Override
4848
public MobBucketItem get() {

src/main/java/org/polaris2023/wild_wind/common/init/items/entity/ModSpawnEggs.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <E extends Mob> ModSpawnEggs(DeferredHolder<EntityType<?>, EntityType<E>> type,
3838
entry = ModInitializer.register(name().toLowerCase(Locale.ROOT), type, backgroundColor, highlightColor);
3939
}
4040

41-
public static void init() {}
41+
4242

4343
@Override
4444
public DeferredSpawnEggItem get() {

src/main/java/org/polaris2023/wild_wind/common/init/items/foods/ModBaseFoods.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public enum ModBaseFoods implements Supplier<Item>, ItemLike {
106106
entry = ModInitializer.simpleItem(name().toLowerCase(Locale.ROOT), ModFoods.valueOf(name()));
107107
}
108108

109-
public static void init() {}
109+
110110

111111
@Override
112112
public Item get() {

0 commit comments

Comments
 (0)