Skip to content

Commit 08ac716

Browse files
KneelawkKneelawk
committed
Update to 1.21-rc1 & re-enable neoforge modules
1 parent dcd068e commit 08ac716

5 files changed

Lines changed: 63 additions & 71 deletions

File tree

‎gradle.properties‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,36 @@ org.gradle.parallel = true
66
architectury_loom_version = 1.6-SNAPSHOT
77
versioning_version = 1.0.0
88
kpublish_version = 1.0.0
9-
submodule_version = 0.2.4
9+
submodule_version = 0.2.11
1010
remapcheck_version = 0.3.4
1111

1212
# Fabric Properties
1313
# check these on https://fabricmc.net/develop
1414
java_version = 21
15-
minecraft_version = 1.21-pre2
15+
minecraft_version = 1.21-rc1
1616
parchment_mc_version = 1.20.6
17-
parchment_version = 2024.05.01
18-
yarn_version = 2
17+
parchment_version = 2024.06.02
18+
yarn_version = 1
1919
fabric_loader_version = 0.15.11
20-
neoforge_version = 20.6.55-beta
20+
neoforge_version = 21.0.0-alpha.1.21-rc1.20240611.190055
21+
neoforge_pr = 1076
2122

2223
# Mod Properties
23-
project_version = 2.99.99+1.21.local
24+
project_version = 2.0.99+1.21.local
2425
maven_group = com.kneelawk.graphlib
2526
archives_base_name = graphlib
2627
javadoc_package_name = com/kneelawk/graphlib
2728

2829
# Dependencies
29-
fapi_version = 0.99.4+1.21
30-
codextra_version = 2.0.0-beta.3+1.21
31-
common_events_version = 1.0.0-beta.7+1.21
30+
fapi_version = 0.100.0+1.21
31+
codextra_version = 2.0.0+1.21
32+
common_events_version = 1.0.0+1.21
3233
lns_version = 0.13.0-pre.1
33-
kml_version = 0.4.1+1.21
34-
knet_version = 1.0.0-beta.1+1.21
34+
kml_version = 0.4.3+1.21
35+
knet_version = 1.0.0+1.21
3536

3637
# Runtime Only Dependencies
37-
mod_menu_version = 10.0.0-beta.1
38+
mod_menu_version = 11.0.0-beta.1
3839

3940
# Javadoc Dependencies
4041
jetbrains_annotations_version = 24.0.0

‎modules/debugrender-neoforge/src/main/java/com/kneelawk/graphlib/debugrender/neoforge/impl/GraphLibDebugRenderNeoforgeMod.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,43 @@
2525

2626
package com.kneelawk.graphlib.debugrender.neoforge.impl;
2727

28+
import net.neoforged.bus.api.IEventBus;
2829
import net.neoforged.bus.api.SubscribeEvent;
2930
import net.neoforged.fml.common.EventBusSubscriber;
3031
import net.neoforged.fml.common.Mod;
3132
import net.neoforged.neoforge.event.entity.player.PlayerEvent;
3233
import net.neoforged.neoforge.event.server.ServerStartingEvent;
3334
import net.neoforged.neoforge.event.server.ServerStoppedEvent;
35+
import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
36+
import net.neoforged.neoforge.network.registration.PayloadRegistrar;
3437

3538
import com.kneelawk.graphlib.debugrender.impl.GLDebugNet;
3639
import com.kneelawk.graphlib.debugrender.impl.GraphLibDebugRenderImpl;
37-
import com.kneelawk.graphlib.debugrender.impl.command.GraphLibDebugRenderCommand;
38-
import com.kneelawk.graphlib.neoforge.api.event.GraphCreatedEvent;
39-
import com.kneelawk.graphlib.neoforge.api.event.GraphDestroyedEvent;
40-
import com.kneelawk.graphlib.neoforge.api.event.GraphUpdatedEvent;
41-
import com.kneelawk.graphlib.neoforge.impl.event.AddUniverseSubcommandsEvent;
40+
import com.kneelawk.graphlib.debugrender.impl.client.GLClientDebugNet;
41+
import com.kneelawk.graphlib.debugrender.impl.payload.DebuggingStopPayload;
42+
import com.kneelawk.graphlib.debugrender.impl.payload.GraphDestroyPayload;
43+
import com.kneelawk.graphlib.debugrender.impl.payload.GraphUpdateBulkPayload;
44+
import com.kneelawk.graphlib.debugrender.impl.payload.GraphUpdatePayload;
4245

4346
@Mod(GraphLibDebugRenderImpl.MOD_ID)
4447
@EventBusSubscriber
4548
public class GraphLibDebugRenderNeoforgeMod {
49+
public GraphLibDebugRenderNeoforgeMod(IEventBus modBus) {
50+
modBus.addListener(this::onRegisterPayloads);
51+
}
52+
53+
private void onRegisterPayloads(RegisterPayloadHandlersEvent event) {
54+
PayloadRegistrar registrar = event.registrar(GraphLibDebugRenderImpl.MOD_ID);
55+
registrar.playToClient(GraphUpdatePayload.ID, GraphUpdatePayload.CODEC,
56+
(payload, ctx) -> GLClientDebugNet.onGraphUpdate(payload, ctx::enqueueWork));
57+
registrar.playToClient(GraphUpdateBulkPayload.ID, GraphUpdateBulkPayload.CODEC,
58+
(payload, ctx) -> GLClientDebugNet.onGraphUpdateBulk(payload, ctx::enqueueWork));
59+
registrar.playToClient(GraphDestroyPayload.ID, GraphDestroyPayload.CODEC,
60+
(payload, ctx) -> GLClientDebugNet.onGraphDestroy(payload, ctx::enqueueWork));
61+
registrar.playToClient(DebuggingStopPayload.ID, DebuggingStopPayload.CODEC,
62+
(payload, ctx) -> GLClientDebugNet.onDebugginStop(payload, ctx::enqueueWork));
63+
}
64+
4665
@SubscribeEvent
4766
public static void onServerStart(ServerStartingEvent event) {
4867
GLDebugNet.onServerStart();
@@ -53,27 +72,8 @@ public static void onServerStop(ServerStoppedEvent event) {
5372
GLDebugNet.onServerStop();
5473
}
5574

75+
@SubscribeEvent
5676
public static void onPlayerDisconnect(PlayerEvent.PlayerLoggedOutEvent event) {
5777
GLDebugNet.onDisconnect(event.getEntity().getUUID());
5878
}
59-
60-
@SubscribeEvent
61-
public static void onGraphCreated(GraphCreatedEvent event) {
62-
GLDebugNet.onGraphCreated(event.getWorld(), event.getGraphWorld(), event.getGraph());
63-
}
64-
65-
@SubscribeEvent
66-
public static void onGraphUpdated(GraphUpdatedEvent event) {
67-
GLDebugNet.onGraphUpdated(event.getWorld(), event.getGraphWorld(), event.getGraph());
68-
}
69-
70-
@SubscribeEvent
71-
public static void onGraphDestroyed(GraphDestroyedEvent event) {
72-
GLDebugNet.onGraphDestroyed(event.getWorld(), event.getGraphWorld(), event.getGraphId());
73-
}
74-
75-
@SubscribeEvent
76-
public static void onAddUniverseSubcommands(AddUniverseSubcommandsEvent event) {
77-
GraphLibDebugRenderCommand.addUniverseSubcommands(event.universe);
78-
}
7979
}

‎modules/debugrender-neoforge/src/main/java/com/kneelawk/graphlib/debugrender/neoforge/impl/client/GLDRModClient.java‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,9 @@
2929
import net.neoforged.bus.api.SubscribeEvent;
3030
import net.neoforged.fml.common.EventBusSubscriber;
3131
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
32-
import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
33-
import net.neoforged.neoforge.network.registration.PayloadRegistrar;
3432

35-
import com.kneelawk.graphlib.debugrender.impl.GraphLibDebugRenderImpl;
36-
import com.kneelawk.graphlib.debugrender.impl.client.GLClientDebugNet;
3733
import com.kneelawk.graphlib.debugrender.impl.client.GraphLibDebugRenderClientImpl;
3834
import com.kneelawk.graphlib.debugrender.impl.client.debug.render.DebugRenderer;
39-
import com.kneelawk.graphlib.debugrender.impl.payload.DebuggingStopPayload;
40-
import com.kneelawk.graphlib.debugrender.impl.payload.GraphDestroyPayload;
41-
import com.kneelawk.graphlib.debugrender.impl.payload.GraphUpdateBulkPayload;
42-
import com.kneelawk.graphlib.debugrender.impl.payload.GraphUpdatePayload;
43-
import com.kneelawk.kmodlib.client.overlay.RenderToOverlay;
44-
45-
import com.mojang.blaze3d.vertex.BufferBuilder;
4635

4736
@EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
4837
public class GLDRModClient {
@@ -52,23 +41,7 @@ public static void onClientStartup(FMLClientSetupEvent event) {
5241
GraphLibDebugRenderClientImpl.register();
5342

5443
// Render to overlay stuff
55-
RenderToOverlay.LAYER_MAP.put(DebugRenderer.Layers.DEBUG_LINES,
56-
new BufferBuilder(DebugRenderer.Layers.DEBUG_LINES.bufferSize()));
57-
RenderToOverlay.LAYER_MAP.put(DebugRenderer.Layers.DEBUG_QUADS,
58-
new BufferBuilder(DebugRenderer.Layers.DEBUG_QUADS.bufferSize()));
44+
DebugRenderer.init();
5945
});
6046
}
61-
62-
@SubscribeEvent
63-
public static void onRegisterPayloads(RegisterPayloadHandlersEvent event) {
64-
PayloadRegistrar registrar = event.registrar(GraphLibDebugRenderImpl.MOD_ID);
65-
registrar.playToClient(GraphUpdatePayload.ID, GraphUpdatePayload.CODEC,
66-
(payload, ctx) -> GLClientDebugNet.onGraphUpdate(payload, ctx::enqueueWork));
67-
registrar.playToClient(GraphUpdateBulkPayload.ID, GraphUpdateBulkPayload.CODEC,
68-
(payload, ctx) -> GLClientDebugNet.onGraphUpdateBulk(payload, ctx::enqueueWork));
69-
registrar.playToClient(GraphDestroyPayload.ID, GraphDestroyPayload.CODEC,
70-
(payload, ctx) -> GLClientDebugNet.onGraphDestroy(payload, ctx::enqueueWork));
71-
registrar.playToClient(DebuggingStopPayload.ID, DebuggingStopPayload.CODEC,
72-
(payload, ctx) -> GLClientDebugNet.onDebugginStop(payload, ctx::enqueueWork));
73-
}
7447
}

‎modules/debugrender-neoforge/src/main/java/com/kneelawk/graphlib/debugrender/neoforge/impl/client/GLDRRenderClient.java‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,33 @@
2828
import net.neoforged.api.distmarker.Dist;
2929
import net.neoforged.bus.api.SubscribeEvent;
3030
import net.neoforged.fml.common.EventBusSubscriber;
31+
import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent;
32+
import net.neoforged.neoforge.event.level.ChunkEvent;
3133

34+
import com.kneelawk.graphlib.debugrender.impl.client.GraphLibDebugRenderClientImpl;
3235
import com.kneelawk.graphlib.debugrender.impl.client.debug.render.DebugRenderer;
33-
import com.kneelawk.kmodlib.client.overlay.RenderToOverlayEvent;
3436

3537
@EventBusSubscriber(Dist.CLIENT)
3638
public class GLDRRenderClient {
3739
@SubscribeEvent
38-
public static void onRenderToOverlay(RenderToOverlayEvent event) {
39-
DebugRenderer.render(event.getPoseStack(), event.getModelViewMatrix(), event.getCamera().getPosition(),
40-
event.getProvider());
40+
public static void onJoin(ClientPlayerNetworkEvent.LoggingIn event) {
41+
DebugRenderer.DEBUG_GRAPHS.clear();
42+
GraphLibDebugRenderClientImpl.GRAPHS_PER_CHUNK.clear();
43+
}
44+
45+
@SubscribeEvent
46+
public static void onDisconnect(ClientPlayerNetworkEvent.LoggingOut event) {
47+
DebugRenderer.DEBUG_GRAPHS.clear();
48+
GraphLibDebugRenderClientImpl.GRAPHS_PER_CHUNK.clear();
49+
}
50+
51+
@SubscribeEvent
52+
public static void onChunkLoad(ChunkEvent.Load event) {
53+
GraphLibDebugRenderClientImpl.chunkLoad(event.getChunk().getPos().toLong());
54+
}
55+
56+
@SubscribeEvent
57+
public static void onChunkUnload(ChunkEvent.Unload event) {
58+
GraphLibDebugRenderClientImpl.chunkUnload(event.getChunk().getPos().toLong());
4159
}
4260
}

‎settings.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pluginManagement {
1212
maven("https://maven.neoforged.net/releases/") {
1313
name = "NeoForged"
1414
}
15-
maven("https://kneelawk.com/maven") {
15+
maven("https://maven.kneelawk.com/releases/") {
1616
name = "Kneelawk"
1717
}
1818
gradlePluginPortal()
@@ -76,7 +76,7 @@ fun javadoc(enabled: Boolean, name: String) {
7676
val xplat = true
7777
val mojmap = true
7878
val fabric = true
79-
val neoforge = false
79+
val neoforge = true
8080

8181
module(xplat, "core-xplat")
8282
module(mojmap, "core-xplat-mojmap")

0 commit comments

Comments
 (0)