Skip to content

Commit 174dedb

Browse files
Goldenfield192Goldenfield192
committed
resolve conflicts 1.17
1 parent 2e9b56c commit 174dedb

4 files changed

Lines changed: 59 additions & 76 deletions

File tree

‎src/main/java/cam72cam/mod/ModCore.java‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
package cam72cam.mod;
22

3-
import java.io.*;
4-
import java.nio.charset.StandardCharsets;
5-
import java.nio.file.Path;
6-
import java.nio.file.Paths;
7-
import java.util.*;
8-
9-
import net.minecraft.resources.*;
10-
import net.minecraftforge.fml.loading.FMLLoader;
11-
import org.apache.logging.log4j.LogManager;
12-
import org.apache.logging.log4j.Logger;
13-
143
import cam72cam.mod.config.ConfigFile;
154
import cam72cam.mod.entity.ModdedEntity;
165
import cam72cam.mod.entity.sync.EntitySync;
@@ -27,21 +16,12 @@
2716
import cam72cam.mod.world.ChunkManager;
2817
import com.mojang.blaze3d.systems.RenderSystem;
2918
import net.minecraft.client.Minecraft;
30-
import net.minecraft.network.chat.TextComponent;
31-
import net.minecraft.resources.ResourceLocation;
32-
import net.minecraft.server.packs.*;
33-
import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
34-
import net.minecraft.server.packs.repository.Pack;
35-
import net.minecraft.server.packs.repository.PackCompatibility;
36-
import net.minecraft.server.packs.repository.PackSource;
3719
import net.minecraft.server.packs.resources.ReloadableResourceManager;
38-
import net.minecraft.server.packs.resources.Resource;
3920
import net.minecraft.util.Unit;
4021
import net.minecraftforge.common.MinecraftForge;
4122
import net.minecraftforge.event.RegisterCommandsEvent;
4223
import net.minecraftforge.eventbus.api.SubscribeEvent;
4324
import net.minecraftforge.fml.DistExecutor;
44-
import net.minecraftforge.fml.ModList;
4525
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
4626
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
4727
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
@@ -57,18 +37,11 @@
5737
import org.apache.logging.log4j.LogManager;
5838
import org.apache.logging.log4j.Logger;
5939

60-
import javax.annotation.Nullable;
6140
import java.io.*;
6241
import java.nio.charset.StandardCharsets;
6342
import java.nio.file.Path;
6443
import java.nio.file.Paths;
6544
import java.util.*;
66-
import java.util.function.Predicate;
67-
import java.util.stream.Collectors;
68-
import java.io.File;
69-
import java.io.IOException;
70-
import java.util.ArrayList;
71-
import java.util.List;
7245

7346
/** UMC Mod, do not touch... */
7447
@net.minecraftforge.fml.common.Mod(ModCore.MODID)

‎src/main/java/cam72cam/mod/event/platform/LoadDatapackEvent.java‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
11
package cam72cam.mod.event.platform;
22

3-
import net.minecraft.resources.*;
4-
import net.minecraft.util.text.StringTextComponent;
3+
import net.minecraft.network.chat.TextComponent;
4+
import net.minecraft.server.packs.PackResources;
5+
import net.minecraft.server.packs.repository.Pack;
6+
import net.minecraft.server.packs.repository.PackCompatibility;
7+
import net.minecraft.server.packs.repository.PackRepository;
8+
import net.minecraft.server.packs.repository.PackSource;
59
import net.minecraftforge.eventbus.api.Event;
6-
import net.minecraftforge.fml.event.lifecycle.IModBusEvent;
10+
import net.minecraftforge.fml.event.IModBusEvent;
711

812
/**
913
* Fired when datapacks are reloaded, useful when injecting your dynamic datapack implementations.
1014
*/
1115
public class LoadDatapackEvent extends Event implements IModBusEvent {
12-
private final ResourcePackList infos;
16+
private final PackRepository infos;
1317

14-
public LoadDatapackEvent(ResourcePackList infos) {
18+
public LoadDatapackEvent(PackRepository infos) {
1519
this.infos = infos;
1620
}
1721

18-
public void addDataPack(IResourcePack pack) {
22+
public void addDataPack(PackResources pack) {
1923
infos.addPackFinder((consumer, p_230230_2_) -> {
20-
consumer.accept(new ResourcePackInfo(pack.getName(),
21-
true,
22-
() -> pack,
23-
new StringTextComponent(""),
24-
new StringTextComponent(""),
25-
PackCompatibility.COMPATIBLE,
26-
ResourcePackInfo.Priority.TOP,
27-
true,
28-
IPackNameDecorator.BUILT_IN,
29-
false));
24+
consumer.accept(new Pack(pack.getName(),
25+
true,
26+
() -> pack,
27+
new TextComponent(""),
28+
new TextComponent(""),
29+
PackCompatibility.COMPATIBLE,
30+
Pack.Position.TOP,
31+
true,
32+
PackSource.DEFAULT,
33+
true));
3034
});
3135
}
3236
}

‎src/main/java/cam72cam/mod/mixin/feat/data_registry/MixinMinecraftServer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cam72cam.mod.mixin.feat.data_registry;
22

33
import cam72cam.mod.event.platform.LoadDatapackEvent;
4-
import net.minecraft.resources.ResourcePackList;
54
import net.minecraft.server.MinecraftServer;
6-
import net.minecraft.util.datafix.codec.DatapackCodec;
5+
import net.minecraft.server.packs.repository.PackRepository;
6+
import net.minecraft.world.level.DataPackConfig;
77
import net.minecraftforge.fml.ModLoader;
88
import org.spongepowered.asm.mixin.Mixin;
99
import org.spongepowered.asm.mixin.injection.At;
@@ -16,7 +16,7 @@
1616
@Mixin(MinecraftServer.class)
1717
public class MixinMinecraftServer {
1818
@Inject(method = "configurePackRepository", at = @At("HEAD"))
19-
private static void callback(ResourcePackList repo, DatapackCodec codec, boolean forceModData, CallbackInfoReturnable<DatapackCodec> cir) {
19+
private static void callback(PackRepository repo, DataPackConfig config, boolean forceModData, CallbackInfoReturnable<DataPackConfig> cir) {
2020
LoadDatapackEvent event = new LoadDatapackEvent(repo);
2121
ModLoader.get().postEvent(event);
2222
}

‎src/main/java/cam72cam/mod/resource/BuiltinPack.java‎

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
import cam72cam.mod.ModCore;
44
import cam72cam.mod.event.platform.LoadDatapackEvent;
55
import net.minecraft.client.Minecraft;
6-
import net.minecraft.resources.*;
7-
import net.minecraft.resources.data.IMetadataSectionSerializer;
8-
import net.minecraft.util.ResourceLocation;
9-
import net.minecraft.util.text.StringTextComponent;
6+
import net.minecraft.network.chat.TextComponent;
7+
import net.minecraft.resources.ResourceLocation;
8+
import net.minecraft.server.packs.*;
9+
import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
10+
import net.minecraft.server.packs.repository.Pack;
11+
import net.minecraft.server.packs.repository.PackCompatibility;
12+
import net.minecraft.server.packs.repository.PackSource;
1013
import net.minecraftforge.api.distmarker.Dist;
1114
import net.minecraftforge.api.distmarker.OnlyIn;
1215
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -15,7 +18,10 @@
1518
import net.minecraftforge.fml.loading.FMLPaths;
1619

1720
import javax.annotation.Nullable;
18-
import java.io.*;
21+
import java.io.ByteArrayInputStream;
22+
import java.io.File;
23+
import java.io.IOException;
24+
import java.io.InputStream;
1925
import java.util.*;
2026
import java.util.function.Function;
2127
import java.util.function.Predicate;
@@ -86,7 +92,7 @@ public static void redirect(Identifier requestedPrefix, Identifier actualPrefix)
8692
* Registers a file or folder as a resource pack to the game.
8793
*/
8894
@OnlyIn(Dist.CLIENT)
89-
public static IResourcePack attach(File path) {
95+
public static PackResources attach(File path) {
9096
if (path.isDirectory()) {
9197
return new UMCFolderPack(path);
9298
} else {
@@ -105,29 +111,29 @@ public static void putData(ResourceLocation location, byte[] content) {
105111
* Internal
106112
*/
107113
public static void loadClientResources() {
108-
List<IResourcePack> packs = new ArrayList<>();
114+
List<PackResources> packs = new ArrayList<>();
109115

110116
for (ModCore.Mod mod : ModCore.instance.getLoadedMods()) {
111117
BuiltinPack.loadModResource(mod, packs);
112118
}
113119

114-
IResourcePack pack = new InternalResourcePack();
120+
PackResources pack = new InternalResourcePack();
115121
//Ensure people will get our result first via getResourceStream() and getLastResourceStream()
116122
packs.add(1, pack);
117123
packs.add(pack);
118124

119125
Minecraft.getInstance().getResourcePackRepository().addPackFinder((consumer, packInfoFactory) -> {
120-
for (IResourcePack pack1 : packs) {
121-
consumer.accept(new ResourcePackInfo(pack1.getName(),
122-
true,
123-
() -> pack1,
124-
new StringTextComponent(""),
125-
new StringTextComponent(""),
126-
PackCompatibility.COMPATIBLE,
127-
ResourcePackInfo.Priority.TOP,
128-
true,
129-
IPackNameDecorator.DEFAULT,
130-
true));
126+
for (PackResources pack1 : packs) {
127+
consumer.accept(new Pack(pack1.getName(),
128+
true,
129+
() -> pack1,
130+
new TextComponent(""),
131+
new TextComponent(""),
132+
PackCompatibility.COMPATIBLE,
133+
Pack.Position.TOP,
134+
true,
135+
PackSource.DEFAULT,
136+
true));
131137
}
132138
});
133139
}
@@ -140,11 +146,11 @@ public static void loadServerResource(LoadDatapackEvent event) {
140146
event.addDataPack(new InternalDataPack());
141147
}
142148

143-
private static void loadModResource(ModCore.Mod mod, List<IResourcePack> packs) {
149+
private static void loadModResource(ModCore.Mod mod, List<PackResources> packs) {
144150
String configDir = FMLPaths.CONFIGDIR.toString();
145151
new File(configDir).mkdirs();
146152

147-
IResourcePack modPack = BuiltinPack.attach(ModList.get().getModFileById(mod.modID()).getFile().getFilePath().toFile());
153+
PackResources modPack = BuiltinPack.attach(ModList.get().getModFileById(mod.modID()).getFile().getFilePath().toFile());
148154
// Ensure people will get our result first via getResourceStream() and getLastResourceStream()
149155
// (Also injects last modified time access)
150156
// BUG: sounds can still be overridden by resource packs
@@ -178,7 +184,7 @@ public static void reload() {
178184
/**
179185
* Internal, Client side assets loading
180186
*/
181-
private static class InternalResourcePack extends ResourcePack {
187+
private static class InternalResourcePack extends AbstractPackResources {
182188
public InternalResourcePack() {
183189
super(ModList.get().getModFileById("universalmodcore").getFile().getFilePath().toFile());
184190
}
@@ -250,7 +256,7 @@ && handleRedirect(ident, entry.getKey(), entry.getValue()).canLoad()) {
250256
}
251257

252258
@Override
253-
public Collection<ResourceLocation> getResources(ResourcePackType type, String pathIn, String namespace, int maxDepth, Predicate<String> filter) {
259+
public Collection<ResourceLocation> getResources(PackType type, String pathIn, String namespace, int maxDepth, Predicate<String> filter) {
254260
//TODO list all redirect/conditional resources, may need new parameters in API?
255261
List<ResourceLocation> result = new ArrayList<>();
256262
final String folder = pathIn + "/"; // Ensure folders
@@ -278,7 +284,7 @@ public Collection<ResourceLocation> getResources(ResourcePackType type, String p
278284
}
279285

280286
@Override
281-
public Set<String> getNamespaces(ResourcePackType type) {
287+
public Set<String> getNamespaces(PackType type) {
282288
Set<String> collect = ModCore.instance.getLoadedMods().stream().map(ModCore.Mod::modID).collect(Collectors.toSet());
283289
collect.add("universalmodcore");
284290
return collect;
@@ -291,7 +297,7 @@ public String getName() {
291297

292298
@Nullable
293299
@Override
294-
public <T> T getMetadataSection(IMetadataSectionSerializer<T> p_195760_1_) throws IOException {
300+
public <T> T getMetadataSection(MetadataSectionSerializer<T> p_195760_1_) throws IOException {
295301
return getMetadataFromStream(p_195760_1_, new ByteArrayInputStream("{}".getBytes()));
296302
}
297303

@@ -343,7 +349,7 @@ public static InputStream loadServerResource(Identifier ident) throws IOExceptio
343349
/**
344350
* Internal, Server side data loading
345351
*/
346-
public static class InternalDataPack extends ResourcePack {
352+
public static class InternalDataPack extends AbstractPackResources {
347353
static Map<ResourceLocation, byte[]> data = new HashMap<>();
348354

349355
public InternalDataPack() {
@@ -365,7 +371,7 @@ public boolean hasResource(String resourcePath) {
365371
}
366372

367373
@Override
368-
public Collection<ResourceLocation> getResources(ResourcePackType type, String pathIn, String namespace, int maxDepth, Predicate<String> filter) {
374+
public Collection<ResourceLocation> getResources(PackType type, String pathIn, String namespace, int maxDepth, Predicate<String> filter) {
369375
List<ResourceLocation> result = new ArrayList<>();
370376
final String folder = pathIn + "/"; // Ensure folders
371377
data.keySet().forEach((k) -> {
@@ -381,7 +387,7 @@ public Collection<ResourceLocation> getResources(ResourcePackType type, String p
381387
}
382388

383389
@Override
384-
public Set<String> getNamespaces(ResourcePackType type) {
390+
public Set<String> getNamespaces(PackType type) {
385391
Set<String> collect = ModCore.instance.getLoadedMods().stream().map(ModCore.Mod::modID).collect(Collectors.toSet());
386392
collect.add("universalmodcore");
387393
return collect;
@@ -398,7 +404,7 @@ public void close() {
398404
}
399405
}
400406

401-
private static class UMCFolderPack extends FolderPack {
407+
private static class UMCFolderPack extends FolderPackResources {
402408
public UMCFolderPack(File folder) {
403409
super(folder);
404410
}
@@ -416,7 +422,7 @@ public boolean hasResource(String resourcePath) {
416422
}
417423
}
418424

419-
private static class UMCFilePack extends FilePack {
425+
private static class UMCFilePack extends FilePackResources {
420426
private final File path;
421427

422428
public UMCFilePack(File fileIn) {

0 commit comments

Comments
 (0)