Skip to content

Commit 69668db

Browse files
committed
1.21.9 but without cloth-config
1 parent 30cdae2 commit 69668db

8 files changed

Lines changed: 13 additions & 33 deletions

File tree

common/src/main/java/com/lukasabbe/bookshelfinspector/platform/services/IPlatformHelper.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ public interface IPlatformHelper {
77

88
boolean isModLoaded(String modId);
99

10-
boolean isDevelopmentEnvironment();
11-
1210
Path getConfigPath(String file);
1311

1412
Path getFileInModContainer(String mod, String fileName);
15-
16-
default String getEnvironmentName() {
17-
18-
return isDevelopmentEnvironment() ? "development" : "production";
19-
}
2013
}

fabric/src/main/java/com/lukasabbe/bookshelfinspector/platform/FabricPlatformHelper.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ public boolean isModLoaded(String modId) {
1919
return FabricLoader.getInstance().isModLoaded(modId);
2020
}
2121

22-
@Override
23-
public boolean isDevelopmentEnvironment() {
24-
25-
return FabricLoader.getInstance().isDevelopmentEnvironment();
26-
}
27-
2822
@Override
2923
public Path getConfigPath(String file) {
3024
return FabricLoader.getInstance().getConfigDir().resolve(file);

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
version=2.1+1.21.9-rc1
1+
version=2.1+1.21.9-Beta.1
22
group=com.lukasabbe.bookshelfinspector
33
java_version=21
44

55
# Common
6-
minecraft_version=1.21.9-rc1
6+
minecraft_version=1.21.9
77
mod_name=BookshelfInspector
88
mod_author=Lukasabbe
99
mod_id=bookshelfinspector
1010
license=MIT
1111
credits=
1212
description=Inspect any book in a chiseled bookshelf.
13-
minecraft_version_range=[1.21.8, 1.22)
13+
minecraft_version_range=[1.21.9, 1.22)
1414

1515
# https://projects.neoforged.net/neoforged/neoform
16-
neo_form_version=1.21.9-rc1-20250925.142447
16+
neo_form_version=1.21.9-20250930.151910
1717
# The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
1818
parchment_minecraft=1.21.8
1919
parchment_version=2025.07.20
2020

2121
# Fabric
22-
fabric_version=0.133.13+1.21.9
22+
fabric_version=0.133.14+1.21.9
2323
fabric_loader_version=0.17.2
2424

2525
# NeoForge
26-
neoforge_version=21.8.47
26+
neoforge_version=21.9.0-beta
2727
neoforge_loader_version_range=[4,)
2828

2929
# Gradle

neoforge/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ neoForge {
1818
mappingsVersion = parchment_version
1919
}
2020
dependencies {
21-
api "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config}"
21+
//api "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config}"
2222
}
2323

2424
runs {
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
package com.lukasabbe.bookshelfinspector;
22

3-
import com.lukasabbe.bookshelfinspector.config.ClothConfigGenerator;
43
import com.lukasabbe.bookshelfinspector.util.EventHandler;
54
import net.neoforged.api.distmarker.Dist;
65
import net.neoforged.bus.api.IEventBus;
7-
import net.neoforged.fml.ModLoadingContext;
86
import net.neoforged.fml.common.Mod;
9-
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
107

118
@Mod(value = Constants.MOD_ID, dist = Dist.CLIENT)
129
public class BookshelfInspectorNeoForgeClient {
1310
public BookshelfInspectorNeoForgeClient(IEventBus bus) {
1411
EventHandler.initClient();
1512
BookshelfInspectorClient.clientInit();
16-
ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class, () -> (client, parent) -> ClothConfigGenerator.createConfig(parent));
13+
//ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class, () -> (client, parent) -> ClothConfigGenerator.createConfig(parent));
1714
}
1815
}

neoforge/src/main/java/com/lukasabbe/bookshelfinspector/config/ClothConfigGenerator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*
12
package com.lukasabbe.bookshelfinspector.config;
23
34
import com.lukasabbe.bookshelfinspector.BookshelfInspectorClient;
@@ -37,3 +38,4 @@ public static Screen createConfig(Screen parent){
3738
return builder.build();
3839
}
3940
}
41+
*/

neoforge/src/main/java/com/lukasabbe/bookshelfinspector/platform/NeoForgePlatformHelper.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import net.neoforged.fml.loading.FMLPaths;
99

1010
import java.nio.file.Path;
11+
import java.nio.file.Paths;
1112

1213
public class NeoForgePlatformHelper implements IPlatformHelper {
1314

@@ -19,16 +20,9 @@ public String getPlatformName() {
1920

2021
@Override
2122
public boolean isModLoaded(String modId) {
22-
2323
return ModList.get().isLoaded(modId);
2424
}
2525

26-
@Override
27-
public boolean isDevelopmentEnvironment() {
28-
29-
return !FMLLoader.isProduction();
30-
}
31-
3226
@Override
3327
public Path getConfigPath(String file) {
3428
return FMLPaths.CONFIGDIR.get().resolve(file);
@@ -38,6 +32,6 @@ public Path getConfigPath(String file) {
3832
public Path getFileInModContainer(String mod, String fileName) {
3933
if(ModList.get().getModContainerById(mod).isEmpty()) return null;
4034
ModContainer container = ModList.get().getModContainerById(mod).get();
41-
return container.getModInfo().getOwningFile().getFile().findResource(fileName);
35+
return Paths.get(container.getModInfo().getOwningFile().getFile().getContents().findFile(fileName).get());
4236
}
4337
}

neoforge/src/main/java/com/lukasabbe/bookshelfinspector/util/EventHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static void initClient(){
2020
public static void initServer(){ NeoForge.EVENT_BUS.addListener(EventHandler::onJoin); }
2121

2222
private static void onJoin(PlayerEvent.PlayerLoggedInEvent event){
23-
playerJoinEvents.forEach(onPlayerJoinEvent -> onPlayerJoinEvent.onPlayerJoin((ServerPlayer) event.getEntity(),event.getEntity().getServer()));
23+
playerJoinEvents.forEach(onPlayerJoinEvent -> onPlayerJoinEvent.onPlayerJoin((ServerPlayer) event.getEntity(), ((ServerPlayer)event.getEntity()).level().getServer()));
2424
}
2525

2626
private static void onDisconnect(ClientPlayerNetworkEvent.LoggingOut event){

0 commit comments

Comments
 (0)