Skip to content

Commit e1c9215

Browse files
resolve conflicts 1.7
1 parent 1c0e4ea commit e1c9215

2 files changed

Lines changed: 28 additions & 10 deletions

File tree

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
import org.lwjgl.opengl.GL11;
4343

4444
import java.io.File;
45+
import java.io.IOException;
46+
import java.io.InputStream;
4547
import java.lang.reflect.Field;
4648
import java.nio.file.Path;
4749
import java.nio.file.Paths;
@@ -195,6 +197,29 @@ public void event(ModEvent event, Mod m) {
195197
packs.add(modPack);
196198
BuiltinPack.onConstruct(packs);
197199

200+
//Backport of lowercase language v
201+
//No redirect here as language codes are not enumerable in 1.7...
202+
BuiltinPack.conditional(ident -> {
203+
String path = ident.getPath();
204+
if (!path.endsWith(".lang") || path.toLowerCase(Locale.ROOT).equals(path)) {
205+
// Not lang or already converted
206+
return null;
207+
}
208+
209+
Identifier modern = new Identifier(ident.toString().toLowerCase());
210+
if (!modern.canLoad()) {
211+
return null;
212+
}
213+
214+
try (InputStream stream = modern.getResourceStream()) {
215+
byte[] buffer = new byte[stream.available()];
216+
stream.read(buffer);
217+
return buffer;
218+
} catch (IOException e) {
219+
throw new RuntimeException(e);
220+
}
221+
});
222+
198223
constructed = true;
199224
}
200225
}

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package cam72cam.mod.resource;
22

33
import cam72cam.mod.ModCore;
4+
import cpw.mods.fml.common.Loader;
5+
import cpw.mods.fml.relauncher.Side;
6+
import cpw.mods.fml.relauncher.SideOnly;
47
import net.minecraft.client.Minecraft;
58
import net.minecraft.client.resources.*;
6-
import net.minecraft.client.resources.data.IMetadataSection;
7-
import net.minecraft.client.resources.data.MetadataSerializer;
8-
import net.minecraftforge.fml.common.Loader;
9-
import net.minecraftforge.fml.relauncher.Side;
10-
import net.minecraftforge.fml.relauncher.SideOnly;
119

1210
import java.io.*;
1311
import java.util.*;
@@ -229,11 +227,6 @@ public Set<String> getResourceDomains() {
229227
public String getPackName() {
230228
return "UMC Generated Resources";
231229
}
232-
233-
@Override
234-
public <T extends IMetadataSection> T getPackMetadata(MetadataSerializer metadataSerializer, String metadataSectionName) throws IOException {
235-
return super.getPackMetadata(metadataSerializer, metadataSectionName);
236-
}
237230
}
238231

239232
/**

0 commit comments

Comments
 (0)