Skip to content

Commit 2902678

Browse files
SrRapero720SrRapero720
committed
Structural code changes and hide chloride built-in resourcepacks
1 parent 48f6fbf commit 2902678

File tree

3 files changed

+76
-68
lines changed

3 files changed

+76
-68
lines changed

‎src/main/java/me/srrapero720/chloride/Chloride.java‎

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,22 @@
11
package me.srrapero720.chloride;
22

3-
import me.srrapero720.chloride.impl.Zoom;
4-
import net.minecraft.network.chat.Component;
5-
import net.minecraft.server.packs.PackType;
6-
import net.minecraft.server.packs.repository.Pack;
7-
import net.minecraft.server.packs.repository.PackSource;
83
import net.minecraftforge.api.distmarker.Dist;
94
import net.minecraftforge.api.distmarker.OnlyIn;
10-
import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
11-
import net.minecraftforge.event.AddPackFindersEvent;
125
import net.minecraftforge.eventbus.api.SubscribeEvent;
13-
import net.minecraftforge.fml.ModList;
146
import net.minecraftforge.fml.common.Mod;
157
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
168
import net.minecraftforge.fml.loading.FMLLoader;
17-
import net.minecraftforge.forgespi.locating.IModFile;
18-
import net.minecraftforge.resource.PathPackResources;
199
import org.apache.logging.log4j.LogManager;
2010
import org.apache.logging.log4j.Logger;
2111
import org.apache.logging.log4j.Marker;
2212
import org.apache.logging.log4j.MarkerManager;
23-
import org.jetbrains.annotations.NotNull;
24-
25-
import java.nio.file.Path;
2613

2714
@Mod(Chloride.ID)
2815
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
2916
public class Chloride {
3017
public static final String ID = "chloride";
3118
public static final Logger LOGGER = LogManager.getLogger("chloride");
3219
public static final Marker IT = MarkerManager.getMarker("Main");
33-
public static Pack SOLID_BEDS_PACK;
34-
public static Pack SOLID_CHESTS_PACK;
3520

3621
public Chloride() {
3722
if (FMLLoader.getDist().isClient()) {
@@ -55,56 +40,7 @@ public static void earlyLoad() {
5540
ChlorideConfig.load(FMLLoader.getGamePath().resolve("config"));
5641
}
5742

58-
@SubscribeEvent
59-
public static void registerResourcePacks(AddPackFindersEvent e) {
60-
LOGGER.info("registered CHLORIDE packs");
61-
if (e.getPackType() == PackType.CLIENT_RESOURCES) {
62-
SOLID_BEDS_PACK = Pack.readMetaAndCreate(ID + "_solid_beds",
63-
Component.literal("Chloride: Solid Beds"),
64-
false,
65-
id -> getPathResources(ID, "custom_packs/solid_beds"),
66-
PackType.CLIENT_RESOURCES,
67-
Pack.Position.TOP,
68-
PackSource.BUILT_IN);
69-
70-
SOLID_CHESTS_PACK = Pack.readMetaAndCreate(ID + "_solid_chests",
71-
Component.literal("Chloride: Solid Chests"),
72-
false,
73-
id -> getPathResources(ID, "custom_packs/solid_chests"),
74-
PackType.CLIENT_RESOURCES,
75-
Pack.Position.TOP,
76-
PackSource.BUILT_IN);
77-
78-
e.addRepositorySource(consumer -> {
79-
consumer.accept(SOLID_BEDS_PACK);
80-
consumer.accept(SOLID_CHESTS_PACK);
81-
});
82-
}
43+
public static boolean installed(final String modid) {
44+
return FMLLoader.getLoadingModList().getModFileById(modid) != null;
8345
}
84-
85-
@SubscribeEvent
86-
@OnlyIn(Dist.CLIENT)
87-
public static void registerKeys(final RegisterKeyMappingsEvent event) {
88-
event.register(Zoom.KEY);
89-
}
90-
91-
private static PathPackResources getPathResources(String name, String path) {
92-
final IModFile modFile = ModList.get().getModFileById(ID).getFile();
93-
return new PathPackResources(name, true, modFile.findResource(path)) {
94-
@NotNull
95-
protected Path resolve(String... paths) {
96-
final String[] allPaths = new String[paths.length + 1];
97-
allPaths[0] = path;
98-
System.arraycopy(paths, 0, allPaths, 1, paths.length);
99-
return modFile.findResource(allPaths);
100-
}
101-
102-
@Override
103-
public boolean isHidden() {
104-
return false;
105-
}
106-
};
107-
}
108-
109-
public static boolean installed(final String modid) { return FMLLoader.getLoadingModList().getModFileById(modid) != null; }
11046
}

‎src/main/java/me/srrapero720/chloride/impl/FastBlocks.java‎

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,27 @@
33
import me.srrapero720.chloride.Chloride;
44
import me.srrapero720.chloride.api.events.FastModelSettingsUpdate;
55
import net.minecraft.client.Minecraft;
6+
import net.minecraft.network.chat.Component;
7+
import net.minecraft.server.packs.PackType;
8+
import net.minecraft.server.packs.repository.Pack;
9+
import net.minecraft.server.packs.repository.PackSource;
610
import net.minecraftforge.api.distmarker.Dist;
11+
import net.minecraftforge.event.AddPackFindersEvent;
712
import net.minecraftforge.eventbus.api.EventPriority;
813
import net.minecraftforge.eventbus.api.SubscribeEvent;
14+
import net.minecraftforge.fml.ModList;
915
import net.minecraftforge.fml.common.Mod;
16+
import net.minecraftforge.forgespi.locating.IModFile;
17+
import net.minecraftforge.resource.PathPackResources;
18+
import org.jetbrains.annotations.NotNull;
1019

11-
import static me.srrapero720.chloride.Chloride.SOLID_BEDS_PACK;
12-
import static me.srrapero720.chloride.Chloride.SOLID_CHESTS_PACK;
20+
import java.nio.file.Path;
1321

1422
@Mod.EventBusSubscriber(value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.FORGE, modid = Chloride.ID)
1523
public class FastBlocks {
24+
public static Pack SOLID_BEDS_PACK;
25+
public static Pack SOLID_CHESTS_PACK;
26+
1627
public static boolean canUseOnChests() {
1728
return !Chloride.installed("enhancedblockentities");
1829
}
@@ -34,4 +45,54 @@ public static void onBedSettingUpdateEvent(FastModelSettingsUpdate.BedEvent e) {
3445
Minecraft.getInstance().getResourcePackRepository().removePack(SOLID_BEDS_PACK.getId());
3546
}
3647
}
48+
49+
@Mod.EventBusSubscriber(value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD, modid = Chloride.ID)
50+
public static final class ModEvents {
51+
52+
@SubscribeEvent
53+
public static void registerResourcePacks(AddPackFindersEvent e) {
54+
Chloride.LOGGER.info("Register CHLORIDE packs");
55+
if (e.getPackType() == PackType.CLIENT_RESOURCES) {
56+
SOLID_BEDS_PACK = Pack.readMetaAndCreate(Chloride.ID + "_solid_beds",
57+
Component.literal("Chloride: Solid Beds"),
58+
false,
59+
id -> getPathResources(Chloride.ID, "custom_packs/solid_beds"),
60+
PackType.CLIENT_RESOURCES,
61+
Pack.Position.TOP,
62+
PackSource.BUILT_IN);
63+
64+
SOLID_CHESTS_PACK = Pack.readMetaAndCreate(Chloride.ID + "_solid_chests",
65+
Component.literal("Chloride: Solid Chests"),
66+
false,
67+
id -> getPathResources(Chloride.ID, "custom_packs/solid_chests"),
68+
PackType.CLIENT_RESOURCES,
69+
Pack.Position.TOP,
70+
PackSource.BUILT_IN);
71+
72+
e.addRepositorySource(consumer -> {
73+
consumer.accept(SOLID_BEDS_PACK);
74+
consumer.accept(SOLID_CHESTS_PACK);
75+
});
76+
}
77+
}
78+
79+
}
80+
81+
private static PathPackResources getPathResources(String name, String path) {
82+
final IModFile modFile = ModList.get().getModFileById(Chloride.ID).getFile();
83+
return new PathPackResources(name, true, modFile.findResource(path)) {
84+
@NotNull
85+
protected Path resolve(String... paths) {
86+
final String[] allPaths = new String[paths.length + 1];
87+
allPaths[0] = path;
88+
System.arraycopy(paths, 0, allPaths, 1, paths.length);
89+
return modFile.findResource(allPaths);
90+
}
91+
92+
@Override
93+
public boolean isHidden() {
94+
return true;
95+
}
96+
};
97+
}
3798
}

‎src/main/java/me/srrapero720/chloride/impl/Zoom.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
import net.minecraft.client.KeyMapping;
77
import net.minecraft.client.Minecraft;
88
import net.minecraftforge.api.distmarker.Dist;
9+
import net.minecraftforge.api.distmarker.OnlyIn;
910
import net.minecraftforge.client.event.InputEvent;
11+
import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
1012
import net.minecraftforge.client.event.ViewportEvent;
1113
import net.minecraftforge.client.settings.KeyConflictContext;
1214
import net.minecraftforge.client.settings.KeyModifier;
@@ -77,4 +79,13 @@ public static void onGetFovEvent(final ViewportEvent.ComputeFov e) {
7779
if (canUseZoom() && ChlorideConfig.enableZoom)
7880
e.setFOV(zoom(e.getFOV()));
7981
}
82+
83+
@Mod.EventBusSubscriber(value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD, modid = Chloride.ID)
84+
public static final class ModEvents {
85+
@SubscribeEvent
86+
@OnlyIn(Dist.CLIENT)
87+
public static void registerKeys(final RegisterKeyMappingsEvent event) {
88+
event.register(KEY);
89+
}
90+
}
8091
}

0 commit comments

Comments
 (0)