diff --git a/build.gradle b/build.gradle index 7a1eb5bb7..b23548fc1 100644 --- a/build.gradle +++ b/build.gradle @@ -94,11 +94,11 @@ accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg') minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}" - compileOnly fg.deobf("mezz.jei:jei-1.14.3:6.0.0.7:api") + compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.10:api") // deobfProvided "pl.asie:Charset-Lib:0.5.4.6" // deobfProvided "MCMultiPart2:MCMultiPart:2.5.3" - runtimeOnly fg.deobf("mezz.jei:jei-1.14.3:6.0.0.7") + runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.10") shade 'org.squiddev:Cobalt:0.5.0-SNAPSHOT' diff --git a/src/main/java/dan200/computercraft/client/ClientRegistry.java b/src/main/java/dan200/computercraft/client/ClientRegistry.java index 22bc90878..1a5efaefb 100644 --- a/src/main/java/dan200/computercraft/client/ClientRegistry.java +++ b/src/main/java/dan200/computercraft/client/ClientRegistry.java @@ -12,6 +12,7 @@ import dan200.computercraft.shared.media.items.ItemDisk; import dan200.computercraft.shared.pocket.items.ItemPocketComputer; import dan200.computercraft.shared.util.Colour; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.IUnbakedModel; import net.minecraft.client.renderer.model.ModelResourceLocation; @@ -58,8 +59,8 @@ public final class ClientRegistry }; private static final String[] EXTRA_TEXTURES = new String[] { - // TODO: Gather these automatically from the model. I'm unable to get this working with Forge's current - // model loading code. + // TODO: Gather these automatically from the model. Sadly the model loader isn't available + // when stitching textures. "block/turtle_colour", "block/turtle_elf_overlay", "block/turtle_crafty_face", @@ -77,13 +78,12 @@ public static void registerModels( ModelRegistryEvent event ) @SubscribeEvent public static void onTextureStitchEvent( TextureStitchEvent.Pre event ) { - /* - IResourceManager manager = Minecraft.getInstance().getResourceManager(); + if( event.getMap() != Minecraft.getInstance().getTextureMap() ) return; + for( String extra : EXTRA_TEXTURES ) { - // TODO: event.getMap().registerSprite( manager, new ResourceLocation( ComputerCraft.MOD_ID, extra ) ); + event.addSprite( new ResourceLocation( ComputerCraft.MOD_ID, extra ) ); } - */ } @SubscribeEvent