Skip to content

Commit 2e2617a

Browse files
DaFuqsDaFuqs
committed
neo: get!
1 parent f7c6d1f commit 2e2617a

File tree

6 files changed

+42
-47
lines changed

6 files changed

+42
-47
lines changed

‎src/main/java/de/dafuqs/revelationary/RevelationRegistry.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ public static void addRevelationAwares() {
130130
registerItemTranslation(itemTranslation.getA(), itemTranslation.getB());
131131
}
132132
}
133+
134+
RevelationRegistry.deepTrim();
133135
}
134136

135137
public static void registerFromJson(JsonObject jsonObject) {
@@ -378,7 +380,6 @@ public static void fromPacket(RevelationaryNetworking.RevelationSync syncPacket)
378380
cloakedItemNameTranslations = syncPacket.cloakedItemNameTranslations();
379381

380382
RevelationRegistry.addRevelationAwares();
381-
RevelationRegistry.deepTrim();
382383
}
383384

384385
public static RevelationaryNetworking.RevelationSync intoPacket() {

‎src/main/java/de/dafuqs/revelationary/Revelationary.java‎

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import de.dafuqs.revelationary.api.advancements.*;
44
import net.minecraft.server.level.*;
55
import net.neoforged.bus.api.*;
6+
import net.neoforged.fml.*;
67
import net.neoforged.fml.common.*;
78
import net.neoforged.fml.loading.*;
89
import net.neoforged.neoforge.common.*;
910
import net.neoforged.neoforge.event.*;
1011
import net.neoforged.neoforge.event.entity.player.*;
1112
import net.neoforged.neoforge.event.server.*;
1213
import net.neoforged.neoforge.network.event.*;
13-
import net.neoforged.neoforge.network.registration.*;
1414
import org.jetbrains.annotations.*;
1515
import org.slf4j.*;
1616

@@ -20,39 +20,24 @@ public class Revelationary {
2020
public static final String MOD_ID = "revelationary";
2121
private static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
2222

23-
public static void logInfo(String message) {
24-
LOGGER.info("[Revelationary] {}", message);
25-
}
26-
27-
public static void logWarning(String message) {
28-
LOGGER.warn("[Revelationary] {}", message);
29-
}
30-
3123
public static void logError(String message) {
3224
LOGGER.error("[Revelationary] {}", message);
3325
}
3426
public static void logException(Throwable t) {
3527
LOGGER.error("[Revelationary] ", t);
3628
}
3729

38-
public Revelationary() {
39-
AdvancementCriteria.register();
30+
public Revelationary(IEventBus eventBus, ModContainer container) {
4031
NeoForge.EVENT_BUS.register(this);
41-
}
42-
43-
@SubscribeEvent
44-
public void onInitialize() {
45-
logInfo("Starting Common Startup");
46-
AdvancementCriteria.register();
32+
AdvancementCriteria.register(eventBus);
33+
eventBus.addListener(RegisterPayloadHandlersEvent.class, RevelationaryNetworking::register);
4734

48-
if (cursedChunkBuildingActive()) {
49-
logWarning("Sodium/Rubidium detected. Chunk rebuilding will be done in cursed mode.");
35+
if (isCursedChunkRebuildingActive()) {
36+
LOGGER.warn("Sodium/Rubidium detected. Chunk rebuilding will be done in cursed mode.");
5037
}
51-
52-
logInfo("Common startup completed!");
5338
}
5439

55-
public static boolean cursedChunkBuildingActive() {
40+
public static boolean isCursedChunkRebuildingActive() {
5641
LoadingModList modlist = LoadingModList.get();
5742
return modlist.getModFileById("sodium") != null || modlist.getModFileById("rubidium") != null;
5843
}
@@ -61,8 +46,6 @@ public static boolean cursedChunkBuildingActive() {
6146
public void onAddReloadListener(@NotNull AddReloadListenerEvent event) {
6247
// TODO: is there a better location to trigger this?
6348
RevelationRegistry.addRevelationAwares();
64-
RevelationRegistry.deepTrim();
65-
6649
event.addListener(RevelationDataLoader.INSTANCE);
6750
}
6851

@@ -83,15 +66,4 @@ public void onPlayerLogIn(PlayerEvent.@NotNull PlayerLoggedInEvent event) {
8366
}
8467
}
8568

86-
@SubscribeEvent
87-
public static void register(final RegisterPayloadHandlersEvent event) {
88-
// Sets the current network version
89-
final PayloadRegistrar registrar = event.registrar("1");
90-
registrar.playToClient(
91-
RevelationaryNetworking.RevelationSync.TYPE,
92-
RevelationaryNetworking.RevelationSync.CODEC,
93-
ClientPayloadHandler::handleDataOnMain
94-
);
95-
}
96-
9769
}

‎src/main/java/de/dafuqs/revelationary/RevelationaryNetworking.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,27 @@
1313
import net.minecraft.world.item.*;
1414
import net.minecraft.world.level.block.*;
1515
import net.minecraft.world.level.block.state.*;
16+
import net.neoforged.bus.api.*;
1617
import net.neoforged.neoforge.network.*;
18+
import net.neoforged.neoforge.network.event.*;
19+
import net.neoforged.neoforge.network.registration.*;
1720

1821
import java.util.*;
1922

2023
public class RevelationaryNetworking {
2124

25+
@SubscribeEvent
26+
public static void register(final RegisterPayloadHandlersEvent event) {
27+
PayloadRegistrar registrar = event.registrar("1");
28+
29+
// Sets the current network version
30+
registrar.playToClient(
31+
RevelationaryNetworking.RevelationSync.TYPE,
32+
RevelationaryNetworking.RevelationSync.CODEC,
33+
ClientPayloadHandler::handleDataOnMain
34+
);
35+
}
36+
2237
public static void sendRevelations(ServerPlayer player) {
2338
PacketDistributor.sendToPlayer(player, RevelationRegistry.intoPacket());
2439
}

‎src/main/java/de/dafuqs/revelationary/api/advancements/AdvancementCriteria.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
11
package de.dafuqs.revelationary.api.advancements;
22

3+
import de.dafuqs.revelationary.*;
34
import de.dafuqs.revelationary.advancement_criteria.*;
45
import net.minecraft.advancements.*;
6+
import net.minecraft.core.registries.*;
7+
import net.neoforged.bus.api.*;
8+
import net.neoforged.neoforge.registries.*;
9+
10+
import java.util.function.*;
511

612
public class AdvancementCriteria {
13+
14+
public static final DeferredRegister<CriterionTrigger<?>> TRIGGER_TYPES = DeferredRegister.create(Registries.TRIGGER_TYPE, Revelationary.MOD_ID);
15+
716
/**
817
* Triggered every time a player gets a new advancement
918
*/
10-
public static AdvancementGottenCriterion ADVANCEMENT_GOTTEN;
19+
public static Supplier<AdvancementGottenCriterion> ADVANCEMENT_GOTTEN = TRIGGER_TYPES.register("advancement_gotten", AdvancementGottenCriterion::new);
1120
/**
1221
* Triggered every time a player gets a new advancement
1322
* matches multiple advancements with optional count parameter
1423
*/
15-
public static AdvancementCountCriterion ADVANCEMENT_COUNT;
24+
public static Supplier<AdvancementCountCriterion> ADVANCEMENT_COUNT = TRIGGER_TYPES.register("advancement_count", AdvancementCountCriterion::new);
1625
/**
1726
* Triggers every time a new block is revealed
1827
*/
19-
public static HadRevelationCriterion HAD_REVELATION;
28+
public static Supplier<HadRevelationCriterion> HAD_REVELATION = TRIGGER_TYPES.register("had_revelation", HadRevelationCriterion::new);
2029

21-
public static void register() {
22-
ADVANCEMENT_COUNT = CriteriaTriggers.register("revelationary:advancement_count", new AdvancementCountCriterion());
23-
HAD_REVELATION = CriteriaTriggers.register("revelationary:had_revelation", new HadRevelationCriterion());
24-
ADVANCEMENT_GOTTEN = CriteriaTriggers.register("revelationary:advancement_gotten", new AdvancementGottenCriterion());
30+
public static void register(IEventBus eventBus) {
31+
TRIGGER_TYPES.register(eventBus);
2532
}
2633
}

‎src/main/java/de/dafuqs/revelationary/mixin/PlayerAdvancementTrackerMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ public abstract class PlayerAdvancementTrackerMixin {
2121
public void revelationary$triggerAdvancementCriteria(AdvancementHolder advancement, String criterionName, CallbackInfoReturnable<Boolean> cir) {
2222
AdvancementProgress advancementProgress = ((PlayerAdvancements) (Object) this).getOrStartProgress(advancement);
2323
if (advancementProgress.isDone()) {
24-
AdvancementCriteria.ADVANCEMENT_GOTTEN.trigger(player, advancement);
25-
AdvancementCriteria.ADVANCEMENT_COUNT.trigger(player);
24+
AdvancementCriteria.ADVANCEMENT_GOTTEN.get().trigger(player, advancement);
25+
AdvancementCriteria.ADVANCEMENT_COUNT.get().trigger(player);
2626

2727
List<Block> revelations = RevelationRegistry.getBlockEntries(advancement.id());
2828
for (Block revelation : revelations) {
29-
AdvancementCriteria.HAD_REVELATION.trigger(player, revelation);
29+
AdvancementCriteria.HAD_REVELATION.get().trigger(player, revelation);
3030
}
3131
}
3232
}

‎src/main/java/de/dafuqs/revelationary/mixin/client/WorldRendererMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public abstract class WorldRendererMixin implements WorldRendererAccessor {
2323
* Warning: Costly + LagSpike!
2424
*/
2525
public void revelationary$rebuildAllChunks() {
26-
if (Revelationary.cursedChunkBuildingActive()) {
26+
if (Revelationary.isCursedChunkRebuildingActive()) {
2727
revelationary$rebuildAllChunksSodium();
2828
return;
2929
}

0 commit comments

Comments
 (0)