mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-17 21:55:12 +00:00
Code Issues Releases Wiki Activity

Small cleanup after testing

Browse Source 
- Use TinyRemapper to remap mixins on Fabric. Mixins in the common
   project weren't being remapped correctly.

 - Update to latest NeoForge
   - Switch to the new tick events.
   - Call refreshDimensions() in the fake player constructor.
This commit is contained in:
Jonathan Coates
2024-04-28 22:02:12 +01:00
parent 959bdaeb61
commit 2226df7224
9 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
projects/forge/src/client/java/dan200/computercraft/client/ForgeClientHooks.java
View File

@@ -12,7 +12,6 @@ import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.client.event.*;
import net.neoforged.neoforge.client.event.sound.PlayStreamingSourceEvent;
import net.neoforged.neoforge.event.TickEvent;
import net.neoforged.neoforge.event.level.LevelEvent;
/**
@@ -24,13 +23,13 @@ public final class ForgeClientHooks {
}
@SubscribeEvent
public static void onTick(TickEvent.ClientTickEvent event) {
if (event.phase == TickEvent.Phase.START) ClientHooks.onTick();
public static void onTick(ClientTickEvent.Pre event) {
ClientHooks.onTick();
}
@SubscribeEvent
public static void onRenderTick(TickEvent.RenderTickEvent event) {
if (event.phase == TickEvent.Phase.START) ClientHooks.onRenderTick();
public static void onRenderTick(RenderFrameEvent.Pre event) {
ClientHooks.onRenderTick();
}
@SubscribeEvent

14
projects/forge/src/main/java/dan200/computercraft/shared/ForgeCommonHooks.java
View File

@@ -16,7 +16,6 @@ import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.event.AddReloadListenerEvent;
import net.neoforged.neoforge.event.LootTableLoadEvent;
import net.neoforged.neoforge.event.RegisterCommandsEvent;
import net.neoforged.neoforge.event.TickEvent;
import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
import net.neoforged.neoforge.event.entity.living.LivingDropsEvent;
import net.neoforged.neoforge.event.level.ChunkEvent;
@@ -25,6 +24,7 @@ import net.neoforged.neoforge.event.level.ChunkWatchEvent;
import net.neoforged.neoforge.event.server.ServerStartedEvent;
import net.neoforged.neoforge.event.server.ServerStartingEvent;
import net.neoforged.neoforge.event.server.ServerStoppedEvent;
import net.neoforged.neoforge.event.tick.ServerTickEvent;
/**
* Forge-specific dispatch for {@link CommonHooks}.
@@ -32,11 +32,13 @@ import net.neoforged.neoforge.event.server.ServerStoppedEvent;
@EventBusSubscriber(modid = ComputerCraftAPI.MOD_ID)
public class ForgeCommonHooks {
@SubscribeEvent
public static void onServerTick(TickEvent.ServerTickEvent event) {
switch (event.phase) {
case START -> CommonHooks.onServerTickStart(event.getServer());
case END -> CommonHooks.onServerTickEnd();
}
public static void onServerTick(ServerTickEvent.Pre event) {
CommonHooks.onServerTickStart(event.getServer());
}
@SubscribeEvent
public static void onServerTick(ServerTickEvent.Post event) {
CommonHooks.onServerTickStart(event.getServer());
}
@SubscribeEvent

6
projects/forge/src/main/java/dan200/computercraft/shared/platform/FakePlayerExt.java
View File

@@ -22,11 +22,7 @@ class FakePlayerExt extends FakePlayer {
FakePlayerExt(ServerLevel serverLevel, GameProfile profile) {
super(serverLevel, profile);
}
@Override
public void doTick() {
super.doTick();
refreshDimensions();
}
@Override

6
projects/forge/src/testMod/java/dan200/computercraft/gametest/core/TestMod.java
View File

@@ -15,8 +15,8 @@ import net.neoforged.neoforge.client.event.ScreenEvent;
import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.neoforge.event.RegisterCommandsEvent;
import net.neoforged.neoforge.event.RegisterGameTestsEvent;
import net.neoforged.neoforge.event.TickEvent;
import net.neoforged.neoforge.event.server.ServerStartedEvent;
import net.neoforged.neoforge.event.tick.ServerTickEvent;
@Mod("cctest")
public class TestMod {
@@ -34,9 +34,7 @@ public class TestMod {
private static void onInitializeClient() {
var bus = NeoForge.EVENT_BUS;
bus.addListener((TickEvent.ServerTickEvent e) -> {
if (e.phase == TickEvent.Phase.START) ClientTestHooks.onServerTick(e.getServer());
});
bus.addListener((ServerTickEvent.Pre e) -> ClientTestHooks.onServerTick(e.getServer()));
bus.addListener((ScreenEvent.Opening e) -> {
if (ClientTestHooks.onOpenScreen(e.getScreen())) e.setCanceled(true);
});