mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

Small cleanup after testing 

- 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
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
9 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/libs.versions.toml
View File

@ -9,7 +9,7 @@
# Remember to update corresponding versions in fabric.mod.json/neoforge.mods.toml
fabric-api = "0.97.6+1.20.5"
fabric-loader = "0.15.10"
neoForge = "20.5.0-beta"
neoForge = "20.5.20-beta"
neoForgeSpi = "8.0.1"
mixin = "0.8.5"
parchment = "2024.04.14"
@ -67,7 +67,7 @@ ideaExt = "1.1.7"
illuaminate = "0.1.0-71-g378d86e"
lwjgl = "3.3.3"
minotaur = "2.8.7"
neoGradle = "7.0.107"
neoGradle = "7.0.116"
nullAway = "0.10.25"
spotless = "6.23.3"
taskTree = "2.1.1"

2
projects/fabric/build.gradle.kts
View File

@ -109,7 +109,7 @@ sourceSets.main { resources.srcDir("src/generated/resources") }
loom {
accessWidenerPath.set(project(":common").file("src/main/resources/computercraft.accesswidener"))
mixin.defaultRefmapName.set("computercraft.refmap.json")
mixin.useLegacyMixinAp = false
mods {
register("computercraft") {

8
projects/fabric/src/main/java/dan200/computercraft/shared/platform/FakePlayer.java
View File

@ -12,18 +12,14 @@
import net.minecraft.world.entity.Pose;
import net.minecraft.world.entity.player.Player;
public final class FakePlayer extends net.fabricmc.fabric.api.entity.FakePlayer {
final class FakePlayer extends net.fabricmc.fabric.api.entity.FakePlayer {
private static final EntityDimensions DIMENSIONS = EntityDimensions.fixed(0, 0);
private FakePlayer(ServerLevel serverLevel, GameProfile gameProfile) {
FakePlayer(ServerLevel serverLevel, GameProfile gameProfile) {
super(serverLevel, gameProfile);
refreshDimensions();
}
static FakePlayer create(ServerLevel serverLevel, GameProfile profile) {
return new FakePlayer(serverLevel, profile);
}
@Override
public boolean canHarmPlayer(Player other) {
return true;

2
projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java
View File

@ -236,7 +236,7 @@ public boolean onNotifyNeighbour(Level level, BlockPos pos, BlockState block, Di
@Override
public ServerPlayer createFakePlayer(ServerLevel world, GameProfile name) {
return FakePlayer.create(world, name);
return new FakePlayer(world, name);
}
@Override

2
projects/fabric/src/main/resources/fabric.mod.json
View File

@ -47,7 +47,7 @@
"depends": {
"fabricloader": ">=0.15.10",
"fabric-api": ">=0.97.3",
"minecraft": "=1.20.5"
"minecraft": ">=1.20.5 <1.20.7"
},
"accessWidener": "computercraft.accesswidener"
}

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

@ -12,7 +12,6 @@
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 @@ private 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.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.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 @@
@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.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 TestMod(IEventBus modBus) {
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);
});