Skip to content

Commit 695aafe

Browse files
committed
Fixed issues + Forge config screen works
1 parent 78b66ea commit 695aafe

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

forge/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ architectury {
1515

1616
repositories {
1717
mavenCentral()
18+
mavenLocal()
1819
maven {
1920
url = "https://maven.shedaniel.me/"
2021
}
@@ -36,12 +37,8 @@ dependencies {
3637
exclude(module: "fabric-loader")
3738
}
3839

39-
modCompile(shadow('com.oroarmor:oro-config-forge:3.0.0')) {
40-
exclude(module: "fabric-loader")
41-
exclude(module: "modmenu")
42-
exclude(module: "config-2")
43-
exclude(module: "fabric-command-api-v1")
44-
}
40+
modImplementation('com.oroarmor:oro-config-forge:3.1.0')
41+
modRuntime('com.oroarmor:oro-config-forge:3.1.0')
4542

4643
implementation(project(path: ":common")) {
4744
exclude(module: "fabric-loader")

forge/logs/debug.log

Whitespace-only changes.

forge/logs/latest.log

Whitespace-only changes.

forge/src/main/java/com/oroarmor/netherite_plus/ForgeNetheritePlusMod.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
import net.minecraftforge.fml.network.NetworkRegistry;
4646
import net.minecraftforge.fml.network.simple.SimpleChannel;
4747

48+
import net.minecraft.server.network.ServerPlayerEntity;
49+
4850
@Mod(NetheritePlusMod.MOD_ID)
4951
public class ForgeNetheritePlusMod {
5052

@@ -56,7 +58,7 @@ public ForgeNetheritePlusMod() {
5658
NetheritePlusMod.initialize();
5759
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> FMLJavaModLoadingContext.get().getModEventBus().register(new ForgeNetheritePlusModClient()));
5860
MinecraftForge.EVENT_BUS.register(this);
59-
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, ()-> new ForgeConfigScreen(NetheritePlusMod.CONFIG));
61+
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () -> new ForgeConfigScreen(NetheritePlusMod.CONFIG));
6062

6163
INSTANCE.registerMessage(0, UpdateNetheriteBeaconC2SPacket.class, (unb, fbb2) -> {
6264
try {
@@ -73,9 +75,10 @@ public ForgeNetheritePlusMod() {
7375
}
7476
return packet;
7577
}, (packet, ctx) -> {
76-
ctx.get().getSender().server.execute(() -> {
77-
if (ctx.get().getSender().currentScreenHandler instanceof NetheriteBeaconScreenHandler) {
78-
((NetheriteBeaconScreenHandler) ctx.get().getSender().currentScreenHandler).setEffects(packet.getPrimaryEffectId(), packet.getSecondaryEffectId(), packet.getTertiaryEffectId());
78+
ServerPlayerEntity sender = ctx.get().getSender();
79+
sender.server.execute(() -> {
80+
if (sender.currentScreenHandler instanceof NetheriteBeaconScreenHandler) {
81+
((NetheriteBeaconScreenHandler) sender.currentScreenHandler).setEffects(packet.getPrimaryEffectId(), packet.getSecondaryEffectId(), packet.getTertiaryEffectId());
7982
}
8083
});
8184
});

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip

0 commit comments

Comments
 (0)